Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 10:27:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

* xterm.c (x_dispatch_event): More accurate ifdefs.

Browse source
This commit is contained in:
Paul Eggert 2011-04-16 09:44:58 -07:00
parent 748945cc8b
commit dda3aeddcb
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ChangeLog
View file

@ -6,12 +6,10 @@
* xterm.c: Fix problems found by static analysis with other toolkits.
(toolkit_scroll_bar_interaction): Define and use only if USE_X_TOOLKIT.
(x_dispatch_event): Declare static only if !USE_GTK && USE_X_TOOLKIT.
Define if USE_GTK || (HAVE_MENUS && USE_X_TOOLKIT); USE_MOTIF need
not be part of this test.
(x_dispatch_event): Declare static if USE_GTK, and
define if USE_GTK || USE_X_TOOLKIT.
(SET_SAVED_BUTTON_EVENT): Define only if USE_X_TOOLKIT || USE_GTK.
* xterm.h (x_dispatch_event): Use USE_GTK, not USE_MOTIF, when testing
whether to declare.
* xterm.h (x_dispatch_event): Extern only if USE_X_TOOLKIT.
* xterm.c, xterm.h (x_mouse_leave): Bring this function back, but only if
defined HAVE_MENUS && !defined USE_X_TOOLKIT && !defined USE_GTK.

4
src/xterm.c
View file

@ -349,7 +349,7 @@ static void x_check_expected_move (struct frame *, int, int);
static void x_sync_with_move (struct frame *, int, int, int);
static int handle_one_xevent (struct x_display_info *, XEvent *,
int *, struct input_event *);
#if !defined USE_GTK && defined USE_X_TOOLKIT
#ifdef USE_GTK
static int x_dispatch_event (XEvent *, Display *);
#endif
/* Don't declare this NO_RETURN because we want no
@ -6977,7 +6977,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr,
return count;
}
#if defined USE_GTK || (defined HAVE_MENUS && defined USE_X_TOOLKIT)
#if defined USE_GTK || defined USE_X_TOOLKIT
/* Handles the XEvent EVENT on display DISPLAY.
This is used for event loops outside the normal event handling,

2
src/xterm.h
View file

@ -986,7 +986,7 @@ extern void x_clear_area (Display *, Window, int, int, int, int, int);
extern void x_mouse_leave (struct x_display_info *);
#endif
#if defined USE_GTK || defined USE_X_TOOLKIT
#ifdef USE_X_TOOLKIT
extern int x_dispatch_event (XEvent *, Display *);
#endif
extern unsigned int x_x_to_emacs_modifiers (struct x_display_info *,