commit ad7f692f01592e2ba1b054d032c94a6a3e7da0df
parent 46e9f99c197f9adb104ccd24bc5c1a141d00ab48
Author: Kyle Milz <krwmilz@gmail.com>
Date: Tue, 14 Sep 2021 17:42:20 +0000
replace some DISP with XtWindow(w)
Diffstat:
| M | events.c | | | 63 | ++++++++++++++++++++++++++++++++------------------------------- |
1 file changed, 32 insertions(+), 31 deletions(-)
diff --git a/events.c b/events.c
@@ -938,8 +938,6 @@ ACTION(Act_center)
{
int x, y;
-
-
x = event->xkey.x - clip_w / 2;
y = event->xkey.y - clip_h / 2;
/* The clip widget gives a more exact value. */
@@ -947,9 +945,7 @@ ACTION(Act_center)
XtCallCallbacks(x_bar, XtNscrollProc, (XtPointer) (ptrdiff_t) x);
if (y_bar != NULL)
XtCallCallbacks(y_bar, XtNscrollProc, (XtPointer) (ptrdiff_t) y);
- XWarpPointer(DISP, None, None, 0, 0, 0, 0, -x, -y);
-
-
+ XWarpPointer(XtDisplay(w), None, None, 0, 0, 0, 0, -x, -y);
}
static
@@ -960,7 +956,7 @@ ACTION(Act_left)
(XtPointer) (*num_params == 0 ? (-2 * (ptrdiff_t) clip_w / 3)
: (ptrdiff_t) (-atof(*params) * clip_w)));
else
- XBell(DISP, 0);
+ XBell(XtDisplay(w), 0);
}
static
@@ -971,7 +967,7 @@ ACTION(Act_right)
(XtPointer) (*num_params == 0 ? (2 * (ptrdiff_t) clip_w / 3)
: (ptrdiff_t) (atof(*params) * clip_w)));
else
- XBell(DISP, 0);
+ XBell(XtDisplay(w), 0);
}
static
@@ -982,7 +978,7 @@ ACTION(Act_up)
(XtPointer) (*num_params == 0 ? (-2 * (ptrdiff_t) clip_h / 3)
: (ptrdiff_t) (-atof(*params) * clip_h)));
else
- XBell(DISP, 0);
+ XBell(XtDisplay(w), 0);
}
static
@@ -993,7 +989,7 @@ ACTION(Act_down)
(XtPointer) (*num_params == 0 ? (2 * (ptrdiff_t) clip_h / 3)
: (ptrdiff_t) (atof(*params) * clip_h)));
else
- XBell(DISP, 0);
+ XBell(XtDisplay(w), 0);
}
static
@@ -1013,13 +1009,13 @@ ACTION(Act_down_or_next)
if (current_page < total_pages - 1) {
goto_page(current_page + 1, home);
ev_flags |= EV_NEWPAGE;
- XFlush(DISP);
+ XFlush(XtDisplay(w));
return; /* Don't use longjmp here: it might be called from
* within the toolkit, and we don't want to longjmp out
* of Xt routines. */
}
else
- XBell(DISP, 0);
+ XBell(XtDisplay(w), 0);
}
static
@@ -1039,20 +1035,22 @@ ACTION(Act_up_or_previous)
if (current_page > 0) {
goto_page(current_page - 1, home_bottom);
ev_flags |= EV_NEWPAGE;
- XFlush(DISP);
+ XFlush(XtDisplay(w));
return; /* Don't use longjmp here: it might be called from
* within the toolkit, and we don't want to longjmp out
* of Xt routines. */
}
else
- XBell(DISP, 0);
+ XBell(XtDisplay(w), 0);
}
static
ACTION(Act_show_display_attributes)
{
+ Display *disp = XtDisplay(w);
+
printf("Unit = %d, bitord = %d, byteord = %d\n",
- BitmapUnit(DISP), BitmapBitOrder(DISP), ImageByteOrder(DISP));
+ BitmapUnit(disp), BitmapBitOrder(disp), ImageByteOrder(disp));
}
static int
@@ -1077,7 +1075,7 @@ ACTION(Act_set_shrink_factor)
number, arg = shrink_to_fit());
if (arg <= 0) {
- XBell(DISP, 0);
+ XBell(XtDisplay(w), 0);
return;
}
@@ -1099,7 +1097,7 @@ ACTION(Act_set_shrink_factor)
reconfig();
home(False);
ev_flags |= EV_NEWPAGE;
- XFlush(DISP);
+ XFlush(XtDisplay(w));
}
static
@@ -1113,7 +1111,7 @@ ACTION(Act_shrink_to_dpi)
arg = (double) pixels_per_inch / arg + 0.5;
if (arg <= 0) {
- XBell(DISP, 0);
+ XBell(XtDisplay(w), 0);
return;
}
@@ -1135,7 +1133,7 @@ ACTION(Act_shrink_to_dpi)
reconfig();
home(False);
ev_flags |= EV_NEWPAGE;
- XFlush(DISP);
+ XFlush(XtDisplay(w));
}
static
@@ -1144,7 +1142,7 @@ ACTION(Act_set_density)
int arg;
GET_ARG4(arg, arg = atoi(*params), sign * number,
- {XBell(DISP, 0); return;});
+ {XBell(XtDisplay(w), 0); return;});
float newgamma = arg != 0 ? arg / 100.0 : 1.0;
@@ -1158,7 +1156,7 @@ ACTION(Act_set_density)
reset_colors();
ev_flags |= EV_NEWPAGE;
- XFlush(DISP);
+ XFlush(XtDisplay(w));
}
@@ -1219,6 +1217,7 @@ ACTION(Act_magnifier)
int x, y;
XSetWindowAttributes attr;
Window throwaway;
+ Display *disp;
/*
* Don't pop up a magnifying glass if we're still generating fonts or
@@ -1227,10 +1226,12 @@ ACTION(Act_magnifier)
if (!check_dvi_file() || !dvi_file_ready)
return;
+ disp = XtDisplay(w);
+
if (event->type != ButtonPress || mouse_release != null_mouse
|| alt.win != (Window) 0 || mane.shrinkfactor == 1
|| *num_params != 1) {
- XBell(DISP, 0);
+ XBell(disp, 0);
return;
}
@@ -1239,7 +1240,7 @@ ACTION(Act_magnifier)
int n = atoi(p + 1) - 1;
if (n < 0 || n >= 5 || mg_size[n].w <= 0) {
- XBell(DISP, 0);
+ XBell(disp, 0);
return;
}
alt.width = mg_size[n].w;
@@ -1253,11 +1254,11 @@ ACTION(Act_magnifier)
if (alt.height == 0) alt.width = 0;
}
if (alt.width == 0) {
- XBell(DISP, 0);
+ XBell(disp, 0);
return;
}
}
- (void) XTranslateCoordinates(DISP, event->xbutton.window, mane.win,
+ (void) XTranslateCoordinates(XtDisplay(w), event->xbutton.window, mane.win,
0, 0, &mag_conv_x, &mag_conv_y, &throwaway);
mag_x = event->xbutton.x + mag_conv_x;
@@ -1271,13 +1272,13 @@ ACTION(Act_magnifier)
attr.border_pixel = brdr_Pixel;
attr.background_pixel = bg_current->pixel;
attr.override_redirect = True;
- alt.win = XCreateWindow(DISP, RootWindowOfScreen(SCRN),
+ alt.win = XCreateWindow(disp, RootWindowOfScreen(SCRN),
x, y, alt.width, alt.height, MAGBORD,
CopyFromParent, InputOutput, CopyFromParent,
CWSaveUnder | CWBorderPixel | CWBackPixel |
CWOverrideRedirect, &attr);
- XSelectInput(DISP, alt.win, ExposureMask);
- XMapWindow(DISP, alt.win);
+ XSelectInput(disp, alt.win, ExposureMask);
+ XMapWindow(disp, alt.win);
alt_stat = 1; /* waiting for exposure */
mouse_motion = mag_motion;
mouse_release = mag_release;
@@ -1365,7 +1366,7 @@ ACTION(Act_drag)
else
drag_motion(event);
- XFlush(DISP);
+ XFlush(XtDisplay(w));
dragcurs = True;
}
@@ -1416,7 +1417,7 @@ ACTION(Act_wheel)
int dist;
if (*num_params == 0) {
- XBell(DISP, 0);
+ XBell(XtDisplay(w), 0);
return;
}
dist = (index(*params, '.') == NULL) ? atoi(*params)
@@ -1436,7 +1437,7 @@ ACTION(Act_hwheel)
int dist;
if (*num_params == 0) {
- XBell(DISP, 0);
+ XBell(XtDisplay(w), 0);
return;
}
dist = (index(*params, '.') == NULL) ? atoi(*params)
@@ -1460,7 +1461,7 @@ ACTION(Act_wheel_actions)
Modifiers value = 0;
if (wactp->late_bindings == NULL
- || _XtComputeLateBindings(DISP, wactp->late_bindings,
+ || _XtComputeLateBindings(XtDisplay(w), wactp->late_bindings,
&value, &mask)) {
mask |= wactp->mask;
value |= wactp->value;
