Commit 9bc266a0 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

use --xinerama-index instead of XINERAMA_INDEX to override xinerama screen selection

parent 4d11fb3e

src/imlib.c

+2 −2
Original line number Diff line number Diff line
@@ -78,8 +78,8 @@ void init_xinerama(void) 
		XineramaQueryVersion(disp, &major, &minor);

		xinerama_screens = XineramaQueryScreens(disp, &num_xinerama_screens);



		if (getenv("XINERAMA_SCREEN"))

			xinerama_screen = atoi(getenv("XINERAMA_SCREEN"));

		if (opt.xinerama_index >= 0)

			xinerama_screen = opt.xinerama_index;

		else {

			xinerama_screen = 0;

			XQueryPointer(disp, root, &dw, &dw, &px, &py, &di, &di, &du);

src/keyevents.c

+2 −3
Original line number Diff line number Diff line
@@ -731,9 +731,8 @@ void feh_event_handle_keypress(XEvent * ev) 
					break;

				}

			}

			if (getenv("XINERAMA_SCREEN"))

				curr_screen = xinerama_screen =

					atoi(getenv("XINERAMA_SCREEN"));

			if (opt.xinerama_index >= 0)

				curr_screen = xinerama_screen = opt.xinerama_index;

		}

#endif				/* HAVE_LIBXINERAMA */

		winwid->full_screen = !winwid->full_screen;

src/menu.c

+2 −3
Original line number Diff line number Diff line
@@ -1154,9 +1154,8 @@ void feh_menu_cb_opt_fullscreen(feh_menu * m, feh_menu_item * i) 
			}



		}

		if (getenv("XINERAMA_SCREEN"))

			curr_screen = xinerama_screen =

				atoi(getenv("XINERAMA_SCREEN"));

		if (opt.xinerama_index >= 0)

			curr_screen = xinerama_screen = opt.xinerama_index;

	}

#endif				/* HAVE_LIBXINERAMA */

src/winwidget.c

+2 −2
Original line number Diff line number Diff line
@@ -826,8 +826,8 @@ void winwidget_resize(winwidget winwid, int w, int h) 
			}



		}

		if (getenv("XINERAMA_SCREEN"))

			xinerama_screen = atoi(getenv("XINERAMA_SCREEN"));

		if (opt.xinerama_index >= 0)

			xinerama_screen = opt.xinerama_index;



		scr_width = xinerama_screens[xinerama_screen].width;

		scr_height = xinerama_screens[xinerama_screen].height;