[COMMIT] Get Stephen's last change compiling, fix a clear bug.

Thanks for the change, Steve. As far as I can see your reasoning applies equally to Display{Width,Height}MM and probably the other system metrics, but I don’t see an easy way of forcing X11 to return an up-to-date value (as you comment, the functions just return the same cached values that the macros do). APPROVE COMMIT NOTE: This patch has been committed. # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net&gt; # Date 1555244583 -3600 # Sun Apr 14 13:23:03 2019 +0100 # Node ID a975482ad82db38730ffaaf33e0db6092f7cf779 # Parent 60e40afb6fbede36786e8fe8c3f74025c798723a Get Stephen's last change compiling, fix a clear bug. src/ChangeLog addition: 2019-04-14 Aidan Kehoe <kehoea(a)parhasard.net&gt; Get Stephen's last change compiling, fix a clear bug. * balloon_help.c: Make the types, macros from from lisp.h, device.h, console-x.h available here. Use the XEmacs Boolint rather than making a new boolean. * balloon_help.c (show_help): * balloon_help.c (balloon_help_create): Wrap the pointer to the device returned by get_device_from_display(), making it a Lisp_Object, as we want. * balloon_help.c (balloon_help_hide): * device-x.c (x_device_system_metrics): Declare the parameters to XGetGeometry using the documented types. Return the pixel size as intended, rather than falling through to the DM_size_device_mm case. * device.c: Move Qsize_device to general-slots.h. * frame-x.c (x_set_frame_position): DPY isn't used, removed it. * general-slots.h: Move Qsize_device here. * lisp.h: Declare Fdevice_system_metric(), now it's used in frame_x.c, balloon_help.c. diff -r 60e40afb6fbe -r a975482ad82d src/ChangeLog --- a/src/ChangeLog Fri Apr 05 18:55:50 2019 +0900 +++ b/src/ChangeLog Sun Apr 14 13:23:03 2019 +0100 ＠＠ -1,3 +1,29 ＠＠ +2019-04-14 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + Get Stephen's last change compiling, fix a clear bug. + * balloon_help.c: + Make the types, macros from from lisp.h, device.h, console-x.h + available here. + Use the XEmacs Boolint rather than making a new boolean. + * balloon_help.c (show_help): + * balloon_help.c (balloon_help_create): + Wrap the pointer to the device returned by + get_device_from_display(), making it a Lisp_Object, as we want. + * balloon_help.c (balloon_help_hide): + * device-x.c (x_device_system_metrics): + Declare the parameters to XGetGeometry using the documented types. + Return the pixel size as intended, rather than falling through to + the DM_size_device_mm case. + * device.c: + Move Qsize_device to general-slots.h. + * frame-x.c (x_set_frame_position): + DPY isn't used, removed it. + * general-slots.h: + Move Qsize_device here. + * lisp.h: + Declare Fdevice_system_metric(), now it's used in frame_x.c, + balloon_help.c. + 2019-04-02 Stephen J. Turnbull <turnbull(a)sk.tsukuba.ac.jp&gt; * device-x.c (x_device_system_metrics): diff -r 60e40afb6fbe -r a975482ad82d src/balloon_help.c --- a/src/balloon_help.c Fri Apr 05 18:55:50 2019 +0900 +++ b/src/balloon_help.c Sun Apr 14 13:23:03 2019 +0100 ＠＠ -31,27 +31,22 ＠＠ */ #include <config.h> +#include "lisp.h" +#include "device.h" +#include "console-x.h" + #include <string.h> #include <stdlib.h> #include <stdio.h> -#include <assert.h> #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/extensions/shape.h> -#include "compiler.h" #include "xintrinsic.h" #include "balloon_help.h" -#ifndef max -#define max(x,y) (x>y?x:y) -#endif - -#undef bool -#define bool int - #define MARGIN_WIDTH 4 #define POINTER_OFFSET 8 #define BORDER_WIDTH 2 ＠＠ -78,7 +73,7 ＠＠ static GC b_shadowGC; static Window b_win; -static bool b_winMapped; +static Boolint b_winMapped; static Pixmap b_mask; static int b_maskWidth, b_maskHeight; ＠＠ -377,7 +372,7 ＠＠ XClearWindow (b_dpy, b_win); XMapRaised (b_dpy, b_win); - b_winMapped = True; + b_winMapped = 1; draw_text (b_dpy, b_win, b_gc, b_fontStruct, BORDER_WIDTH + MARGIN_WIDTH, ＠＠ -524,13 +519,13 ＠＠ create_pixmap_mask (1, 1); b_maskGC = create_gc (dpy, b_mask, bg, fg, b_fontStruct); - b_winMapped = False; + b_winMapped = 0; b_timer = None; b_delay = 500; - root_size = Fdevice_system_metric (get_device_from_display (dpy), - Qsize_device, - Qnil); + root_size + = Fdevice_system_metric (wrap_device (get_device_from_display (dpy)), + Qsize_device, Qnil); b_screenWidth = XFIXNUM (XCAR (root_size)); b_screenHeight = XFIXNUM (XCDR (root_size)); ＠＠ -572,7 +567,7 ＠＠ b_text = NULL; XUnmapWindow (b_dpy, b_win); - b_winMapped = False; + b_winMapped = 0; if (b_timer) { XtRemoveTimeOut (b_timer); diff -r 60e40afb6fbe -r a975482ad82d src/device-x.c --- a/src/device-x.c Fri Apr 05 18:55:50 2019 +0900 +++ b/src/device-x.c Sun Apr 14 13:23:03 2019 +0100 ＠＠ -1769,11 +1769,11 ＠＠ { int x, y; /* Nobody would be running X on a smaller screen, right? */ - Dimension w = 1024, h = 768, b, d; + unsigned int w = 1024, h = 768, b, dd; Window root = RootWindow(dpy, DefaultScreen(dpy)); /* If this fails, Xlib promises w and h are not updated. */ - XGetGeometry(dpy, root, &root, &x, &y, &w, &h, &b, &d); - Fcons (make_fixnum (w), make_fixnum (h)); + XGetGeometry(dpy, root, &root, &x, &y, &w, &h, &b, &dd); + return Fcons (make_fixnum (w), make_fixnum (h)); } case DM_size_device_mm: return Fcons (make_fixnum (XDisplayWidthMM (dpy, DefaultScreen (dpy))), diff -r 60e40afb6fbe -r a975482ad82d src/device.c --- a/src/device.c Fri Apr 05 18:55:50 2019 +0900 +++ b/src/device.c Sun Apr 14 13:23:03 2019 +0100 ＠＠ -72,7 +72,7 ＠＠ Qcolor_scrollbar, Qcolor_desktop, Qcolor_workspace, Qfont_default, Qfont_menubar, Qfont_dialog, Qsize_cursor, Qsize_scrollbar, Qsize_menu, Qsize_toolbar, Qsize_toolbar_button, - Qsize_toolbar_border, Qsize_icon, Qsize_icon_small, Qsize_device, + Qsize_toolbar_border, Qsize_icon, Qsize_icon_small, Qsize_workspace, Qoffset_workspace, Qsize_device_mm, Qdevice_dpi, Qnum_bit_planes, Qnum_color_cells, Qnum_screens, Qmouse_buttons, Qsave_under, Qswap_buttons, Qshow_sounds, Qslow_device, Qsecurity, diff -r 60e40afb6fbe -r a975482ad82d src/frame-x.c --- a/src/frame-x.c Fri Apr 05 18:55:50 2019 +0900 +++ b/src/frame-x.c Sun Apr 14 13:23:03 2019 +0100 ＠＠ -2227,7 +2227,6 ＠＠ x_set_frame_position (struct frame *f, int xoff, int yoff) { Widget w = FRAME_X_SHELL_WIDGET (f); - Display *dpy = XtDisplay (w); Lisp_Object root_size = Fdevice_system_metric (FRAME_DEVICE (f), Qsize_device, Qnil); diff -r 60e40afb6fbe -r a975482ad82d src/general-slots.h --- a/src/general-slots.h Fri Apr 05 18:55:50 2019 +0900 +++ b/src/general-slots.h Sun Apr 14 13:23:03 2019 +0100 ＠＠ -275,6 +275,7 ＠＠ SYMBOL (Qsignal); SYMBOL_MODULE_API (Qsimple); SYMBOL (Qsize); +SYMBOL (Qsize_device); SYMBOL (Qsound); SYMBOL (Qspace); SYMBOL (Qspecifier); diff -r 60e40afb6fbe -r a975482ad82d src/lisp.h --- a/src/lisp.h Fri Apr 05 18:55:50 2019 +0900 +++ b/src/lisp.h Sun Apr 14 13:23:03 2019 +0100 ＠＠ -4708,6 +4708,7 ＠＠ Lisp_Object object); extern Lisp_Object Qdevice_live_p; +EXFUN (Fdevice_system_metric, 3); /* Defined in device-x.c */ extern Lisp_Object Vx_initial_argv_list; Ar an cúigiú lá de mí Aibréan, scríobh Stephen J. Turnbull: -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)