Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37716296
en ru br
Репозитории ALT
S:2.3.3-alt1
D:2.1-alt0.1
5.1: 2.1-alt3.pre12
4.1: 2.1-alt3.pre12
4.0: 2.1-alt3.pre12
3.0: 2.0-alt2
www.altlinux.org/Changes

Группа :: Графика
Пакет: qiv

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: qiv-2.1pre12-alt-font.patch
Скачать


--- qiv-2.1-pre12/main.c.orig	2007-05-03 04:54:53 +0800
+++ qiv-2.1-pre12/main.c	2007-07-03 20:55:03 +0800
@@ -34,6 +34,7 @@ int main(int argc, char **argv)
   // [as] workaround for problem with X composite extension
   putenv("XLIB_SKIP_ARGB_VISUALS=1");
 
+  gtk_set_locale();
 /*
   // [as] thinks that this is not portable enough
   // [lc]
@@ -72,7 +73,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_fontset_load(user_font) : gdk_fontset_load(STATUSBAR_FONT);
+  if (text_font == NULL) text_font = gdk_fontset_load(STATUSBAR_FONT);
   screen_x = gdk_screen_width();
   screen_y = gdk_screen_height();
 
--- qiv-2.1-pre12/main.h.orig	2007-04-25 10:09:51 +0800
+++ qiv-2.1-pre12/main.h	2007-07-03 20:53:08 +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-04-25 09:51:33 +0800
+++ qiv-2.1-pre12/options.c	2007-07-03 20:53:08 +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-04-25 06:29:16 +0800
+++ qiv-2.1-pre12/qiv.h	2007-07-03 20:53:08 +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;
--- qiv-2.1-pre12/Makefile.orig	2007-07-03 20:58:51 +0800
+++ qiv-2.1-pre12/Makefile	2007-07-03 21:02:01 +0800
@@ -7,7 +7,7 @@
 PREFIX = /usr/local
 
 # Font to use for statusbar in fullscreen mode
-STATUSBAR_FONT = "fixed"
+STATUSBAR_FONT = "-*-fixed-*"
 
 # Cursor to use on qiv windows - see
 # /usr/X11R6/include/X11/cursorfont.h for more choices.
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin