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

Xephyr: consistently use scrpriv->mynum for debug logging

Browse source 
The debug logging is inconsistent with which screen number to print out in
(usually disabled) debug log messages. For now both pScreen->myNum and
scrnpriv->mynum are the same - but in the future they might become different.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2026-09-22 13:10:04 +02:00 • committed by Enrico Weigelt
commit 412214ac21
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -846,7 +846,7 @@ ephyrCreateResources(ScreenPtr pScreen)
EphyrScrPriv *scrpriv = screen->driver; EphyrScrPriv *scrpriv = screen->driver;
EPHYR_LOG("mark pScreen=%p mynum=%d shadow=%d", EPHYR_LOG("mark pScreen=%p mynum=%d shadow=%d",
pScreen, pScreen->myNum, scrpriv->shadow); pScreen, scrpriv->mynum, scrpriv->shadow);
if (scrpriv->shadow) if (scrpriv->shadow)
return KdShadowSet(pScreen, return KdShadowSet(pScreen,
@ -1039,21 +1039,21 @@ ephyrProcessMouseMotion(xcb_generic_event_t *xev)
if (!ephyrMouse || if (!ephyrMouse ||
!((EphyrPointerPrivate *) ephyrMouse->driverPrivate)->enabled) { !((EphyrPointerPrivate *) ephyrMouse->driverPrivate)->enabled) {
EPHYR_LOG("skipping mouse motion:%d\n", screen->pScreen->myNum); EPHYR_LOG("skipping mouse motion:%d\n", screen->pScreen->driver->mynum);
return; return;
} }
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->driver->mynum : -1, screen->pScreen->driver->mynum);
ephyrWarpCursor(inputInfo.pointer, screen->pScreen, ephyrWarpCursor(inputInfo.pointer, screen->pScreen,
motion->event_x, motion->event_y); motion->event_x, motion->event_y);
} }
else { else {
int x = 0, y = 0; int x = 0, y = 0;
EPHYR_LOG("enqueuing mouse motion:%d\n", screen->pScreen->myNum); EPHYR_LOG("enqueuing mouse motion:%d\n", screen->pScreen->driver->mynum);
x = motion->event_x; x = motion->event_x;
y = motion->event_y; y = motion->event_y;
EPHYR_LOG("initial (x,y):(%d,%d)\n", x, y); EPHYR_LOG("initial (x,y):(%d,%d)\n", x, y);
@ -1075,7 +1075,7 @@ ephyrProcessButtonPress(xcb_generic_event_t *xev)
if (!ephyrMouse || if (!ephyrMouse ||
!((EphyrPointerPrivate *) ephyrMouse->driverPrivate)->enabled) { !((EphyrPointerPrivate *) ephyrMouse->driverPrivate)->enabled) {
EPHYR_LOG("skipping mouse press:%d\n", screen_from_window(button->event)->pScreen->myNum); EPHYR_LOG("skipping mouse press:%d\n", screen_from_window(button->event)->pScreen->driver->mynum);
return; return;
} }
@ -1085,7 +1085,7 @@ ephyrProcessButtonPress(xcb_generic_event_t *xev)
*/ */
mouseState |= 1 << (button->detail - 1); mouseState |= 1 << (button->detail - 1);
EPHYR_LOG("enqueuing mouse press:%d\n", screen_from_window(button->event)->pScreen->myNum); EPHYR_LOG("enqueuing mouse press:%d\n", screen_from_window(button->event)->pScreen->driver->mynum);
KdEnqueuePointerEvent(ephyrMouse, mouseState | KD_MOUSE_DELTA, 0, 0, 0); KdEnqueuePointerEvent(ephyrMouse, mouseState | KD_MOUSE_DELTA, 0, 0, 0);
} }
@ -1102,7 +1102,7 @@ ephyrProcessButtonRelease(xcb_generic_event_t *xev)
ephyrUpdateModifierState(button->state); ephyrUpdateModifierState(button->state);
mouseState &= ~(1 << (button->detail - 1)); mouseState &= ~(1 << (button->detail - 1));
EPHYR_LOG("enqueuing mouse release:%d\n", screen_from_window(button->event)->pScreen->myNum); EPHYR_LOG("enqueuing mouse release:%d\n", screen_from_window(button->event)->pScreen->driver->mynum);
KdEnqueuePointerEvent(ephyrMouse, mouseState | KD_MOUSE_DELTA, 0, 0, 0); KdEnqueuePointerEvent(ephyrMouse, mouseState | KD_MOUSE_DELTA, 0, 0, 0);
} }