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.251 by root, Sun Jan 8 07:55:36 2006 UTC vs.
Revision 1.255 by root, Wed Jan 11 03:13:26 2006 UTC

… …
867#endif 867#endif
868 /* nil */ ; 868 /* nil */ ;
869 } 869 }
870 } 870 }
871 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END))) 872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 873 return;
874 874
875 if (len <= 0) 875 if (len <= 0)
876 return; /* not mapped */ 876 return; /* not mapped */
877 877
… …
987 987
988 do 988 do
989 { 989 {
990 l = &ROW (row++); 990 l = &ROW (row++);
991 991
992 if (l->f & LINE_FILTERED) 992 if (!(l->f & LINE_FILTERED))
993 row++;
994 else
995 { 993 {
996 // line not filtered, mark it as filtered 994 // line not filtered, mark it as filtered
997 l->f |= LINE_FILTERED; 995 l->f |= LINE_FILTERED;
998 while (l->is_longer ()) 996 while (l->is_longer ())
999 { 997 {
1000 l = &ROW (++row); 998 l = &ROW (row++);
1001 l->f |= LINE_FILTERED; 999 l->f |= LINE_FILTERED;
1002 } 1000 }
1003 1001
1004 // and filter it 1002 // and filter it
1005 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1003 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
… …
1007 break; 1005 break;
1008 } 1006 }
1009 } 1007 }
1010 while (l->is_longer () && row < end_row); 1008 while (l->is_longer () && row < end_row);
1011 } 1009 }
1012 while (++row < end_row); 1010 while (row < end_row);
1013 } 1011 }
1014 1012
1015 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
1016 scrollbar_show (1); 1014 scrollbar_show (1);
1017#ifdef USE_XIM 1015#ifdef USE_XIM
… …
1329 1327
1330 break; 1328 break;
1331 1329
1332 case KeyRelease: 1330 case KeyRelease:
1333 { 1331 {
1334#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1335 KeySym ks; 1333 KeySym keysym;
1336 1334
1337 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1335 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1338#endif 1336#endif
1339 1337
1340#if ENABLE_FRILLS || ISO_14755 1338#if ENABLE_FRILLS || ISO_14755
1341 // ISO 14755 support 1339 // ISO 14755 support
1342 if (iso14755buf) 1340 if (iso14755buf)
… …
1347# endif 1345# endif
1348# if ISO_14755 1346# if ISO_14755
1349 // iso14755 part 5.2 handling: release time 1347 // iso14755 part 5.2 handling: release time
1350 // first: controls 1348 // first: controls
1351 if ((ev.xkey.state & ControlMask) 1349 if ((ev.xkey.state & ControlMask)
1352 && ((ks >= 0x40 && ks <= 0x5f) 1350 && ((keysym >= 0x40 && keysym <= 0x5f)
1353 || (ks >= 0x61 && ks <= 0x7f))) 1351 || (keysym >= 0x61 && keysym <= 0x7f)))
1354 { 1352 {
1355 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1353 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1356 commit_iso14755 (); 1354 commit_iso14755 ();
1357 goto skip_switch; 1355 goto skip_switch;
1358 } 1356 }
1359 1357
1360 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1361 if (i[0] == ks) 1359 if (i[0] == keysym)
1362 { 1360 {
1363 iso14755buf = ISO_14755_51 | i[1]; 1361 iso14755buf = ISO_14755_51 | i[1];
1364 commit_iso14755 (); 1362 commit_iso14755 ();
1365 goto skip_switch; 1363 goto skip_switch;
1366 } 1364 }
… …
1390 iso14755buf = 0; 1388 iso14755buf = 0;
1391 } 1389 }
1392#endif 1390#endif
1393 1391
1394 if (ev.xany.window == vt 1392 if (ev.xany.window == vt
1395 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) 1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1396 break; 1394 break;
1397 1395
1398#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1399 if (!(ev.xkey.state & ControlMask)) 1397 if (!(ev.xkey.state & ControlMask))
1400 slip_wheel_ev.stop (); 1398 slip_wheel_ev.stop ();
1401 else if (ks == XK_Control_L || ks == XK_Control_R) 1399 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1402 mouse_slip_wheel_speed = 0; 1400 mouse_slip_wheel_speed = 0;
1403#endif 1401#endif
1404 break; 1402 break;
1405 } 1403 }
1406 1404
… …
1573 1571
1574 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1575 scr_expose (ev.xexpose.x, ev.xexpose.y, 1573 scr_expose (ev.xexpose.x, ev.xexpose.y,
1576 ev.xexpose.width, ev.xexpose.height, False); 1574 ev.xexpose.width, ev.xexpose.height, False);
1577 1575
1578 scr_refresh (refresh_type); 1576 want_refresh = 1;
1579 } 1577 }
1580 else 1578 else
1581 { 1579 {
1582 XEvent unused_event; 1580 XEvent unused_event;
1583 1581
… …
1710 &unused_root_x, &unused_root_y, 1708 &unused_root_x, &unused_root_y,
1711 &ev.xbutton.x, &ev.xbutton.y, 1709 &ev.xbutton.x, &ev.xbutton.y,
1712 &unused_mask); 1710 &unused_mask);
1713 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1711 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1714 scrollbar_size ()); 1712 scrollbar_size ());
1715 scr_refresh (refresh_type); 1713 want_refresh = 1;
1716 refresh_limit = 0; 1714 refresh_limit = 0;
1717 scrollbar_show (1); 1715 scrollbar_show (1);
1718 } 1716 }
1719 break; 1717 break;
1720 } 1718 }
… …
2216 slip_wheel_ev.start (); 2214 slip_wheel_ev.start ();
2217 } 2215 }
2218 else 2216 else
2219 { 2217 {
2220# endif 2218# endif
2221# ifdef JUMP_MOUSE_WHEEL
2222 scr_page (v, i); 2219 scr_page (v, i);
2223 scr_refresh (SMOOTH_REFRESH);
2224 scrollbar_show (1); 2220 scrollbar_show (1);
2225# else
2226 while (i--)
2227 {
2228 scr_page (v, 1);
2229 scr_refresh (SMOOTH_REFRESH);
2230 scrollbar_show (1);
2231 }
2232# endif
2233# ifdef MOUSE_SLIP_WHEELING 2221# ifdef MOUSE_SLIP_WHEELING
2234 } 2222 }
2235#endif 2223# endif
2236 } 2224 }
2237 break; 2225 break;
2238#endif 2226#endif
2239 } 2227 }
2240 } 2228 }
… …
2834 refresh_limit++; 2822 refresh_limit++;
2835 else 2823 else
2836 { 2824 {
2837 flag = true; 2825 flag = true;
2838 scr_refresh (refresh_type); 2826 scr_refresh (refresh_type);
2839 flush_ev.stop (); 2827 want_refresh = 1;
2840 } 2828 }
2841 } 2829 }
2842 2830
2843 } 2831 }
2844 else 2832 else
… …
4462const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4450const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4463 4451
4464void 4452void
4465rxvt_term::tt_write (const char *data, unsigned int len) 4453rxvt_term::tt_write (const char *data, unsigned int len)
4466{ 4454{
4455 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4456 return;
4457
4467 if (pty.pty < 0) 4458 if (pty.pty < 0)
4468 return; 4459 return;
4469 4460
4470 if (v_buflen == 0) 4461 if (v_buflen == 0)
4471 { 4462 {

Diff Legend

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