andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,082 Commits 86 Branches 473 Tags 48 MiB
3575d9584e
Commit Graph

160 Commits

Author SHA1 Message Date
Adam Jackson
9757106bba Remove all empty extension reset hooks, replace with NULL. 2008-07-24 15:46:08 -04:00
Dodji Seketeli
92fdd01d8e [Xephyr] various X86_64 build cleanups 2008-07-23 01:07:29 +02:00
Dodji Seketeli
5de1867fbb [Xephyr] Fix #15839 
Make sure the _XSERVER64 macro is not defined in Xlib client code.
That macro is meant to be define only on pure server code, when necessary.
 2008-07-23 01:01:26 +02:00
Daniel Stone
6c7c0ffeb7 KDrive: Delete rafts of unused code 
Most of this stuff was gone with the last real hardware drivers that
used it.  Au revoir.
 2008-07-17 20:45:01 +03:00
Adam Jackson
689292e58c Fix GLX in Xvfb and kdrive. 2008-07-02 11:25:50 -04:00
Jeremy Uejio
c8216aede6 Sun bug #6685465: Xephyr uses wrong or bad colortable in 8-bit mode 
<http://bugs.opensolaris.org/view_bug.do?bug_id=6685465>

This bug is caused by Xephyr not handling the RGB byte order correctly
of the server where Xephyr is displaying on. The previous code just
assumed that the order was RGB and did not take into account that
Xservers may use different order (such as BGR).

The fix is to add a function to calculate the byte order and bits
to shift based on the visual mask and the visual bits_per_rgb (which
is usually 8, but could be server dependent).  Since the shifts won't
change once the display connection has been made, I can cache these
values so that Xephyr doesn't have to keep recalculating them everytime
it tries to translate the Xephyr colormap entries for Xephyr clients to
the actual server colormap entries (i.e. calling the function
hostx_set_cmap_entry() repeatedly for every colormap entry).
 2008-07-01 13:37:12 -07:00
Peter Hutterer
585125685b ephyr: some whitespace changes. 2008-06-08 23:28:27 +09:30
Tiago Vignatti
5ba07cb548 kdrive: changes ephyr API according mpx merge. 
This fix host-cursor in Xephyr server.

Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
 2008-06-02 10:27:12 +09:30
Peter Hutterer
942086fc96 dix: ProcQueryPointer doesn't need special grab handling, PickPointer does it 2008-05-31 18:17:49 +09:30
Peter Hutterer
26c1958c32 Merge branch 'master' into mpx 2008-05-26 17:37:31 +09:30
George Sapountzis
ae0504d34d kdrive: need not export symbols for glx anymore 2008-05-23 22:40:25 +03:00
Dan Nicholson
c76fddeea2 Fix up paths for GL/glx -> glx renaming 2008-05-21 10:51:15 -07:00
Peter Hutterer
99d28c3ef3 Merge branch 'master' into mpx 
Conflicts:

	Xext/xprint.c (removed in master)
	config/hal.c
	dix/main.c
	hw/kdrive/ati/ati_cursor.c (removed in master)
	hw/kdrive/i810/i810_cursor.c (removed in master)
	hw/xprint/ddxInit.c (removed in master)
	xkb/ddxLoad.c
 2008-05-20 10:20:14 +09:30
Aaron Plattner
d500eeb945 Xephyr: Handle depth 30 and reject higher depths rather than crashing. 2008-05-04 10:26:25 -07:00
Peter Hutterer
3344569529 Merge branch 'master' into mpx 
Conflicts:

	Xi/exevents.c
	dix/devices.c
 2008-05-02 11:00:14 +09:30
George Sapountzis
00effad583 xephyr: XEPHYR_DRI is identical to XF86DRI 2008-04-23 18:11:56 +03:00
George Sapountzis
6a9f7f28ec xephyr: sync with mesa 2008-04-23 18:11:56 +03:00
George Sapountzis
7ffc68c5cc xephyr: libGL is client lib 2008-04-23 18:11:56 +03:00
George Sapountzis
a27c244d72 xephyr: Makefile cleanup 2 2008-04-23 18:11:56 +03:00
George Sapountzis
d4d19b2f22 xephyr: Makefile cleanup 1 2008-04-23 18:11:56 +03:00
George Sapountzis
efb723e166 glcore: prepare for dynamic loading 
glcore gets linked with -ldl, -lpthread for s3tc and glapi
xserver needs
        DLOPEN_LIBS - to dlopen the glcore dso
        LD_EXPORT_SYMBOLS_FLAG - to export symbols for glcore to use

