Attachment 2068 Details for Bug 11975 – User font select patch for qiv-2.1pre12

[patch] User font select patch for qiv-2.1pre12

qiv-2.1pre12-user_font.patch (text/plain), 2.64 KB, created by Evgenii Terechkov on 2007-06-29 20:55:08 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: Evgenii Terechkov

Created: 2007-06-29 20:55:08 MSD

Size: 2.64 KB

patch

obsolete

>--- qiv-2.1-pre12/main.c.orig	2007-05-03 04:54:53 +0800
>+++ qiv-2.1-pre12/main.c	2007-06-22 09:19:44 +0800
>@@ -72,7 +72,8 @@ int main(int argc, char **argv)
> 
>   qiv_main_loop = g_main_new(TRUE);
>   cmap = gdk_colormap_get_system();
>-  text_font = gdk_font_load(STATUSBAR_FONT);
>+  text_font = user_font ? gdk_font_load(user_font) : gdk_font_load(STATUSBAR_FONT);
>+  if (text_font == NULL) text_font = gdk_font_load(STATUSBAR_FONT);
>   screen_x = gdk_screen_width();
>   screen_y = gdk_screen_height();
> 
>--- qiv-2.1-pre12/main.h.orig	2007-06-19 10:09:28 +0800
>+++ qiv-2.1-pre12/main.h	2007-06-19 10:43:23 +0800
>@@ -57,6 +57,7 @@ XineramaScreenInfo preferred_screen[1];
> XineramaScreenInfo statusbar_screen[1];
> #endif
> 
>+char *user_font = STATUSBAR_FONT;
> 
> /* Used for the ? key */
> 
>@@ -109,6 +110,7 @@ const char *helpstrs[] =
>     "y                    tile image on background",
>     "z                    stretch image on background",
>     "<                    turn on/off magnifying window",
>+    "q (in command args)  set font for statusbar",
>     "arrow keys                 move image (in fullscreen mode)",
>     "arrow keys+Shift           move image faster (in fullscreen mode)",
>     "NumPad-arrow keys+NumLock  move image faster (in fullscreen mode)",
>--- qiv-2.1-pre12/options.c.orig	2007-06-19 09:56:42 +0800
>+++ qiv-2.1-pre12/options.c	2007-06-19 10:13:41 +0800
>@@ -24,7 +24,7 @@ extern int rreaddir(const char *);
> extern int rrreaddir(const char *);
> extern int rreadfile(const char *);
> 
>-static char *short_options = "hexyzmtb:c:g:niIpaGA:vo:srRSd:u:fw:W:DPMNF:TX:";
>+static char *short_options = "hexyzmtb:c:g:niIpaGA:vo:srRSd:u:fw:W:DPMNF:TX:q:";
> static struct option long_options[] =
> {
>     {"help",             0, NULL, 'h'},
>@@ -62,6 +62,7 @@ static struct option long_options[] =
>     {"file",             1, NULL, 'F'},
>     {"watch",            0, NULL, 'T'},
>     {"xineramascreen",   1, NULL, 'X'},
>+    {"font",             1, NULL, 'q'},
>     {0,                  0, NULL, 0}
> };
> 
>@@ -292,6 +293,9 @@ void options_read(int argc, char **argv,
> //             g_print("set xinerama screen: %i\n", user_screen);
> 		      break;
> #endif
>+        case 'q':
>+          user_font = optarg;
>+          break;
> 	    case 0:
> 	    case '?': usage(argv[0], 1);
> 		      gdk_exit(0);
>--- qiv-2.1-pre12/qiv.h.orig	2007-06-19 10:06:45 +0800
>+++ qiv-2.1-pre12/qiv.h	2007-06-19 10:29:43 +0800
>@@ -83,6 +83,7 @@ typedef struct _qiv_deletedfile {
> 
> extern int              first;
> extern char             infotext[BUF_LEN];
>+extern char             *user_font;
> extern GMainLoop        *qiv_main_loop;
> extern gint             screen_x, screen_y;
> extern GdkFont          *text_font;

Actions: View | Diff

Attachments on bug 11975: 2067 | 2068 | 2075