ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.269 by root, Tue Jan 17 12:22:59 2006 UTC vs.
Revision 1.279 by root, Sat Jan 21 14:25:05 2006 UTC

… …
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71
72#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
73 70
74#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76#define ISO_14755_52 0x20000000UL // keycap (section 5.2) 73#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
… …
464 { 461 {
465 switch (keysym) 462 switch (keysym)
466 { 463 {
467 /* normal XTerm key bindings */ 464 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 465 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 466 selection_request (ev.time);
470 return; 467 return;
471#if TODO 468#if TODO
472 /* rxvt extras */ 469 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 470 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 471 change_font (FONT_UP);
… …
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
1045{ 1042{
1046 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1044 want_refresh = 1;
1048 1045
1049 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1050} 1047}
1051#endif 1048#endif
1052 1049
1053#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
1054void 1051void
… …
1405 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1406 break; 1403 break;
1407 1404
1408 case ClientMessage: 1405 case ClientMessage:
1409 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1407 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411 { 1408 {
1409 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1410 {
1411 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1412 {
1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1413 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1414 {
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413 destroy (); 1416 destroy ();
1417 }
1414#if ENABLE_EWMH 1418#if ENABLE_EWMH
1415 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416 XSendEvent (disp, ev.xclient.window = display->root, 1420 XSendEvent (disp, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask, 1421 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev); 1422 &ev);
1423#endif
1424 }
1425 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1419#endif 1434#endif
1420 } 1435 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1430#ifdef OFFIX_DND
1431 /* OffiX Dnd (drag 'n' drop) protocol */
1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1433 && (ev.xclient.data.l[0] == DndFile
1434 || ev.xclient.data.l[0] == DndDir
1435 || ev.xclient.data.l[0] == DndLink))
1436 {
1437 /* Get Dnd data */
1438 Atom ActualType;
1439 int ActualFormat;
1440 unsigned char *data;
1441 unsigned long Size, RemainingBytes;
1442
1443 XGetWindowProperty (disp, display->root,
1444 xa[XA_DNDSELECTION],
1445 0L, 1000000L,
1446 False, AnyPropertyType,
1447 &ActualType, &ActualFormat,
1448 &Size, &RemainingBytes,
1449 &data);
1450 set_string_property (XA_CUT_BUFFER0, data);
1451 XFree (data);
1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1454 }
1455#endif /* OFFIX_DND */
1456 break; 1436 break;
1457 1437
1458 case MappingNotify: 1438 case MappingNotify:
1459 XRefreshKeyboardMapping (&ev.xmapping); 1439 XRefreshKeyboardMapping (&ev.xmapping);
1460 break; 1440 break;
… …
1502 { 1482 {
1503 seen_resize = 1; 1483 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505 } 1485 }
1506 1486
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1507#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1508 if (OPTION (Opt_transparent)) 1490 if (OPTION (Opt_transparent))
1509 check_our_parents (); 1491 check_our_parents ();
1510#endif 1492#endif
1511 } 1493 }
1512 break; 1494 break;
1513 1495
1514 case PropertyNotify: 1496 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1515 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1516 && ev.xproperty.state == PropertyNewValue) 1499 && ev.xproperty.state == PropertyNewValue)
1517 selection_property (ev.xproperty.window, ev.xproperty.atom); 1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1518 1501
1519 break; 1502 break;
1520 1503
1521 case SelectionClear: 1504 case SelectionClear:
1522 selection_clear (); 1505 selection_clear ();
… …
1711 { 1694 {
1712 hidden_cursor = 0; 1695 hidden_cursor = 0;
1713 want_refresh = 1; 1696 want_refresh = 1;
1714 } 1697 }
1715 1698
1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1717 } 1700 }
1718#endif 1701#endif
1719 1702
1720#if defined(POINTER_BLANK) 1703#if defined(POINTER_BLANK)
1721 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1749 XSetICFocus (Input_Context); 1732 XSetICFocus (Input_Context);
1750 } 1733 }
1751#endif 1734#endif
1752#if CURSOR_BLINK 1735#if CURSOR_BLINK
1753 if (OPTION (Opt_cursorBlink)) 1736 if (OPTION (Opt_cursorBlink))
1754 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1755#endif 1738#endif
1756#if OFF_FOCUS_FADING 1739#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade]) 1740 if (rs[Rs_fade])
1758 { 1741 {
1759 pix_colors = pix_colors_focused; 1742 pix_colors = pix_colors_focused;
… …
2153 { 2136 {
2154 case Button1: 2137 case Button1:
2155 case Button3: 2138 case Button3:
2156 selection_make (ev.time); 2139 selection_make (ev.time);
2157 break; 2140 break;
2141
2158 case Button2: 2142 case Button2:
2159 selection_request (ev.time, ev.x, ev.y); 2143 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2144 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
2160 break; 2145 break;
2146
2161#ifdef MOUSE_WHEEL 2147#ifdef MOUSE_WHEEL
2162 case Button4: 2148 case Button4:
2163 case Button5: 2149 case Button5:
2164 { 2150 {
2165 int i; 2151 int i;
… …
2643 am_transparent = 0; 2629 am_transparent = 0;
2644 /* XXX: also turn off Opt_transparent? */ 2630 /* XXX: also turn off Opt_transparent? */
2645 } 2631 }
2646 else 2632 else
2647 { 2633 {
2648#if WAIT_FOR_WM
2649 /* wait (an arbitrary period) for the WM to do its thing
2650 * needed for fvwm2.2.2 (and before?) */
2651 sleep (1);
2652#endif
2653 for (n = 0; n < (unsigned int)i; n++) 2634 for (n = 0; n < (unsigned int)i; n++)
2654 { 2635 {
2655 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2636 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2656 XClearWindow (disp, parent[n]); 2637 XClearWindow (disp, parent[n]);
2657 } 2638 }
… …
2820 return flag; 2801 return flag;
2821} 2802}
2822 2803
2823// read the next character 2804// read the next character
2824wchar_t 2805wchar_t
2825rxvt_term::next_char () 2806rxvt_term::next_char () NOTHROW
2826{ 2807{
2827 while (cmdbuf_ptr < cmdbuf_endp) 2808 while (cmdbuf_ptr < cmdbuf_endp)
2828 { 2809 {
2829 // assume 7-bit to be ascii ALWAYS 2810 // assume 7-bit to be ascii ALWAYS
2830 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2811 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2851 return NOCHAR; 2832 return NOCHAR;
2852} 2833}
2853 2834
2854// read the next octet 2835// read the next octet
2855uint32_t 2836uint32_t
2856rxvt_term::next_octet () 2837rxvt_term::next_octet () NOTHROW
2857{ 2838{
2858 return cmdbuf_ptr < cmdbuf_endp 2839 return cmdbuf_ptr < cmdbuf_endp
2859 ? (unsigned char)*cmdbuf_ptr++ 2840 ? (unsigned char)*cmdbuf_ptr++
2860 : NOCHAR; 2841 : NOCHAR;
2861} 2842}
2843
2844static class out_of_input out_of_input;
2862 2845
2863/* rxvt_cmd_getc () - Return next input character */ 2846/* rxvt_cmd_getc () - Return next input character */
2864/* 2847/*
2865 * Return the next input character after first passing any keyboard input 2848 * Return the next input character after first passing any keyboard input
2866 * to the command. 2849 * to the command.
2867 */ 2850 */
2868wchar_t 2851wchar_t
2869rxvt_term::cmd_getc () 2852rxvt_term::cmd_getc () THROW ((class out_of_input))
2870{ 2853{
2871 wchar_t c = next_char (); 2854 wchar_t c = next_char ();
2872 2855
2873 if (c == NOCHAR) 2856 if (c == NOCHAR)
2874 throw out_of_input; 2857 throw out_of_input;
2875 2858
2876 return c; 2859 return c;
2877} 2860}
2878 2861
2879uint32_t 2862uint32_t
2880rxvt_term::cmd_get8 () 2863rxvt_term::cmd_get8 () THROW ((class out_of_input))
2881{ 2864{
2882 uint32_t c = next_octet (); 2865 uint32_t c = next_octet ();
2883 2866
2884 if (c == NOCHAR) 2867 if (c == NOCHAR)
2885 throw out_of_input; 2868 throw out_of_input;
… …
3764 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3765 */ 3748 */
3766void 3749void
3767rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3750rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3768{ 3751{
3769 int changed = 0;
3770 int color; 3752 int color;
3771 char *buf, *name; 3753 char *buf, *name;
3772 bool query = str[0] == '?' && !str[1]; 3754 bool query = str[0] == '?' && !str[1];
3773 int saveop = op; 3755 int saveop = op;
3774 dDisp; 3756 dDisp;
… …
3890 want_full_refresh = want_refresh = 1; 3872 want_full_refresh = want_refresh = 1;
3891 break; 3873 break;
3892#endif 3874#endif
3893 3875
3894 case Rxvt_Pixmap: 3876 case Rxvt_Pixmap:
3877 {
3895 if (*str != ';') 3878 if (*str != ';')
3896 { 3879 {
3897#if XPM_BACKGROUND 3880#if XPM_BACKGROUND
3898 scale_pixmap (""); /* reset to default scaling */ 3881 scale_pixmap (""); /* reset to default scaling */
3899 set_bgPixmap (str); /* change pixmap */ 3882 set_bgPixmap (str); /* change pixmap */
3900 scr_touch (true); 3883 scr_touch (true);
3901#endif 3884#endif
3902 } 3885 }
3903 3886
3887 int changed = 0;
3888
3904 while ((str = strchr (str, ';')) != NULL) 3889 while ((str = strchr (str, ';')) != NULL)
3905 { 3890 {
3906 str++; 3891 str++;
3907#if XPM_BACKGROUND 3892#if XPM_BACKGROUND
3908 changed += scale_pixmap (str); 3893 changed += scale_pixmap (str);
3909#endif 3894#endif
3910 } 3895 }
3911 3896
3912 if (changed) 3897 if (changed)
3913 { 3898 {
3914#ifdef XPM_BACKGROUND 3899#ifdef XPM_BACKGROUND
3915 resize_pixmap (); 3900 resize_pixmap ();
3916 scr_touch (true); 3901 scr_touch (true);
3917#endif 3902#endif
3918 } 3903 }
3904 }
3919 break; 3905 break;
3920 3906
3921 case Rxvt_restoreFG: 3907 case Rxvt_restoreFG:
3922 set_window_color (Color_fg, str); 3908 set_window_color (Color_fg, str);
3923 break; 3909 break;
… …
4032 return state; 4018 return state;
4033} 4019}
4034 4020
4035/* we're not using priv _yet_ */ 4021/* we're not using priv _yet_ */
4036void 4022void
4037rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4023rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4038{ 4024{
4039 unsigned int i, j; 4025 unsigned int i, j;
4040 int state; 4026 int state;
4041 4027
4042 static const struct 4028 static const struct

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines