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.250 by root, Sun Jan 8 06:35:23 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
… …
1005 break; 1005 break;
1006 } 1006 }
1007 } 1007 }
1008 while (l->is_longer () && row < end_row); 1008 while (l->is_longer () && row < end_row);
1009 } 1009 }
1010 while (++row < end_row); 1010 while (row < end_row);
1011 } 1011 }
1012 1012
1013 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
1014 scrollbar_show (1); 1014 scrollbar_show (1);
1015#ifdef USE_XIM 1015#ifdef USE_XIM
… …
1327 1327
1328 break; 1328 break;
1329 1329
1330 case KeyRelease: 1330 case KeyRelease:
1331 { 1331 {
1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1333 KeySym ks; 1333 KeySym keysym;
1334 1334
1335 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 :/
1336#endif 1336#endif
1337 1337
1338#if ENABLE_FRILLS || ISO_14755 1338#if ENABLE_FRILLS || ISO_14755
1339 // ISO 14755 support 1339 // ISO 14755 support
1340 if (iso14755buf) 1340 if (iso14755buf)
… …
1345# endif 1345# endif
1346# if ISO_14755 1346# if ISO_14755
1347 // iso14755 part 5.2 handling: release time 1347 // iso14755 part 5.2 handling: release time
1348 // first: controls 1348 // first: controls
1349 if ((ev.xkey.state & ControlMask) 1349 if ((ev.xkey.state & ControlMask)
1350 && ((ks >= 0x40 && ks <= 0x5f) 1350 && ((keysym >= 0x40 && keysym <= 0x5f)
1351 || (ks >= 0x61 && ks <= 0x7f))) 1351 || (keysym >= 0x61 && keysym <= 0x7f)))
1352 { 1352 {
1353 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1353 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1354 commit_iso14755 (); 1354 commit_iso14755 ();
1355 goto skip_switch; 1355 goto skip_switch;
1356 } 1356 }
1357 1357
1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1359 if (i[0] == ks) 1359 if (i[0] == keysym)
1360 { 1360 {
1361 iso14755buf = ISO_14755_51 | i[1]; 1361 iso14755buf = ISO_14755_51 | i[1];
1362 commit_iso14755 (); 1362 commit_iso14755 ();
1363 goto skip_switch; 1363 goto skip_switch;
1364 } 1364 }
… …
1388 iso14755buf = 0; 1388 iso14755buf = 0;
1389 } 1389 }
1390#endif 1390#endif
1391 1391
1392 if (ev.xany.window == vt 1392 if (ev.xany.window == vt
1393 && 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)))
1394 break; 1394 break;
1395 1395
1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1397 if (!(ev.xkey.state & ControlMask)) 1397 if (!(ev.xkey.state & ControlMask))
1398 slip_wheel_ev.stop (); 1398 slip_wheel_ev.stop ();
1399 else if (ks == XK_Control_L || ks == XK_Control_R) 1399 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1400 mouse_slip_wheel_speed = 0; 1400 mouse_slip_wheel_speed = 0;
1401#endif 1401#endif
1402 break; 1402 break;
1403 } 1403 }
1404 1404
… …
1571 1571
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1573 scr_expose (ev.xexpose.x, ev.xexpose.y, 1573 scr_expose (ev.xexpose.x, ev.xexpose.y,
1574 ev.xexpose.width, ev.xexpose.height, False); 1574 ev.xexpose.width, ev.xexpose.height, False);
1575 1575
1576 scr_refresh (refresh_type); 1576 want_refresh = 1;
1577 } 1577 }
1578 else 1578 else
1579 { 1579 {
1580 XEvent unused_event; 1580 XEvent unused_event;
1581 1581
… …
1708 &unused_root_x, &unused_root_y, 1708 &unused_root_x, &unused_root_y,
1709 &ev.xbutton.x, &ev.xbutton.y, 1709 &ev.xbutton.x, &ev.xbutton.y,
1710 &unused_mask); 1710 &unused_mask);
1711 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1711 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1712 scrollbar_size ()); 1712 scrollbar_size ());
1713 scr_refresh (refresh_type); 1713 want_refresh = 1;
1714 refresh_limit = 0; 1714 refresh_limit = 0;
1715 scrollbar_show (1); 1715 scrollbar_show (1);
1716 } 1716 }
1717 break; 1717 break;
1718 } 1718 }
… …
2214 slip_wheel_ev.start (); 2214 slip_wheel_ev.start ();
2215 } 2215 }
2216 else 2216 else
2217 { 2217 {
2218# endif 2218# endif
2219# ifdef JUMP_MOUSE_WHEEL
2220 scr_page (v, i); 2219 scr_page (v, i);
2221 scr_refresh (SMOOTH_REFRESH);
2222 scrollbar_show (1); 2220 scrollbar_show (1);
2223# else
2224 while (i--)
2225 {
2226 scr_page (v, 1);
2227 scr_refresh (SMOOTH_REFRESH);
2228 scrollbar_show (1);
2229 }
2230# endif
2231# ifdef MOUSE_SLIP_WHEELING 2221# ifdef MOUSE_SLIP_WHEELING
2232 } 2222 }
2233#endif 2223# endif
2234 } 2224 }
2235 break; 2225 break;
2236#endif 2226#endif
2237 } 2227 }
2238 } 2228 }
… …
2832 refresh_limit++; 2822 refresh_limit++;
2833 else 2823 else
2834 { 2824 {
2835 flag = true; 2825 flag = true;
2836 scr_refresh (refresh_type); 2826 scr_refresh (refresh_type);
2837 flush_ev.stop (); 2827 want_refresh = 1;
2838 } 2828 }
2839 } 2829 }
2840 2830
2841 } 2831 }
2842 else 2832 else
… …
4460const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4450const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4461 4451
4462void 4452void
4463rxvt_term::tt_write (const char *data, unsigned int len) 4453rxvt_term::tt_write (const char *data, unsigned int len)
4464{ 4454{
4455 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4456 return;
4457
4465 if (pty.pty < 0) 4458 if (pty.pty < 0)
4466 return; 4459 return;
4467 4460
4468 if (v_buflen == 0) 4461 if (v_buflen == 0)
4469 { 4462 {

Diff Legend

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