hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-26 01:59:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge e85f7a9c22 into 84d53bf2f0

Browse source
This commit is contained in:
Enrico Weigelt 2026-10-20 17:48:34 +00:00 • committed by GitHub
commit fb2d4e0eec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 6 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hw/kdrive/ephyr/ephyr.c
View file

@ -223,7 +223,7 @@ ephyrMapFramebuffer(KdScreenInfo * screen)
int buffer_height; int buffer_height;
EPHYR_LOG("screen->width: %d, screen->height: %d index=%d", EPHYR_LOG("screen->width: %d, screen->height: %d index=%d",
screen->width, screen->height, screen->mynum); screen->width, screen->height, screen->pScreen->myNum);
/* /*
* Use the rotation last applied to ourselves (in the Xephyr case the fb * Use the rotation last applied to ourselves (in the Xephyr case the fb
@ -785,8 +785,6 @@ ephyrInitScreen(ScreenPtr pScreen)
KdScreenPriv(pScreen); KdScreenPriv(pScreen);
KdScreenInfo *screen = pScreenPriv->screen; KdScreenInfo *screen = pScreenPriv->screen;
EPHYR_LOG("pScreen->myNum:%d\n", pScreen->myNum);
hostx_set_screen_number(screen, pScreen->myNum);
if (!EphyrHostGrabSet) { if (!EphyrHostGrabSet) {
ephyrSetGrabShortcut("ctrl+shift"); ephyrSetGrabShortcut("ctrl+shift");
} }
@ -1046,7 +1044,7 @@ ephyrProcessMouseMotion(xcb_generic_event_t *xev)
if (ephyrCursorScreen != screen->pScreen) { if (ephyrCursorScreen != screen->pScreen) {
EPHYR_LOG("warping mouse cursor. " EPHYR_LOG("warping mouse cursor. "
"cur_screen:%d, motion_screen:%d\n", "cur_screen:%d, motion_screen:%d\n",
ephyrCursorScreen ? ephyrCursorScreen->myNum : -1, screen->pScreen->myNum); ephyrCursorScreen ? ephyrCursorScreen->myNum: -1, screen->pScreen->myNum);
ephyrWarpCursor(inputInfo.pointer, screen->pScreen, ephyrWarpCursor(inputInfo.pointer, screen->pScreen,
motion->event_x, motion->event_y); motion->event_x, motion->event_y);
} }
@ -1214,7 +1212,7 @@ ephyrProcessKeyRelease(xcb_generic_event_t *xev)
xcb_ungrab_keyboard(conn, xcb_ungrab_keyboard(conn,
XCB_TIME_CURRENT_TIME); XCB_TIME_CURRENT_TIME);
} else { } else {
grabbed_screen = scrpriv->mynum; grabbed_screen = screen->pScreen->myNum;
} }
} }
} }

1
hw/kdrive/ephyr/ephyr.h
View file

@ -81,7 +81,6 @@ typedef struct _ephyrScrPriv {
size_t shmsize; size_t shmsize;
KdScreenInfo *screen; KdScreenInfo *screen;
int mynum; /* Screen number */
unsigned long cmap[256]; unsigned long cmap[256];
ScreenBlockHandlerProcPtr BlockHandler; ScreenBlockHandlerProcPtr BlockHandler;

2
hw/kdrive/ephyr/ephyrinit.c
View file

@ -150,7 +150,7 @@ processScreenOrOutputArg(const char *screen_size, const char *output, char *pare
} }
use_geometry = (strchr(screen_size, '+') != NULL); use_geometry = (strchr(screen_size, '+') != NULL);
EPHYR_DBG("screen number:%d\n", screen->mynum); EPHYR_DBG("screen number:%d\n", screen->pScreen->myNum);
hostx_add_screen(screen, p_id, use_geometry, output); hostx_add_screen(screen, p_id, use_geometry, output);
} }
else { else {

15
hw/kdrive/ephyr/hostx.c
View file

@ -174,17 +174,6 @@ hostx_set_display_name(char *name)
HostX.server_dpy_name = strdup(name); HostX.server_dpy_name = strdup(name);
} }
void
hostx_set_screen_number(KdScreenInfo *screen, int number)
{
EphyrScrPriv *scrpriv = screen->driver;
if (scrpriv) {
scrpriv->mynum = number;
hostx_set_win_title(screen, "");
}
}
void void
hostx_set_win_title(KdScreenInfo *screen, const char *extra_text) hostx_set_win_title(KdScreenInfo *screen, const char *extra_text)
{ {
@ -207,7 +196,7 @@ hostx_set_win_title(KdScreenInfo *screen, const char *extra_text)
memset(buf, 0, BUF_LEN + 1); memset(buf, 0, BUF_LEN + 1);
snprintf(buf, BUF_LEN, "Xephyr on %s.%d %s", snprintf(buf, BUF_LEN, "Xephyr on %s.%d %s",
HostX.server_dpy_name ? HostX.server_dpy_name : ":0", HostX.server_dpy_name ? HostX.server_dpy_name : ":0",
scrpriv->mynum, (extra_text != NULL) ? extra_text : ""); screen->mynum, (extra_text != NULL) ? extra_text : "");
xcb_icccm_set_wm_name(HostX.conn, xcb_icccm_set_wm_name(HostX.conn,
scrpriv->win, scrpriv->win,
@ -1049,7 +1038,7 @@ hostx_paint_rect(KdScreenInfo *screen,
{ {
EphyrScrPriv *scrpriv = screen->driver; EphyrScrPriv *scrpriv = screen->driver;
EPHYR_DBG("painting in screen %d\n", scrpriv->mynum); EPHYR_DBG("painting in screen %d\n", screen->mynum);
#ifdef GLAMOR #ifdef GLAMOR
if (ephyr_glamor) { if (ephyr_glamor) {

3
hw/kdrive/ephyr/hostx.h
View file

@ -117,9 +117,6 @@ hostx_add_screen(KdScreenInfo *screen, unsigned long win_id, Bool use_geometry,
void void
hostx_set_display_name(char *name); hostx_set_display_name(char *name);
void
hostx_set_screen_number(KdScreenInfo *screen, int number);
void void
hostx_set_win_title(KdScreenInfo *screen, const char *extra_text); hostx_set_win_title(KdScreenInfo *screen, const char *extra_text);