commit d6d9af32c3e2c0a96727bb1f70eeb3a2f9062c75
parent fab97782ee64666612c06e19e09d6ee3f8f462e4
Author: Kyle Milz <krwmilz@gmail.com>
Date: Sat, 11 Sep 2021 21:01:16 +0000
move more globals into better header files
Diffstat:
5 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/dvi-draw.c b/dvi-draw.c
@@ -128,7 +128,6 @@ put_bitmap(bitmap, x, y)
struct bitmap *bitmap;
int x, y;
{
-
if (debug & DBG_BITMAP)
Printf("X(%d,%d)\n", x - currwin.base_x, y - currwin.base_y);
if (x < max_x && x + (int) bitmap->w >= min_x
diff --git a/dvi-init.c b/dvi-init.c
@@ -724,8 +724,6 @@ set_titles()
free(title_name);
if (icon_name_malloced)
free(icon_name);
-
- titles_are_stale = False;
}
/*
@@ -748,8 +746,7 @@ internal_init_dvi()
warn_spec_now = warn_spec;
source_fwd_box_page = -1;
init_prescan();
- if (titles_are_stale)
- set_titles();
+ set_titles();
dvi_is_valid = True;
return True;
}
diff --git a/events.h b/events.h
@@ -82,6 +82,18 @@ extern struct WindowRec mane, alt, currwin;
unsigned int ev_flags = EV_IDLE;
+extern XtActionsRec Actions[];
+extern Cardinal num_actions;
+GC ruleGC;
+GC foreGC, highGC;
+GC foreGC2;
+GC copyGC;
+
+Pixel *pixeltbl;
+Pixel *pixeltbl_t;
+
+int min_x, max_x, min_y, max_y;
+
Bool compile_action(const char *, struct xdvi_action **);
void do_color_change(void);
diff --git a/xdvi.c b/xdvi.c
@@ -952,8 +952,6 @@ main(int argc, char **argv)
app_pixel_resources, XtNumber(app_pixel_resources),
(ArgList) NULL, 0);
- copy = resource.copy;
-
fore_color_data.pixel = fore_Pixel;
back_color_data.pixel = back_Pixel;
XQueryColors(DISP, colormap, color_data, 2);
diff --git a/xdvi.h b/xdvi.h
@@ -246,7 +246,6 @@ char *dvi_name = NULL; /* dvi file name */
FILE *dvi_file; /* user's file */
Boolean dvi_file_ready = False;
/* done with font generation and prescanning */
-Boolean titles_are_stale = True;
/* replace icon/window titles */
int bak_shrink; /* last shrink factor != 1 */
Dimension window_w, window_h;
@@ -255,22 +254,10 @@ int backing_store;
Display *DISP;
Screen *SCRN;
-extern XtActionsRec Actions[];
-extern Cardinal num_actions;
XtAccelerators accels_cr, accels_cr_click;
-GC ruleGC;
-GC foreGC, highGC;
-GC foreGC2;
-GC copyGC;
-Boolean copy;
Cursor redraw_cursor, ready_cursor;
-Pixel *pixeltbl;
-Pixel *pixeltbl_t;
-
-int min_x, max_x, min_y, max_y;
-
Widget top_level = 0;
Widget vport_widget, draw_widget, clip_widget;
Widget addr_widget, form_widget;
