Commit 1e03474b authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Make -O work without X as well. Closes bugs.debian.org #373209

parent 63681d6a

src/feh.h

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ void show_usage(void); 
void show_version(void);

int feh_main_iteration(int block);

void feh_handle_event(XEvent * ev);

void init_imlib_fonts(void);

void init_x_and_imlib(void);

#ifdef HAVE_LIBXINERAMA

void init_xinerama(void);

src/imlib.c

+13 −5
Original line number Diff line number Diff line
@@ -66,6 +66,19 @@ init_xinerama(void) 
}

#endif /* HAVE_LIBXINERAMA */



void

init_imlib_fonts(void)

{

   D_ENTER(4);



   /* Set up the font stuff */

   imlib_add_path_to_font_path(".");

   imlib_add_path_to_font_path(PREFIX "/share/feh/fonts");

   imlib_add_path_to_font_path("./ttfonts");



   D_RETURN_(4);

}



void

init_x_and_imlib(void)

{
@@ -96,11 +109,6 @@ init_x_and_imlib(void) 
   /* Initialise random numbers */

   srand(getpid() * time(NULL) % ((unsigned int) -1));



   /* Set up the font stuff */

   imlib_add_path_to_font_path(".");

   imlib_add_path_to_font_path(PREFIX "/share/feh/fonts");

   imlib_add_path_to_font_path("./ttfonts");



   D_RETURN_(4);

}

src/main.c

+3 −1
Original line number Diff line number Diff line
@@ -44,7 +44,9 @@ main(int argc, char **argv) 


   init_parse_options(argc, argv);



   if (!opt.list)

   init_imlib_fonts();



   if (opt.display)

      init_x_and_imlib();



   feh_event_init();

src/options.c

+1 −0
Original line number Diff line number Diff line
@@ -460,6 +460,7 @@ feh_parse_option_array(int argc, char **argv) 
           break;

        case 'l':

           opt.list = 1;

           opt.display = 0;

           break;

        case 'G':

           opt.wget_timestamp = 1;