diff options
| author | Jan D <[email protected]> | 2010-11-13 19:59:28 +0100 |
|---|---|---|
| committer | Jan D <[email protected]> | 2010-11-13 19:59:28 +0100 |
| commit | 933e29ff5e9d63ae6976cc998980042fbea09b26 (patch) | |
| tree | be0b2316d739a21bc38eafbf6fb40cd66925eb01 /src | |
| parent | a048073e243c62bae2727e70913ec54133ae8746 (diff) | |
Fix Atoms and Lisp_Object mixup and related bugs.
* src/xselect.c (x_send_client_event): Move CHECK_STRING ...
(Fx_send_client_event): to here.
* src/xterm.c (set_wm_state): Don't put Atom in cons, call
make_fixnum_or_float on them first.
(x_term_init): Initialize Xatom_net_supporting_wm_check and
Xatom_net_supported correctly.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 10 | ||||
| -rw-r--r-- | src/xselect.c | 6 | ||||
| -rw-r--r-- | src/xterm.c | 7 |
3 files changed, 18 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b821d17e29..66266110fc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2010-11-13 Jan Djärv <[email protected]> + + * xterm.c (set_wm_state): Don't put Atom in cons, call + make_fixnum_or_float on them first. + (x_term_init): Initialize Xatom_net_supporting_wm_check and + Xatom_net_supported correctly. + + * xselect.c (x_send_client_event): Move CHECK_STRING ... + (Fx_send_client_event): to here. + 2010-11-13 Martin Rudalics <[email protected]> * window.c (Fwindow_use_time): New function. diff --git a/src/xselect.c b/src/xselect.c index b566b90898..ea64d9c3f3 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -2528,8 +2528,11 @@ are ignored. */) { struct x_display_info *dpyinfo = check_x_display_info (display); + CHECK_STRING (message_type); x_send_client_event(display, dest, from, - XInternAtom (dpyinfo->display, SDATA (message_type), False), + XInternAtom (dpyinfo->display, + SDATA (message_type), + False), format, values); return Qnil; @@ -2546,7 +2549,6 @@ x_send_client_event (Lisp_Object display, Lisp_Object dest, Lisp_Object from, At struct frame *f = check_x_frame (from); int to_root; - CHECK_STRING (message_type); CHECK_NUMBER (format); CHECK_CONS (values); diff --git a/src/xterm.c b/src/xterm.c index f8b7b2a630..277c32df6e 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -8380,8 +8380,9 @@ set_wm_state (Lisp_Object frame, int add, Atom atom, Atom value) Fcons (make_number (add ? 1 : 0), Fcons - (atom, - value != 0 ? value : Qnil))); + (make_fixnum_or_float (atom), + value != 0 + ? make_fixnum_or_float (value) : Qnil))); } void @@ -10247,7 +10248,7 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) { "_NET_WM_ICON_NAME", &dpyinfo->Xatom_net_wm_icon_name }, { "_NET_WM_NAME", &dpyinfo->Xatom_net_wm_name }, { "_NET_SUPPORTED", &dpyinfo->Xatom_net_supported }, - { "_NET_SUPPORTING_WM_CHECK", &dpyinfo->Xatom_net_supported }, + { "_NET_SUPPORTING_WM_CHECK", &dpyinfo->Xatom_net_supporting_wm_check }, { "_NET_WM_WINDOW_OPACITY", &dpyinfo->Xatom_net_wm_window_opacity }, { "_NET_ACTIVE_WINDOW", &dpyinfo->Xatom_net_active_window }, { "_NET_FRAME_EXTENTS", &dpyinfo->Xatom_net_frame_extents }, |