*** empty log message ***

diff --git a/src/perl/urxvt-popup b/src/perl/urxvt-popup
index 7d3534d0a24bc478bb1a6ea6a6dfffe3439a5881..cd902fdbd4e38a5238556621a3e2997f1a29e34a 100644 (file)
--- a/src/perl/urxvt-popup
+++ b/src/perl/urxvt-popup
@@ -132,8 +132,6 @@ sub on_map_notify {
       and $self->allow_events_async;
 }
 
-sub on_destroy {
-}
 
 
 

diff --git a/src/rxvtperl.xs b/src/rxvtperl.xs
index a9c8b74ed68dfc41942c1e70475cd297d027b5a7..e8fab1504b3167f664513c6e17557c4ae0fb5bc3 100644 (file)
--- a/src/rxvtperl.xs
+++ b/src/rxvtperl.xs
@@ -28,6 +28,7 @@
 
 #include "../config.h"
 
+#include <cstddef>
 #include <cstdarg>
 
 #include "rxvt.h"
@@ -601,7 +602,22 @@ BOOT:
   export_const_iv (RS_Blink);
   export_const_iv (RS_RVid);
   export_const_iv (RS_Uline);
+
   export_const_iv (CurrentTime);
+  export_const_iv (ShiftMask);
+  export_const_iv (LockMask);
+  export_const_iv (ControlMask);
+  export_const_iv (Mod1Mask);
+  export_const_iv (Mod2Mask);
+  export_const_iv (Mod3Mask);
+  export_const_iv (Mod4Mask);
+  export_const_iv (Mod5Mask);
+  export_const_iv (Button1Mask);
+  export_const_iv (Button2Mask);
+  export_const_iv (Button3Mask);
+  export_const_iv (Button4Mask);
+  export_const_iv (Button5Mask);
+  export_const_iv (AnyModifier);
 
   sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
 }
@@ -812,8 +828,7 @@ rxvt_term::locale_decode (SV *octets)
        OUTPUT:
         RETVAL
 
-# very portable, especially on objects as opposed to pods
-#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
+#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
 
 #define TERM_OFFSET_width      TERM_OFFSET(width)
 #define TERM_OFFSET_height     TERM_OFFSET(height)
@@ -848,6 +863,22 @@ rxvt_term::width ()
         OUTPUT:
         RETVAL
 
+unsigned int
+rxvt_term::ModLevel3Mask ()
+       ALIAS:
+           ModLevel3Mask  = 0
+           ModMetaMask    = 1
+           ModNumLockMask = 2
+       CODE:
+        switch (ix)
+          {
+           case 0: RETVAL = THIS->ModLevel3Mask;  break;
+           case 1: RETVAL = THIS->ModMetaMask;    break;
+           case 2: RETVAL = THIS->ModNumLockMask; break;
+          }
+        OUTPUT:
+        RETVAL
+
 U32
 rxvt_term::parent ()
        CODE:

diff --git a/src/urxvt.pm b/src/urxvt.pm
index 7b29d10cb404ff5f19bca52584b14818a41cf3ec..36ed839a349f3b413b3397bcf124aad4b6901f53 100644 (file)
--- a/src/urxvt.pm
+++ b/src/urxvt.pm
@@ -333,6 +333,14 @@ correct place, e.g. on stderr of the connecting urxvtc client.
 
 Returns the "current time" (as per the event loop).
 
+=item urxvt::CurrentTime
+
+=item urxvt::ShiftMask, LockMask, ControlMask, Mod1Mask, Mod2Mask,
+Mod3Mask, Mod4Mask, Mod5Mask, Button1Mask, Button2Mask, Button3Mask,
+Button4Mask, Button5Mask, AnyModifier
+
+Various constants for use in X events.
+
 =back
 
 =head2 RENDITION
@@ -778,6 +786,15 @@ Return the window id of the terminal window.
 
 Return various integers describing terminal characteristics.
 
+=item $modifiermask = $term->ModLevel3Mask
+
+=item $modifiermask = $term->ModMetaMask
+
+=item $modifiermask = $term->ModNumLockMask
+
+Return the modifier masks corresponding to the "ISO Level 3 Shift" (often
+AltGr), the meta key (often Alt) and the num lock key, if applicable.
+
 =item $view_start = $term->view_start ([$newvalue])
 
 Returns the negative row number of the topmost line. Minimum value is