Re: [PATCH 1/4 v2] os/log: Pull LogMessageTypeVerbString out of LogVMessageVerb
On Mon, 2011-08-01 at 12:21:20 +0800, Daniel Kurtz wrote:
Also, optimize how the type and format strings are combined.
Signed-off-by: Daniel Kurtz djku...@chromium.org
---
os/log.c | 111 ++---
1 files changed, 62 insertions(+), 49 deletions(-)
diff --git a/os/log.c b/os/log.c
index 4a310e6..06ae027 100644
--- a/os/log.c
+++ b/os/log.c
@@ -323,58 +326,68 @@ LogWrite(int verb, const char *f, ...)
va_end(args);
}
-void
-LogVMessageVerb(MessageType type, int verb, const char *format, va_list args)
+/* Returns the Message Type string to prepend to a logging message, or NULL
+ * if the message will be dropped due to insufficient verbosity. */
+static const char*
+LogMessageTypeVerbString(MessageType type, int verb)
{
[...]
+switch (type) {
+case X_PROBED:
+ return X_PROBE_STRING;
+case X_CONFIG:
+ return X_CONFIG_STRING;
+case X_DEFAULT:
+ return X_DEFAULT_STRING;
There's some spaces too many here.
+case X_CMDLINE:
+ return X_CMDLINE_STRING;
+case X_NOTICE:
+ return X_NOTICE_STRING;
+case X_ERROR:
+ return X_ERROR_STRING;
+case X_WARNING:
+ return X_WARNING_STRING;
+case X_INFO:
+ return X_INFO_STRING;
+case X_NOT_IMPLEMENTED:
+ return X_NOT_IMPLEMENTED_STRING;
+case X_UNKNOWN:
+ return X_UNKNOWN_STRING;
+case X_NONE:
+ return X_NONE_STRING;
}
+return X_UNKNOWN_STRING;
+}
+
+void
+LogVMessageVerb(MessageType type, int verb, const char *format, va_list args)
+{
+const char *type_str;
+char tmpFormat[1024];
+char *tmpFormat_end = tmpFormat[sizeof(tmpFormat)];
+char *p = tmpFormat;
+int left;
+
+type_str = LogMessageTypeVerbString(type, verb);
+if (!type_str)
+ return;
+
+/* if type_str is not , prepend it, and ' ', to format */
+left = tmpFormat_end - p;
+if (strlen(type_str))
+ p += snprintf(p, left, %s , type_str);
+
+/* if still room in tmpBuf copy as much of format as will fit */
+left = tmpFormat_end - p;
+if (left 1)
+ snprintf(p, left, %s, format);
+
+LogVWrite(verb, tmpFormat, args);
How about something like this instead:
const char *type_str;
char tmpFormat[1024];
char *new_format;
type_str = LogMessageTypeVerbString(type, verb);
if (!type_str)
return;
if (type_str[0] == '\0')
new_format = format;
else
{
new_format = tmpFormat;
snprintf(tmpFormat, sizeof(tmpFormat), %s %s, type_str, format);
}
LogVWrite(verb, new_format, args);
}
/* Log message with verbosity level specified. */
regards,
guillem
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH] render: Improve glyph double hashing
Instead of artificially introducing collisions in the step value by
replacing 0 with 1 (which causes the value 1 to have twice the
frequency of any other value), the step value can simply be computed
as an uniformly distributed value in the range [1, rehash], extremes
included.
This is safe because any step value smaller than the hash modulus is
co-prime with it, hence induces an orbit which includes every integer
in [0, tableSize - 1].
---
render/glyph.c |6 +-
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/render/glyph.c b/render/glyph.c
index 7193d47..6ebf790 100644
--- a/render/glyph.c
+++ b/render/glyph.c
@@ -164,11 +164,7 @@ FindGlyphRef (GlyphHashPtr hash,
break;
}
if (!step)
- {
- step = signature % hash-hashSet-rehash;
- if (!step)
- step = 1;
- }
+ step = 1 + signature % hash-hashSet-rehash;
elt += step;
if (elt = tableSize)
elt -= tableSize;
--
1.7.1
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: libXaw3d hosting on freedesktop
On 07/30/11 18:00, Matt Turner wrote: Xaw3d apparently has no upstream, anywhere. It's unfortunately still used by a couple of applications. I guess it'd be nice to get it moved to xorg/lib/libXaw3d at some point too. +1 for that, though if it was possible to share common code with libXaw (perhaps by making Xaw3d another variant/subdir in the libXaw git repo), that would be nice too. -- -Alan Coopersmith-alan.coopersm...@oracle.com Oracle Solaris Platform Engineering: X Window System ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: libXaw3d hosting on freedesktop
On Mon, Aug 1, 2011 at 2:13 PM, Alan Coopersmith alan.coopersm...@oracle.com wrote: On 07/30/11 18:00, Matt Turner wrote: Xaw3d apparently has no upstream, anywhere. It's unfortunately still used by a couple of applications. I guess it'd be nice to get it moved to xorg/lib/libXaw3d at some point too. +1 for that, though if it was possible to share common code with libXaw (perhaps by making Xaw3d another variant/subdir in the libXaw git repo), that would be nice too. -- -Alan Coopersmith- alan.coopersm...@oracle.com Oracle Solaris Platform Engineering: X Window System I'll check into how much code is shared between them. It's also been pointed out to me that there is a Xaw3d-1.5E floating around, with apparent utf8 support, so I'll check it out and probably rebase my work on it. Matt ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH rendercheck] Use the right screen from $DISPLAY
RootWindow(dpy, 0) always uses screen 0, even if a different screen is
specified in the $DISPLAY environment variable. Use
DefaultRootWindow(dpy) instead to use the right one.
---
main.c |4 ++--
t_bug7366.c |2 +-
t_repeat.c |2 +-
t_srccoords.c |2 +-
t_tsrccoords.c |2 +-
t_tsrccoords2.c |2 +-
tests.c | 12 ++--
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/main.c b/main.c
index e261c78..5190c49 100644
--- a/main.c
+++ b/main.c
@@ -289,8 +289,8 @@ int main(int argc, char **argv)
num_ops = PictOpSaturate;
}
- window.d = XCreateSimpleWindow(dpy, RootWindow(dpy, 0), 0, 0, win_width,
- win_height, 0, 0, WhitePixel(dpy, 0));
+ window.d = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy), 0, 0,
+ win_width, win_height, 0, 0, WhitePixel(dpy, 0));
as.override_redirect = True;
XChangeWindowAttributes(dpy, window.d, CWOverrideRedirect, as);
diff --git a/t_bug7366.c b/t_bug7366.c
index 1277580..34ac004 100644
--- a/t_bug7366.c
+++ b/t_bug7366.c
@@ -69,7 +69,7 @@ bug7366_test_set_alpha_map(Display *dpy)
memset(color, 0, sizeof(color));
source_pict = XRenderCreateSolidFill(dpy, color);
-pixmap = XCreatePixmap(dpy, RootWindow(dpy, 0), 1, 1, 32);
+pixmap = XCreatePixmap(dpy, DefaultRootWindow(dpy), 1, 1, 32);
pict = XRenderCreatePicture(dpy, pixmap,
XRenderFindStandardFormat(dpy, PictStandardARGB32), 0, NULL);
diff --git a/t_repeat.c b/t_repeat.c
index 4e26136..679bca1 100644
--- a/t_repeat.c
+++ b/t_repeat.c
@@ -69,7 +69,7 @@ repeat_test(Display *dpy, picture_info *win, picture_info
*dst, int op,
pa.component_alpha = test_mask;
pa.repeat = TRUE;
- src.d = XCreatePixmap(dpy, RootWindow(dpy, 0), w, h, 32);
+ src.d = XCreatePixmap(dpy, DefaultRootWindow(dpy), w, h, 32);
src.format = XRenderFindStandardFormat(dpy, PictStandardARGB32);
src.pict = XRenderCreatePicture(dpy, src.d, src.format,
CPComponentAlpha | CPRepeat, pa);
diff --git a/t_srccoords.c b/t_srccoords.c
index 6aff6d5..6e29e8a 100644
--- a/t_srccoords.c
+++ b/t_srccoords.c
@@ -43,7 +43,7 @@ static picture_info *create_target_picture(Display *dpy)
p = malloc(sizeof(picture_info));
- p-d = XCreatePixmap(dpy, RootWindow(dpy, 0), 5, 5, 32);
+ p-d = XCreatePixmap(dpy, DefaultRootWindow(dpy), 5, 5, 32);
p-format = XRenderFindStandardFormat(dpy, PictStandardARGB32);
p-pict = XRenderCreatePicture(dpy, p-d, p-format, 0, NULL);
p-name = target picture;
diff --git a/t_tsrccoords.c b/t_tsrccoords.c
index 124fdc9..279591d 100644
--- a/t_tsrccoords.c
+++ b/t_tsrccoords.c
@@ -43,7 +43,7 @@ static picture_info *create_dot_picture(Display *dpy)
p = malloc(sizeof(picture_info));
- p-d = XCreatePixmap(dpy, RootWindow(dpy, 0), 5, 5, 32);
+ p-d = XCreatePixmap(dpy, DefaultRootWindow(dpy), 5, 5, 32);
p-format = XRenderFindStandardFormat(dpy, PictStandardARGB32);
p-pict = XRenderCreatePicture(dpy, p-d, p-format, 0, NULL);
p-name = dot picture;
diff --git a/t_tsrccoords2.c b/t_tsrccoords2.c
index 4449dca..0d83fd5 100644
--- a/t_tsrccoords2.c
+++ b/t_tsrccoords2.c
@@ -43,7 +43,7 @@ static picture_info *create_target_picture(Display *dpy)
p = malloc(sizeof(picture_info));
- p-d = XCreatePixmap(dpy, RootWindow(dpy, 0), 5, 5, 32);
+ p-d = XCreatePixmap(dpy, DefaultRootWindow(dpy), 5, 5, 32);
p-format = XRenderFindStandardFormat(dpy, PictStandardARGB32);
p-pict = XRenderCreatePicture(dpy, p-d, p-format, 0, NULL);
p-name = target picture;
diff --git a/tests.c b/tests.c
index def1bf5..aacd14d 100644
--- a/tests.c
+++ b/tests.c
@@ -337,7 +337,7 @@ do_tests(Display *dpy, picture_info *win)
for (i = 0; i num_dests; i++) {
dests[i].format = format_list[i];
- dests[i].d = XCreatePixmap(dpy, RootWindow(dpy, 0),
+ dests[i].d = XCreatePixmap(dpy, DefaultRootWindow(dpy),
win_width, win_height, dests[i].format-depth);
dests[i].pict = XRenderCreatePicture(dpy, dests[i].d,
dests[i].format, 0, NULL);
@@ -359,8 +359,8 @@ do_tests(Display *dpy, picture_info *win)
/* The standard PictFormat numbers go from 0 to 4 */
pictures_1x1[i].format = format_list[i % nformats];
- pictures_1x1[i].d = XCreatePixmap(dpy, RootWindow(dpy, 0), 1,
- 1, pictures_1x1[i].format-depth);
+ pictures_1x1[i].d = XCreatePixmap(dpy, DefaultRootWindow(dpy),
+ 1, 1, pictures_1x1[i].format-depth);
pa.repeat = TRUE;
pictures_1x1[i].pict = XRenderCreatePicture(dpy,
pictures_1x1[i].d, pictures_1x1[i].format, CPRepeat, pa);
@@ -395,8
Re: libXaw3d hosting on freedesktop
Matt, Thank you for working on Xaw3d issues. I have an old, and reliable, X client that will work better after your changes are merged. Pat --- On Mon, Aug 1, 2011 at 1:43 PM, Matt Turner matts...@gmail.com wrote: On Mon, Aug 1, 2011 at 2:13 PM, Alan Coopersmith alan.coopersm...@oracle.com wrote: On 07/30/11 18:00, Matt Turner wrote: Xaw3d apparently has no upstream, anywhere. It's unfortunately still used by a couple of applications. I guess it'd be nice to get it moved to xorg/lib/libXaw3d at some point too. +1 for that, though if it was possible to share common code with libXaw (perhaps by making Xaw3d another variant/subdir in the libXaw git repo), that would be nice too. -- -Alan Coopersmith- alan.coopersm...@oracle.com Oracle Solaris Platform Engineering: X Window System I'll check into how much code is shared between them. It's also been pointed out to me that there is a Xaw3d-1.5E floating around, with apparent utf8 support, so I'll check it out and probably rebase my work on it. Matt ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] [xhost] man: xhost can not take a user name as a parameter.
On 07/30/11 10:38, Erik Saule wrote: On Mon, Jul 25, 2011 at 01:48:20PM -0700, Alan Coopersmith wrote: On 07/23/11 15:24, Erik Saule wrote: Dear list, I submit a patch for review on the man page of the xhost utility. running xhost username does not work in xhost anymore. This patch corrects the man page to reflect this behavior and propose an alternative way of doing so. That's an incorrect assumption - xhost +username has always worked the same and only supported Secure RPC authentication, which is the one place in the man page where it's fully described as working. If someone could figure out how to reword the man page to make that clearer, I'd love to see the patch, but just removing it and pretending it doesn't work for Secure RPC users is the wrong answer. Thank you for pointing out my mistake. I submit a new patch that rephrased the description of the name parameter in the options section as: The name can be a host name, a Secure RPC user name or a complete name (See NAMES for more details). The patch also hint to the server interpreted addresses to specify a local user. That's better - thanks for revising. Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com -- -Alan Coopersmith-alan.coopersm...@oracle.com Oracle Solaris Platform Engineering: X Window System ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH 2/4] xserver: limit the kernel subsystems we look for devices in
On Thu, 2011-07-21 at 09:40 +1000, Peter Hutterer wrote:
On Wed, Jul 20, 2011 at 05:52:16AM -0700, Dan Nicholson wrote:
On Mon, Jul 18, 2011 at 12:17 PM, Lennart Poettering
lenn...@poettering.net wrote:
Don't enumerate/monitor all devices of the system (since that can be
quite a few), but limit our search to devices from the input
subsystem, as well as the tty subsystem (to cover Wacom tablets).
This should make X start up a bit faster and reduce the number of
unnecessary wake-ups of the X server.
---
config/udev.c |7 +++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/config/udev.c b/config/udev.c
index 5ac52a1..0763cc9 100644
--- a/config/udev.c
+++ b/config/udev.c
@@ -281,6 +281,9 @@ config_udev_init(void)
if (!udev_monitor)
return 0;
+udev_monitor_filter_add_match_subsystem_devtype(udev_monitor,
input, NULL);
+udev_monitor_filter_add_match_subsystem_devtype(udev_monitor, tty,
NULL); /* For Wacom serial devices */
+
if (udev_monitor_enable_receiving(udev_monitor)) {
ErrorF(config/udev: failed to bind the udev monitor\n);
return 0;
@@ -289,6 +292,10 @@ config_udev_init(void)
enumerate = udev_enumerate_new(udev);
if (!enumerate)
return 0;
+
+udev_enumerate_add_match_subsystem(enumerate, input);
+udev_enumerate_add_match_subsystem(enumerate, tty);
+
udev_enumerate_scan_devices(enumerate);
devices = udev_enumerate_get_list_entry(enumerate);
udev_list_entry_foreach(device, devices) {
Last time this came up, we were a little uneasy about limiting the
subsystems. I guess this should work for devices we care about, and
any future input devices should fall under the input subsystem (I
hope). One thing we could use help on in upstream udev is marking the
appropriate serial devices with ID_INPUT* in
60-persistent-input.rules. I'm cc'ing Thomas since he was the one who
originally requested that we not just filter to input.
At this point, all input devices that I've seen* are either supported by the
kernel or are legacy serial devices that don't have a kernel driver (yet).
I think we'll be fine filtering for those two only.
Sorry for the late response - I was rather behind on reading this list.
I would greatly appreciate it if you could add the misc subsystem for
the sake of the VirtualBox mouse integration.
Regards,
Michael
--
ORACLE Deutschland B.V. Co. KG Michael Thayer
Werkstrasse 24 VirtualBox engineering
71384 Weinstadt, Germany mailto:michael.tha...@oracle.com
Hauptverwaltung: Riesstr. 25, D-80992 München
Registergericht: Amtsgericht München, HRA 95603
Komplementärin: ORACLE Deutschland Verwaltung B.V.
Hertogswetering 163/167, 3543 AS Utrecht, Niederlande
Handelsregister der Handelskammer Midden-Niederlande, Nr. 30143697
Geschäftsführer: Jürgen Kunz, Marcel van de Molen, Alexander van der Ven
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH rendercheck] Use the right screen from $DISPLAY
Looks about right...
Reviewed-by: Jeremy Huddleston jerem...@apple.com
On Aug 1, 2011, at 12:34, Aaron Plattner wrote:
RootWindow(dpy, 0) always uses screen 0, even if a different screen is
specified in the $DISPLAY environment variable. Use
DefaultRootWindow(dpy) instead to use the right one.
---
main.c |4 ++--
t_bug7366.c |2 +-
t_repeat.c |2 +-
t_srccoords.c |2 +-
t_tsrccoords.c |2 +-
t_tsrccoords2.c |2 +-
tests.c | 12 ++--
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/main.c b/main.c
index e261c78..5190c49 100644
--- a/main.c
+++ b/main.c
@@ -289,8 +289,8 @@ int main(int argc, char **argv)
num_ops = PictOpSaturate;
}
- window.d = XCreateSimpleWindow(dpy, RootWindow(dpy, 0), 0, 0, win_width,
- win_height, 0, 0, WhitePixel(dpy, 0));
+ window.d = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy), 0, 0,
+ win_width, win_height, 0, 0, WhitePixel(dpy, 0));
as.override_redirect = True;
XChangeWindowAttributes(dpy, window.d, CWOverrideRedirect, as);
diff --git a/t_bug7366.c b/t_bug7366.c
index 1277580..34ac004 100644
--- a/t_bug7366.c
+++ b/t_bug7366.c
@@ -69,7 +69,7 @@ bug7366_test_set_alpha_map(Display *dpy)
memset(color, 0, sizeof(color));
source_pict = XRenderCreateSolidFill(dpy, color);
-pixmap = XCreatePixmap(dpy, RootWindow(dpy, 0), 1, 1, 32);
+pixmap = XCreatePixmap(dpy, DefaultRootWindow(dpy), 1, 1, 32);
pict = XRenderCreatePicture(dpy, pixmap,
XRenderFindStandardFormat(dpy, PictStandardARGB32), 0, NULL);
diff --git a/t_repeat.c b/t_repeat.c
index 4e26136..679bca1 100644
--- a/t_repeat.c
+++ b/t_repeat.c
@@ -69,7 +69,7 @@ repeat_test(Display *dpy, picture_info *win, picture_info
*dst, int op,
pa.component_alpha = test_mask;
pa.repeat = TRUE;
- src.d = XCreatePixmap(dpy, RootWindow(dpy, 0), w, h, 32);
+ src.d = XCreatePixmap(dpy, DefaultRootWindow(dpy), w, h, 32);
src.format = XRenderFindStandardFormat(dpy, PictStandardARGB32);
src.pict = XRenderCreatePicture(dpy, src.d, src.format,
CPComponentAlpha | CPRepeat, pa);
diff --git a/t_srccoords.c b/t_srccoords.c
index 6aff6d5..6e29e8a 100644
--- a/t_srccoords.c
+++ b/t_srccoords.c
@@ -43,7 +43,7 @@ static picture_info *create_target_picture(Display *dpy)
p = malloc(sizeof(picture_info));
- p-d = XCreatePixmap(dpy, RootWindow(dpy, 0), 5, 5, 32);
+ p-d = XCreatePixmap(dpy, DefaultRootWindow(dpy), 5, 5, 32);
p-format = XRenderFindStandardFormat(dpy, PictStandardARGB32);
p-pict = XRenderCreatePicture(dpy, p-d, p-format, 0, NULL);
p-name = target picture;
diff --git a/t_tsrccoords.c b/t_tsrccoords.c
index 124fdc9..279591d 100644
--- a/t_tsrccoords.c
+++ b/t_tsrccoords.c
@@ -43,7 +43,7 @@ static picture_info *create_dot_picture(Display *dpy)
p = malloc(sizeof(picture_info));
- p-d = XCreatePixmap(dpy, RootWindow(dpy, 0), 5, 5, 32);
+ p-d = XCreatePixmap(dpy, DefaultRootWindow(dpy), 5, 5, 32);
p-format = XRenderFindStandardFormat(dpy, PictStandardARGB32);
p-pict = XRenderCreatePicture(dpy, p-d, p-format, 0, NULL);
p-name = dot picture;
diff --git a/t_tsrccoords2.c b/t_tsrccoords2.c
index 4449dca..0d83fd5 100644
--- a/t_tsrccoords2.c
+++ b/t_tsrccoords2.c
@@ -43,7 +43,7 @@ static picture_info *create_target_picture(Display *dpy)
p = malloc(sizeof(picture_info));
- p-d = XCreatePixmap(dpy, RootWindow(dpy, 0), 5, 5, 32);
+ p-d = XCreatePixmap(dpy, DefaultRootWindow(dpy), 5, 5, 32);
p-format = XRenderFindStandardFormat(dpy, PictStandardARGB32);
p-pict = XRenderCreatePicture(dpy, p-d, p-format, 0, NULL);
p-name = target picture;
diff --git a/tests.c b/tests.c
index def1bf5..aacd14d 100644
--- a/tests.c
+++ b/tests.c
@@ -337,7 +337,7 @@ do_tests(Display *dpy, picture_info *win)
for (i = 0; i num_dests; i++) {
dests[i].format = format_list[i];
- dests[i].d = XCreatePixmap(dpy, RootWindow(dpy, 0),
+ dests[i].d = XCreatePixmap(dpy, DefaultRootWindow(dpy),
win_width, win_height, dests[i].format-depth);
dests[i].pict = XRenderCreatePicture(dpy, dests[i].d,
dests[i].format, 0, NULL);
@@ -359,8 +359,8 @@ do_tests(Display *dpy, picture_info *win)
/* The standard PictFormat numbers go from 0 to 4 */
pictures_1x1[i].format = format_list[i % nformats];
- pictures_1x1[i].d = XCreatePixmap(dpy, RootWindow(dpy, 0), 1,
- 1, pictures_1x1[i].format-depth);
+ pictures_1x1[i].d = XCreatePixmap(dpy, DefaultRootWindow(dpy),
+ 1, 1, pictures_1x1[i].format-depth);
pa.repeat = TRUE;
pictures_1x1[i].pict =
[PATCH:libXi] Fix the FIXME output in man page .TH macros generated by asciidoc
Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com --- man/Makefile.am |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/man/Makefile.am b/man/Makefile.am index 2181ea9..d4c37b3 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -155,6 +155,10 @@ XIFreeDeviceInfo.man: XIQueryDevice.man # Unable to use __libmansuffix__ as underscores are lost in txt -- xml conversion MAN_SUBSTS += -e 's/libmansuffix/$(LIB_MAN_SUFFIX)/g' +# asciidoc is generating [FIXME...] values in the .TH line we should fix. +MAN_SUBSTS += -e 's/\[FIXME: source\]/$(XORG_MAN_PAGE)/' +MAN_SUBSTS += -e 's/\[FIXME: manual\]/XINPUT FUNCTIONS/' + SUFFIXES = .man .$(LIB_MAN_SUFFIX) .man.$(LIB_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) $ $@ -- 1.7.3.2 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH:libXi] Fix the FIXME output in man page .TH macros generated by asciidoc
Oh, this still leaves some FIXME values in the comments, but those aren't displayed by the man command: .\Author: [FIXME: author] [see http://docbook.sf.net/el/author] -- -Alan Coopersmith-alan.coopersm...@oracle.com Oracle Solaris Platform Engineering: X Window System ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH:libXi] Fix the FIXME output in man page .TH macros generated by asciidoc
On Mon, Aug 01, 2011 at 04:47:38PM -0700, Alan Coopersmith wrote: Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com --- man/Makefile.am |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/man/Makefile.am b/man/Makefile.am index 2181ea9..d4c37b3 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -155,6 +155,10 @@ XIFreeDeviceInfo.man: XIQueryDevice.man # Unable to use __libmansuffix__ as underscores are lost in txt -- xml conversion MAN_SUBSTS += -e 's/libmansuffix/$(LIB_MAN_SUFFIX)/g' +# asciidoc is generating [FIXME...] values in the .TH line we should fix. +MAN_SUBSTS += -e 's/\[FIXME: source\]/$(XORG_MAN_PAGE)/' +MAN_SUBSTS += -e 's/\[FIXME: manual\]/XINPUT FUNCTIONS/' + SUFFIXES = .man .$(LIB_MAN_SUFFIX) .man.$(LIB_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) $ $@ -- 1.7.3.2 e8531dd..5a299d1 master - master thanks Cheers, Peter ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: libXaw3d hosting on freedesktop
On Mon, Aug 1, 2011 at 2:43 PM, Matt Turner matts...@gmail.com wrote: On Mon, Aug 1, 2011 at 2:13 PM, Alan Coopersmith alan.coopersm...@oracle.com wrote: On 07/30/11 18:00, Matt Turner wrote: Xaw3d apparently has no upstream, anywhere. It's unfortunately still used by a couple of applications. I guess it'd be nice to get it moved to xorg/lib/libXaw3d at some point too. +1 for that, though if it was possible to share common code with libXaw (perhaps by making Xaw3d another variant/subdir in the libXaw git repo), that would be nice too. -- -Alan Coopersmith- alan.coopersm...@oracle.com Oracle Solaris Platform Engineering: X Window System I'll check into how much code is shared between them. It's also been pointed out to me that there is a Xaw3d-1.5E floating around, with apparent utf8 support, so I'll check it out and probably rebase my work on it. Matt Rebased everything on 1.5E and rewrote the autotools files to more closely match libXaw. I've never done this before so I'm sure there are errors, but the autotools stuff seems to work well. I also split out the header files into an include directory to match what other libraries do. Give it a look over. :) Thanks, Matt ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
