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.453 by sf-exg, Wed Aug 18 17:45:42 2010 UTC vs.
Revision 1.468 by sf-exg, Tue Dec 21 12:20:20 2010 UTC

… …
771 771
772 default: 772 default:
773 { 773 {
774 int param = map_function_key (keysym); 774 int param = map_function_key (keysym);
775 if (param > 0) 775 if (param > 0)
776 {
777 int n = sprintf (kbuf,"\033[%d~", param); 776 sprintf (kbuf,"\033[%d~", param);
778 /*
779 * pass Shift/Control indicators for function keys ending with `~'
780 *
781 * eg,
782 * Prior = "ESC[5~"
783 * Shift+Prior = "ESC[5$"
784 * Ctrl+Prior = "ESC[5^"
785 * Ctrl+Shift+Prior = "ESC[5@"
786 */
787 kbuf[n-1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
788 }
789 else 777 else
790 newlen = 0; 778 newlen = 0;
791 } 779 }
792 break; 780 break;
793 } 781 }
… …
844 view_start = 0; 832 view_start = 0;
845 want_refresh = 1; 833 want_refresh = 1;
846 } 834 }
847 835
848 /* 836 /*
837 * these modifications only affect the static keybuffer
838 * pass Shift/Control indicators for function keys ending with `~'
839 *
840 * eg,
841 * Prior = "ESC[5~"
842 * Shift+Prior = "ESC[5$"
843 * Ctrl+Prior = "ESC[5^"
844 * Ctrl+Shift+Prior = "ESC[5@"
849 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 845 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
850 */ 846 */
847 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
851 849
852 /* escape prefix */ 850 /* escape prefix */
853 if (meta 851 if (meta
854#ifdef META8_OPTION 852#ifdef META8_OPTION
855 && meta_char == C0_ESC 853 && meta_char == C0_ESC
… …
891 commit_iso14755 (); 889 commit_iso14755 ();
892 890
893 return; 891 return;
894 } 892 }
895 893
896 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
897 if (i[0] == keysym) 895 if (i[0] == keysym)
898 { 896 {
899 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
900 commit_iso14755 (); 898 commit_iso14755 ();
901 899
… …
977rxvt_term::flush () 975rxvt_term::flush ()
978{ 976{
979 flush_ev.stop (); 977 flush_ev.stop ();
980 978
981#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
982 if (bgPixmap.check_clearChanged ()) 980 if (bgPixmap.flags & bgPixmap_t::hasChanged)
983 { 981 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
984// scr_clear (true); This needs to be researched further! 983// scr_clear (true); This needs to be researched further!
985 scr_touch (false); 984 scr_touch (false);
986 } 985 }
987#endif 986#endif
988 987
… …
1253{ 1252{
1254 int button_number, key_state = 0; 1253 int button_number, key_state = 0;
1255 int x, y; 1254 int x, y;
1256 int code = 32; 1255 int code = 32;
1257 1256
1258 x = Pixel2Col (ev.x); 1257 x = Pixel2Col (ev.x) + 1;
1259 y = Pixel2Row (ev.y); 1258 y = Pixel2Row (ev.y) + 1;
1259
1260 if (ev.type == MotionNotify) 1260 if (ev.type == MotionNotify)
1261 { 1261 {
1262 if (x == mouse_row && y == mouse_col) 1262 if (x == mouse_row && y == mouse_col)
1263 return; 1263 return;
1264
1264 mouse_row = x; 1265 mouse_row = x;
1265 mouse_col = y; 1266 mouse_col = y;
1266 code += 32; 1267 code += 32;
1267 } 1268 }
1268 1269
… …
1271 else 1272 else
1272 { 1273 {
1273 button_number = MEvent.button - Button1; 1274 button_number = MEvent.button - Button1;
1274 /* add 0x3D for wheel events, like xterm does */ 1275 /* add 0x3D for wheel events, like xterm does */
1275 if (button_number >= 3) 1276 if (button_number >= 3)
1276 button_number += (64 - 3); 1277 button_number += 64 - 3;
1277 } 1278 }
1278 1279
1279 if (priv_modes & PrivMode_MouseX10) 1280 if (priv_modes & PrivMode_MouseX10)
1280 { 1281 {
1281 /* 1282 /*
… …
1313 fputc ('A', stderr); 1314 fputc ('A', stderr);
1314 if (key_state & 32) 1315 if (key_state & 32)
1315 fputc ('2', stderr); 1316 fputc ('2', stderr);
1316 fprintf (stderr, "]: <%d>, %d/%d\n", 1317 fprintf (stderr, "]: <%d>, %d/%d\n",
1317 button_number, 1318 button_number,
1318 x + 1, 1319 x,
1319 y + 1); 1320 y);
1320#endif 1321#endif
1321 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
1322 tt_printf ("\033[M%c%c%c", 1336 tt_printf ("\033[M%c%c%c",
1323 (code + button_number + key_state), 1337 code + button_number + key_state,
1324 (32 + x + 1), 1338 32 + x,
1325 (32 + y + 1)); 1339 32 + y);
1326} 1340}
1327 1341
1328/*{{{ process an X event */ 1342/*{{{ process an X event */
1329void 1343void
1330rxvt_term::x_cb (XEvent &ev) 1344rxvt_term::x_cb (XEvent &ev)
… …
1432 && ev.xfocus.mode != NotifyGrab) 1446 && ev.xfocus.mode != NotifyGrab)
1433 focus_out (); 1447 focus_out ();
1434 break; 1448 break;
1435 1449
1436 case ConfigureNotify: 1450 case ConfigureNotify:
1437 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1438 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1439 szHint.width, szHint.height);*/
1440 if (ev.xconfigure.window == parent[0]) 1451 if (ev.xconfigure.window == parent[0])
1441 { 1452 {
1442 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1453 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1443 ; 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
1444 1474
1445 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1475 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1446 { 1476 {
1447 seen_resize = 1; 1477 seen_resize = 1;
1448 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1478 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1449 } 1479 }
1450 else 1480 else
1451 { 1481 {
1452#ifdef HAVE_BG_PIXMAP 1482#ifdef HAVE_BG_PIXMAP
1453 if (bgPixmap.window_position_sensitive ()) 1483 if (moved)
1454 { 1484 {
1455 if (mapped) 1485 if (mapped)
1456 update_background (); 1486 update_background ();
1457 else 1487 else
1458 bgPixmap.invalidate (); 1488 bgPixmap.invalidate ();
… …
2665 2695
2666 /* 8.3.87: NEXT LINE */ 2696 /* 8.3.87: NEXT LINE */
2667 case C1_NEL: /* ESC E */ 2697 case C1_NEL: /* ESC E */
2668 { 2698 {
2669 wchar_t nlcr[] = { C0_LF, C0_CR }; 2699 wchar_t nlcr[] = { C0_LF, C0_CR };
2670 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2700 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2671 } 2701 }
2672 break; 2702 break;
2673 2703
2674 /* kidnapped escape sequence: Should be 8.3.48 */ 2704 /* kidnapped escape sequence: Should be 8.3.48 */
2675 case C1_ESA: /* ESC G */ 2705 case C1_ESA: /* ESC G */
… …
2744 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,
2745 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 ,
2746 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
2747}; 2777};
2748 2778
2749#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2779#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2750 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2780 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2751 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2781 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2752#define get_byte_array_bit(array, bit) \ 2782#define get_byte_array_bit(array, bit) \
2753 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2783 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2754 2784
2755const unsigned char csi_defaults[] = 2785static const unsigned char csi_defaults[] =
2756 { 2786 {
2757 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, */
2758 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, */
2759 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, */
2760 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, [, \, ], ^, _, */
… …
2849 { 2879 {
2850 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2880 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2851 scr_soft_reset (); 2881 scr_soft_reset ();
2852 2882
2853 static const int pm_h[] = { 7, 25 }; 2883 static const int pm_h[] = { 7, 25 };
2854 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 };
2855 2885
2856 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);
2857 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);
2858 } 2888 }
2859 break; 2889 break;
2860 } 2890 }
2861 2891
2862 return; 2892 return;
… …
3452 { 3482 {
3453 int changed = 0; 3483 int changed = 0;
3454 3484
3455 if (*str != ';') 3485 if (*str != ';')
3456 { 3486 {
3457 /* reset to default scaling :*/
3458 bgPixmap.unset_geometry ();
3459 if (bgPixmap.set_file (str)) /* change pixmap */ 3487 if (bgPixmap.set_file (str)) /* change pixmap */
3488 {
3460 changed++; 3489 changed++;
3461 str = strchr (str, ';'); 3490 str = strchr (str, ';');
3462 if (str == NULL) 3491 if (str == NULL)
3463 bgPixmap.set_defaultGeometry (); 3492 bgPixmap.set_defaultGeometry ();
3493 else
3494 bgPixmap.set_geometry (str+1);
3495 }
3464 } 3496 }
3465 3497 else
3466 while (str)
3467 { 3498 {
3468 str++; 3499 str++;
3469 if (bgPixmap.set_geometry (str)) 3500 if (bgPixmap.set_geometry (str, true))
3470 changed++; 3501 changed++;
3471 str = strchr (str, ';');
3472 } 3502 }
3473 3503
3474 if (changed) 3504 if (changed)
3505 {
3506 if (bgPixmap.window_position_sensitive ())
3507 {
3508 int x, y;
3509 get_window_origin (x, y);
3510 bgPixmap.set_position (x, y);
3511 }
3475 update_background (); 3512 update_background ();
3513 }
3476 } 3514 }
3477 break; 3515 break;
3478#endif 3516#endif
3479 3517
3480 case XTerm_logfile: 3518 case XTerm_logfile:
… …
3612 { 6, PrivMode_relOrigin }, // DECOM 3650 { 6, PrivMode_relOrigin }, // DECOM
3613 { 7, PrivMode_Autowrap }, // DECAWM 3651 { 7, PrivMode_Autowrap }, // DECAWM
3614 // 8, auto-repeat keys // DECARM 3652 // 8, auto-repeat keys // DECARM
3615 { 9, PrivMode_MouseX10 }, 3653 { 9, PrivMode_MouseX10 },
3616 // 18 end FF to printer after print screen 3654 // 18 end FF to printer after print screen
3617 // 19 Print screen prints full screen/scorll region 3655 // 19 Print screen prints full screen/scroll region
3618 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3656 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3619#ifdef scrollBar_esc 3657#ifdef scrollBar_esc
3620 { scrollBar_esc, PrivMode_scrollBar }, 3658 { scrollBar_esc, PrivMode_scrollBar },
3621#endif 3659#endif
3622 { 35, PrivMode_ShiftKeys }, // rxvt extension 3660 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3631 { 67, PrivMode_BackSpace }, // DECBKM 3669 { 67, PrivMode_BackSpace }, // DECBKM
3632#endif 3670#endif
3633 { 1000, PrivMode_MouseX11 }, 3671 { 1000, PrivMode_MouseX11 },
3634 { 1002, PrivMode_MouseBtnEvent }, 3672 { 1002, PrivMode_MouseBtnEvent },
3635 { 1003, PrivMode_MouseAnyEvent }, 3673 { 1003, PrivMode_MouseAnyEvent },
3674#if ENABLE_FRILLS
3675 { 1005, PrivMode_ExtModeMouse },
3676#endif
3636 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3677 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3637 { 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
3638 // 1035 enable modifiers for alt, numlock NYI 3682 // 1035 enable modifiers for alt, numlock NYI
3639 // 1036 send ESC for meta keys NYI 3683 // 1036 send ESC for meta keys NYI
3640 // 1037 send DEL for keypad delete NYI 3684 // 1037 send DEL for keypad delete NYI
3641 { 1047, PrivMode_Screen }, 3685 { 1047, PrivMode_Screen },
3642 // 1048 save and restore cursor 3686 // 1048 save and restore cursor, implemented in code
3643 { 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 */
3644 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3688 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3645 { 2004, PrivMode_BracketPaste }, 3689 { 2004, PrivMode_BracketPaste },
3646 }; 3690 };
3647 3691
… …
3657 for (i = 0; i < nargs; i++) 3701 for (i = 0; i < nargs; i++)
3658 { 3702 {
3659 state = -1; 3703 state = -1;
3660 3704
3661 /* basic handling */ 3705 /* basic handling */
3662 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3706 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3663 if (argtopriv[j].argval == arg[i]) 3707 if (argtopriv[j].argval == arg[i])
3664 { 3708 {
3665 state = privcases (mode, argtopriv[j].bit); 3709 state = privcases (mode, argtopriv[j].bit);
3666 break; 3710 break;
3667 } 3711 }
… …
3745 case 1003: 3789 case 1003:
3746 if (state) 3790 if (state)
3747 { 3791 {
3748 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3792 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3749 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;
3750 vt_emask_mouse = PointerMotionMask; 3795 vt_emask_mouse = PointerMotionMask;
3751 } 3796 }
3752 else 3797 else
3753 vt_emask_mouse = NoEventMask; 3798 vt_emask_mouse = NoEventMask;
3754 3799
… …
3980 4025
3981/* ---------------------------------------------------------------------- */ 4026/* ---------------------------------------------------------------------- */
3982/* 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,
3983 * or generated by us in response to a query ESC sequence. 4028 * or generated by us in response to a query ESC sequence.
3984 */ 4029 */
3985const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4030static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3986 4031
3987void 4032void
3988rxvt_term::tt_write (const char *data, unsigned int len) 4033rxvt_term::tt_write (const char *data, unsigned int len)
3989{ 4034{
3990 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)))

Diff Legend

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