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.446 by root, Fri Apr 2 19:27:38 2010 UTC vs.
Revision 1.471 by sf-exg, Thu Jan 20 16:41:23 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// scr_clear (true); This needs to be researched further! 982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
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)
… …
1430 && ev.xfocus.mode != NotifyGrab) 1445 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1446 focus_out ();
1432 break; 1447 break;
1433 1448
1434 case ConfigureNotify: 1449 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]) 1450 if (ev.xconfigure.window == parent[0])
1439 { 1451 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 1453 ;
1454
1455#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bgPixmap.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 (bgPixmap.set_position (x, y)
1469 || (bgPixmap.flags & bgPixmap_t::isInvalid))
1470 moved = true;
1471 }
1472#endif
1442 1473
1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1475 {
1445 seen_resize = 1; 1476 seen_resize = 1;
1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1478 }
1448 else 1479 else
1449 { 1480 {
1450#ifdef HAVE_BG_PIXMAP 1481#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ()) 1482 if (moved)
1452 { 1483 {
1453 if (mapped) 1484 if (mapped)
1454 update_background (); 1485 update_background ();
1455 else 1486 else
1456 bgPixmap.invalidate (); 1487 bgPixmap.invalidate ();
… …
1483 selection_send (ev.xselectionrequest); 1514 selection_send (ev.xselectionrequest);
1484 break; 1515 break;
1485 1516
1486 case MapNotify: 1517 case MapNotify:
1487#ifdef HAVE_BG_PIXMAP 1518#ifdef HAVE_BG_PIXMAP
1488 /* This is needed spcifically to fix the case of no window manager or a 1519 /* This is needed specifically to fix the case of no window manager or a
1489 * non-reparenting window manager. In those cases we never get first 1520 * non-reparenting window manager. In those cases we never get first
1490 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1521 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1491 * care of multiplicity of ConfigureNotify events arriwing while WM does 1522 * care of multiplicity of ConfigureNotify events arriving while WM does
1492 * reparenting. 1523 * reparenting.
1493 * We should not render background immidiately, as there could be several 1524 * We should not render background immediately, as there could be several
1494 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1525 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1495 * 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
1496 * bit of time for ConfigureNotifies to arrive. 1527 * bit of time for ConfigureNotifies to arrive.
1497 * 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
1498 * of ConfigureNotifys for the best results. 1529 * of ConfigureNotifys for the best results.
… …
1869 /* save the xbutton state (for ButtonRelease) */ 1900 /* save the xbutton state (for ButtonRelease) */
1870 MEvent.state = ev.state; 1901 MEvent.state = ev.state;
1871#ifdef MOUSE_REPORT_DOUBLECLICK 1902#ifdef MOUSE_REPORT_DOUBLECLICK
1872 if (ev.button == MEvent.button && clickintime) 1903 if (ev.button == MEvent.button && clickintime)
1873 { 1904 {
1874 /* same button, within alloted time */ 1905 /* same button, within allowed time */
1875 MEvent.clicks++; 1906 MEvent.clicks++;
1876 1907
1877 if (MEvent.clicks > 1) 1908 if (MEvent.clicks > 1)
1878 { 1909 {
1879 /* only report double clicks */ 1910 /* only report double clicks */
… …
2150 selection_make (ev.time); 2181 selection_make (ev.time);
2151 break; 2182 break;
2152 2183
2153 case Button2: 2184 case Button2:
2154 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2185 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2155 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2156 break; 2187 break;
2157 2188
2158#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
2159 case Button4: 2190 case Button4:
2160 case Button5: 2191 case Button5:
… …
2663 2694
2664 /* 8.3.87: NEXT LINE */ 2695 /* 8.3.87: NEXT LINE */
2665 case C1_NEL: /* ESC E */ 2696 case C1_NEL: /* ESC E */
2666 { 2697 {
2667 wchar_t nlcr[] = { C0_LF, C0_CR }; 2698 wchar_t nlcr[] = { C0_LF, C0_CR };
2668 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2699 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2669 } 2700 }
2670 break; 2701 break;
2671 2702
2672 /* kidnapped escape sequence: Should be 8.3.48 */ 2703 /* kidnapped escape sequence: Should be 8.3.48 */
2673 case C1_ESA: /* ESC G */ 2704 case C1_ESA: /* ESC G */
… …
2742 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,
2743 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 ,
2744 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
2745}; 2776};
2746 2777
2747#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2778#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2748 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2779 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2749 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2780 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2750#define get_byte_array_bit(array, bit) \ 2781#define get_byte_array_bit(array, bit) \
2751 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2782 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2752 2783
2753const unsigned char csi_defaults[] = 2784static const unsigned char csi_defaults[] =
2754 { 2785 {
2755 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, */
2756 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, */
2757 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, */
2758 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, [, \, ], ^, _, */
… …
2847 { 2878 {
2848 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2879 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2849 scr_soft_reset (); 2880 scr_soft_reset ();
2850 2881
2851 static const int pm_h[] = { 7, 25 }; 2882 static const int pm_h[] = { 7, 25 };
2852 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 };
2853 2884
2854 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);
2855 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);
2856 } 2887 }
2857 break; 2888 break;
2858 } 2889 }
2859 2890
2860 return; 2891 return;
… …
3231 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3262 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3232 */ 3263 */
3233void 3264void
3234rxvt_term::process_dcs_seq () 3265rxvt_term::process_dcs_seq ()
3235{ 3266{
3236 char *s;
3237 unicode_t eh;
3238
3239 /* 3267 /*
3240 * Not handled yet 3268 * Not handled yet
3241 */ 3269 */
3270
3271 unicode_t eh;
3242 s = get_to_st (eh); 3272 char *s = get_to_st (eh);
3243 if (s) 3273 if (s)
3244 free (s); 3274 free (s);
3245 3275
3246 return; 3276 return;
3247} 3277}
… …
3251 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3281 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3252 */ 3282 */
3253void 3283void
3254rxvt_term::process_osc_seq () 3284rxvt_term::process_osc_seq ()
3255{ 3285{
3256 unicode_t ch, eh;
3257 int arg; 3286 int arg;
3258 3287
3259 ch = cmd_getc (); 3288 unicode_t ch = cmd_getc ();
3260 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3289 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3261 arg = arg * 10 + (ch - '0'); 3290 arg = arg * 10 + (ch - '0');
3262 3291
3263 if (ch == ';') 3292 if (ch == ';')
3264 { 3293 {
3294 unicode_t eh;
3265 char *s = get_to_st (eh); 3295 char *s = get_to_st (eh);
3266 3296
3267 if (s) 3297 if (s)
3268 { 3298 {
3269 process_xterm_seq (arg, s, eh); 3299 process_xterm_seq (arg, s, eh);
… …
3394 process_color_seq (op, Color_pointer_fg, str, resp); 3424 process_color_seq (op, Color_pointer_fg, str, resp);
3395 break; 3425 break;
3396 case XTerm_Color_pointer_bg: 3426 case XTerm_Color_pointer_bg:
3397 process_color_seq (op, Color_pointer_bg, str, resp); 3427 process_color_seq (op, Color_pointer_bg, str, resp);
3398 break; 3428 break;
3429#ifdef OPTION_HC
3430 case XTerm_Color_HC:
3431 process_color_seq (op, Color_HC, str, resp);
3432 break;
3433 case XTerm_Color_HTC:
3434 process_color_seq (op, Color_HTC, str, resp);
3435 break;
3436#endif
3399#ifndef NO_BOLD_UNDERLINE_REVERSE 3437#ifndef NO_BOLD_UNDERLINE_REVERSE
3400 case XTerm_Color_RV:
3401 process_color_seq (op, Color_RV, str, resp);
3402 break;
3403 case Rxvt_Color_BD:
3404 case URxvt_Color_BD: 3438 case URxvt_Color_BD:
3405 process_color_seq (op, Color_BD, str, resp); 3439 process_color_seq (op, Color_BD, str, resp);
3406 break; 3440 break;
3407 case Rxvt_Color_UL:
3408 case URxvt_Color_UL: 3441 case URxvt_Color_UL:
3409 process_color_seq (op, Color_UL, str, resp); 3442 process_color_seq (op, Color_UL, str, resp);
3410 break; 3443 break;
3411 case URxvt_Color_IT: 3444 case URxvt_Color_IT:
3412 process_color_seq (op, Color_IT, str, resp); 3445 process_color_seq (op, Color_IT, str, resp);
… …
3421 { 3454 {
3422 bool changed = false; 3455 bool changed = false;
3423 3456
3424 if (ISSET_PIXCOLOR (Color_tint)) 3457 if (ISSET_PIXCOLOR (Color_tint))
3425 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3458 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3426 else
3427 changed = bgPixmap.unset_tint ();
3428 3459
3429 if (changed) 3460 if (changed)
3430 update_background (); 3461 update_background ();
3431 } 3462 }
3432 3463
… …
3448 { 3479 {
3449 int changed = 0; 3480 int changed = 0;
3450 3481
3451 if (*str != ';') 3482 if (*str != ';')
3452 { 3483 {
3453 /* reset to default scaling :*/
3454 bgPixmap.unset_geometry ();
3455 if (bgPixmap.set_file (str)) /* change pixmap */ 3484 if (bgPixmap.set_file (str)) /* change pixmap */
3485 {
3456 changed++; 3486 changed++;
3457 str = strchr (str, ';'); 3487 str = strchr (str, ';');
3458 if (str == NULL) 3488 if (str == NULL)
3459 bgPixmap.set_defaultGeometry (); 3489 bgPixmap.set_defaultGeometry ();
3490 else
3491 bgPixmap.set_geometry (str+1);
3492 }
3460 } 3493 }
3461 3494 else
3462 while (str)
3463 { 3495 {
3464 str++; 3496 str++;
3465 if (bgPixmap.set_geometry (str)) 3497 if (bgPixmap.set_geometry (str, true))
3466 changed++; 3498 changed++;
3467 str = strchr (str, ';');
3468 } 3499 }
3469 3500
3470 if (changed) 3501 if (changed)
3502 {
3503 if (bgPixmap.window_position_sensitive ())
3504 {
3505 int x, y;
3506 get_window_origin (x, y);
3507 bgPixmap.set_position (x, y);
3508 }
3471 update_background (); 3509 update_background ();
3510 }
3472 } 3511 }
3473 break; 3512 break;
3474#endif 3513#endif
3475 3514
3476 case XTerm_logfile: 3515 case XTerm_logfile:
… …
3579 { 3618 {
3580 if (mode == 'r') 3619 if (mode == 'r')
3581 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3620 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3582 else 3621 else
3583 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3622 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3623
3584 set_privmode (bit, state); 3624 set_privmode (bit, state);
3585 } 3625 }
3586 3626
3587 return state; 3627 return state;
3588} 3628}
… …
3607 { 6, PrivMode_relOrigin }, // DECOM 3647 { 6, PrivMode_relOrigin }, // DECOM
3608 { 7, PrivMode_Autowrap }, // DECAWM 3648 { 7, PrivMode_Autowrap }, // DECAWM
3609 // 8, auto-repeat keys // DECARM 3649 // 8, auto-repeat keys // DECARM
3610 { 9, PrivMode_MouseX10 }, 3650 { 9, PrivMode_MouseX10 },
3611 // 18 end FF to printer after print screen 3651 // 18 end FF to printer after print screen
3612 // 19 Print screen prints full screen/scorll region 3652 // 19 Print screen prints full screen/scroll region
3613 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3653 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3614#ifdef scrollBar_esc 3654#ifdef scrollBar_esc
3615 { scrollBar_esc, PrivMode_scrollBar }, 3655 { scrollBar_esc, PrivMode_scrollBar },
3616#endif 3656#endif
3617 { 35, PrivMode_ShiftKeys }, // rxvt extension 3657 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
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