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.456 by sf-exg, Fri Oct 22 16:49:26 2010 UTC vs.
Revision 1.475 by sf-exg, Tue Feb 1 00:41:01 2011 UTC

… …
889 commit_iso14755 (); 889 commit_iso14755 ();
890 890
891 return; 891 return;
892 } 892 }
893 893
894 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
895 if (i[0] == keysym) 895 if (i[0] == keysym)
896 { 896 {
897 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
898 commit_iso14755 (); 898 commit_iso14755 ();
899 899
… …
975rxvt_term::flush () 975rxvt_term::flush ()
976{ 976{
977 flush_ev.stop (); 977 flush_ev.stop ();
978 978
979#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
980 if (bgPixmap.check_clearChanged ()) 980 if (bg_flags & BG_NEEDS_REFRESH)
981 { 981 {
982// scr_clear (true); This needs to be researched further! 982 bg_flags &= ~BG_NEEDS_REFRESH;
983 scr_touch (false); 983 scr_touch (false);
984 } 984 }
985#endif 985#endif
986 986
987 if (want_refresh) 987 if (want_refresh)
… …
1251{ 1251{
1252 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1253 int x, y; 1253 int x, y;
1254 int code = 32; 1254 int code = 32;
1255 1255
1256 x = Pixel2Col (ev.x); 1256 x = Pixel2Col (ev.x) + 1;
1257 y = Pixel2Row (ev.y); 1257 y = Pixel2Row (ev.y) + 1;
1258
1258 if (ev.type == MotionNotify) 1259 if (ev.type == MotionNotify)
1259 { 1260 {
1260 if (x == mouse_row && y == mouse_col) 1261 if (x == mouse_row && y == mouse_col)
1261 return; 1262 return;
1263
1262 mouse_row = x; 1264 mouse_row = x;
1263 mouse_col = y; 1265 mouse_col = y;
1264 code += 32; 1266 code += 32;
1265 } 1267 }
1266 1268
… …
1269 else 1271 else
1270 { 1272 {
1271 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1272 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1273 if (button_number >= 3) 1275 if (button_number >= 3)
1274 button_number += (64 - 3); 1276 button_number += 64 - 3;
1275 } 1277 }
1276 1278
1277 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1278 { 1280 {
1279 /* 1281 /*
… …
1311 fputc ('A', stderr); 1313 fputc ('A', stderr);
1312 if (key_state & 32) 1314 if (key_state & 32)
1313 fputc ('2', stderr); 1315 fputc ('2', stderr);
1314 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1315 button_number, 1317 button_number,
1316 x + 1, 1318 x,
1317 y + 1); 1319 y);
1318#endif 1320#endif
1319 1321
1322#if ENABLE_FRILLS
1323 if (priv_modes & PrivMode_ExtMouseRight)
1324 tt_printf ("\033[%d;%d;%dM",
1325 code + button_number + key_state,
1326 x,
1327 y);
1328 else if (priv_modes & PrivMode_ExtModeMouse)
1329 tt_printf ("\033[M%c%lc%lc",
1330 code + button_number + key_state,
1331 wint_t (32 + x),
1332 wint_t (32 + y));
1333 else
1334#endif
1320 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1321 (code + button_number + key_state), 1336 code + button_number + key_state,
1322 (32 + x + 1), 1337 32 + x,
1323 (32 + y + 1)); 1338 32 + y);
1324} 1339}
1325 1340
1326/*{{{ process an X event */ 1341/*{{{ process an X event */
1327void 1342void
1328rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
… …
1435 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent[0])
1436 { 1451 {
1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1438 ; 1453 ;
1439 1454
1455#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ())
1458 {
1459 int x, y;
1460 if (ev.xconfigure.send_event)
1461 {
1462 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y;
1464 }
1465 else
1466 get_window_origin (x, y);
1467
1468 if (bg_set_position (x, y)
1469 || !(bg_flags & BG_IS_VALID))
1470 moved = true;
1471 }
1472#endif
1473
1440 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1441 { 1475 {
1442 seen_resize = 1; 1476 seen_resize = 1;
1443 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1444 } 1478 }
1445 else 1479 else
1446 { 1480 {
1447#ifdef HAVE_BG_PIXMAP 1481#ifdef HAVE_BG_PIXMAP
1448 if (bgPixmap.window_position_sensitive ()) 1482 if (moved)
1449 { 1483 {
1450 if (mapped) 1484 if (mapped)
1451 update_background (); 1485 update_background ();
1452 else 1486 else
1453 bgPixmap.invalidate (); 1487 bg_invalidate ();
1454 } 1488 }
1455#endif 1489#endif
1456 } 1490 }
1457 1491
1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1492 * by scheduling background redraw as soon as we can, but giving a short 1526 * by scheduling background redraw as soon as we can, but giving a short
1493 * bit of time for ConfigureNotifies to arrive. 1527 * bit of time for ConfigureNotifies to arrive.
1494 * We should render background PRIOR to drawing any text, but AFTER all 1528 * We should render background PRIOR to drawing any text, but AFTER all
1495 * of ConfigureNotifys for the best results. 1529 * of ConfigureNotifys for the best results.
1496 */ 1530 */
1497 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1531 if (!(bg_flags & BG_IS_VALID))
1498 update_background_ev.start (0.025); 1532 update_background_ev.start (0.025);
1499#endif 1533#endif
1500 mapped = 1; 1534 mapped = 1;
1501#ifdef TEXT_BLINK 1535#ifdef TEXT_BLINK
1502 text_blink_ev.start (); 1536 text_blink_ev.start ();
… …
1517 if (ev.xany.window == vt) 1551 if (ev.xany.window == vt)
1518 { 1552 {
1519 do 1553 do
1520 { 1554 {
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1523 } 1557 }
1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1525 1559
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527 1561
1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1529 { 1563 {
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1564 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1565 ev.xexpose.width, ev.xexpose.height, false);
1532 } 1566 }
1533 1567
1534 want_refresh = 1; 1568 want_refresh = 1;
1535 } 1569 }
1536 else 1570 else
… …
1817 * use the property to determine the pixmap. We use it later on. 1851 * use the property to determine the pixmap. We use it later on.
1818 */ 1852 */
1819 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1820 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1821 { 1855 {
1822 bgPixmap.set_root_pixmap (); 1856 bg_set_root_pixmap ();
1823 update_background (); 1857 update_background ();
1824 } 1858 }
1825 1859
1826 break; 1860 break;
1827 } 1861 }
… …
2660 2694
2661 /* 8.3.87: NEXT LINE */ 2695 /* 8.3.87: NEXT LINE */
2662 case C1_NEL: /* ESC E */ 2696 case C1_NEL: /* ESC E */
2663 { 2697 {
2664 wchar_t nlcr[] = { C0_LF, C0_CR }; 2698 wchar_t nlcr[] = { C0_LF, C0_CR };
2665 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2699 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2666 } 2700 }
2667 break; 2701 break;
2668 2702
2669 /* kidnapped escape sequence: Should be 8.3.48 */ 2703 /* kidnapped escape sequence: Should be 8.3.48 */
2670 case C1_ESA: /* ESC G */ 2704 case C1_ESA: /* ESC G */
… …
2739 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2773 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2740 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2774 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2741 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2775 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2742}; 2776};
2743 2777
2744#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2778#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2745 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2779 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2746 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2780 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2747#define get_byte_array_bit(array, bit) \ 2781#define get_byte_array_bit(array, bit) \
2748 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2782 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2749 2783
2750const unsigned char csi_defaults[] = 2784static const unsigned char csi_defaults[] =
2751 { 2785 {
2752 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2786 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2753 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2787 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2754 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2788 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2755 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2789 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2844 { 2878 {
2845 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2879 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2846 scr_soft_reset (); 2880 scr_soft_reset ();
2847 2881
2848 static const int pm_h[] = { 7, 25 }; 2882 static const int pm_h[] = { 7, 25 };
2849 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2883 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2850 2884
2851 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2885 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2852 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2886 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2853 } 2887 }
2854 break; 2888 break;
2855 } 2889 }
2856 2890
2857 return; 2891 return;
… …
3419 process_color_seq (op, Color_tint, str, resp); 3453 process_color_seq (op, Color_tint, str, resp);
3420 { 3454 {
3421 bool changed = false; 3455 bool changed = false;
3422 3456
3423 if (ISSET_PIXCOLOR (Color_tint)) 3457 if (ISSET_PIXCOLOR (Color_tint))
3424 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3458 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3425 else
3426 changed = bgPixmap.unset_tint ();
3427 3459
3428 if (changed) 3460 if (changed)
3429 update_background (); 3461 update_background ();
3430 } 3462 }
3431 3463
… …
3437 if (!strcmp (str, "?")) 3469 if (!strcmp (str, "?"))
3438 { 3470 {
3439 char str[256]; 3471 char str[256];
3440 3472
3441 sprintf (str, "[%dx%d+%d+%d]", 3473 sprintf (str, "[%dx%d+%d+%d]",
3442 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3474 min (h_scale, 32767), min (v_scale, 32767),
3443 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3475 min (h_align, 32767), min (v_align, 32767));
3444 process_xterm_seq (XTerm_title, str, CHAR_ST); 3476 process_xterm_seq (XTerm_title, str, CHAR_ST);
3445 } 3477 }
3446 else 3478 else
3447 { 3479 {
3448 int changed = 0; 3480 int changed = 0;
3449 3481
3450 if (*str != ';') 3482 if (*str != ';')
3451 { 3483 {
3452 /* reset to default scaling :*/
3453 bgPixmap.unset_geometry ();
3454 if (bgPixmap.set_file (str)) /* change pixmap */ 3484 if (bg_set_file (str)) /* change pixmap */
3485 {
3455 changed++; 3486 changed++;
3456 str = strchr (str, ';'); 3487 str = strchr (str, ';');
3457 if (str == NULL) 3488 if (str == NULL)
3458 bgPixmap.set_defaultGeometry (); 3489 bg_set_default_geometry ();
3490 else
3491 bg_set_geometry (str+1);
3492 }
3459 } 3493 }
3460 3494 else
3461 while (str)
3462 { 3495 {
3463 str++; 3496 str++;
3464 if (bgPixmap.set_geometry (str)) 3497 if (bg_set_geometry (str, true))
3465 changed++; 3498 changed++;
3466 str = strchr (str, ';');
3467 } 3499 }
3468 3500
3469 if (changed) 3501 if (changed)
3502 {
3503 if (bg_window_position_sensitive ())
3504 {
3505 int x, y;
3506 get_window_origin (x, y);
3507 bg_set_position (x, y);
3508 }
3470 update_background (); 3509 update_background ();
3510 }
3471 } 3511 }
3472 break; 3512 break;
3473#endif 3513#endif
3474 3514
3475 case XTerm_logfile: 3515 case XTerm_logfile:
… …
3626 { 67, PrivMode_BackSpace }, // DECBKM 3666 { 67, PrivMode_BackSpace }, // DECBKM
3627#endif 3667#endif
3628 { 1000, PrivMode_MouseX11 }, 3668 { 1000, PrivMode_MouseX11 },
3629 { 1002, PrivMode_MouseBtnEvent }, 3669 { 1002, PrivMode_MouseBtnEvent },
3630 { 1003, PrivMode_MouseAnyEvent }, 3670 { 1003, PrivMode_MouseAnyEvent },
3671#if ENABLE_FRILLS
3672 { 1005, PrivMode_ExtModeMouse },
3673#endif
3631 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3674 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3632 { 1011, PrivMode_Keypress }, // rxvt extension 3675 { 1011, PrivMode_Keypress }, // rxvt extension
3676#if ENABLE_FRILLS
3677 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3678#endif
3633 // 1035 enable modifiers for alt, numlock NYI 3679 // 1035 enable modifiers for alt, numlock NYI
3634 // 1036 send ESC for meta keys NYI 3680 // 1036 send ESC for meta keys NYI
3635 // 1037 send DEL for keypad delete NYI 3681 // 1037 send DEL for keypad delete NYI
3636 { 1047, PrivMode_Screen }, 3682 { 1047, PrivMode_Screen },
3637 // 1048 save and restore cursor 3683 // 1048 save and restore cursor, implemented in code
3638 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3684 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3639 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3685 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3640 { 2004, PrivMode_BracketPaste }, 3686 { 2004, PrivMode_BracketPaste },
3641 }; 3687 };
3642 3688
… …
3652 for (i = 0; i < nargs; i++) 3698 for (i = 0; i < nargs; i++)
3653 { 3699 {
3654 state = -1; 3700 state = -1;
3655 3701
3656 /* basic handling */ 3702 /* basic handling */
3657 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3703 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3658 if (argtopriv[j].argval == arg[i]) 3704 if (argtopriv[j].argval == arg[i])
3659 { 3705 {
3660 state = privcases (mode, argtopriv[j].bit); 3706 state = privcases (mode, argtopriv[j].bit);
3661 break; 3707 break;
3662 } 3708 }
… …
3740 case 1003: 3786 case 1003:
3741 if (state) 3787 if (state)
3742 { 3788 {
3743 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3789 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3744 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3790 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3791 mouse_row = mouse_col = 0;
3745 vt_emask_mouse = PointerMotionMask; 3792 vt_emask_mouse = PointerMotionMask;
3746 } 3793 }
3747 else 3794 else
3748 vt_emask_mouse = NoEventMask; 3795 vt_emask_mouse = NoEventMask;
3749 3796
… …
3975 4022
3976/* ---------------------------------------------------------------------- */ 4023/* ---------------------------------------------------------------------- */
3977/* Write data to the pty as typed by the user, pasted with the mouse, 4024/* Write data to the pty as typed by the user, pasted with the mouse,
3978 * or generated by us in response to a query ESC sequence. 4025 * or generated by us in response to a query ESC sequence.
3979 */ 4026 */
3980const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4027static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3981 4028
3982void 4029void
3983rxvt_term::tt_write (const char *data, unsigned int len) 4030rxvt_term::tt_write (const char *data, unsigned int len)
3984{ 4031{
3985 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4032 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3997 4044
3998 data += written; 4045 data += written;
3999 len -= written; 4046 len -= written;
4000 } 4047 }
4001 4048
4002 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4049 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4003 4050
4004 memcpy (v_buffer + v_buflen, data, len); 4051 memcpy (v_buffer + v_buflen, data, len);
4005 v_buflen += len; 4052 v_buflen += len;
4006 4053
4007 pty_ev.set (ev::READ | ev::WRITE); 4054 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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