Attachment #2068 for bug #11975

View | Details | Raw Unified | Return to bug 11975
Collapse All | Expand All

Lines 72-78 int main(int argc, char **argv) Link Here

(-)qiv-2.1-pre12/main.c.orig (-1 / +2 lines)
72		72
73	qiv_main_loop = g_main_new(TRUE);	73	qiv_main_loop = g_main_new(TRUE);
74	cmap = gdk_colormap_get_system();	74	cmap = gdk_colormap_get_system();
75	text_font = gdk_font_load(STATUSBAR_FONT);	75	text_font = user_font ? gdk_font_load(user_font) : gdk_font_load(STATUSBAR_FONT);
		76	if (text_font == NULL) text_font = gdk_font_load(STATUSBAR_FONT);
76	screen_x = gdk_screen_width();	77	screen_x = gdk_screen_width();
77	screen_y = gdk_screen_height();	78	screen_y = gdk_screen_height();
78		79

Lines 57-62 XineramaScreenInfo preferred_screen[1]; Link Here

(-)qiv-2.1-pre12/main.h.orig (+2 lines)
57	XineramaScreenInfo statusbar_screen[1];	57	XineramaScreenInfo statusbar_screen[1];
58	#endif	58	#endif
59		59
		60	char *user_font = STATUSBAR_FONT;
60		61
61	/* Used for the ? key */	62	/* Used for the ? key */
62		63
Lines 109-114 const char *helpstrs[] = Link Here
109	"y tile image on background",	110	"y tile image on background",
110	"z stretch image on background",	111	"z stretch image on background",
111	"< turn on/off magnifying window",	112	"< turn on/off magnifying window",
		113	"q (in command args) set font for statusbar",
112	"arrow keys move image (in fullscreen mode)",	114	"arrow keys move image (in fullscreen mode)",
113	"arrow keys+Shift move image faster (in fullscreen mode)",	115	"arrow keys+Shift move image faster (in fullscreen mode)",
114	"NumPad-arrow keys+NumLock move image faster (in fullscreen mode)",	116	"NumPad-arrow keys+NumLock move image faster (in fullscreen mode)",

Lines 24-30 extern int rreaddir(const char *); Link Here

(-)qiv-2.1-pre12/options.c.orig (-1 / +5 lines)
24	extern int rrreaddir(const char *);	24	extern int rrreaddir(const char *);
25	extern int rreadfile(const char *);	25	extern int rreadfile(const char *);
26		26
27	static char *short_options = "hexyzmtb:c:g:niIpaGA:vo:srRSd:u:fw:W:DPMNF:TX:";	27	static char *short_options = "hexyzmtb:c:g:niIpaGA:vo:srRSd:u:fw:W:DPMNF:TX:q:";
28	static struct option long_options[] =	28	static struct option long_options[] =
29	{	29	{
30	{"help", 0, NULL, 'h'},	30	{"help", 0, NULL, 'h'},
Lines 62-67 static struct option long_options[] = Link Here
62	{"file", 1, NULL, 'F'},	62	{"file", 1, NULL, 'F'},
63	{"watch", 0, NULL, 'T'},	63	{"watch", 0, NULL, 'T'},
64	{"xineramascreen", 1, NULL, 'X'},	64	{"xineramascreen", 1, NULL, 'X'},
		65	{"font", 1, NULL, 'q'},
65	{0, 0, NULL, 0}	66	{0, 0, NULL, 0}
66	};	67	};
67		68
Lines 292-297 void options_read(int argc, char **argv, Link Here
292	// g_print("set xinerama screen: %i\n", user_screen);	293	// g_print("set xinerama screen: %i\n", user_screen);
293	break;	294	break;
294	#endif	295	#endif
		296	case 'q':
		297	user_font = optarg;
		298	break;
295	case 0:	299	case 0:
296	case '?': usage(argv[0], 1);	300	case '?': usage(argv[0], 1);
297	gdk_exit(0);	301	gdk_exit(0);

Lines 83-88 typedef struct _qiv_deletedfile { Link Here

(-)qiv-2.1-pre12/qiv.h.orig (+1 lines)
83		83
84	extern int first;	84	extern int first;
85	extern char infotext[BUF_LEN];	85	extern char infotext[BUF_LEN];
		86	extern char *user_font;
86	extern GMainLoop *qiv_main_loop;	87	extern GMainLoop *qiv_main_loop;
87	extern gint screen_x, screen_y;	88	extern gint screen_x, screen_y;
88	extern GdkFont *text_font;	89	extern GdkFont *text_font;

Return to bug 11975