From 2562841064a6b57147cf667c2b2de6f12dea4f21 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 20 Jan 2006 11:02:46 +0000 Subject: [PATCH] *** empty log message *** --- Changes | 3 +++ configure | 2 +- configure.ac | 2 +- src/command.C | 61 +++++++++++++++++---------------------------------- src/command.h | 6 ----- src/feature.h | 5 ----- src/hookinc.h | 5 +++++ src/init.C | 4 ---- src/rxvt.h | 4 ---- 9 files changed, 30 insertions(+), 62 deletions(-) diff --git a/Changes b/Changes index e21394ae..c2deec54 100644 --- a/Changes +++ b/Changes @@ -16,6 +16,9 @@ WISH: OnTheSpot editing, or maybe switch to miiiiiiif. or maybe use perl and an WISH: just for fun, do shade and tint with XRender. WISH: support tex fonts +7.2 + - removed support for obsolete offix dnd protocol. + 7.1 Thu Jan 19 20:25:34 CET 2006 - setuid/setgid operation is now _encouraged_: security has been improved by moving privileged operations into a separate process diff --git a/configure b/configure index b9835b58..26c9a603 100755 --- a/configure +++ b/configure @@ -3309,7 +3309,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test -z "$orig_CXXFLAGS"; then if test x$GCC = xyes && test "x$GXX" = xyes; then - CXXFLAGS="-g -O3 -Os -fno-threadsafe-statics -fno-enforce-eh-specs" + CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs" cat >conftest.$ac_ext <<_ACEOF int i; diff --git a/configure.ac b/configure.ac index 792f9356..31d90f41 100644 --- a/configure.ac +++ b/configure.ac @@ -54,7 +54,7 @@ dnl# Supply default CXXLAGS, if not specified by `CXXLAGS=flags ./configure' dnl# if test -z "$orig_CXXFLAGS"; then if test x$GCC = xyes && test "x$GXX" = xyes; then - CXXFLAGS="-g -O3 -Os -fno-threadsafe-statics -fno-enforce-eh-specs" + CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs" AC_COMPILE_IFELSE([int i;], [echo didididid], [CXXFLAGS="-g -O3"]) else CXXFLAGS="-O" diff --git a/src/command.C b/src/command.C index 22e2e364..102d09d8 100644 --- a/src/command.C +++ b/src/command.C @@ -1403,53 +1403,32 @@ rxvt_term::x_cb (XEvent &ev) break; case ClientMessage: - if (ev.xclient.format == 32 - && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) + if (ev.xclient.format == 32) { - if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) - destroy (); + if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) + { + if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) + { + if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, ev, DT_END))) + destroy (); + } #if ENABLE_EWMH - else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) - XSendEvent (disp, ev.xclient.window = display->root, - False, SubstructureRedirectMask | SubstructureNotifyMask, - &ev); + else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) + XSendEvent (disp, ev.xclient.window = display->root, + False, SubstructureRedirectMask | SubstructureNotifyMask, + &ev); #endif - } + } #if ENABLE_XEMBED - else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED]) - { - if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) - focus_in (); - else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) - focus_out (); - } + else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED]) + { + if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) + focus_in (); + else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) + focus_out (); + } #endif -#ifdef OFFIX_DND - /* OffiX Dnd (drag 'n' drop) protocol */ - else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] - && (ev.xclient.data.l[0] == DndFile - || ev.xclient.data.l[0] == DndDir - || ev.xclient.data.l[0] == DndLink)) - { - /* Get Dnd data */ - Atom ActualType; - int ActualFormat; - unsigned char *data; - unsigned long Size, RemainingBytes; - - XGetWindowProperty (disp, display->root, - xa[XA_DNDSELECTION], - 0L, 1000000L, - False, AnyPropertyType, - &ActualType, &ActualFormat, - &Size, &RemainingBytes, - &data); - set_string_property (XA_CUT_BUFFER0, data); - XFree (data); - selection_paste (display->root, XA_CUT_BUFFER0, true); - XSetInputFocus (disp, display->root, RevertToNone, CurrentTime); } -#endif /* OFFIX_DND */ break; case MappingNotify: diff --git a/src/command.h b/src/command.h index e30da5dd..8cd5f9ce 100644 --- a/src/command.h +++ b/src/command.h @@ -10,12 +10,6 @@ #define ESC_ARGS 32 /* max # of args for esc sequences */ -#ifdef OFFIX_DND -# define DndFile 2 -# define DndDir 5 -# define DndLink 7 -#endif - /* a large REFRESH_PERIOD causes problems with `cat' */ #define REFRESH_PERIOD 1 diff --git a/src/feature.h b/src/feature.h index 7438f186..45581948 100644 --- a/src/feature.h +++ b/src/feature.h @@ -146,11 +146,6 @@ */ /* #define ALLOW_132_MODE */ -/* - * Add support for the Offix DND (Drag 'n' Drop) protocol - */ -/* #define OFFIX_DND */ - /*---------------------------------KEYS---------------------------------*/ /* diff --git a/src/hookinc.h b/src/hookinc.h index 108ad66b..ea23d61e 100644 --- a/src/hookinc.h +++ b/src/hookinc.h @@ -37,4 +37,9 @@ def (MAP_NOTIFY) def (UNMAP_NOTIFY) def (CONFIGURE_NOTIFY) + def (CLIENT_MESSAGE) + def (WM_DELETE_WINDOW) + def (WM_PROTOCOLS) + def (CUSTOM_REND) // hovering over custom rendition, generate enter/leave maybe? + diff --git a/src/init.C b/src/init.C index a2e58d07..41241b3d 100644 --- a/src/init.C +++ b/src/init.C @@ -205,10 +205,6 @@ const char *const xa_names[] = "_XROOTPMAP_ID", "ESETROOT_PMAP_ID", #endif -#ifdef OFFIX_DND - "DndProtocol", - "DndSelection", -#endif #if ENABLE_XEMBED "_XEMBED", "_XEMBED_INFO", diff --git a/src/rxvt.h b/src/rxvt.h index 36f45c64..3373789e 100644 --- a/src/rxvt.h +++ b/src/rxvt.h @@ -666,10 +666,6 @@ enum { XA_XROOTPMAP_ID, XA_ESETROOT_PMAP_ID, #endif -#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ - XA_DNDPROTOCOL, - XA_DNDSELECTION, -#endif #if ENABLE_XEMBED XA_XEMBED, XA_XEMBED_INFO, -- 2.34.1