Attachment 2166 Details for Bug 2258 – Patch for 2005-03-20-trunk

[patch] Patch for 2005-03-20-trunk

patch.gudiff (text/plain), 4.23 KB, created by Roland Mainz on 2005-03-20 12:42:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2005-03-20 12:42:50 UTC

Size: 4.23 KB

patch

obsolete

>Index: xc/ChangeLog
>===================================================================
>RCS file: /cvs/xorg/xc/ChangeLog,v
>retrieving revision 1.824
>diff -u -2 -0 -r1.824 ChangeLog
>--- xc/ChangeLog	19 Mar 2005 22:04:54 -0000	1.824
>+++ xc/ChangeLog	20 Mar 2005 20:37:33 -0000
>@@ -1,20 +1,28 @@
>+2005-03-20 Roland Mainz <roland.mainz@nrubsig.org>
>+	* xc/programs/xset/xset.c
>+	bugzilla #2258 (https://bugs.freedesktop.org/show_bug.cgi?id=2258)
>+	attachment #xxx (https://bugs.freedesktop.org/attachment.cgi?id=xxx)
>+	"xset q" (query) should not print an error message ('Xlib:  extension
>+	"XFree86-Misc" missing on display ":35.0".') when the "XFree86-Misc"
>+	is not available on the Xserver.
>+
> 2005-03-19 Roland Mainz <roland.mainz@nrubsig.org>
> 	* xc/nls/Compose/iso8859-2
> 	* xc/nls/Compose/iso8859-3
> 	* xc/nls/Compose/iso8859-9
> 	* xc/nls/Compose/iso8859-9e
> 	bugzilla #2592 (https://bugs.freedesktop.org/show_bug.cgi?id=2592)
> 	attachment #2156 (https://bugs.freedesktop.org/attachment.cgi?id=2156)
> 	Fix a couple of typos in ISO8859-* Compose files
> 	("asciicircum" instead "of asciicirum").
> 	Patch by Matthias Hopf <mhopf@suse.de>.
> 
> 2005-03-19 Roland Mainz <roland.mainz@nrubsig.org>
> 	* xc/programs/Xserver/mi/miinitext.c
> 	bugzilla #2771 (https://bugs.freedesktop.org/show_bug.cgi?id=2771)
> 	attachment #2148 (https://bugs.freedesktop.org/attachment.cgi?id=2148)
> 	Remove RENDER extension from exclusion list for the standalone print
> 	server (Xprt) to get this extension enabled if the print DDX support
> 	it.
> 
> 2005-03-18  Michel Daenzer <michel@daenzer.net>
>Index: xc/programs/xset/xset.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/xset/xset.c,v
>retrieving revision 1.6
>diff -u -2 -0 -r1.6 xset.c
>--- xc/programs/xset/xset.c	17 Oct 2004 23:08:07 -0000	1.6
>+++ xc/programs/xset/xset.c	20 Mar 2005 20:38:43 -0000
>@@ -1225,74 +1225,76 @@
>       return onstr;
>     else if (val == offval)
>       return offstr;
> 
>     buf[0] = '\0';
>     sprintf (buf, "<%d>", val);
>     return buf;
> }
> 
> 
> /*  This is the information-getting function for telling the user what the
>  *  current "xsettings" are.
>  */
> static void
> query(Display *dpy)
> {
> int scr = DefaultScreen (dpy);
> XKeyboardState values;
> int acc_num, acc_denom, threshold;
> int timeout, interval, prefer_blank, allow_exp;
>+int dummy;
> #ifdef XF86MISC
> XF86MiscKbdSettings kbdinfo;
> #endif
> #ifdef XKB
> XkbDescPtr xkb;
> int xkbmajor = XkbMajorVersion, xkbminor = XkbMinorVersion;
> int xkbopcode, xkbevent, xkberror;
> #endif
> char **font_path; int npaths;
> int i, j;
> char buf[20];				/* big enough for 16 bit number */
> 
> XGetKeyboardControl(dpy, &values);
> XGetPointerControl(dpy, &acc_num, &acc_denom, &threshold);
> XGetScreenSaver(dpy, &timeout, &interval, &prefer_blank, &allow_exp);
> font_path = XGetFontPath(dpy, &npaths);
> 
> printf ("Keyboard Control:\n");
> printf ("  auto repeat:  %s    key click percent:  %d    LED mask:  %08lx\n", 
> 	on_or_off (values.global_auto_repeat,
> 		   AutoRepeatModeOn, "on", AutoRepeatModeOff, "off", buf),
> 	values.key_click_percent, values.led_mask);
> #ifdef XKB
> if (XkbQueryExtension(dpy, &xkbopcode, &xkbevent, &xkberror, &xkbmajor, &xkbminor)
>     && (xkb = XkbAllocKeyboard()) != NULL
>     && XkbGetControls(dpy, XkbRepeatKeysMask, xkb) == Success)
>   printf ("  auto repeat delay:  %d    repeat rate:  %d\n",
>           xkb->ctrls->repeat_delay,  1000/xkb->ctrls->repeat_interval);
> #ifdef XF86MISC
> else
> #endif
> #endif
> #ifdef XF86MISC
>-if (XF86MiscGetKbdSettings(dpy, &kbdinfo))
>+if (XF86MiscQueryExtension(dpy, &dummy, &dummy) &&
>+    XF86MiscGetKbdSettings(dpy, &kbdinfo))
>   printf ("  auto repeat delay:  %d    repeat rate:  %d\n",
>           kbdinfo.delay, kbdinfo.rate);
> #endif
> printf ("  auto repeating keys:  ");
> for (i = 0; i < 4; i++) {
>     if (i) printf ("                        ");
>     for (j = 0; j < 8; j++) {
> 	printf ("%02x", (unsigned char)values.auto_repeats[i*8 + j]);
>     }
>     printf ("\n");
> }
> printf ("  bell percent:  %d    bell pitch:  %d    bell duration:  %d\n",
> 	values.bell_percent, values.bell_pitch, values.bell_duration);
> 
> printf ("Pointer Control:\n");
> printf ("  acceleration:  %d/%d    threshold:  %d\n",
> 	acc_num, acc_denom, threshold);
> 
> printf ("Screen Saver:\n");
> printf ("  prefer blanking:  %s    ",

Flags:

roland.mainz: 6.8-branch?

Actions: View | Splinter Review

Attachments on bug 2258: 2166

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.