[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: further to XKB issues



On Tue, 2003-08-26 at 07:42, simon raven wrote:
> 
> (==) ADB 3-Button MouseMan Mouse: Buttons: 3
> (II) XINPUT: Adding extended input device "ADB 3-Button MouseMan Mouse" (type: MOUSE)
> Couldn't load XKB keymap, falling back to pre-XKB keymap
> (II) Server_Terminate keybinding not found
> (II) ADB 3-Button MouseMan Mouse: ps2EnableDataReporting: succeeded

This doesn't show an error or a crash, maybe the server runs fine but
the session aborts?

> the only difference was my commenting out calling xmodmap in my
> ~/.xsession to load an an modmap file. 

Maybe related to this?


> the only outright error i get is: 
> 
> (EE) FBDEV(0): FBIOPAN_DISPLAY: Invalid argument

Which is still harmless, nevertheless I've worked around it in XFree86
CVS. Patch attached for reference.


-- 
Earthling Michel Dänzer   \  Debian (powerpc), XFree86 and DRI developer
Software libre enthusiast  \     http://svcs.affero.net/rm.php?r=daenzer
Index: programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c,v
retrieving revision 1.1.1.13
diff -p -u -r1.1.1.13 fbdevhw.c
--- programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c	25 Mar 2003 00:26:50 -0000	1.1.1.13
+++ programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c	26 Aug 2003 10:33:37 -0000
@@ -789,6 +789,11 @@ fbdevHWAdjustFrame(int scrnIndex, int x,
 	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
 
 	TRACE_ENTER("AdjustFrame");
+
+	if ( x < 0 || x + fPtr->var.xres > fPtr->var.xres_virtual || 
+	     y < 0 || y + fPtr->var.yres > fPtr->var.yres_virtual )
+		return;
+
 	fPtr->var.xoffset = x;
 	fPtr->var.yoffset = y;
 	if (-1 == ioctl(fPtr->fd,FBIOPAN_DISPLAY,(void*)&fPtr->var))

Reply to: