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.452 by sf-exg, Mon Jul 26 09:57:53 2010 UTC vs.
Revision 1.470 by sf-exg, Sun Jan 9 23:48:37 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 (bgPixmap.flags & bgPixmap_t::hasChanged)
981 { 981 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
982// scr_clear (true); This needs to be researched further! 983// scr_clear (true); This needs to be researched further!
983 scr_touch (false); 984 scr_touch (false);
984 } 985 }
985#endif 986#endif
986 987
… …
1251{ 1252{
1252 int button_number, key_state = 0; 1253 int button_number, key_state = 0;
1253 int x, y; 1254 int x, y;
1254 int code = 32; 1255 int code = 32;
1255 1256
1256 x = Pixel2Col (ev.x); 1257 x = Pixel2Col (ev.x) + 1;
1257 y = Pixel2Row (ev.y); 1258 y = Pixel2Row (ev.y) + 1;
1259
1258 if (ev.type == MotionNotify) 1260 if (ev.type == MotionNotify)
1259 { 1261 {
1260 if (x == mouse_row && y == mouse_col) 1262 if (x == mouse_row && y == mouse_col)
1261 return; 1263 return;
1264
1262 mouse_row = x; 1265 mouse_row = x;
1263 mouse_col = y; 1266 mouse_col = y;
1264 code += 32; 1267 code += 32;
1265 } 1268 }
1266 1269
… …
1269 else 1272 else
1270 { 1273 {
1271 button_number = MEvent.button - Button1; 1274 button_number = MEvent.button - Button1;
1272 /* add 0x3D for wheel events, like xterm does */ 1275 /* add 0x3D for wheel events, like xterm does */
1273 if (button_number >= 3) 1276 if (button_number >= 3)
1274 button_number += (64 - 3); 1277 button_number += 64 - 3;
1275 } 1278 }
1276 1279
1277 if (priv_modes & PrivMode_MouseX10) 1280 if (priv_modes & PrivMode_MouseX10)
1278 { 1281 {
1279 /* 1282 /*
… …
1311 fputc ('A', stderr); 1314 fputc ('A', stderr);
1312 if (key_state & 32) 1315 if (key_state & 32)
1313 fputc ('2', stderr); 1316 fputc ('2', stderr);
1314 fprintf (stderr, "]: <%d>, %d/%d\n", 1317 fprintf (stderr, "]: <%d>, %d/%d\n",
1315 button_number, 1318 button_number,
1316 x + 1, 1319 x,
1317 y + 1); 1320 y);
1318#endif 1321#endif
1319 1322
1323#if ENABLE_FRILLS
1324 if (priv_modes & PrivMode_ExtMouseRight)
1325 tt_printf ("\033[%d;%d;%dM",
1326 code + button_number + key_state,
1327 x,
1328 y);
1329 else if (priv_modes & PrivMode_ExtModeMouse)
1330 tt_printf ("\033[M%c%lc%lc",
1331 code + button_number + key_state,
1332 wint_t (32 + x),
1333 wint_t (32 + y));
1334 else
1335#endif
1320 tt_printf ("\033[M%c%c%c", 1336 tt_printf ("\033[M%c%c%c",
1321 (code + button_number + key_state), 1337 code + button_number + key_state,
1322 (32 + x + 1), 1338 32 + x,
1323 (32 + y + 1)); 1339 32 + y);
1324} 1340}
1325 1341
1326/*{{{ process an X event */ 1342/*{{{ process an X event */
1327void 1343void
1328rxvt_term::x_cb (XEvent &ev) 1344rxvt_term::x_cb (XEvent &ev)
… …
1430 && ev.xfocus.mode != NotifyGrab) 1446 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1447 focus_out ();
1432 break; 1448 break;
1433 1449
1434 case ConfigureNotify: 1450 case ConfigureNotify:
1435 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height);*/
1438 if (ev.xconfigure.window == parent[0]) 1451 if (ev.xconfigure.window == parent[0])
1439 { 1452 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1453 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 1454 ;
1455
1456#ifdef HAVE_BG_PIXMAP
1457 bool moved = false;
1458 if (bgPixmap.window_position_sensitive ())
1459 {
1460 int x, y;
1461 if (ev.xconfigure.send_event)
1462 {
1463 x = ev.xconfigure.x;
1464 y = ev.xconfigure.y;
1465 }
1466 else
1467 get_window_origin (x, y);
1468
1469 if (bgPixmap.set_position (x, y)
1470 || (bgPixmap.flags & bgPixmap_t::isInvalid))
1471 moved = true;
1472 }
1473#endif
1442 1474
1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1475 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1476 {
1445 seen_resize = 1; 1477 seen_resize = 1;
1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1478 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1479 }
1448 else 1480 else
1449 { 1481 {
1450#ifdef HAVE_BG_PIXMAP 1482#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ()) 1483 if (moved)
1452 { 1484 {
1453 if (mapped) 1485 if (mapped)
1454 update_background (); 1486 update_background ();
1455 else 1487 else
1456 bgPixmap.invalidate (); 1488 bgPixmap.invalidate ();
… …
2663 2695
2664 /* 8.3.87: NEXT LINE */ 2696 /* 8.3.87: NEXT LINE */
2665 case C1_NEL: /* ESC E */ 2697 case C1_NEL: /* ESC E */
2666 { 2698 {
2667 wchar_t nlcr[] = { C0_LF, C0_CR }; 2699 wchar_t nlcr[] = { C0_LF, C0_CR };
2668 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2700 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2669 } 2701 }
2670 break; 2702 break;
2671 2703
2672 /* kidnapped escape sequence: Should be 8.3.48 */ 2704 /* kidnapped escape sequence: Should be 8.3.48 */
2673 case C1_ESA: /* ESC G */ 2705 case C1_ESA: /* ESC G */
… …
2742 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2774 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2743 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2775 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2744 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2776 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2745}; 2777};
2746 2778
2747#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2779#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2748 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2780 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2749 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2781 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2750#define get_byte_array_bit(array, bit) \ 2782#define get_byte_array_bit(array, bit) \
2751 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2783 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2752 2784
2753const unsigned char csi_defaults[] = 2785static const unsigned char csi_defaults[] =
2754 { 2786 {
2755 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2787 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2756 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2788 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2757 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2789 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2758 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2790 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2847 { 2879 {
2848 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2880 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2849 scr_soft_reset (); 2881 scr_soft_reset ();
2850 2882
2851 static const int pm_h[] = { 7, 25 }; 2883 static const int pm_h[] = { 7, 25 };
2852 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2884 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2853 2885
2854 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2886 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2855 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2887 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2856 } 2888 }
2857 break; 2889 break;
2858 } 2890 }
2859 2891
2860 return; 2892 return;
… …
3423 { 3455 {
3424 bool changed = false; 3456 bool changed = false;
3425 3457
3426 if (ISSET_PIXCOLOR (Color_tint)) 3458 if (ISSET_PIXCOLOR (Color_tint))
3427 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3459 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3428 else
3429 changed = bgPixmap.unset_tint ();
3430 3460
3431 if (changed) 3461 if (changed)
3432 update_background (); 3462 update_background ();
3433 } 3463 }
3434 3464
… …
3450 { 3480 {
3451 int changed = 0; 3481 int changed = 0;
3452 3482
3453 if (*str != ';') 3483 if (*str != ';')
3454 { 3484 {
3455 /* reset to default scaling :*/
3456 bgPixmap.unset_geometry ();
3457 if (bgPixmap.set_file (str)) /* change pixmap */ 3485 if (bgPixmap.set_file (str)) /* change pixmap */
3486 {
3458 changed++; 3487 changed++;
3459 str = strchr (str, ';'); 3488 str = strchr (str, ';');
3460 if (str == NULL) 3489 if (str == NULL)
3461 bgPixmap.set_defaultGeometry (); 3490 bgPixmap.set_defaultGeometry ();
3491 else
3492 bgPixmap.set_geometry (str+1);
3493 }
3462 } 3494 }
3463 3495 else
3464 while (str)
3465 { 3496 {
3466 str++; 3497 str++;
3467 if (bgPixmap.set_geometry (str)) 3498 if (bgPixmap.set_geometry (str, true))
3468 changed++; 3499 changed++;
3469 str = strchr (str, ';');
3470 } 3500 }
3471 3501
3472 if (changed) 3502 if (changed)
3503 {
3504 if (bgPixmap.window_position_sensitive ())
3505 {
3506 int x, y;
3507 get_window_origin (x, y);
3508 bgPixmap.set_position (x, y);
3509 }
3473 update_background (); 3510 update_background ();
3511 }
3474 } 3512 }
3475 break; 3513 break;
3476#endif 3514#endif
3477 3515
3478 case XTerm_logfile: 3516 case XTerm_logfile:
… …
3610 { 6, PrivMode_relOrigin }, // DECOM 3648 { 6, PrivMode_relOrigin }, // DECOM
3611 { 7, PrivMode_Autowrap }, // DECAWM 3649 { 7, PrivMode_Autowrap }, // DECAWM
3612 // 8, auto-repeat keys // DECARM 3650 // 8, auto-repeat keys // DECARM
3613 { 9, PrivMode_MouseX10 }, 3651 { 9, PrivMode_MouseX10 },
3614 // 18 end FF to printer after print screen 3652 // 18 end FF to printer after print screen
3615 // 19 Print screen prints full screen/scorll region 3653 // 19 Print screen prints full screen/scroll region
3616 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3654 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3617#ifdef scrollBar_esc 3655#ifdef scrollBar_esc
3618 { scrollBar_esc, PrivMode_scrollBar }, 3656 { scrollBar_esc, PrivMode_scrollBar },
3619#endif 3657#endif
3620 { 35, PrivMode_ShiftKeys }, // rxvt extension 3658 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3629 { 67, PrivMode_BackSpace }, // DECBKM 3667 { 67, PrivMode_BackSpace }, // DECBKM
3630#endif 3668#endif
3631 { 1000, PrivMode_MouseX11 }, 3669 { 1000, PrivMode_MouseX11 },
3632 { 1002, PrivMode_MouseBtnEvent }, 3670 { 1002, PrivMode_MouseBtnEvent },
3633 { 1003, PrivMode_MouseAnyEvent }, 3671 { 1003, PrivMode_MouseAnyEvent },
3672#if ENABLE_FRILLS
3673 { 1005, PrivMode_ExtModeMouse },
3674#endif
3634 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3675 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3635 { 1011, PrivMode_Keypress }, // rxvt extension 3676 { 1011, PrivMode_Keypress }, // rxvt extension
3677#if ENABLE_FRILLS
3678 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3679#endif
3636 // 1035 enable modifiers for alt, numlock NYI 3680 // 1035 enable modifiers for alt, numlock NYI
3637 // 1036 send ESC for meta keys NYI 3681 // 1036 send ESC for meta keys NYI
3638 // 1037 send DEL for keypad delete NYI 3682 // 1037 send DEL for keypad delete NYI
3639 { 1047, PrivMode_Screen }, 3683 { 1047, PrivMode_Screen },
3640 // 1048 save and restore cursor 3684 // 1048 save and restore cursor, implemented in code
3641 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3685 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3642 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3686 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3643 { 2004, PrivMode_BracketPaste }, 3687 { 2004, PrivMode_BracketPaste },
3644 }; 3688 };
3645 3689
… …
3655 for (i = 0; i < nargs; i++) 3699 for (i = 0; i < nargs; i++)
3656 { 3700 {
3657 state = -1; 3701 state = -1;
3658 3702
3659 /* basic handling */ 3703 /* basic handling */
3660 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3704 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3661 if (argtopriv[j].argval == arg[i]) 3705 if (argtopriv[j].argval == arg[i])
3662 { 3706 {
3663 state = privcases (mode, argtopriv[j].bit); 3707 state = privcases (mode, argtopriv[j].bit);
3664 break; 3708 break;
3665 } 3709 }
… …
3743 case 1003: 3787 case 1003:
3744 if (state) 3788 if (state)
3745 { 3789 {
3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3790 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3747 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3791 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3792 mouse_row = mouse_col = 0;
3748 vt_emask_mouse = PointerMotionMask; 3793 vt_emask_mouse = PointerMotionMask;
3749 } 3794 }
3750 else 3795 else
3751 vt_emask_mouse = NoEventMask; 3796 vt_emask_mouse = NoEventMask;
3752 3797
… …
3978 4023
3979/* ---------------------------------------------------------------------- */ 4024/* ---------------------------------------------------------------------- */
3980/* Write data to the pty as typed by the user, pasted with the mouse, 4025/* Write data to the pty as typed by the user, pasted with the mouse,
3981 * or generated by us in response to a query ESC sequence. 4026 * or generated by us in response to a query ESC sequence.
3982 */ 4027 */
3983const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4028static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3984 4029
3985void 4030void
3986rxvt_term::tt_write (const char *data, unsigned int len) 4031rxvt_term::tt_write (const char *data, unsigned int len)
3987{ 4032{
3988 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4033 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4000 4045
4001 data += written; 4046 data += written;
4002 len -= written; 4047 len -= written;
4003 } 4048 }
4004 4049
4005 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4050 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4006 4051
4007 memcpy (v_buffer + v_buflen, data, len); 4052 memcpy (v_buffer + v_buflen, data, len);
4008 v_buflen += len; 4053 v_buflen += len;
4009 4054
4010 pty_ev.set (ev::READ | ev::WRITE); 4055 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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