Commit Graph

450 Commits

Author SHA1 Message Date
Jeremy Huddleston
03579fe1d5 Default to use standard bitmap fonts, with builtins as fallback
The builtin-fonts configure option was removed, as it at best should
have been a runtime option. Instead, now it always register all "font
path element" backends, and adds built-ins fonts at the end of the
default font path.
  This should be a more reasonable solution, to "correct" the most
common Xorg FAQ (could not open default font 'fixed'), and also don't
break by default applications that use only the standard/historical
X Font rendering.
(cherry picked from commit 49b93df8a3)

    Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 69a2728891)
2009-02-24 22:30:13 -08:00
Julien Cristau
e1b5967c1a Ansify declaration of FontToXError()
(cherry picked from commit e85d5d707d)
2009-02-24 22:29:10 -08:00
Jie Luo
e902f51490 Remove duplicate load of freetype font renderer.
libXfont will do this for us in FontFileRegisterFpeFunctions.
(cherry picked from commit e3ff850174)
2009-02-24 22:29:01 -08:00
Adam Jackson
300322b883 Remove loadable font renderer support.
(cherry picked from commit affec10635)
2009-02-24 22:27:09 -08:00
Adam Jackson
95a7e9b00f Remove the numVideoScreens xprintism.
This was to account for cases where you had video and print screens in
the same server.  Lunacy.  Leave the slot in ScreenInfo, but rename it,
and stop looking at it.
(cherry picked from commit a82e6efb7b)
2009-02-24 22:27:00 -08:00
Tiago Vignatti
6c78f1b736 Remove NOFONTSERVERACCESS macro
dix: this is semantically different but it goes through the same path in
the code.
(cherry picked from commit f3b29efc4d)
2009-02-24 22:26:50 -08:00
Jeremy Huddleston
159e6a1b20 X n'est pas une print API.
(cherry picked from commit 1c8bd318fb)
2009-02-24 22:26:32 -08:00
Alan Coopersmith
5fc34f65f7 Return a valid X error when stuck in font alias loop
Part of fix for Sun bug 4258475
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4258475>
(cherry picked from commit 1a01e96c6d)
2009-02-24 22:25:21 -08:00
Adam Jackson
e8a45d97d3 Death to APPGROUP.
(cherry picked from commit eafaf40fb3)
2009-02-24 22:24:03 -08:00
Jeremy Huddleston
2db1d46bac XQuartz: mieq: Wait for the server to finish initializing before letting other threads mieqEnqueue
Avoid possible race condition whereby one thread might call mieqEnqueue before InitAndStartDevices finishes
(cherry picked from commit 94e417ac87)
2009-01-16 13:59:36 -08:00
Jeremy Huddleston
d0f00dd2f9 dix: Added missing include for miPaintWindow 2008-11-22 14:30:36 -08:00
Jeremy Huddleston
b8cc3acdac dix: Fix some sanity in getevents.c 2008-11-15 21:58:24 -08:00
Jeremy Huddleston
f5201d47d0 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-10-15 17:31:44 -07:00
Adam Jackson
b595b65e54 Revert "Array-index based devPrivates implementation."
This reverts commit 8ef37c194f.
2008-10-09 14:53:29 -04:00
Jeremy Huddleston
42d1454507 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-10-08 18:43:55 -07:00
Julien Cristau
ca659813a8 Fix GKVE with key_code > 255
Move the keycode validation checks before use.
2008-10-08 19:46:50 +02:00
Eamon Walsh
8ef37c194f Array-index based devPrivates implementation.
Note: DevPrivateKey is now pointer-to-int, which means
each key now needs to point to some global storage of
size at least sizeof(int).

