old
/
eterm
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Wed Oct 27 14:11:11 PDT 1999 Michael Jennings <mej@eterm.org> 

64-bit cleanliness changes.


SVN revision: 998
This commit is contained in:
Michael Jennings 1999-10-27 13:39:30 +00:00
parent 0193b323db
commit dad7bc5f2c
12 changed files with 71 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -2624,11 +2624,16 @@ Tue Oct 19 16:34:51 PDT 1999 Michael Jennings <mej@eterm.org>
extern int unlockpt(int fd); extern int unlockpt(int fd);
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Tue Oct 26 16:28:34 PDT 1999 Mandrake <mandrake@mandrake.net>
Tue Oct 26 16:28:34 PDT 1999
(Mandrake)
I hate the default behaviour for tripleclick, and there's an option I hate the default behaviour for tripleclick, and there's an option
to turn it off. however, it isn't documented in the default theme to turn it off. however, it isn't documented in the default theme
anywhere. So, I fixed that annoyance and put it in the sample anywhere. So, I fixed that annoyance and put it in the sample
Eterm theme.cfg file (set to the default value, not the OTW) Eterm theme.cfg file (set to the default value, not the OTW)
-------------------------------------------------------------------------------
Wed Oct 27 14:11:11 PDT 1999 Michael Jennings <mej@eterm.org>
64-bit cleanliness changes.
-------------------------------------------------------------------------------

2
configure.in
View File

