From c6f80401dc533b04341afe8d596960d1bc25efce Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 10 Apr 2012 10:49:59 +0200 Subject: fontconfig mesa xkeyboard-config xserver pixman git update 10 Apr 2012 --- xorg-server/Xi/xipassivegrab.c | 9 ++- xorg-server/hw/xquartz/darwin.c | 6 +- xorg-server/hw/xquartz/mach-startup/Makefile.am | 14 +++-- xorg-server/os/log.c | 2 + .../xkeyboard-config/rules/base.extras.xml.in | 17 ++++++ xorg-server/xkeyboard-config/symbols/cz | 2 +- xorg-server/xkeyboard-config/symbols/il | 66 ++++++++++++++++++++++ xorg-server/xkeyboard-config/symbols/in | 18 +++--- 8 files changed, 113 insertions(+), 21 deletions(-) (limited to 'xorg-server') diff --git a/xorg-server/Xi/xipassivegrab.c b/xorg-server/Xi/xipassivegrab.c index 8a1c59968..7130328ec 100644 --- a/xorg-server/Xi/xipassivegrab.c +++ b/xorg-server/Xi/xipassivegrab.c @@ -290,13 +290,15 @@ ProcXIPassiveUngrabDevice(ClientPtr client) if (stuff->grab_type != XIGrabtypeButton && stuff->grab_type != XIGrabtypeKeycode && stuff->grab_type != XIGrabtypeEnter && - stuff->grab_type != XIGrabtypeFocusIn) { + stuff->grab_type != XIGrabtypeFocusIn && + stuff->grab_type != XIGrabtypeTouchBegin) { client->errorValue = stuff->grab_type; return BadValue; } if ((stuff->grab_type == XIGrabtypeEnter || - stuff->grab_type == XIGrabtypeFocusIn) && stuff->detail != 0) { + stuff->grab_type == XIGrabtypeFocusIn || + stuff->grab_type == XIGrabtypeTouchBegin) && stuff->detail != 0) { client->errorValue = stuff->detail; return BadValue; } @@ -327,6 +329,9 @@ ProcXIPassiveUngrabDevice(ClientPtr client) case XIGrabtypeFocusIn: tempGrab->type = XI_FocusIn; break; + case XIGrabtypeTouchBegin: + tempGrab->type = XI_TouchBegin; + break; } tempGrab->grabtype = XI2; tempGrab->modifierDevice = mod_dev; diff --git a/xorg-server/hw/xquartz/darwin.c b/xorg-server/hw/xquartz/darwin.c index 2e0bfe6da..03030ad22 100644 --- a/xorg-server/hw/xquartz/darwin.c +++ b/xorg-server/hw/xquartz/darwin.c @@ -541,15 +541,15 @@ InitInput(int argc, char **argv) gdkdev->info.source = GDK_SOURCE_PEN; */ - darwinTabletStylus = AddInputDevice(serverClient, DarwinTabletProc, FALSE); + darwinTabletStylus = AddInputDevice(serverClient, DarwinTabletProc, TRUE); assert(darwinTabletStylus); darwinTabletStylus->name = strdup("pen"); - darwinTabletCursor = AddInputDevice(serverClient, DarwinTabletProc, FALSE); + darwinTabletCursor = AddInputDevice(serverClient, DarwinTabletProc, TRUE); assert(darwinTabletCursor); darwinTabletCursor->name = strdup("cursor"); - darwinTabletEraser = AddInputDevice(serverClient, DarwinTabletProc, FALSE); + darwinTabletEraser = AddInputDevice(serverClient, DarwinTabletProc, TRUE); assert(darwinTabletEraser); darwinTabletEraser->name = strdup("eraser"); diff --git a/xorg-server/hw/xquartz/mach-startup/Makefile.am b/xorg-server/hw/xquartz/mach-startup/Makefile.am index 21ad5b503..77962b14d 100644 --- a/xorg-server/hw/xquartz/mach-startup/Makefile.am +++ b/xorg-server/hw/xquartz/mach-startup/Makefile.am @@ -23,7 +23,7 @@ nodist_X11_bin_SOURCES = \ mach_startupServer.c \ mach_startupUser.c -X11_bin_LDADD = \ +X11_bin_DEPENDENCIES = \ $(top_builddir)/hw/xquartz/libXquartz.la \ $(top_builddir)/hw/xquartz/xpr/libXquartzXpr.la \ $(top_builddir)/dix/dixfonts.lo \ @@ -31,8 +31,12 @@ X11_bin_LDADD = \ $(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \ $(XQUARTZ_LIBS) $(XSERVER_LIBS) +# $(XSERVER_SYS_LIBS) is placed here in order to set command line ordering +# to work around build issues on Tiger. +X11_bin_LDADD = $(X11_bin_DEPENDENCIES) $(XSERVER_SYS_LIBS) + X11_bin_LDFLAGS = \ - $(XSERVER_SYS_LIBS) -lXplugin \ + -lXplugin \ -XCClinker -Objc \ -Wl,-u,_miDCInitialize \ -Wl,-framework,Carbon \ @@ -41,7 +45,7 @@ X11_bin_LDFLAGS = \ -Wl,-framework,IOKit if GLX -X11_bin_LDADD += \ +X11_bin_DEPENDENCIES += \ $(top_builddir)/hw/xquartz/GL/libCGLCore.la \ $(top_builddir)/glx/libglx.la @@ -55,12 +59,10 @@ X11_bin_LDFLAGS += \ endif if RECORD -X11_bin_LDADD += \ +X11_bin_DEPENDENCIES += \ $(top_builddir)/record/librecord.la endif -X11_bin_DEPENDENCIES = $(X11_bin_LDADD) - bin_PROGRAMS = Xquartz dist_Xquartz_SOURCES = \ diff --git a/xorg-server/os/log.c b/xorg-server/os/log.c index 9a719696c..061b3dd61 100644 --- a/xorg-server/os/log.c +++ b/xorg-server/os/log.c @@ -601,6 +601,8 @@ FatalError(const char *f, ...) else ErrorF("\nFatal server error:\n"); + va_start(args, f); + /* Make a copy for OsVendorFatalError */ va_copy(args2, args); diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in index a2f4db040..205f5c119 100644 --- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in @@ -358,6 +358,23 @@ + + + il + <_shortDescription>he + <_description>Hebrew (Biblical SIL) + heb + + + + + SIL Phonetic + <_description>Biblical SIL phonetic + heb + + + + diff --git a/xorg-server/xkeyboard-config/symbols/cz b/xorg-server/xkeyboard-config/symbols/cz index 25fd54a11..db3dd4885 100644 --- a/xorg-server/xkeyboard-config/symbols/cz +++ b/xorg-server/xkeyboard-config/symbols/cz @@ -90,7 +90,7 @@ xkb_symbols "qwerty" { key { [ z, Z, degree, NoSymbol ] }; key { [ uring, quotedbl, semicolon, colon ] }; - key { [ section, exclam, apostrophe, quotedbl ] }; + key { [ section, exclam, apostrophe, ssharp ] }; key { [ y, Y, NoSymbol, NoSymbol ] }; key { [ uacute, slash, bracketleft, braceleft ] }; key { [parenright, parenleft, bracketright, braceright ] }; diff --git a/xorg-server/xkeyboard-config/symbols/il b/xorg-server/xkeyboard-config/symbols/il index 8bbeaaa51..eafb8cd75 100644 --- a/xorg-server/xkeyboard-config/symbols/il +++ b/xorg-server/xkeyboard-config/symbols/il @@ -249,3 +249,69 @@ xkb_symbols "biblical" { key { [ space, space, thinspace, nobreakspace ] }; }; + +// Biblical hebrew (SIL) US Standard layout version 1.5 +// This map is based closely on v 1.5 of the standard. The only deviation being the replacement of the composite characters sin and shin +// by their more recent Unicodev6 counterparts +// this map contains all the characters found in Biblical annotation, masoretic and Dead Sea Scroll related work. +// The layout corresponds phonetically to a US standard layout or similar (Qwerty). +// If you are using an actual Hebrew keyboard, you are probably better off using a Tiro compliant scholarly layout +// This linux port created and maintained by Dennis Meulensteen, dennis@meulensteen.nl +partial alphanumeric_keys +xkb_symbols "biblicalSIL" { + name[Group1]= "Israel - Biblical Hebrew SIL Phonetic"; + key.type = "FOUR_LEVEL_SEMIALPHABETIC"; + + key { [ U20AC, U20AA, U0024 ] }; //Euro, Shekel, Dollar - + key { [ 1, U0021, U05BD, U0597 ] }; //1, exclamation meteg revia + key { [ 2, U0598, U05A2, U05AE ] }; //2, zarqa atn. hafukh zinor + key { [ 3, U05A8, U0596, U0599 ] }; //3, qadma tipeha pashta + key { [ 4, U059C, U05A5, U05A0 ] }; //4, geresh merkha tel. gedola + key { [ 5, U059E, U05A6, U05A9 ] }; //5, gershayim mer. kefula tel qetana + key { [ 6, VoidSymbol, U05AD, U059F ] }; //6, - dehi qar. para + key { [ 7, U05AC, U05A3, U05A1 ] }; //7, iluy munah pazer + key { [ 8, U059D, U059B, U0595 ] }; //8, g. muqdam tevir zaq. gadol + key { [ 9, U0029, U05A7, U0593 ] }; //9, parenth.R darqa shalshelet + key { [ 0, U0028, U05AA, U05AF ] }; //0, paren.L yer. ben yomo masora c. + key { [ U05BE, U2013, U2014, U05BF ] }; //Maqaf, en dash em dash rafe + key { [ U05BC, VoidSymbol, U0591, U25CC ] }; //Dagesh - etnahta mark base + + key { [ hebrew_qoph, U0597 ] }; //Qof revia - - + key { [ hebrew_waw] }; //waw - - - + key { [ U05B6, U05B5, VoidSymbol, U05B1 ] }; //segol tsere - hat. segol + key { [ hebrew_resh ] }; //resh - - - + key { [ hebrew_taw ] }; //taw - - - + key { [ hebrew_yod, U059F ] }; //jod qar. para - - + key { [ U05BB] }; //quibuts - - - + key { [ U05B4 ] }; //hiriq, - - - + key { [ U05B9, U05BA, U05C7, U05B3 ] }; //holam, holam(wav) qam. qatan hat. Qamats + key { [ hebrew_pe, hebrew_finalpe, VoidSymbol, U034F ] }; //pe final pe - c. grapheme joiner + key { [ bracketright, braceright, VoidSymbol, U0594 ] }; //Bracket R brace R - zaq. qatan + key { [ bracketleft, braceleft, U059A, U0592 ] }; //Brachket L brace L yetiv segolta + key { [ U05C0, U05C0, U05A4, U05AB ] };//Paseq Paseq mahapakh ole + + key { [ U05B7, U05B8, U05C7, U05B2 ] }; //patah Qamats Qam. Qatan hat. patah + key { [ hebrew_samech, U05E9 ] }; //Samech, shin no dot - - + key { [ hebrew_dalet ] }; //dalet - - - + key { [ UFB2B, hebrew_sin, U05C2 ] }; //UCSv6 Sin sin (nodot) sindot - + key { [ hebrew_gimel, VoidSymbol, U25E6, U2022 ] }; //gimel - bullet(DSS) bulletfill (DSS) + key { [ hebrew_he, VoidSymbol, U0336, U030A ] };//he - strikeout(DSS) Ring Above(DSS) + key { [ UFB2A, hebrew_shin, U05C1] }; //UCSv6 Shin shin (nodot) shindot - + key { [ hebrew_kaph, hebrew_finalkaph ] }; //kaph Final kaph - + key { [ hebrew_lamed, VoidSymbol ] }; //lamed - - + key { [ U05B0, U05F4, semicolon, U05C3 ] }; //sva gers. p semicolon sof pasuq + key { [ U2019, U201D, U0323, U05C4 ] };//QuoteRight double R Quote punctum punctum Above + + key { [ hebrew_zain ] }; //Zayin - - + key { [ hebrew_chet ] }; //chet - - + key { [ hebrew_zade, U05E5 ] }; // tzade, final tzade - + key { [ hebrew_tet ] }; //tet - - + key { [ hebrew_bet ] }; //bet - - + key { [ hebrew_nun, hebrew_finalnun ] }; //nun, final nun + key { [ hebrew_mem, hebrew_finalmem, U200C, U200D ] }; //mem, final mem 0.wid.non.join. 0.wid.joiner + key { [ U002C, U05E2, U00AB, U0307 ] }; //comma, ayin guillemetsR masora dot + key { [ U0002E, U05D0, U00BB, U0308 ] }; //period, alef guillemetsL thousands + key { [ slash, question, U05F3 ] }; //slash question geresh P + + key { [ space, space, thinspace, nobreakspace ] };//space space thin space, nbsp +}; \ No newline at end of file diff --git a/xorg-server/xkeyboard-config/symbols/in b/xorg-server/xkeyboard-config/symbols/in index 84d9b06f8..f98d060c3 100644 --- a/xorg-server/xkeyboard-config/symbols/in +++ b/xorg-server/xkeyboard-config/symbols/in @@ -98,7 +98,7 @@ xkb_symbols "deva" { //Inspired by "devrom" keymap by Steve Smith for the windows tool "keyman" //Original Author : Noah Levitt //Past Authors : Pramod.R and Ravikant -// Current Main.: G Karunakar +//Current Main. : G Karunakar partial alphanumeric_keys xkb_symbols "bolnagri" { @@ -110,7 +110,7 @@ xkb_symbols "bolnagri" { key { [ 1, exclam, U0967, exclam ] }; key { [ 2, at, U0968, at ] }; key { [ 3, numbersign, U0969, numbersign ] }; - key { [ 4, dollar, U096A, dollar ] }; + key { [ 4, U20B9, U096A, dollar ] }; // Rupee symbol on $ key { [ 5, percent, U096B, percent ] }; key { [ 6, asciicircum, U096C, asciicircum ] }; key { [ 7, ampersand, U096D, ampersand ] }; @@ -125,7 +125,7 @@ xkb_symbols "bolnagri" { key { [ U200C, U200D ] }; // Q: ZWNJ, ZWJ key { [ U0935, U950 ] }; // W: wa, OM key { [ U0947, U0948, U090F, U0910 ] }; // E: e, ai matras - key { [ U0930, U0943 ] }; // R: ra, vocalic Ri + key { [ U0930, U0943, U0931, U090B ] }; // R: ra, vocalic Ri key { [ U0924, U0925 ] }; // T: ta, tha key { [ U092f, U091E ] }; // Y: ya, nya key { [ U0941, U0942, U0909, U090A ] }; // U: u, uu matras @@ -136,7 +136,7 @@ xkb_symbols "bolnagri" { key { [ bracketright, braceright ] }; //A Row - key { [ U093E, U0906, U0905, U0906 ] }; // A: aa + key { [ U093E, U0906, U0905, U0906 ] }; // A: aa, full A, AA key { [ U0938, U0937 ] }; // S: sa, ssa key { [ U0926, U0927 ] }; // D: da, dha key { [ U091F, U0920 ] }; // F: TA, THA @@ -144,18 +144,18 @@ xkb_symbols "bolnagri" { key { [ U0939, U0903 ] }; // H: ha, visarg key { [ U091C, U091D ] }; // J: ja, jha key { [ U0915, U0916 ] }; // K: ka, kha - key { [ U0932, U0962 ] }; // L: la, vocalic L or lru matra` + key { [ U0932, U0933, U0962, U090C ] }; // L: la, vocalic L or lru matra key { [ semicolon, colon ] }; key { [apostrophe, quotedbl ] }; //Z Row - key { [ U0936, U0945 ] }; // Z: sha, akaar candra - key { [ U094D, U0949 ] }; // X: halant, aakaar candra + key { [ U0936, U0945, U0936, U090D ] }; // Z: sha, akaar candra + key { [ U094D, U0949, U094D, U0911 ] }; // X: halant, aakaar candra, chandra A key { [ U091A, U091B ] }; // C: ca, cha key { [ U0921, U0922 ] }; // V: da, dha key { [ U092C, U092D ] }; // B: ba, bha - key { [ U0928, U0923 ] }; // N: na, nha - key { [ U092E, U093D, U092E, U093D ] }; // M: ma, avagraha + key { [ U0928, U0923 ] }; // N: na, nna + key { [ U092E, U0919, U092E, U093D ] }; // M: ma, nga, avagraha key { [ comma, U0970 ] };// comma: comma, dev abbreviation sign key { [ period, U093C ] }; // period: period, nukta key { [ slash, question ] }; -- cgit v1.2.3