(cherry picked from commit b6ab114212)
2008-10-08 11:15:27 -04:00
Jeremy Huddleston
df2de85c90 XQuartz: Don't warp the pointer on server start for XQuartz
(cherry picked from commit c0da576d49)
2008-09-12 15:19:39 -07:00
Jeremy Huddleston
d96f2c5978 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-09-12 15:16:16 -07:00
Daniel Drake
7f42ed6ca9 Don't try to destroy a NULL pixmap.
(cherry picked from commit 4e1f9f51a9)
2008-09-02 17:33:21 -04:00
Jeremy Huddleston
24aef18e97 XQuartz: Added debugging output to the crash log to help track down two crashes, since people don't often report their system.log spew.
(cherry picked from commit aaf0f71db1)
2008-08-29 20:45:48 -07:00
Jeremy Huddleston
0b2ab2327e Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-08-14 09:12:52 -07:00
Peter Hutterer
6f74475a04 dix: don't try to create events if we don't have a screen. #16898
A NULL screen may happen during server shutdown, when the output has been shut
down but the devices still generate events.

X.Org Bug 16898 <http://bugs.freedesktop.org/show_bug.cgi?id=16898>
(cherry picked from commit 465a9bb96e)
2008-08-08 01:20:53 -07:00
Daniel Stone
b5932f176c DIX: Add strcasestr from FreeBSD
Add strcasestr for use on systems which don't have it.
(cherry picked from ad87c72edc commit)
2008-08-06 16:12:06 -07:00
Daniel Stone
8a319335fa strcasecmp: Actually use the right license
Forgot to update the license when I committed the FreeBSD version, so it
still had an old SGI license.  Sorry.  Sorry.
(cherry picked from dcf6293030 commit)
2008-08-06 16:05:45 -07:00
Daniel Stone
5a5030af9b DIX: Add strncasecmp from FreeBSD, make strcasecmp args const
Add strncasecmp (as we're now using it) in case someone doesn't have it,
and also change strncasecmp args to be const, in accordance with
everything else.
(cherry picked from 11f9e35202 commit)
2008-08-06 16:05:32 -07:00
Jeremy Huddleston
a20a7eb85e Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-08-05 12:53:36 -07:00
Peter Hutterer
476de585be dix: NULL out WindowTable after freeing all the windows.
CloseDownDevices() tries to send PresenceNotify events. If the windows are
already freed, then we are accessing dangling pointers.
(cherry picked from commit aec485f2dc)
2008-07-16 10:34:55 +09:30
Ander Conselvan de Oliveira
e135a77b8b Fix incorrect test regarding keyboard map.
In the map stored in each keyboard device, the first line refers to minimum
keycode, i.e., the 0th line refers to keycode 8. When not using XKB the wrong
test caused some keys to be interpreted as locks ('m' for instance). The had
to be pressed twice to generate both KeyPress and KeyRelease events.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2008-07-13 21:30:46 +09:30
Jeremy Huddleston
e5d4970d4d Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-07-11 10:12:55 -07:00
Eamon Walsh
39cc11b005 Fix a leak of window devPrivates in window.c/CrushTree().
(cherry picked from commit 7ddfb2f158)
2008-06-27 23:11:29 -04:00
Eamon Walsh
5d66908975 Fix a leak in the code that parses the protocol names.
Also added some comments.
Reported by Ben Gamari (bug #16492).
(cherry picked from commit a3ec226273)
2008-06-24 22:03:30 -04:00
Jeremy Huddleston
d451f3d146 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-06-24 09:36:01 -07:00
Eamon Walsh
eed6713d3d SELinux: Bring server-side name registry up to date.
(cherry picked from commit 656d3d7623)
2008-06-17 17:59:10 -04:00
Eamon Walsh
2552026664 Make devPrivates lookup functions ABI instead of static inlines.
This is required to preserve compatibility across changes to the
internal representation of the privates list.
(cherry picked from commit 2d7ba09dc4)
2008-06-13 16:45:08 -04:00
Jeremy Huddleston
33bfb761a7 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-06-10 01:45:40 -07:00
Drew Parsons
2f994cb00e Create dix/libXpdix.la for Xprint-specific build of libdix.la
(cherry picked from commit 4e2c6dbabdbbaaca213fd08edd422de15d0900cc)

required because of commit 7c0709a736,
which made requestingClient in dix specific to Xprint only.
Add to XPRINT_LIBS in hw/xprint/Makefile.am in front of
$(XSERVER_LIBS) to override definitions in libdix.la for standard xservers.

Follows 571206832d (providing -DXPRINT
to xprint subdirs).

Note it may be possible to restructure the code so that
requestingClient is stored elsewhere than in dix. See discussions
following http://lists.freedesktop.org/archives/xorg/2008-March/033844.html
If this is done it may be possible to revert this commit (if not 571206...).
(cherry picked from commit 966ae1781f)
2008-06-09 13:56:59 -04:00
Jeremy Huddleston
3a89ce6307 Dix: Cleaned up sanity checking in Get{Pointer,Keyboard}Events
XQuartz was crashing because the Appkit thread was trying to GetXXXEvents while the Xserver thread was exiting.
This adds some more sanity checks and avoids that crash
(cherry picked from commit 34ec4bd6ac)
2008-04-30 17:32:50 -07:00
Jeremy Huddleston
90c4fd7a49 XQuartz: Cleaned up startup and thread creation a tad.
(cherry picked from commit c861fe00e1)
(cherry picked from commit ef1c520537)
2008-04-26 19:21:18 -07:00
Jeremy Huddleston
ce5a5f9399 Fixed dixLookupClient to work with client=NullClient as it did in the 1.3 branch
(cherry picked from commit e41ccc6470)
2008-04-21 20:08:05 -07:00
Jeremy Huddleston
5cef157d9d Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-04-18 17:23:23 -07:00
Jeremy Huddleston
0f84df88d0 Removed some of our debugging spam from dix main.
(cherry picked from commit a56aca1a6b)
2008-04-17 13:20:43 -07:00
Peter Hutterer
099d1bef22 dix: Call DeleteInputDeviceRequest from CloseDownDevices (#14418)
The DDX (xfree86 anyway) maintains its own device list in addition to the one
in the DIX. CloseDevice will only remove it from the DIX, not the DDX. If the
server then restarts (last client disconnects), the DDX devices are still
there, will be re-initialised, then the hal devices come in and are added too.
This repeats until we run out of device ids.

This also requires us to strdup() the default pointer/keyboard in
checkCoreInputDevices.

X.Org Bug 14418 <http://bugs.freedesktop.org/show_bug.cgi?id=14418>
(cherry picked from commit 6d22a9615a)
2008-04-15 11:47:04 +10:00
Jeremy Huddleston
2d4194a8d1 XQuartz: Fix issue where clicking on an X11 window might send that event to an X11 window in another space.
(cherry picked from commit df21312c8b)
2008-04-08 17:02:56 -07:00
Ben Byer
d39f9a63d7 shovelling code around ...
(cherry picked from commit 2143182ba4)
2008-04-02 17:42:31 -07:00
Adam Jackson
ae8edf3ee7 Fix that last commit.
I can apply patches, really.
(cherry picked from commit 333e7123dc)
2008-03-25 12:48:44 -04:00
Sascha Hlusiak
ff99a3aa2b Fix getValuatorEvents to compute number of valuators correctly.
(cherry picked from commit e7a3644255)
2008-03-25 12:33:03 -04:00
Eamon Walsh
926f32df3c XACE: Check the return value of the selection create hook call.
(cherry picked from commit 056a2ce02c)
2008-03-04 02:46:20 -05:00
Eamon Walsh
7f74ba1b77 dix: Convert selection list to a linked list.
Fixes a bug where pointers were being invalidated after a realloc.
(cherry picked from commit 72f2197545)
2008-03-04 02:17:13 -05:00
Eamon Walsh
cc76ea6e3a XACE: Add generic support for property and selection polyinstantiation. 2008-02-29 18:01:37 -05:00