@ -187,7 +187,7 @@ AC_CHECK_FUNC(unlockpt,
dnl# Check for the appropriate pty mechanism dnl# Check for the appropriate pty mechanism
AC_MSG_CHECKING(for pty mechanism) AC_MSG_CHECKING(for pty mechanism)
PTY_MECH="" PTY_MECH=""
if test -e /dev/ptc ; then if test -c /dev/ptc ; then
AC_DEFINE(HAVE_DEV_PTC) AC_DEFINE(HAVE_DEV_PTC)
PTY_MECH="AIX $PTY_MECH" PTY_MECH="AIX $PTY_MECH"
fi fi

18
libmej/mem.c
View File

@ -96,7 +96,7 @@ memrec_add_var(void *ptr, size_t size)
if ((memrec.Size = (size_t *) realloc(memrec.Size, sizeof(size_t) * memrec.Count)) == NULL) { if ((memrec.Size = (size_t *) realloc(memrec.Size, sizeof(size_t) * memrec.Count)) == NULL) {
D_MALLOC(("Unable to reallocate pointer size list -- %s\n", strerror(errno))); D_MALLOC(("Unable to reallocate pointer size list -- %s\n", strerror(errno)));
} }
D_MALLOC(("Adding variable of size %lu at 0x%08x\n", size, ptr)); D_MALLOC(("Adding variable of size %lu at %8p\n", size, ptr));
memrec.Ptrs[memrec.Count - 1] = ptr; memrec.Ptrs[memrec.Count - 1] = ptr;
memrec.Size[memrec.Count - 1] = size; memrec.Size[memrec.Count - 1] = size;
#if 0 #if 0
@ -118,11 +118,11 @@ memrec_rem_var(void *ptr)
memrec_dump(); memrec_dump();
#endif #endif
D_MALLOC(("Attempt to remove a pointer not allocated with Malloc/Realloc:" D_MALLOC(("Attempt to remove a pointer not allocated with Malloc/Realloc:"
" 0x%08x\n", ptr)); " %8p\n", ptr));
return; return;
} }
memrec.Count--; memrec.Count--;
D_MALLOC(("Removing variable of size %lu at 0x%08x\n", memrec.Size[i], memrec.Ptrs[i])); D_MALLOC(("Removing variable of size %lu at %8p\n", memrec.Size[i], memrec.Ptrs[i]));
memmove(memrec.Ptrs + i, memrec.Ptrs + i + 1, sizeof(void *) * (memrec.Count - i)); memmove(memrec.Ptrs + i, memrec.Ptrs + i + 1, sizeof(void *) * (memrec.Count - i));
memmove(memrec.Size + i, memrec.Size + i + 1, sizeof(size_t) * (memrec.Count - i)); memmove(memrec.Size + i, memrec.Size + i + 1, sizeof(size_t) * (memrec.Count - i));
@ -148,11 +148,11 @@ memrec_chg_var(void *oldp, void *newp, size_t size)
memrec_dump(); memrec_dump();
#endif #endif
D_MALLOC(("Attempt to move a pointer not allocated with Malloc/Realloc:" D_MALLOC(("Attempt to move a pointer not allocated with Malloc/Realloc:"
" 0x%08x\n", oldp)); " %8p\n", oldp));
return; return;
} }
D_MALLOC(("Changing variable of %lu bytes at 0x%08x to one " D_MALLOC(("Changing variable of %lu bytes at %8p to one "
"of %lu bytes at 0x%08x\n", memrec.Size[i], memrec.Ptrs[i], size, newp)); "of %lu bytes at %8p\n", memrec.Size[i], memrec.Ptrs[i], size, newp));
memrec.Ptrs[i] = newp; memrec.Ptrs[i] = newp;
memrec.Size[i] = size; memrec.Size[i] = size;
#if 0 #if 0
@ -178,7 +178,7 @@ memrec_dump(void)
len2 = sizeof(size_t) * memrec.Count; len2 = sizeof(size_t) * memrec.Count;
for (ptr = (unsigned char *) memrec.Ptrs, j = 0; j < len1; j += 8) { for (ptr = (unsigned char *) memrec.Ptrs, j = 0; j < len1; j += 8) {
fprintf(stderr, "DUMP :: %07lu | %08X | %06lu | %07X | ", (unsigned long) 0, (unsigned int) memrec.Ptrs, (unsigned long) (sizeof(void *) * memrec.Count), (unsigned int) j); fprintf(stderr, "DUMP :: %07lu | %8p | %06lu | %07x | ", (unsigned long) 0, memrec.Ptrs, (unsigned long) (sizeof(void *) * memrec.Count), (unsigned int) j);
l = ((len1 - j < 8) ? (len1 - j) : (8)); l = ((len1 - j < 8) ? (len1 - j) : (8));
memset(buff, 0, 9); memset(buff, 0, 9);
@ -193,7 +193,7 @@ memrec_dump(void)
fflush(stderr); fflush(stderr);
} }
for (ptr = (unsigned char *) memrec.Size, j = 0; j < len2; j += 8) { for (ptr = (unsigned char *) memrec.Size, j = 0; j < len2; j += 8) {
fprintf(stderr, "DUMP :: %07lu | %08x | %06lu | %07X | ", (unsigned long) 0, (unsigned int) memrec.Size, sizeof(size_t) * memrec.Count, (unsigned int) j); fprintf(stderr, "DUMP :: %07lu | %8p | %06lu | %07x | ", (unsigned long) 0, memrec.Size, sizeof(size_t) * memrec.Count, (unsigned int) j);
l = ((len2 - j < 8) ? (len2 - j) : (8)); l = ((len2 - j < 8) ? (len2 - j) : (8));
memset(buff, 0, 9); memset(buff, 0, 9);
memcpy(buff, ptr + j, l); memcpy(buff, ptr + j, l);
@ -209,7 +209,7 @@ memrec_dump(void)
for (i = 0; i < memrec.Count; i++) { for (i = 0; i < memrec.Count; i++) {
total += memrec.Size[i]; total += memrec.Size[i];
for (ptr = (unsigned char *) memrec.Ptrs[i], j = 0; j < memrec.Size[i]; j += 8) { for (ptr = (unsigned char *) memrec.Ptrs[i], j = 0; j < memrec.Size[i]; j += 8) {
fprintf(stderr, "DUMP :: %07lu | %08x | %06lu | %07X | ", i + 1, (unsigned int) memrec.Ptrs[i], (unsigned long) memrec.Size[i], (unsigned int) j); fprintf(stderr, "DUMP :: %07lu | %8p | %06lu | %07x | ", i + 1, memrec.Ptrs[i], (unsigned long) memrec.Size[i], (unsigned int) j);
l = ((memrec.Size[i] - j < 8) ? (memrec.Size[i] - j) : (8)); l = ((memrec.Size[i] - j < 8) ? (memrec.Size[i] - j) : (8));
memset(buff, 0, 9); memset(buff, 0, 9);
memcpy(buff, ptr + j, l); memcpy(buff, ptr + j, l);

3
libmej/strings.c
View File

@ -567,8 +567,7 @@ HexDump(void *buff, register size_t count)
fprintf(stderr, " Address | Size | Offset | 00 01 02 03 04 05 06 07 | ASCII \n"); fprintf(stderr, " Address | Size | Offset | 00 01 02 03 04 05 06 07 | ASCII \n");
fprintf(stderr, "---------+--------+---------+-------------------------+---------\n"); fprintf(stderr, "---------+--------+---------+-------------------------+---------\n");
for (ptr = (unsigned char *) buff, j = 0; j < count; j += 8) { for (ptr = (unsigned char *) buff, j = 0; j < count; j += 8) {
fprintf(stderr, " %08x | %06lu | %07x | ", (unsigned int) buff, fprintf(stderr, " %8p | %06lu | %07x | ", buff, (unsigned long) count, (unsigned int) j);
(unsigned long) count, (unsigned int) j);
l = ((count - j < 8) ? (count - j) : (8)); l = ((count - j < 8) ? (count - j) : (8));
memset(buffr, 0, 9); memset(buffr, 0, 9);
memcpy(buffr, ptr + j, l); memcpy(buffr, ptr + j, l);

4
src/command.c
View File

@ -2564,9 +2564,9 @@ main_loop(void)
break; break;
} }
} }
D_SCREEN(("Adding lines, str == 0x%08x, cmdbuf_ptr == 0x%08x, cmdbuf_endp == 0x%08x\n", str, cmdbuf_ptr, D_SCREEN(("Adding lines, str == %8p, cmdbuf_ptr == %8p, cmdbuf_endp == %8p\n", str, cmdbuf_ptr,
cmdbuf_endp)); cmdbuf_endp));
D_SCREEN(("Command buffer base == 0x%08x, length %lu, end at 0x%08x\n", cmdbuf_base, CMD_BUF_SIZE, D_SCREEN(("Command buffer base == %8p, length %lu, end at %8p\n", cmdbuf_base, CMD_BUF_SIZE,
cmdbuf_base + CMD_BUF_SIZE - 1)); cmdbuf_base + CMD_BUF_SIZE - 1));
scr_add_lines(str, nlines, (cmdbuf_ptr - str)); scr_add_lines(str, nlines, (cmdbuf_ptr - str));
} else { } else {

34
src/events.c
View File

@ -212,7 +212,7 @@ handle_key_press(event_t * ev)
#endif #endif
P_SETTIMEVAL(keypress_start); P_SETTIMEVAL(keypress_start);
D_EVENTS(("handle_key_press(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("handle_key_press(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
COUNT_EVENT(keypress_cnt); COUNT_EVENT(keypress_cnt);
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &primary_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &primary_data), 0);
lookup_key(ev); lookup_key(ev);
@ -227,7 +227,7 @@ handle_property_notify(event_t * ev)
Atom prop; Atom prop;
D_EVENTS(("handle_property_notify(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("handle_property_notify(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
if (background_is_trans()) { if (background_is_trans()) {
if ((ev->xany.window == TermWin.parent) || (ev->xany.window == Xroot)) { if ((ev->xany.window == TermWin.parent) || (ev->xany.window == Xroot)) {
@ -265,7 +265,7 @@ unsigned char
handle_destroy_notify(event_t * ev) handle_destroy_notify(event_t * ev)
{ {
D_EVENTS(("handle_destroy_notify(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("handle_destroy_notify(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
if (ev->xdestroywindow.window == ipc_win) { if (ev->xdestroywindow.window == ipc_win) {
D_EVENTS((" -> IPC window 0x%08x changed/destroyed. Clearing ipc_win.\n", ipc_win)); D_EVENTS((" -> IPC window 0x%08x changed/destroyed. Clearing ipc_win.\n", ipc_win));
@ -280,7 +280,7 @@ unsigned char
handle_client_message(event_t * ev) handle_client_message(event_t * ev)
{ {
D_EVENTS(("handle_client_message(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("handle_client_message(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &primary_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &primary_data), 0);
@ -321,7 +321,7 @@ unsigned char
handle_mapping_notify(event_t * ev) handle_mapping_notify(event_t * ev)
{ {
D_EVENTS(("handle_mapping_notify(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("handle_mapping_notify(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
XRefreshKeyboardMapping(&(ev->xmapping)); XRefreshKeyboardMapping(&(ev->xmapping));
return 1; return 1;
@ -331,7 +331,7 @@ unsigned char
handle_visibility_notify(event_t * ev) handle_visibility_notify(event_t * ev)
{ {
D_EVENTS(("handle_visibility_notify(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("handle_visibility_notify(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &primary_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &primary_data), 0);
switch (ev->xvisibility.state) { switch (ev->xvisibility.state) {
@ -355,7 +355,7 @@ unsigned char
handle_focus_in(event_t * ev) handle_focus_in(event_t * ev)
{ {
D_EVENTS(("handle_focus_in(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("handle_focus_in(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &primary_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &primary_data), 0);
if (!TermWin.focus) { if (!TermWin.focus) {
@ -379,7 +379,7 @@ unsigned char
handle_focus_out(event_t * ev) handle_focus_out(event_t * ev)
{ {
D_EVENTS(("handle_focus_out(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("handle_focus_out(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &primary_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &primary_data), 0);
if (TermWin.focus) { if (TermWin.focus) {
@ -404,7 +404,7 @@ handle_configure_notify(event_t * ev)
{ {
XEvent unused_xevent; XEvent unused_xevent;
D_EVENTS(("handle_configure_notify(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("handle_configure_notify(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &primary_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &primary_data), 0);
@ -420,7 +420,7 @@ unsigned char
handle_selection_clear(event_t * ev) handle_selection_clear(event_t * ev)
{ {
D_EVENTS(("handle_selection_clear(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("handle_selection_clear(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
selection_clear(); selection_clear();
return 1; return 1;
@ -430,7 +430,7 @@ unsigned char
handle_selection_notify(event_t * ev) handle_selection_notify(event_t * ev)
{ {
D_EVENTS(("handle_selection_notify(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("handle_selection_notify(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
selection_paste(ev->xselection.requestor, ev->xselection.property, True); selection_paste(ev->xselection.requestor, ev->xselection.property, True);
return 1; return 1;
@ -440,7 +440,7 @@ unsigned char
handle_selection_request(event_t * ev) handle_selection_request(event_t * ev)
{ {
D_EVENTS(("handle_selection_request(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("handle_selection_request(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
selection_send(&(ev->xselectionrequest)); selection_send(&(ev->xselectionrequest));
return 1; return 1;
@ -458,7 +458,7 @@ handle_expose(event_t * ev)
#endif #endif
P_SETTIMEVAL(expose_start); P_SETTIMEVAL(expose_start);
D_EVENTS(("handle_expose(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("handle_expose(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &primary_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &primary_data), 0);
if (ev->xany.window == TermWin.vt) { if (ev->xany.window == TermWin.vt) {
@ -486,7 +486,7 @@ unsigned char
handle_button_press(event_t * ev) handle_button_press(event_t * ev)
{ {
D_EVENTS(("handle_button_press(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("handle_button_press(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &primary_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &primary_data), 0);
if (Options & Opt_borderless) { if (Options & Opt_borderless) {
@ -551,7 +551,7 @@ unsigned char
handle_button_release(event_t * ev) handle_button_release(event_t * ev)
{ {
D_EVENTS(("handle_button_release(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("handle_button_release(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
if (button_state.ignore_release == 1) { if (button_state.ignore_release == 1) {
button_state.ignore_release = 0; button_state.ignore_release = 0;
@ -616,7 +616,7 @@ handle_motion_notify(event_t * ev)
struct timeval motion_start, motion_stop; struct timeval motion_start, motion_stop;
#endif #endif
D_EVENTS(("handle_motion_notify(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("handle_motion_notify(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
COUNT_EVENT(motion_cnt); COUNT_EVENT(motion_cnt);
P_SETTIMEVAL(motion_start); P_SETTIMEVAL(motion_start);
@ -654,7 +654,7 @@ process_x_event(event_t * ev)
#endif #endif
COUNT_EVENT(event_cnt); COUNT_EVENT(event_cnt);
D_EVENTS(("process_x_event(ev [0x%08x] %s on window 0x%08x)\n", ev, event_type_to_name(ev->xany.type), ev->xany.window)); D_EVENTS(("process_x_event(ev [%8p] %s on window 0x%08x)\n", ev, event_type_to_name(ev->xany.type), ev->xany.window));
if (primary_data.handlers[ev->type] != NULL) { if (primary_data.handlers[ev->type] != NULL) {
return ((primary_data.handlers[ev->type]) (ev)); return ((primary_data.handlers[ev->type]) (ev));
} }

12
src/font.c
View File

@ -62,7 +62,7 @@ font_cache_add(const char *name, unsigned char type, void *info) {
etfont_t *font; etfont_t *font;
D_FONT(("font_cache_add(%s, %d, 0x%08x) called.\n", NONULL(name), type, (int) info)); D_FONT(("font_cache_add(%s, %d, %8p) called.\n", NONULL(name), type, info));
font = (etfont_t *) MALLOC(sizeof(etfont_t)); font = (etfont_t *) MALLOC(sizeof(etfont_t));
font->name = StrDup(name); font->name = StrDup(name);
@ -90,13 +90,13 @@ font_cache_del(const void *info) {
etfont_t *current, *tmp; etfont_t *current, *tmp;
D_FONT(("font_cache_del(0x%08x) called.\n", (int) info)); D_FONT(("font_cache_del(%8p) called.\n", info));
if (font_cache == NULL) { if (font_cache == NULL) {
return; return;
} }
if (((font_cache->type == FONT_TYPE_X) && (font_cache->fontinfo.xfontinfo == (XFontStruct *) info))) { if (((font_cache->type == FONT_TYPE_X) && (font_cache->fontinfo.xfontinfo == (XFontStruct *) info))) {
D_FONT((" -> Match found at font_cache (0x%08x). Font name is \"%s\"\n", (int) font_cache, NONULL(font_cache->name))); D_FONT((" -> Match found at font_cache (%8p). Font name is \"%s\"\n", font_cache, NONULL(font_cache->name)));
if (--(font_cache->ref_cnt) == 0) { if (--(font_cache->ref_cnt) == 0) {
D_FONT((" -> Reference count is now 0. Deleting from cache.\n")); D_FONT((" -> Reference count is now 0. Deleting from cache.\n"));
current = font_cache; current = font_cache;
@ -113,7 +113,7 @@ font_cache_del(const void *info) {
} else { } else {
for (current = font_cache; current->next; current = current->next) { for (current = font_cache; current->next; current = current->next) {
if (((current->next->type == FONT_TYPE_X) && (current->next->fontinfo.xfontinfo == (XFontStruct *) info))) { if (((current->next->type == FONT_TYPE_X) && (current->next->fontinfo.xfontinfo == (XFontStruct *) info))) {
D_FONT((" -> Match found at current->next (0x%08x, current == 0x%08x). Font name is \"%s\"\n", (int) current->next, (int) current, NONULL(current->next->name))); D_FONT((" -> Match found at current->next (%8p, current == %8p). Font name is \"%s\"\n", current->next, current, NONULL(current->next->name)));
if (--(current->next->ref_cnt) == 0) { if (--(current->next->ref_cnt) == 0) {
D_FONT((" -> Reference count is now 0. Deleting from cache.\n")); D_FONT((" -> Reference count is now 0. Deleting from cache.\n"));
tmp = current->next; tmp = current->next;
@ -142,7 +142,7 @@ font_cache_find(const char *name, unsigned char type) {
D_FONT(("font_cache_find(%s, %d) called.\n", NONULL(name), type)); D_FONT(("font_cache_find(%s, %d) called.\n", NONULL(name), type));
for (current = font_cache; current; current = current->next) { for (current = font_cache; current; current = current->next) {
D_FONT((" -> Checking current (0x%08x), type == %d, name == %s\n", current, current->type, NONULL(current->name))); D_FONT((" -> Checking current (%8p), type == %d, name == %s\n", current, current->type, NONULL(current->name)));
if ((current->type == type) && !strcasecmp(current->name, name)) { if ((current->type == type) && !strcasecmp(current->name, name)) {
D_FONT((" -> Match!\n")); D_FONT((" -> Match!\n"));
return (current); return (current);
@ -162,7 +162,7 @@ font_cache_find_info(const char *name, unsigned char type) {
D_FONT(("font_cache_find_info(%s, %d) called.\n", NONULL(name), type)); D_FONT(("font_cache_find_info(%s, %d) called.\n", NONULL(name), type));
for (current = font_cache; current; current = current->next) { for (current = font_cache; current; current = current->next) {
D_FONT((" -> Checking current (0x%08x), type == %d, name == %s\n", current, current->type, NONULL(current->name))); D_FONT((" -> Checking current (%8p), type == %d, name == %s\n", current, current->type, NONULL(current->name)));
if ((current->type == type) && !strcasecmp(current->name, name)) { if ((current->type == type) && !strcasecmp(current->name, name)) {
D_FONT((" -> Match!\n")); D_FONT((" -> Match!\n"));
switch (type) { switch (type) {

16
src/menus.c
View File

@ -164,7 +164,7 @@ menu_handle_enter_notify(event_t * ev)
register menu_t *menu; register menu_t *menu;
D_EVENTS(("menu_handle_enter_notify(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("menu_handle_enter_notify(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &menu_event_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &menu_event_data), 0);
@ -187,7 +187,7 @@ unsigned char
menu_handle_leave_notify(event_t * ev) menu_handle_leave_notify(event_t * ev)
{ {
D_EVENTS(("menu_handle_leave_notify(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("menu_handle_leave_notify(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &menu_event_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &menu_event_data), 0);
@ -201,7 +201,7 @@ unsigned char
menu_handle_focus_in(event_t * ev) menu_handle_focus_in(event_t * ev)
{ {
D_EVENTS(("menu_handle_focus_in(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("menu_handle_focus_in(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &menu_event_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &menu_event_data), 0);
@ -212,7 +212,7 @@ unsigned char
menu_handle_focus_out(event_t * ev) menu_handle_focus_out(event_t * ev)
{ {
D_EVENTS(("menu_handle_focus_out(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("menu_handle_focus_out(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &menu_event_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &menu_event_data), 0);
@ -225,7 +225,7 @@ menu_handle_expose(event_t * ev)
XEvent unused_xevent; XEvent unused_xevent;
D_EVENTS(("menu_handle_expose(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("menu_handle_expose(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &menu_event_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &menu_event_data), 0);
@ -238,7 +238,7 @@ unsigned char
menu_handle_button_press(event_t * ev) menu_handle_button_press(event_t * ev)
{ {
D_EVENTS(("menu_handle_button_press(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("menu_handle_button_press(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &menu_event_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &menu_event_data), 0);
@ -254,7 +254,7 @@ menu_handle_button_release(event_t * ev)
{ {
menuitem_t *item; menuitem_t *item;
D_EVENTS(("menu_handle_button_release(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("menu_handle_button_release(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &menu_event_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &menu_event_data), 0);
@ -318,7 +318,7 @@ menu_handle_motion_notify(event_t * ev)
register menuitem_t *item = NULL; register menuitem_t *item = NULL;
D_EVENTS(("menu_handle_motion_notify(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("menu_handle_motion_notify(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &menu_event_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &menu_event_data), 0);

10
src/pixmap.c
View File

@ -372,7 +372,7 @@ paste_simage(simage_t *simg, unsigned char which, Window win, unsigned short x,
ASSERT(simg != NULL); ASSERT(simg != NULL);
REQUIRE(win != None); REQUIRE(win != None);
D_PIXMAP(("paste_simage(0x%08x, %s, 0x%08x, %hd, %hd, %hd, %hd) called.\n", (int) simg, get_image_type(which), (int) win, x, y, w, h)); D_PIXMAP(("paste_simage(%8p, %s, 0x%08x, %hd, %hd, %hd, %hd) called.\n", simg, get_image_type(which), (int) win, x, y, w, h));
if ((images[which].mode & MODE_AUTO) && (images[which].mode & ALLOW_AUTO)) { if ((images[which].mode & MODE_AUTO) && (images[which].mode & ALLOW_AUTO)) {
char buff[255], *reply; char buff[255], *reply;
@ -507,7 +507,7 @@ render_simage(simage_t * simg, Window win, unsigned short width, unsigned short
ASSERT(simg->iml != NULL); ASSERT(simg->iml != NULL);
ASSERT(simg->pmap != NULL); ASSERT(simg->pmap != NULL);
D_PIXMAP(("render_simage(): Rendering simg->iml->im 0x%08x (%s) at %hux%hu onto window 0x%08x\n", simg->iml->im, get_image_type(which), width, height, win)); D_PIXMAP(("render_simage(): Rendering simg->iml->im %8p (%s) at %hux%hu onto window 0x%08x\n", simg->iml->im, get_image_type(which), width, height, win));
D_PIXMAP(("render_simage(): Image mode is 0x%02x\n", images[which].mode)); D_PIXMAP(("render_simage(): Image mode is 0x%02x\n", images[which].mode));
if ((which == image_bg) && image_mode_is(image_bg, MODE_VIEWPORT)) { if ((which == image_bg) && image_mode_is(image_bg, MODE_VIEWPORT)) {
@ -750,7 +750,7 @@ render_simage(simage_t * simg, Window win, unsigned short width, unsigned short
simg->iml->bmod->gamma, simg->iml->bmod->brightness, simg->iml->bmod->contrast)); simg->iml->bmod->gamma, simg->iml->bmod->brightness, simg->iml->bmod->contrast));
Imlib_set_image_blue_modifier(imlib_id, simg->iml->im, simg->iml->bmod); Imlib_set_image_blue_modifier(imlib_id, simg->iml->im, simg->iml->bmod);
} }
D_PIXMAP(("render_simage(): Rendering image simg->iml->im [0x%08x] to %hdx%hd pixmap\n", simg->iml->im, xscaled, yscaled)); D_PIXMAP(("render_simage(): Rendering image simg->iml->im [%8p] to %hdx%hd pixmap\n", simg->iml->im, xscaled, yscaled));
Imlib_render(imlib_id, simg->iml->im, xscaled, yscaled); Imlib_render(imlib_id, simg->iml->im, xscaled, yscaled);
rendered = 1; rendered = 1;
} }
@ -963,7 +963,7 @@ load_image(const char *file, short type)
reset_simage(images[type].current, (RESET_IMLIB_IM | RESET_PMAP_PIXMAP | RESET_PMAP_MASK)); reset_simage(images[type].current, (RESET_IMLIB_IM | RESET_PMAP_PIXMAP | RESET_PMAP_MASK));
images[type].current->iml->im = img.im; images[type].current->iml->im = img.im;
} }
D_PIXMAP(("load_image() exiting. images[%s].current->iml->im == 0x%08x\n", get_image_type(type), images[type].current->iml->im)); D_PIXMAP(("load_image() exiting. images[%s].current->iml->im == %8p\n", get_image_type(type), images[type].current->iml->im));
return 1; return 1;
} }
} }
@ -1072,7 +1072,7 @@ colormod_trans(Pixmap p, GC gc, unsigned short w, unsigned short h)
p, w, h); p, w, h);
return; return;
} }
D_PIXMAP(("XGetImage(Xdisplay, 0x%08x, 0, 0, %d, %d, -1, ZPixmap) returned 0x%08x.", p, w, h, ximg)); D_PIXMAP(("XGetImage(Xdisplay, 0x%08x, 0, 0, %d, %d, -1, ZPixmap) returned %8p.", p, w, h, ximg));
if (Xdepth <= 8) { if (Xdepth <= 8) {
D_PIXMAP(("Rendering low-depth image, depth == %d\n", (int) Xdepth)); D_PIXMAP(("Rendering low-depth image, depth == %d\n", (int) Xdepth));
for (y = 0; y < h; y++) { for (y = 0; y < h; y++) {

18
src/scrollbar.c
View File

@ -272,7 +272,7 @@ unsigned char
sb_handle_configure_notify(event_t * ev) sb_handle_configure_notify(event_t * ev)
{ {
D_EVENTS(("sb_handle_configure_notify(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("sb_handle_configure_notify(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_PARENT(ev, &scrollbar_event_data), 0); REQUIRE_RVAL(XEVENT_IS_PARENT(ev, &scrollbar_event_data), 0);
@ -284,7 +284,7 @@ unsigned char
sb_handle_enter_notify(event_t * ev) sb_handle_enter_notify(event_t * ev)
{ {
D_EVENTS(("sb_handle_enter_notify(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("sb_handle_enter_notify(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &scrollbar_event_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &scrollbar_event_data), 0);
@ -311,7 +311,7 @@ unsigned char
sb_handle_leave_notify(event_t * ev) sb_handle_leave_notify(event_t * ev)
{ {
D_EVENTS(("sb_handle_leave_notify(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("sb_handle_leave_notify(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &scrollbar_event_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &scrollbar_event_data), 0);
@ -338,7 +338,7 @@ unsigned char
sb_handle_focus_in(event_t * ev) sb_handle_focus_in(event_t * ev)
{ {
D_EVENTS(("sb_handle_focus_in(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("sb_handle_focus_in(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &scrollbar_event_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &scrollbar_event_data), 0);
@ -349,7 +349,7 @@ unsigned char
sb_handle_focus_out(event_t * ev) sb_handle_focus_out(event_t * ev)
{ {
D_EVENTS(("sb_handle_focus_out(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("sb_handle_focus_out(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &scrollbar_event_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &scrollbar_event_data), 0);
@ -362,7 +362,7 @@ sb_handle_expose(event_t * ev)
XEvent unused_xevent; XEvent unused_xevent;
D_EVENTS(("sb_handle_expose(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("sb_handle_expose(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &scrollbar_event_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &scrollbar_event_data), 0);
@ -378,7 +378,7 @@ unsigned char
sb_handle_button_press(event_t * ev) sb_handle_button_press(event_t * ev)
{ {
D_EVENTS(("sb_handle_button_press(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("sb_handle_button_press(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &scrollbar_event_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &scrollbar_event_data), 0);
@ -500,7 +500,7 @@ sb_handle_button_release(event_t * ev)
Window root, child; Window root, child;
int root_x, root_y, win_x, win_y, mask; int root_x, root_y, win_x, win_y, mask;
D_EVENTS(("sb_handle_button_release(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("sb_handle_button_release(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &scrollbar_event_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &scrollbar_event_data), 0);
button_state.mouse_offset = 0; button_state.mouse_offset = 0;
@ -557,7 +557,7 @@ unsigned char
sb_handle_motion_notify(event_t * ev) sb_handle_motion_notify(event_t * ev)
{ {
D_EVENTS(("sb_handle_motion_notify(ev [0x%08x] on window 0x%08x)\n", ev, ev->xany.window)); D_EVENTS(("sb_handle_motion_notify(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window));
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &scrollbar_event_data), 0); REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &scrollbar_event_data), 0);
if ((PrivateModes & PrivMode_mouse_report) && !(button_state.bypass_keystate)) if ((PrivateModes & PrivMode_mouse_report) && !(button_state.bypass_keystate))

2
src/timer.c
View File

@ -68,7 +68,7 @@ timer_add(unsigned long msec, timer_handler_t handler, void *data) {
timer->handler = handler; timer->handler = handler;
timer->data = data; timer->data = data;
timer->next = NULL; timer->next = NULL;
D_TIMER(("Added timer. Timer set to %lu/%lu with handler 0x%08x and data 0x%08x\n", timer->time.tv_sec, timer->time.tv_usec, timer->handler, timer->data)); D_TIMER(("Added timer. Timer set to %lu/%lu with handler %8p and data %8p\n", timer->time.tv_sec, timer->time.tv_usec, timer->handler, timer->data));
return ((timerhdl_t) timer); return ((timerhdl_t) timer);
} }

8
utils/Esetroot.c
View File

@ -164,15 +164,15 @@ main(int argc, char *argv[])
if (debug) { if (debug) {
fprintf(stderr, "%s:%d: Chose screen %d\n", __FILE__, __LINE__, screen); fprintf(stderr, "%s:%d: Chose screen %d\n", __FILE__, __LINE__, screen);
fprintf(stderr, "%s:%d: Root window is 0x%08x\n", __FILE__, __LINE__, (unsigned int) Xroot); fprintf(stderr, "%s:%d: Root window is 0x%08x\n", __FILE__, __LINE__, (unsigned int) Xroot);
fprintf(stderr, "%s:%d: Found screen information at 0x%08x\n", __FILE__, __LINE__, (unsigned int) scr); fprintf(stderr, "%s:%d: Found screen information at %8p\n", __FILE__, __LINE__, scr);
} }
params.flags = PARAMS_VISUALID; params.flags = PARAMS_VISUALID;
params.visualid = (DefaultVisual(Xdisplay, screen))->visualid; params.visualid = (DefaultVisual(Xdisplay, screen))->visualid;
id = Imlib_init_with_params(Xdisplay, &params); id = Imlib_init_with_params(Xdisplay, &params);
im = Imlib_load_image(id, fname); im = Imlib_load_image(id, fname);
if (debug) { if (debug) {
fprintf(stderr, "%s:%d: The Imlib Data is at 0x%08x\n", __FILE__, __LINE__, (unsigned int) id); fprintf(stderr, "%s:%d: The Imlib Data is at %8p\n", __FILE__, __LINE__, id);
fprintf(stderr, "%s:%d: The Imlib Image is at 0x%08x\n", __FILE__, __LINE__, (unsigned int) im); fprintf(stderr, "%s:%d: The Imlib Image is at %8p\n", __FILE__, __LINE__, im);
} }
if (scale) { if (scale) {
w = scr->width; w = scr->width;
@ -209,7 +209,7 @@ main(int argc, char *argv[])
if (debug) { if (debug) {
fprintf(stderr, "%s:%d: Assigned width and height for rendering as %dx%d\n", __FILE__, __LINE__, w, h); fprintf(stderr, "%s:%d: Assigned width and height for rendering as %dx%d\n", __FILE__, __LINE__, w, h);
fprintf(stderr, "%s:%d: Created %dx%d+%d+%d pixmap 0x%08x\n", __FILE__, __LINE__, scr->width, scr->height, x, y, (unsigned int) p); fprintf(stderr, "%s:%d: Created %dx%d+%d+%d pixmap 0x%08x\n", __FILE__, __LINE__, scr->width, scr->height, x, y, (unsigned int) p);
fprintf(stderr, "%s:%d: Applied Graphics Context 0x%08x to pixmap.\n", __FILE__, __LINE__, (unsigned int) gc); fprintf(stderr, "%s:%d: Applied Graphics Context %8p to pixmap.\n", __FILE__, __LINE__, gc);
} }
Imlib_render(id, im, w, h); Imlib_render(id, im, w, h);
temp_pmap = Imlib_move_image(id, im); temp_pmap = Imlib_move_image(id, im);