the ld flag is added to kdrive only when GLX is enabled, the net overhead for
Xephyr is ~155KB, could be reduced with --dynamic-list.
 2008-04-23 18:11:55 +03:00
Peter Hutterer
8190ef8754 Merge branch 'master' into mpx 
Conflicts:

	Xext/EVI.c
	Xext/appgroup.c
	Xext/cup.c
	Xext/mitmisc.c
	Xext/sampleEVI.c
	dix/window.c
 2008-04-22 18:04:05 +09:30
Eric Anholt
a7e3ad1c6b Remove NDEBUG (assert() disable) define from the X Server. 
A few pieces of code were abusing this define for other purposes, which are
converted to #ifndef DEBUG instead.  There should be no ABI consequences
to this change.

The rationale is that having the define in xorg-server.h also disables
assert() drivers, which is unexpected, and also difficult to avoid since
xorg-server.h is included in their config.h, and you can't put a #undef in
config.h.  As for removing it from the server instead of moving it to an
internal header, we probably shouldn't have unnecessary assert()s in
critical server paths anyway, and if we do we could #define NDEBUG in the
specific cases needed.
 2008-04-10 10:35:14 -07:00
Peter Hutterer
fd06e8f8c1 Merge branch 'master' into dcdc_rework 
Conflicts:

	Xext/xevie.c
	dix/dispatch.c
 2008-04-07 07:56:41 +09:30
David Nusinow
f028e245a7 Bug #10016: Implement WM_CLASS hints in Xephyr. 2008-03-24 16:06:33 -04:00
Dodji Seketeli
cdadd2ff9b [Xephyr/DRI] correctly route motion events targeted at GL drawable 2008-03-18 14:02:41 +01:00
Donnie Berkholz
aa231f28d5 Xephyr: Build fix: Port across XF86dri.c changes from Mesa. 2008-03-14 18:43:41 -07:00
Donnie Berkholz
a955c3b587 Xephyr: Distribute ephyrdriext.h in tarballs. 2008-03-14 18:43:40 -07:00
Peter Hutterer
4f2cd0ed96 Merge branch 'master' into mpx 
This merge reverts Magnus' device coorindate scaling changes. MPX core event
generation is very different, so we can't scale in GetPointerEvents.

Conflicts:

	Xi/opendev.c
	dix/devices.c
	dix/dixfonts.c
	dix/getevents.c
	dix/resource.c
	dix/window.c
	hw/xfree86/common/xf86Xinput.c
	mi/mipointer.c
	xkb/ddxBeep.c
	xkb/ddxCtrls.c
	xkb/ddxKeyClick.c
	xkb/ddxList.c
	xkb/ddxLoad.c
	xkb/xkb.c
	xkb/xkbAccessX.c
	xkb/xkbEvents.c
	xkb/xkbInit.c
	xkb/xkbPrKeyEv.c
	xkb/xkbUtils.c
 2008-03-04 18:11:10 +10:30
Dodji Seketeli
d74b0327e8 [Xephyr/GL] unbreak the build 
Don't touch Xephyr DRI stuff when not compiling in a DRI environment.
 2008-02-27 09:48:53 +01:00
Adam Jackson
69f7826767 Match Xephyr DRI definitions to the ones in xf86dri.h 2008-02-22 16:04:35 -05:00
Dodji Seketeli
c14fd2a5cb [Xephyr/GL] properly route expose event on GL drawables 
When an expose event happens on an host GL window paired with an
internal drawable, route that expose event to the clients listening
to the expose event on the internal drawable.
 2008-02-21 15:33:02 +01:00
