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.460 by sf-exg, Fri Nov 19 23:29:30 2010 UTC vs.
Revision 1.469 by sf-exg, Sat Jan 8 10:15:36 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
… …
1252{ 1252{
1253 int button_number, key_state = 0; 1253 int button_number, key_state = 0;
1254 int x, y; 1254 int x, y;
1255 int code = 32; 1255 int code = 32;
1256 1256
1257 x = Pixel2Col (ev.x); 1257 x = Pixel2Col (ev.x) + 1;
1258 y = Pixel2Row (ev.y); 1258 y = Pixel2Row (ev.y) + 1;
1259
1259 if (ev.type == MotionNotify) 1260 if (ev.type == MotionNotify)
1260 { 1261 {
1261 if (x == mouse_row && y == mouse_col) 1262 if (x == mouse_row && y == mouse_col)
1262 return; 1263 return;
1264
1263 mouse_row = x; 1265 mouse_row = x;
1264 mouse_col = y; 1266 mouse_col = y;
1265 code += 32; 1267 code += 32;
1266 } 1268 }
1267 1269
… …
1270 else 1272 else
1271 { 1273 {
1272 button_number = MEvent.button - Button1; 1274 button_number = MEvent.button - Button1;
1273 /* add 0x3D for wheel events, like xterm does */ 1275 /* add 0x3D for wheel events, like xterm does */
1274 if (button_number >= 3) 1276 if (button_number >= 3)
1275 button_number += (64 - 3); 1277 button_number += 64 - 3;
1276 } 1278 }
1277 1279
1278 if (priv_modes & PrivMode_MouseX10) 1280 if (priv_modes & PrivMode_MouseX10)
1279 { 1281 {
1280 /* 1282 /*
… …
1312 fputc ('A', stderr); 1314 fputc ('A', stderr);
1313 if (key_state & 32) 1315 if (key_state & 32)
1314 fputc ('2', stderr); 1316 fputc ('2', stderr);
1315 fprintf (stderr, "]: <%d>, %d/%d\n", 1317 fprintf (stderr, "]: <%d>, %d/%d\n",
1316 button_number, 1318 button_number,
1317 x + 1, 1319 x,
1318 y + 1); 1320 y);
1319#endif 1321#endif
1320 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
1321 tt_printf ("\033[M%c%c%c", 1336 tt_printf ("\033[M%c%c%c",
1322 (code + button_number + key_state), 1337 code + button_number + key_state,
1323 (32 + x + 1), 1338 32 + x,
1324 (32 + y + 1)); 1339 32 + y);
1325} 1340}
1326 1341
1327/*{{{ process an X event */ 1342/*{{{ process an X event */
1328void 1343void
1329rxvt_term::x_cb (XEvent &ev) 1344rxvt_term::x_cb (XEvent &ev)
… …
2680 2695
2681 /* 8.3.87: NEXT LINE */ 2696 /* 8.3.87: NEXT LINE */
2682 case C1_NEL: /* ESC E */ 2697 case C1_NEL: /* ESC E */
2683 { 2698 {
2684 wchar_t nlcr[] = { C0_LF, C0_CR }; 2699 wchar_t nlcr[] = { C0_LF, C0_CR };
2685 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2700 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2686 } 2701 }
2687 break; 2702 break;
2688 2703
2689 /* kidnapped escape sequence: Should be 8.3.48 */ 2704 /* kidnapped escape sequence: Should be 8.3.48 */
2690 case C1_ESA: /* ESC G */ 2705 case C1_ESA: /* ESC G */
… …
2759 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,
2760 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 ,
2761 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
2762}; 2777};
2763 2778
2764#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2779#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2780 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2781 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2767#define get_byte_array_bit(array, bit) \ 2782#define get_byte_array_bit(array, bit) \
2768 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2783 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2769 2784
2770const unsigned char csi_defaults[] = 2785static const unsigned char csi_defaults[] =
2771 { 2786 {
2772 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, */
2773 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, */
2774 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, */
2775 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, [, \, ], ^, _, */
… …
2864 { 2879 {
2865 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2880 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2866 scr_soft_reset (); 2881 scr_soft_reset ();
2867 2882
2868 static const int pm_h[] = { 7, 25 }; 2883 static const int pm_h[] = { 7, 25 };
2869 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 };
2870 2885
2871 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);
2872 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);
2873 } 2888 }
2874 break; 2889 break;
2875 } 2890 }
2876 2891
2877 return; 2892 return;
… …
3654 { 67, PrivMode_BackSpace }, // DECBKM 3669 { 67, PrivMode_BackSpace }, // DECBKM
3655#endif 3670#endif
3656 { 1000, PrivMode_MouseX11 }, 3671 { 1000, PrivMode_MouseX11 },
3657 { 1002, PrivMode_MouseBtnEvent }, 3672 { 1002, PrivMode_MouseBtnEvent },
3658 { 1003, PrivMode_MouseAnyEvent }, 3673 { 1003, PrivMode_MouseAnyEvent },
3674#if ENABLE_FRILLS
3675 { 1005, PrivMode_ExtModeMouse },
3676#endif
3659 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3677 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3660 { 1011, PrivMode_Keypress }, // rxvt extension 3678 { 1011, PrivMode_Keypress }, // rxvt extension
3679#if ENABLE_FRILLS
3680 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3681#endif
3661 // 1035 enable modifiers for alt, numlock NYI 3682 // 1035 enable modifiers for alt, numlock NYI
3662 // 1036 send ESC for meta keys NYI 3683 // 1036 send ESC for meta keys NYI
3663 // 1037 send DEL for keypad delete NYI 3684 // 1037 send DEL for keypad delete NYI
3664 { 1047, PrivMode_Screen }, 3685 { 1047, PrivMode_Screen },
3665 // 1048 save and restore cursor 3686 // 1048 save and restore cursor, implemented in code
3666 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3687 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3667 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3688 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3668 { 2004, PrivMode_BracketPaste }, 3689 { 2004, PrivMode_BracketPaste },
3669 }; 3690 };
3670 3691
… …
3680 for (i = 0; i < nargs; i++) 3701 for (i = 0; i < nargs; i++)
3681 { 3702 {
3682 state = -1; 3703 state = -1;
3683 3704
3684 /* basic handling */ 3705 /* basic handling */
3685 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3706 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3686 if (argtopriv[j].argval == arg[i]) 3707 if (argtopriv[j].argval == arg[i])
3687 { 3708 {
3688 state = privcases (mode, argtopriv[j].bit); 3709 state = privcases (mode, argtopriv[j].bit);
3689 break; 3710 break;
3690 } 3711 }
… …
3768 case 1003: 3789 case 1003:
3769 if (state) 3790 if (state)
3770 { 3791 {
3771 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3792 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3772 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3793 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3794 mouse_row = mouse_col = 0;
3773 vt_emask_mouse = PointerMotionMask; 3795 vt_emask_mouse = PointerMotionMask;
3774 } 3796 }
3775 else 3797 else
3776 vt_emask_mouse = NoEventMask; 3798 vt_emask_mouse = NoEventMask;
3777 3799
… …
4003 4025
4004/* ---------------------------------------------------------------------- */ 4026/* ---------------------------------------------------------------------- */
4005/* Write data to the pty as typed by the user, pasted with the mouse, 4027/* Write data to the pty as typed by the user, pasted with the mouse,
4006 * or generated by us in response to a query ESC sequence. 4028 * or generated by us in response to a query ESC sequence.
4007 */ 4029 */
4008const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4030static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4009 4031
4010void 4032void
4011rxvt_term::tt_write (const char *data, unsigned int len) 4033rxvt_term::tt_write (const char *data, unsigned int len)
4012{ 4034{
4013 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4035 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4025 4047
4026 data += written; 4048 data += written;
4027 len -= written; 4049 len -= written;
4028 } 4050 }
4029 4051
4030 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4052 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4031 4053
4032 memcpy (v_buffer + v_buflen, data, len); 4054 memcpy (v_buffer + v_buflen, data, len);
4033 v_buflen += len; 4055 v_buflen += len;
4034 4056
4035 pty_ev.set (ev::READ | ev::WRITE); 4057 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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