Commit 98148110 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Apply 05_xinerama.patch from Debian

parent 99c6590b

src/keyevents.c

+0 −4
Original line number Diff line number Diff line
@@ -385,10 +385,6 @@ feh_event_handle_keypress(XEvent * ev) 
        if (opt.xinerama && xinerama_screens) {

          int i, rect[4];



          /* FIXME: this doesn't do what it should;  XGetGeometry always

           * returns x,y == 0,0.  I think that's due to the hints being passed

           * (or more specifically, a missing hint) to X in winwidget_create

           */

          winwidget_get_geometry(winwid, rect);

          /* printf("window: (%d, %d)\n", rect[0], rect[1]);

          printf("found %d screens.\n", num_xinerama_screens); */

src/menu.c

+0 −4
Original line number Diff line number Diff line
@@ -2071,10 +2071,6 @@ feh_menu_cb_opt_fullscreen(feh_menu * m, 
  if (opt.xinerama && xinerama_screens) {

    int i, rect[4];



    /* FIXME: this doesn't do what it should;  XGetGeometry always

     * returns x,y == 0,0.  I think that's due to the hints being passed

     * (or more specifically, a missing hint) to X in winwidget_create

     */

    winwidget_get_geometry(m->fehwin, rect);

    /* printf("window: (%d, %d)\n", rect[0], rect[1]);

    printf("found %d screens.\n", num_xinerama_screens); */

src/winwidget.c

+4 −0
Original line number Diff line number Diff line
@@ -1034,6 +1034,7 @@ int winwidget_get_height(winwidget winwid) { 


void winwidget_get_geometry(winwidget winwid, int *rect) {

  int bw, bp;

  Window child;

  D_ENTER(4);

  if (!rect)

    return;
@@ -1041,6 +1042,9 @@ void winwidget_get_geometry(winwidget winwid, int *rect) { 
  XGetGeometry(disp, winwid->win, &root, 

               &(rect[0]), &(rect[1]), &(rect[2]), &(rect[3]), &bw, &bp);



  XTranslateCoordinates(disp, winwid->win, root,

                          0, 0, &(rect[0]), &(rect[1]), &child);



  /* update the window geometry (in case it's inaccurate) */

  winwid->x = rect[0];

  winwid->y = rect[1];