summaryrefslogtreecommitdiffstats
path: root/meta/packages/xorg-lib/libx11-git/X18NCMSstubs.diff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-10-14 11:53:14 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-10-14 11:53:14 +0000
commit8e98e1f211632640a829df478399fd8fe5039088 (patch)
tree543c619afafa0d0f81932585693cc79bc6b3d2c5 /meta/packages/xorg-lib/libx11-git/X18NCMSstubs.diff
parent13a115a1885b7f91437de0ad890996dd281f352e (diff)
downloadpoky-8e98e1f211632640a829df478399fd8fe5039088.tar.gz
libx11-diet: added GIT version
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5500 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xorg-lib/libx11-git/X18NCMSstubs.diff')
-rw-r--r--meta/packages/xorg-lib/libx11-git/X18NCMSstubs.diff568
1 files changed, 568 insertions, 0 deletions
diff --git a/meta/packages/xorg-lib/libx11-git/X18NCMSstubs.diff b/meta/packages/xorg-lib/libx11-git/X18NCMSstubs.diff
new file mode 100644
index 0000000000..2dd27fc94f
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-git/X18NCMSstubs.diff
@@ -0,0 +1,568 @@
1---
2 configure.ac | 9 -
3 src/Makefile.am | 5
4 src/X18NCMSstubs.c | 428 +++++++++++++++++++++++++++++++++++++++++++++++++++++
5 src/imConv.c | 4
6 src/locking.c | 4
7 5 files changed, 448 insertions(+), 2 deletions(-)
8
9--- git.orig/configure.ac
10+++ git/configure.ac
11@@ -263,11 +263,18 @@ if test -f "$KEYSYMDEF"; then
12 else
13 AC_MSG_ERROR([Cannot find keysymdef.h])
14 fi
15 AC_SUBST(KEYSYMDEF)
16
17-AM_CONDITIONAL(UDC, test xfalse = xtrue)
18+AC_ARG_ENABLE(udc,
19+ AC_HELP_STRING([--disable-udc],
20+ [Disable Xlib support for UDC *EXPERIMENTAL*]),
21+ [UDC=$enableval],[UDC=yes])
22+AM_CONDITIONAL(UDC, [test x$UDC = xyes ])
23+if test x"$UDC" = "xyes"; then
24+ AC_DEFINE(UDC,1,[Include support for UDC])
25+fi
26
27 AC_ARG_ENABLE(xcms,
28 AC_HELP_STRING([--disable-xcms],
29 [Disable Xlib support for CMS *EXPERIMENTAL*]),
30 [XCMS=$enableval],[XCMS=yes])
31--- git.orig/src/Makefile.am
32+++ git/src/Makefile.am
33@@ -329,18 +329,21 @@ endif
34
35 if THRSTUBS
36 libX11_la_SOURCES+=UIThrStubs.c
37 endif
38
39+libX11_la_SOURCES+=X18NCMSstubs.c
40+
41 x11datadir = @X11_DATADIR@
42 x11data_DATA = XKeysymDB XErrorDB
43
44 EXTRA_DIST = \
45 $(x11data_DATA) \
46 os2Stubs.c \
47 udcInf.c \
48- UIThrStubs.c
49+ UIThrStubs.c \
50+ X18NCMSstubs.c
51
52 if XCB
53 libX11_la_SOURCES += \
54 xcb_lock.c \
55 xcb_disp.c \
56--- /dev/null
57+++ git/src/X18NCMSstubs.c
58@@ -0,0 +1,428 @@
59+/*
60+ * X18NCMSstubs.c
61+ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed
62+ *
63+ * Copyright © 2003 Matthew Allum
64+ *
65+ * Permission to use, copy, modify, distribute, and sell this software and its
66+ * documentation for any purpose is hereby granted without fee, provided that
67+ * the above copyright notice appear in all copies and that both that
68+ * copyright notice and this permission notice appear in supporting
69+ * documentation, and that the name of Matthew Allum not be used in
70+ * advertising or publicity pertaining to distribution of the software without
71+ * specific, written prior permission. Keith Packard and Compaq makes no
72+ * representations about the suitability of this software for any purpose. It
73+ * is provided "as is" without express or implied warranty.
74+ *
75+ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
76+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
77+ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
78+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
79+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
80+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
81+ * PERFORMANCE OF THIS SOFTWARE.
82+ */
83+
84+#include <stdlib.h>
85+#include "Xlibint.h"
86+#include "Xlcint.h"
87+#include <X11/Xlocale.h>
88+#include <X11/Xos.h>
89+#ifdef WIN32
90+#undef close
91+#endif
92+#include <X11/Xutil.h>
93+#include "XlcPubI.h"
94+
95+#include "Xcmsint.h" /* for XcmsCCC type */
96+#include "XlcPubI.h" /* for XLCd type */
97+#include "config.h"
98+
99+#if ! XLOCALE
100+
101+Bool
102+XSupportsLocale()
103+{
104+ return False;
105+}
106+
107+char *
108+XSetLocaleModifiers(
109+ const char *modifiers)
110+{
111+ return NULL;
112+}
113+
114+XLCd
115+_XOpenLC(
116+ char *name)
117+{
118+ return NULL;
119+}
120+
121+XLCd
122+_XlcCurrentLC()
123+{
124+ return NULL;
125+}
126+
127+void
128+_XlcVaToArgList(
129+ va_list var,
130+ int count,
131+ XlcArgList *args_ret)
132+{
133+ return;
134+}
135+
136+void
137+_XlcCountVaList(
138+ va_list var,
139+ int *count_ret)
140+{
141+ return;
142+}
143+
144+void
145+_XCloseLC(
146+ XLCd lcd)
147+{
148+ return;
149+}
150+
151+int
152+_XlcConvert(
153+ XlcConv conv,
154+ XPointer *from,
155+ int *from_left,
156+ XPointer *to,
157+ int *to_left,
158+ XPointer *args,
159+ int num_args)
160+{
161+ return 0;
162+}
163+
164+/* XIM Stubs */
165+
166+XPointer
167+_XimGetLocaleCode ( _Xconst char* encoding_name )
168+{
169+ return NULL;
170+}
171+
172+int
173+_XimGetCharCode (
174+ XPointer ucs_conv,
175+ KeySym keysym,
176+ unsigned char* buf,
177+ int nbytes)
178+{
179+ return 0;
180+}
181+
182+/* Xrm Stubs */
183+
184+XrmMethods
185+_XrmInitParseInfo(
186+ XPointer *state)
187+{
188+ return (XrmMethods) NULL;
189+}
190+
191+/* Xwc Stubs */
192+
193+int
194+XwcTextExtents(
195+ XFontSet font_set,
196+ _Xconst wchar_t *text,
197+ int text_len,
198+ XRectangle *overall_ink_extents,
199+ XRectangle *overall_logical_extents)
200+{
201+ return 0;
202+}
203+
204+void
205+XwcDrawString(Display *display,
206+ Drawable d,
207+ XFontSet font_set,
208+ GC gc,
209+ int x, int y,
210+ _Xconst wchar_t *string,
211+ int num_wchars)
212+{
213+ ;
214+}
215+
216+void
217+XwcDrawText(
218+ Display *dpy,
219+ Drawable d,
220+ GC gc,
221+ int x,
222+ int y,
223+ XwcTextItem *text_items,
224+ int nitems)
225+{
226+ ;
227+}
228+
229+void
230+XwcDrawImageString(
231+ Display *dpy,
232+ Drawable d,
233+ XFontSet font_set,
234+ GC gc,
235+ int x,
236+ int y,
237+ _Xconst wchar_t *text,
238+ int text_len)
239+{
240+ ;
241+}
242+
243+int
244+XwcTextEscapement(
245+ XFontSet font_set,
246+ _Xconst wchar_t *text,
247+ int text_len)
248+{
249+ return 0;
250+}
251+
252+Status
253+XwcTextPerCharExtents(
254+ XFontSet font_set,
255+ _Xconst wchar_t *text,
256+ int text_len,
257+ XRectangle *ink_extents_buffer,
258+ XRectangle *logical_extents_buffer,
259+ int buffer_size,
260+ int *num_chars,
261+ XRectangle *max_ink_extents,
262+ XRectangle *max_logical_extents)
263+{
264+ ;
265+}
266+
267+int
268+XwcTextPropertyToTextList(
269+ Display *dpy,
270+ const XTextProperty *text_prop,
271+ wchar_t ***list_ret,
272+ int *count_ret)
273+{
274+ return 0;
275+}
276+
277+int
278+XwcTextListToTextProperty(
279+ Display *dpy,
280+ wchar_t **list,
281+ int count,
282+ XICCEncodingStyle style,
283+ XTextProperty *text_prop)
284+{
285+ return 0;
286+}
287+
288+void
289+XwcFreeStringList(wchar_t **list)
290+{
291+ return;
292+}
293+
294+
295+void XmbSetWMProperties ( /* Actually from mbWMProps.c */
296+ Display *dpy,
297+ Window w,
298+ _Xconst char *windowName,
299+ _Xconst char *iconName,
300+ char **argv,
301+ int argc,
302+ XSizeHints *sizeHints,
303+ XWMHints *wmHints,
304+ XClassHint *classHints)
305+{
306+ return;
307+}
308+
309+int
310+XmbTextPropertyToTextList(
311+ Display *dpy,
312+ const XTextProperty *text_prop,
313+ char ***list_ret,
314+ int *count_ret)
315+{
316+ return XLocaleNotSupported;
317+}
318+
319+int
320+XmbTextListToTextProperty(
321+ Display *dpy,
322+ char **list,
323+ int count,
324+ XICCEncodingStyle style,
325+ XTextProperty *text_prop)
326+{
327+ return XLocaleNotSupported;
328+}
329+
330+int
331+XmbTextExtents(
332+ XFontSet font_set,
333+ _Xconst char *text,
334+ int text_len,
335+ XRectangle *overall_ink_extents,
336+ XRectangle *overall_logical_extents)
337+{
338+ return 0;
339+}
340+
341+void
342+XmbDrawText(
343+ Display *dpy,
344+ Drawable d,
345+ GC gc,
346+ int x,
347+ int y,
348+ XmbTextItem *text_items,
349+ int nitems)
350+{
351+ ;
352+}
353+
354+void
355+XmbDrawString(
356+ Display *dpy,
357+ Drawable d,
358+ XFontSet font_set,
359+ GC gc,
360+ int x,
361+ int y,
362+ _Xconst char *text,
363+ int text_len)
364+{
365+ ;
366+}
367+
368+void
369+XmbDrawImageString(
370+ Display *dpy,
371+ Drawable d,
372+ XFontSet font_set,
373+ GC gc,
374+ int x,
375+ int y,
376+ _Xconst char *text,
377+ int text_len)
378+{
379+ ;
380+}
381+
382+int
383+XmbTextEscapement(
384+ XFontSet font_set,
385+ _Xconst char *text,
386+ int text_len)
387+{
388+ return 0;
389+}
390+
391+Status
392+XmbTextPerCharExtents(
393+ XFontSet font_set,
394+ _Xconst char *text,
395+ int text_len,
396+ XRectangle *ink_extents_buffer,
397+ XRectangle *logical_extents_buffer,
398+ int buffer_size,
399+ int *num_chars,
400+ XRectangle *max_ink_extents,
401+ XRectangle *max_logical_extents)
402+{
403+ return 0;
404+}
405+
406+unsigned int
407+KeySymToUcs4(KeySym keysym)
408+{
409+ return 0;
410+}
411+
412+#endif
413+
414+#if ! XCMS
415+
416+XcmsCCC
417+XcmsCCCOfColormap(dpy, cmap)
418+ Display *dpy;
419+ Colormap cmap;
420+{
421+ return NULL;
422+}
423+
424+Status
425+_XcmsResolveColorString (
426+ XcmsCCC ccc,
427+ const char **color_string,
428+ XcmsColor *pColor_exact_return,
429+ XcmsColorFormat result_format)
430+{
431+ return(XcmsFailure);
432+}
433+
434+void
435+_XcmsUnresolveColor(
436+ XcmsCCC ccc,
437+ XcmsColor *pColor)
438+{
439+ return;
440+}
441+
442+void
443+_XUnresolveColor(
444+ XcmsCCC ccc,
445+ XColor *pXColor)
446+{
447+ return;
448+}
449+
450+XcmsCmapRec *
451+_XcmsAddCmapRec(dpy, cmap, windowID, visual)
452+ Display *dpy;
453+ Colormap cmap;
454+ Window windowID;
455+ Visual *visual;
456+{
457+ return NULL;
458+}
459+
460+void
461+_XcmsRGB_to_XColor(
462+ XcmsColor *pColors,
463+ XColor *pXColors,
464+ unsigned int nColors)
465+{
466+ return;
467+}
468+
469+XcmsCmapRec *
470+_XcmsCopyCmapRecAndFree(
471+ Display *dpy,
472+ Colormap src_cmap,
473+ Colormap copy_cmap)
474+{
475+ return NULL;
476+}
477+
478+void
479+_XcmsDeleteCmapRec(
480+ Display *dpy,
481+ Colormap cmap)
482+{
483+ return;
484+}
485+
486+#endif
487--- git.orig/src/imConv.c
488+++ git/src/imConv.c
489@@ -81,10 +81,11 @@ static const struct SubstRec SubstTable[
490 /*
491 * Given the name of a charset, returns the pointer to convertors
492 * from UCS char to specified charset char.
493 * This converter is needed for _XimGetCharCode subroutine.
494 */
495+#ifdef XLOCALE
496 XPointer
497 _XimGetLocaleCode (
498 _Xconst char* encoding_name)
499 {
500 XPointer cvt = _Utf8GetConvByName(encoding_name);
501@@ -94,10 +95,11 @@ _XimGetLocaleCode (
502 if (!strcmp(encoding_name, SubstTable[i].encoding_name))
503 return _Utf8GetConvByName(SubstTable[i].charset_name);
504 }
505 return cvt;
506 }
507+#endif
508
509 /*
510 * Returns the locale dependent representation of a keysym.
511 * The locale's encoding is passed in form of pointer to UCS convertor.
512 * The resulting multi-byte sequence is placed starting at buf (a buffer
513@@ -105,10 +107,11 @@ _XimGetLocaleCode (
514 * Returns the length of the resulting multi-byte sequence, excluding the
515 * terminating NUL byte. Return 0 if the keysym is not representable in the
516 * locale
517 */
518 /*ARGSUSED*/
519+#ifdef XLOCALE
520 int
521 _XimGetCharCode (
522 XPointer ucs_conv,
523 KeySym keysym,
524 unsigned char* buf,
525@@ -133,10 +136,11 @@ _XimGetCharCode (
526 return nbytes;
527 if (count<nbytes)
528 buf[count]= '\0';
529 return count;
530 }
531+#endif
532
533 #ifdef XKB
534 static int lookup_string(
535 XKeyEvent* event,
536 char* buffer,
537--- git.orig/src/locking.c
538+++ git/src/locking.c
539@@ -53,11 +53,13 @@ in this Software without prior written a
540 #endif
541
542 #define NUM_FREE_CVLS 4
543
544 /* in lcWrap.c */
545+#ifdef XLOCALE
546 extern LockInfoPtr _Xi18n_lock;
547+#endif
548
549 #ifdef WIN32
550 static DWORD _X_TlsIndex = (DWORD)-1;
551
552 void _Xthread_init()
553@@ -623,13 +625,15 @@ Status XInitThreads()
554 return 0;
555 }
556 _Xglobal_lock = &global_lock;
557 xmutex_init(_Xglobal_lock->lock);
558 xmutex_set_name(_Xglobal_lock->lock, "Xlib global");
559+#ifdef XLOCALE
560 _Xi18n_lock = &i18n_lock;
561 xmutex_init(_Xi18n_lock->lock);
562 xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n");
563+#endif
564 _XLockMutex_fn = _XLockMutex;
565 _XUnlockMutex_fn = _XUnlockMutex;
566 _XCreateMutex_fn = _XCreateMutex;
567 _XFreeMutex_fn = _XFreeMutex;
568 _XInitDisplayLock_fn = _XInitDisplayLock;
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 15:44:50 +0000