Dodji Seketeli
437c78ef9f [Xephyr/GL] don't crash when the host returns a NULL server string 2008-02-21 15:29:27 +01:00
Peter Hutterer
0ac1755977 Merge branch 'master' into mpx 
Conflicts:

	Xext/sampleEVI.c
 2008-01-26 13:55:07 +10:30
Daniel Stone
e85130c85f Xephyr: One-time keyboard leak fix 
Don't leak the originally-allocated keysym map.
 2008-01-17 18:43:06 +11:00
Tiago Vignatti
7a0d16ef0a Removed some warnings. 2008-01-15 03:27:16 -02:00
Tiago Vignatti
315d6a2b1d Fix Xephyr compilation without GLX. 2008-01-15 02:59:56 -02:00
Peter Hutterer
38bf01bd1c Merge branch 'master' into mpx 2008-01-10 13:38:46 +10:30
Peter Hutterer
8da83836b6 Merge branch 'master' into mpx 
Conflicts:

	XTrap/xtrapddmi.c
	Xext/security.c
	Xext/xprint.c
	Xext/xtest.c
	Xext/xvdisp.c
	Xi/exevents.c
	Xi/grabdevb.c
	Xi/grabdevk.c
	Xi/opendev.c
	Xi/ungrdev.c
	Xi/ungrdevb.c
	Xi/ungrdevk.c
	dix/cursor.c
	dix/devices.c
	dix/dixutils.c
	dix/events.c
	dix/getevents.c
	dix/main.c
	dix/window.c
	hw/xfree86/ramdac/xf86Cursor.c
	include/dix.h
	include/input.h
	include/inputstr.h
	mi/midispcur.c
	mi/miinitext.c
	mi/misprite.c
	render/animcur.c
	xfixes/cursor.c
	xkb/xkbAccessX.c
 2008-01-03 17:04:54 +10:30
Daniel Stone
941058f8da KDrive: Xephyr: Don't leak screen damage structure 2007-12-28 15:51:36 +02:00
Eamon Walsh
1c1a4bc970 devPrivates rework: more cleanup from previous merge operation. 2007-12-13 19:51:40 -05:00
Peter Hutterer
28b93d74a1 ephyr: miPointerWarpCursor needs the device parameter. 
Thanks to Mitchell Quille for spotting it.
 2007-12-03 14:35:33 +10:30
Eamon Walsh
1603130236 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	Xext/xace.c
	Xext/xace.h
 2007-11-14 13:35:50 -05:00
Dodji Seketeli
26e1fc7b42 Xephyr: don't use Xv or GL when those are disabled. 2007-11-07 18:48:23 +01:00
Peter Hutterer
0b729051c0 Merge branch 'master' into mpx 
Conflicts:

	Xi/extinit.c
	Xi/grabdev.c
	Xi/setmode.c
	Xi/ungrdev.c
	dix/devices.c
	dix/events.c
	dix/getevents.c
	include/dix.h
	mi/midispcur.c
	mi/misprite.c
	xkb/xkbActions.c
	xkb/xkbEvents.c
	xkb/xkbPrKeyEv.c
 2007-11-07 15:37:23 +10:30
Dodji Seketeli
868e303630 Xephyr: fix a crash when using xrandr twice 
* hw/kdrive/ephyr/ephyr.c:
          (ephyrScreenFini): don't forget to
          free shadowfb data (if necessary) upon server is reset.
 2007-11-06 16:24:46 +01:00
Eamon Walsh
a52c9b2a59 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	dix/dispatch.c
	dix/property.c
	hw/xfree86/common/xf86VidMode.c
	include/xkbsrv.h
	render/glyph.c
	xkb/xkbActions.c
 2007-11-05 19:08:36 -05:00
Dodji Seketeli
6ff79ea5f7 Xephyr: fix some DRI build breakage 2007-11-05 16:46:49 +01:00
Eamon Walsh
c3f7b86255 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	os/access.c
 2007-10-17 15:00:54 -04:00
Dodji Seketeli
ab11bad547 Xephyr: remove a potential crasher 
* hw/kdrive/ephyr/hostx.c:
	  (hostx_has_dri): be more defensive.
 2007-10-04 13:05:29 +02:00