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.226 by root, Sun Jan 1 15:03:49 2006 UTC vs.
Revision 1.440 by root, Tue Mar 30 23:00:35 2010 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 44 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 45 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 46 *----------------------------------------------------------------------*/
46 47
47/*{{{ includes: */ 48/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 49#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 50#include "rxvt.h"
51#include "rxvtperl.h"
50#include "version.h" 52#include "version.h"
51#include "command.h" 53#include "command.h"
52 54
53#if HAVE_SCHED_YIELD
54# include <sched.h>
55#endif
56
57#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
58# include "keyboard.h" 56# include "keyboard.h"
59#endif 57#endif
60 58
61#include <csignal> 59#include <csignal>
62 60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64
63/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
64 66
65#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
66
67// exception thrown when the command parser runs out of input data
68class out_of_input { } out_of_input;
69 68
70#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
71 70
72#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
73#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
97 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
98 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
99 98
100 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
102 XK_ISO_Lock, 0x21eb,
103 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
104 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
105 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
106 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
107 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
145 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
146 return; 144 return;
147 145
148 for (;;) 146 for (;;)
149 { 147 {
150 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
151 149
152 text_t t = l.t[x]; 150 text_t t = l.t[x];
153 151
154 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
155 { 153 {
… …
164 162
165void 163void
166rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
167{ 165{
168 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
169 rxvt_font *f = (*fs)[fs->find_font (ch)];
170 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
171 int len; 168 int len;
172
173 fname = rxvt_utf8towcs (f->name);
174 169
175# if ENABLE_COMBINING 170# if ENABLE_COMBINING
176 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
177 { 172 {
178 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
199 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
200 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
201 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
202 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
203 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = fs->get (chr[i]);
204 fname[i] = rxvt_utf8towcs (f->name);
204 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
205 207
206 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
207 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
208 210
209 if (y >= 0) 211 if (y >= 0)
210 { 212 {
211 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
212 x = 0; 214 x = 0;
213 } 215 }
214 216
215 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
216 218
217 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
218 220
219 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
220 { 222 {
… …
223 ch = *chr++; 225 ch = *chr++;
224 226
225 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
226 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
227 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
228# if !UNICODE3 230# if !UNICODE_3
229 if (ch >= 0x10000) 231 if (ch >= 0x10000)
230 ch = 0xfffd; 232 ch = 0xfffd;
231# endif 233# endif
232 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
235
236 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 237 scr_overlay_set (12, y, NOCHAR, r);
234 } 238 }
235 239
240// {
241// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf);
244// }
236 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
237 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
238
239 free (fname); 249 free (fname[i]);
250 }
240 251
241# if ENABLE_COMBINING 252# if ENABLE_COMBINING
242 if (alloc) 253 if (alloc)
243 delete [] alloc; 254 delete [] alloc;
244# endif 255# endif
… …
266 mb[0] = ch[0]; 277 mb[0] = ch[0];
267 len = 1; 278 len = 1;
268 } 279 }
269 280
270 if (len > 0) 281 if (len > 0)
271 tt_write ((unsigned char *)mb, len); 282 tt_write (mb, len);
272 else 283 else
273 scr_bell (); 284 scr_bell ();
274 } 285 }
275 286
276 iso14755buf = 0; 287 iso14755buf = 0;
277} 288}
278 289
279int 290static int
280rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
281{ 292{
282 // check wether this event corresponds to a hex digit 293 // check wether this event corresponds to a hex digit
283 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
284 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
285 { 296 {
… …
293 304
294 return -1; 305 return -1;
295} 306}
296#endif 307#endif
297 308
298/*{{{ Convert the keypress event into a string */ 309static inline KeySym
310translate_keypad (KeySym keysym, bool kp)
311{
312#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin
328 };
329
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
331 {
332 unsigned int index = keysym - XK_KP_Home;
333 keysym = kp ? keypadtrans[index] : XK_Home + index;
334 }
335 else if (keysym == XK_KP_Insert)
336 keysym = kp ? XK_KP_0 : XK_Insert;
337# ifndef NO_DELETE_KEY
338 else if (keysym == XK_KP_Delete)
339 keysym = kp ? XK_KP_Decimal : XK_Delete;
340# endif
341#endif
342 return keysym;
343}
344
345static inline int
346map_function_key (KeySym keysym)
347{
348 int param = 0;
349
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
351 {
352 param = 11 + keysym - XK_F1;
353 if (keysym >= XK_F17)
354 param += 4;
355 else if (keysym >= XK_F15)
356 param += 3;
357 else if (keysym >= XK_F11)
358 param += 2;
359 else if (keysym >= XK_F6)
360 param += 1;
361 }
362 else
363 switch (keysym)
364 {
365 case XK_Find:
366 param = 1;
367 break;
368 case XK_Insert:
369 param = 2;
370 break;
371#ifdef DXK_Remove
372 case DXK_Remove:
373#endif
374 case XK_Execute:
375 param = 3;
376 break;
377 case XK_Select:
378 param = 4;
379 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior:
382 param = 5;
383 break;
384 case XK_Next:
385 param = 6;
386 break;
387 case XK_Home:
388 param = 7;
389 break;
390 case XK_End:
391 param = 8;
392 break;
393#endif
394 case XK_Help:
395 param = 28;
396 break;
397 case XK_Menu:
398 param = 29;
399 break;
400 }
401 return param;
402}
403
299void 404void
300rxvt_term::lookup_key (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
301{ 406{
302 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
303 unsigned int newlen;
304 KeySym keysym; 408 KeySym keysym;
305#ifdef DEBUG_CMD
306 static int debug_key = 1; /* accessible by a debugger only */
307#endif
308 int valid_keysym; 409 int valid_keysym;
309 unsigned char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
411
412#if ISO_14755
413 if (iso14755buf & ISO_14755_52)
414 return;
415#endif
310 416
311 /* 417 /*
312 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 418 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
313 * escape sequence to toggle the Keypad. 419 * escape sequence to toggle the Keypad.
314 * 420 *
… …
319 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
320 426
321 if (numlock_state || (ev.state & ModNumLockMask)) 427 if (numlock_state || (ev.state & ModNumLockMask))
322 { 428 {
323 numlock_state = (ev.state & ModNumLockMask); 429 numlock_state = (ev.state & ModNumLockMask);
324 PrivMode ((!numlock_state), PrivMode_aplKP); 430 set_privmode (PrivMode_aplKP, !numlock_state);
325 } 431 }
326 432
327 kbuf[0] = 0; 433 kbuf[0] = 0;
328 434
329#ifdef USE_XIM 435#ifdef USE_XIM
… …
332 Status status_return; 438 Status status_return;
333 439
334#if 0 440#if 0
335#ifdef X_HAVE_UTF8_STRING 441#ifdef X_HAVE_UTF8_STRING
336 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 442 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
337 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 443 len = Xutf8LookupString (Input_Context, &ev, kbuf,
338 KBUFSZ, &keysym, &status_return); 444 KBUFSZ, &keysym, &status_return);
339 else 445 else
340#endif 446#endif
341#endif 447#endif
342 { 448 {
… …
379 || status_return == XLookupBoth; 485 || status_return == XLookupBoth;
380 } 486 }
381 else 487 else
382#endif 488#endif
383 { 489 {
384 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 490 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
385 valid_keysym = keysym != NoSymbol; 491 valid_keysym = keysym != NoSymbol;
386 } 492 }
387 493
388 if (valid_keysym) 494 if (valid_keysym)
389 { 495 {
… …
405#ifdef PAGING_CONTEXT_LINES 511#ifdef PAGING_CONTEXT_LINES
406 lnsppg = nrow - PAGING_CONTEXT_LINES; 512 lnsppg = nrow - PAGING_CONTEXT_LINES;
407#else 513#else
408 lnsppg = nrow * 4 / 5; 514 lnsppg = nrow * 4 / 5;
409#endif 515#endif
516 max_it (lnsppg, 1);
517
410 if (keysym == XK_Prior) 518 if (keysym == XK_Prior)
411 { 519 {
412 scr_page (UP, lnsppg); 520 scr_page (UP, lnsppg);
413 return; 521 return;
414 } 522 }
… …
441 scr_move_to (0, 1); 549 scr_move_to (0, 1);
442 return; 550 return;
443 } 551 }
444 else if (keysym == XK_End) 552 else if (keysym == XK_End)
445 { 553 {
446 scr_move_to (1, 0); 554 scr_move_to (1, 1);
447 return; 555 return;
448 } 556 }
449 } 557 }
450#endif 558#endif
451 } 559 }
… …
462 { 570 {
463 switch (keysym) 571 switch (keysym)
464 { 572 {
465 /* normal XTerm key bindings */ 573 /* normal XTerm key bindings */
466 case XK_Insert: /* Shift+Insert = paste mouse selection */ 574 case XK_Insert: /* Shift+Insert = paste mouse selection */
467 selection_request (ev.time, 0, 0); 575 selection_request (ev.time);
468 return; 576 return;
469#if TODO 577#if TODO
470 /* rxvt extras */ 578 /* rxvt extras */
471 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 579 case XK_KP_Add: /* Shift+KP_Add = bigger font */
472 change_font (FONT_UP); 580 change_font (FONT_UP);
… …
479 } 587 }
480 } 588 }
481 589
482#if ENABLE_FRILLS || ISO_14755 590#if ENABLE_FRILLS || ISO_14755
483 // ISO 14755 support 591 // ISO 14755 support
484 if (shft && ctrl) 592 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
485 { 593 {
486 int hv; 594 int hv;
487 595
488 if (iso14755buf & ISO_14755_51 596 if (iso14755buf & ISO_14755_51
489 && (keysym == XK_space || keysym == XK_KP_Space 597 && (keysym == XK_space || keysym == XK_KP_Space
… …
491 { 599 {
492 commit_iso14755 (); 600 commit_iso14755 ();
493 iso14755buf = ISO_14755_51; 601 iso14755buf = ISO_14755_51;
494# if ISO_14755 602# if ISO_14755
495 iso14755_51 (0); 603 iso14755_51 (0);
604# endif
605 return;
606 }
607 else if (keysym == XK_BackSpace)
608 {
609 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
610# if ISO_14755
611 iso14755_51 (iso14755buf & ISO_14755_MASK);
496# endif 612# endif
497 return; 613 return;
498 } 614 }
499 else if ((hv = hex_keyval (ev)) >= 0) 615 else if ((hv = hex_keyval (ev)) >= 0)
500 { 616 {
… …
505# endif 621# endif
506 return; 622 return;
507 } 623 }
508 else 624 else
509 { 625 {
510# if ENABLE_OVERLAY 626# if ISO_14755
511 scr_overlay_off (); 627 scr_overlay_off ();
512# endif 628# endif
513 iso14755buf = 0; 629 iso14755buf = 0;
514 } 630 }
515 } 631 }
632 else if (option (Opt_iso14755) &&
516 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 633 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
517 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 634 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
518 if (!(iso14755buf & ISO_14755_STARTED)) 635 if (!(iso14755buf & ISO_14755_STARTED))
519 { 636 {
520 iso14755buf |= ISO_14755_STARTED; 637 iso14755buf |= ISO_14755_STARTED;
521# if ENABLE_OVERLAY 638# if ISO_14755
522 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 639 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
523 scr_overlay_set (0, 0, "ISO 14755 mode"); 640 scr_overlay_set (0, 0, "ISO 14755 mode");
524# endif 641# endif
525 } 642 }
526#endif 643#endif
527 644
528#ifdef PRINTPIPE 645#ifdef PRINTPIPE
529 if (keysym == XK_Print) 646 if (keysym == XK_Print)
530 { 647 {
531 scr_printscreen (ctrl | shft); 648 scr_printscreen (ctrl | shft);
532 return; 649 return;
533 } 650 }
534#endif 651#endif
535 652
536 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 653 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
537 { 654 {
655 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
656 unsigned int newlen = 1;
657
658 switch (translate_keypad (keysym, kp))
538 { 659 {
660#ifndef NO_BACKSPACE_KEY
661 case XK_BackSpace:
662 if (priv_modes & PrivMode_HaveBackSpace)
663 {
664 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
665 ^ !!ctrl) ? '\b' : '\177';
666 kbuf[1] = '\0';
667 }
668 else
669 strcpy (kbuf, rs[Rs_backspace_key]);
670 break;
671#endif
672#ifndef NO_DELETE_KEY
673 case XK_Delete:
674 strcpy (kbuf, rs[Rs_delete_key]);
675 break;
676#endif
677 case XK_Tab:
678 if (shft)
679 strcpy (kbuf, "\033[Z");
680 else
681 {
682#ifdef CTRL_TAB_MAKES_META
683 if (ctrl)
684 meta = 1;
685#endif
686#ifdef MOD4_TAB_MAKES_META
687 if (ev.state & Mod4Mask)
688 meta = 1;
689#endif
539 newlen = 1; 690 newlen = 0;
540 switch (keysym) 691 }
692 break;
693
694 case XK_Up: /* "\033[A" */
695 case XK_Down: /* "\033[B" */
696 case XK_Right: /* "\033[C" */
697 case XK_Left: /* "\033[D" */
698 strcpy (kbuf, "\033[Z");
699 kbuf[2] = "DACB"[keysym - XK_Left];
700 /* do Shift first */
701 if (shft)
702 kbuf[2] = "dacb"[keysym - XK_Left];
703 else if (ctrl)
704 {
705 kbuf[1] = 'O';
706 kbuf[2] = "dacb"[keysym - XK_Left];
707 }
708 else if (priv_modes & PrivMode_aplCUR)
709 kbuf[1] = 'O';
710 break;
711
712 case XK_KP_Enter:
713 /* allow shift to override */
714 if (kp)
715 {
716 strcpy (kbuf, "\033OM");
717 break;
718 }
719
720 /* FALLTHROUGH */
721
722 case XK_Return:
723 if (priv_modes & PrivMode_LFNL)
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\012';
727 kbuf[2] = '\0';
728 }
729 else
730 {
731 kbuf[0] = '\015';
732 kbuf[1] = '\0';
733 }
734 break;
735
736 case XK_KP_F1: /* "\033OP" */
737 case XK_KP_F2: /* "\033OQ" */
738 case XK_KP_F3: /* "\033OR" */
739 case XK_KP_F4: /* "\033OS" */
740 strcpy (kbuf, "\033OP");
741 kbuf[2] += (keysym - XK_KP_F1);
742 break;
743
744 case XK_KP_Multiply: /* "\033Oj" : "*" */
745 case XK_KP_Add: /* "\033Ok" : "+" */
746 case XK_KP_Separator: /* "\033Ol" : "," */
747 case XK_KP_Subtract: /* "\033Om" : "-" */
748 case XK_KP_Decimal: /* "\033On" : "." */
749 case XK_KP_Divide: /* "\033Oo" : "/" */
750 case XK_KP_0: /* "\033Op" : "0" */
751 case XK_KP_1: /* "\033Oq" : "1" */
752 case XK_KP_2: /* "\033Or" : "2" */
753 case XK_KP_3: /* "\033Os" : "3" */
754 case XK_KP_4: /* "\033Ot" : "4" */
755 case XK_KP_5: /* "\033Ou" : "5" */
756 case XK_KP_6: /* "\033Ov" : "6" */
757 case XK_KP_7: /* "\033Ow" : "7" */
758 case XK_KP_8: /* "\033Ox" : "8" */
759 case XK_KP_9: /* "\033Oy" : "9" */
760 /* allow shift to override */
761 if (kp)
762 {
763 strcpy (kbuf, "\033Oj");
764 kbuf[2] += (keysym - XK_KP_Multiply);
765 }
766 else
767 {
768 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
769 kbuf[1] = '\0';
770 }
771 break;
772
773 default:
541 { 774 {
542#ifndef NO_BACKSPACE_KEY 775 int param = map_function_key (keysym);
543 case XK_BackSpace: 776 if (param > 0)
544 if (priv_modes & PrivMode_HaveBackSpace) 777 sprintf (kbuf,"\033[%d~", param);
545 {
546 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
547 ^ !!ctrl) ? '\b' : '\177';
548 kbuf[1] = '\0';
549 }
550 else 778 else
551 strcpy (kbuf, key_backspace);
552 break;
553#endif
554#ifndef NO_DELETE_KEY
555# ifdef XK_KP_Prior
556 case XK_KP_Delete:
557 /* allow shift to override */
558 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
559 {
560 strcpy (kbuf, "\033On");
561 break;
562 }
563 /* FALLTHROUGH */
564# endif
565 case XK_Delete:
566 strcpy (kbuf, key_delete);
567 break;
568#endif
569 case XK_Tab:
570 if (shft)
571 strcpy (kbuf, "\033[Z");
572 else
573 {
574#ifdef CTRL_TAB_MAKES_META
575 if (ctrl)
576 meta = 1;
577#endif
578#ifdef MOD4_TAB_MAKES_META
579 if (ev.state & Mod4Mask)
580 meta = 1;
581#endif
582 newlen = 0;
583 }
584 break;
585
586#ifdef XK_KP_Left
587 case XK_KP_Up: /* \033Ox or standard */
588 case XK_KP_Down: /* \033Or or standard */
589 case XK_KP_Right: /* \033Ov or standard */
590 case XK_KP_Left: /* \033Ot or standard */
591 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
592 {
593 strcpy (kbuf, "\033OZ");
594 kbuf[2] = "txvr"[keysym - XK_KP_Left];
595 break;
596 }
597 else
598 /* translate to std. cursor key */
599 keysym = XK_Left + (keysym - XK_KP_Left);
600 /* FALLTHROUGH */
601#endif
602 case XK_Up: /* "\033[A" */
603 case XK_Down: /* "\033[B" */
604 case XK_Right: /* "\033[C" */
605 case XK_Left: /* "\033[D" */
606 strcpy (kbuf, "\033[Z");
607 kbuf[2] = "DACB"[keysym - XK_Left];
608 /* do Shift first */
609 if (shft)
610 kbuf[2] = "dacb"[keysym - XK_Left];
611 else if (ctrl)
612 {
613 kbuf[1] = 'O';
614 kbuf[2] = "dacb"[keysym - XK_Left];
615 }
616 else if (priv_modes & PrivMode_aplCUR)
617 kbuf[1] = 'O';
618 break;
619
620#ifndef UNSHIFTED_SCROLLKEYS
621# ifdef XK_KP_Prior
622 case XK_KP_Prior:
623 /* allow shift to override */
624 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
625 {
626 strcpy (kbuf, "\033Oy");
627 break;
628 }
629 /* FALLTHROUGH */
630# endif
631 case XK_Prior:
632 strcpy (kbuf, "\033[5~");
633 break;
634# ifdef XK_KP_Next
635 case XK_KP_Next:
636 /* allow shift to override */
637 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
638 {
639 strcpy (kbuf, "\033Os");
640 break;
641 }
642 /* FALLTHROUGH */
643# endif
644 case XK_Next:
645 strcpy (kbuf, "\033[6~");
646 break;
647#endif
648 case XK_KP_Enter:
649 /* allow shift to override */
650 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
651 {
652 strcpy (kbuf, "\033OM");
653 break;
654 }
655
656 /* FALLTHROUGH */
657
658 case XK_Return:
659 if (priv_modes & PrivMode_LFNL)
660 {
661 kbuf[0] = '\015';
662 kbuf[1] = '\012';
663 kbuf[2] = '\0';
664 }
665 else
666 {
667 kbuf[0] = '\015';
668 kbuf[1] = '\0';
669 }
670 break;
671
672#ifdef XK_KP_Begin
673 case XK_KP_Begin:
674 strcpy (kbuf, "\033Ou");
675 break;
676
677#endif
678 case XK_KP_F1: /* "\033OP" */
679 case XK_KP_F2: /* "\033OQ" */
680 case XK_KP_F3: /* "\033OR" */
681 case XK_KP_F4: /* "\033OS" */
682 strcpy (kbuf, "\033OP");
683 kbuf[2] += (keysym - XK_KP_F1);
684 break;
685
686 case XK_KP_Multiply: /* "\033Oj" : "*" */
687 case XK_KP_Add: /* "\033Ok" : "+" */
688 case XK_KP_Separator: /* "\033Ol" : "," */
689 case XK_KP_Subtract: /* "\033Om" : "-" */
690 case XK_KP_Decimal: /* "\033On" : "." */
691 case XK_KP_Divide: /* "\033Oo" : "/" */
692 case XK_KP_0: /* "\033Op" : "0" */
693 case XK_KP_1: /* "\033Oq" : "1" */
694 case XK_KP_2: /* "\033Or" : "2" */
695 case XK_KP_3: /* "\033Os" : "3" */
696 case XK_KP_4: /* "\033Ot" : "4" */
697 case XK_KP_5: /* "\033Ou" : "5" */
698 case XK_KP_6: /* "\033Ov" : "6" */
699 case XK_KP_7: /* "\033Ow" : "7" */
700 case XK_KP_8: /* "\033Ox" : "8" */
701 case XK_KP_9: /* "\033Oy" : "9" */
702 /* allow shift to override */
703 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
704 {
705 strcpy (kbuf, "\033Oj");
706 kbuf[2] += (keysym - XK_KP_Multiply);
707 }
708 else
709 {
710 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
711 kbuf[1] = '\0';
712 }
713 break;
714
715 case XK_Find:
716 strcpy (kbuf, "\033[1~");
717 break;
718
719#ifdef XK_KP_End
720 case XK_KP_Insert:
721 /* allow shift to override */
722 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
723 {
724 strcpy (kbuf, "\033Op");
725 break;
726 }
727 /* FALLTHROUGH */
728#endif
729 case XK_Insert:
730 strcpy (kbuf, "\033[2~");
731 break;
732#ifdef DXK_Remove /* support for DEC remove like key */
733 case DXK_Remove:
734 /* FALLTHROUGH */
735#endif
736 case XK_Execute:
737 strcpy (kbuf, "\033[3~");
738 break;
739 case XK_Select:
740 strcpy (kbuf, "\033[4~");
741 break;
742#ifdef XK_KP_End
743 case XK_KP_End:
744 /* allow shift to override */
745 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
746 {
747 strcpy (kbuf, "\033Oq");
748 break;
749 }
750 /* FALLTHROUGH */
751#endif
752 case XK_End:
753 strcpy (kbuf, KS_END);
754 break;
755#ifdef XK_KP_Home
756 case XK_KP_Home:
757 /* allow shift to override */
758 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
759 {
760 strcpy (kbuf, "\033Ow");
761 break;
762 }
763 /* FALLTHROUGH */
764#endif
765 case XK_Home:
766 strcpy (kbuf, KS_HOME);
767 break;
768
769#define FKEY(n, fkey) \
770 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
771
772 case XK_F1: /* "\033[11~" */
773 case XK_F2: /* "\033[12~" */
774 case XK_F3: /* "\033[13~" */
775 case XK_F4: /* "\033[14~" */
776 case XK_F5: /* "\033[15~" */
777 FKEY (11, XK_F1);
778 break;
779 case XK_F6: /* "\033[17~" */
780 case XK_F7: /* "\033[18~" */
781 case XK_F8: /* "\033[19~" */
782 case XK_F9: /* "\033[20~" */
783 case XK_F10: /* "\033[21~" */
784 FKEY (17, XK_F6);
785 break;
786 case XK_F11: /* "\033[23~" */
787 case XK_F12: /* "\033[24~" */
788 case XK_F13: /* "\033[25~" */
789 case XK_F14: /* "\033[26~" */
790 FKEY (23, XK_F11);
791 break;
792 case XK_F15: /* "\033[28~" */
793 case XK_F16: /* "\033[29~" */
794 FKEY (28, XK_F15);
795 break;
796 case XK_Help: /* "\033[28~" */
797 FKEY (28, XK_Help);
798 break;
799 case XK_Menu: /* "\033[29~" */
800 FKEY (29, XK_Menu);
801 break;
802 case XK_F17: /* "\033[31~" */
803 case XK_F18: /* "\033[32~" */
804 case XK_F19: /* "\033[33~" */
805 case XK_F20: /* "\033[34~" */
806 case XK_F21: /* "\033[35~" */
807 case XK_F22: /* "\033[36~" */
808 case XK_F23: /* "\033[37~" */
809 case XK_F24: /* "\033[38~" */
810 case XK_F25: /* "\033[39~" */
811 case XK_F26: /* "\033[40~" */
812 case XK_F27: /* "\033[41~" */
813 case XK_F28: /* "\033[42~" */
814 case XK_F29: /* "\033[43~" */
815 case XK_F30: /* "\033[44~" */
816 case XK_F31: /* "\033[45~" */
817 case XK_F32: /* "\033[46~" */
818 case XK_F33: /* "\033[47~" */
819 case XK_F34: /* "\033[48~" */
820 case XK_F35: /* "\033[49~" */
821 FKEY (31, XK_F17);
822 break;
823#undef FKEY
824 default:
825 newlen = 0; 779 newlen = 0;
826 break;
827 } 780 }
828 781 break;
829 if (newlen)
830 len = strlen (kbuf);
831 } 782 }
783
784 if (newlen)
785 len = strlen (kbuf);
832 786
833 /* 787 /*
834 * Pass meta for all function keys, if 'meta' option set 788 * Pass meta for all function keys, if 'meta' option set
835 */ 789 */
836#ifdef META8_OPTION 790#ifdef META8_OPTION
… …
853 { 807 {
854#ifdef META8_OPTION 808#ifdef META8_OPTION
855 /* set 8-bit on */ 809 /* set 8-bit on */
856 if (meta && (meta_char == 0x80)) 810 if (meta && (meta_char == 0x80))
857 { 811 {
858 unsigned char *ch; 812 char *ch;
859 813
860 for (ch = kbuf; ch < kbuf + len; ch++) 814 for (ch = kbuf; ch < kbuf + len; ch++)
861 *ch |= 0x80; 815 *ch |= 0x80;
862 816
863 meta = 0; 817 meta = 0;
… …
865#endif 819#endif
866 /* nil */ ; 820 /* nil */ ;
867 } 821 }
868 } 822 }
869 823
824 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
825 return;
826
870 if (len <= 0) 827 if (len <= 0)
871 return; /* not mapped */ 828 return; /* not mapped */
872 829
873 if (OPTION (Opt_scrollTtyKeypress)) 830 if (option (Opt_scrollTtyKeypress))
874 if (view_start) 831 if (view_start)
875 { 832 {
876 view_start = 0; 833 view_start = 0;
877 want_refresh = 1; 834 want_refresh = 1;
878 } 835 }
… …
896#ifdef META8_OPTION 853#ifdef META8_OPTION
897 && meta_char == C0_ESC 854 && meta_char == C0_ESC
898#endif 855#endif
899 ) 856 )
900 { 857 {
901 const unsigned char ch = C0_ESC; 858 const char ch = C0_ESC;
902 tt_write (&ch, 1); 859 tt_write (&ch, 1);
903 } 860 }
904 861
905#if defined(DEBUG_CMD)
906 /* Display keyboard buffer contents */
907 unsigned char *p;
908 int i;
909
910 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
911 for (i = 0, p = kbuf; i < len; i++, p++)
912 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
913 fprintf (stderr, "'\n");
914#endif /* DEBUG_CMD */
915 tt_write (kbuf, (unsigned int)len); 862 tt_write (kbuf, (unsigned int)len);
916} 863}
917/*}}} */
918 864
865void
866rxvt_term::key_release (XKeyEvent &ev)
867{
868#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
869 KeySym keysym;
870
871 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
872#endif
873
874#if ENABLE_FRILLS || ISO_14755
875 // ISO 14755 support
876 if (iso14755buf)
877 if (iso14755buf & ISO_14755_52)
878 {
879# if ISO_14755
880 scr_overlay_off ();
881# endif
882# if ISO_14755
883 // iso14755 part 5.2 handling: release time
884 // first: controls
885 if ((ev.state & ControlMask)
886 && ((keysym >= 0x40 && keysym <= 0x5f)
887 || (keysym >= 0x61 && keysym <= 0x7f)))
888 {
889 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
890 commit_iso14755 ();
891
892 return;
893 }
894
895 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
896 if (i[0] == keysym)
897 {
898 iso14755buf = ISO_14755_51 | i[1];
899 commit_iso14755 ();
900
901 return;
902 }
903
904 scr_bell ();
905# endif
906 iso14755buf = 0;
907
908 return;
909 }
910 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
911 {
912# if ISO_14755
913 scr_overlay_off ();
914# endif
915 if (iso14755buf & ISO_14755_51)
916 commit_iso14755 ();
917#if ISO_14755
918 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
919 {
920 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
921
922 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
923 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
924 }
925# endif
926 else
927 iso14755buf = 0;
928 }
929#endif
930
931 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
932 return;
933
934#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
935 if (!(ev.state & ControlMask))
936 slip_wheel_ev.stop ();
937 else if (keysym == XK_Control_L || keysym == XK_Control_R)
938 mouse_slip_wheel_speed = 0;
939#endif
940}
941
919#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 942#if defined (KEYSYM_RESOURCE)
920/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
921/* attempt to `write' count to the input buffer */
922unsigned int 943unsigned int
923rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 944rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 945{
925 unsigned int n, s; 946 unsigned int n, s;
926 947
927 n = cmdbuf_ptr - cmdbuf_base; 948 n = cmdbuf_ptr - cmdbuf_base;
928 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 949 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
954void 975void
955rxvt_term::flush () 976rxvt_term::flush ()
956{ 977{
957 flush_ev.stop (); 978 flush_ev.stop ();
958 979
959#ifdef TRANSPARENT 980#ifdef HAVE_BG_PIXMAP
960 if (want_full_refresh) 981 if (bgPixmap.check_clearChanged ())
961 { 982 {
962 want_full_refresh = 0; 983// scr_clear (true); This needs to be researched further!
963 scr_clear ();
964 scr_touch (false); 984 scr_touch (false);
965 } 985 }
966#endif 986#endif
967 987
968 if (want_refresh) 988 if (want_refresh)
969 { 989 {
990 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
991 {
992 int row = view_start;
993 int end_row = row + nrow;
994
995 while (row > top_row && ROW (row - 1).is_longer ())
996 --row;
997
998 do
999 {
1000 int start_row = row;
1001 line_t *l;
1002
1003 do
1004 {
1005 l = &ROW (row++);
1006
1007 if (!(l->f & LINE_FILTERED))
1008 {
1009 // line not filtered, mark it as filtered
1010 l->f |= LINE_FILTERED;
1011 while (l->is_longer ())
1012 {
1013 l = &ROW (row++);
1014 l->f |= LINE_FILTERED;
1015 }
1016
1017 // and filter it
1018 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1019
1020 break;
1021 }
1022 }
1023 while (l->is_longer () && row < end_row);
1024 }
1025 while (row < end_row);
1026 }
1027
970 scr_refresh (refresh_type); 1028 scr_refresh ();
971 scrollbar_show (1); 1029 scrollBar.show (1);
972#ifdef USE_XIM 1030#ifdef USE_XIM
973 IMSendSpot (); 1031 IMSendSpot ();
974#endif 1032#endif
975 } 1033 }
976 1034
977 display->flush (); 1035 display->flush ();
978} 1036}
979 1037
1038/* checks wether a refresh is requested and starts the refresh timer */
980void 1039void
981rxvt_term::check_cb (check_watcher &w) 1040rxvt_term::refresh_check ()
982{ 1041{
983 SET_R (this); 1042 if (want_refresh && !flush_ev.is_active ())
984 SET_LOCALE (locale); 1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
985 1044
986 display->flush (); 1045 display->flush ();
987
988 if (want_refresh && !flush_ev.active)
989 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
990} 1046}
991 1047
992void 1048void
993rxvt_term::flush_cb (time_watcher &w) 1049rxvt_term::flush_cb (ev::timer &w, int revents)
994{ 1050{
995 SET_R (this); 1051 make_current ();
996 SET_LOCALE (locale);
997 1052
998 refresh_limit = 1;
999 refresh_count = 0; 1053 refresh_count = 0;
1000 flush (); 1054 flush ();
1001} 1055}
1002 1056
1003#ifdef CURSOR_BLINK 1057#ifdef CURSOR_BLINK
1004void 1058void
1005rxvt_term::cursor_blink_cb (time_watcher &w) 1059rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1006{ 1060{
1007 hidden_cursor = !hidden_cursor; 1061 hidden_cursor = !hidden_cursor;
1008 want_refresh = 1; 1062 want_refresh = 1;
1009 1063 refresh_check ();
1010 w.start (w.at + BLINK_INTERVAL);
1011} 1064}
1012#endif 1065#endif
1013 1066
1014#ifdef TEXT_BLINK 1067#ifdef TEXT_BLINK
1015void 1068void
1016rxvt_term::text_blink_cb (time_watcher &w) 1069rxvt_term::text_blink_cb (ev::timer &w, int revents)
1017{ 1070{
1018 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1071 if (scr_refresh_rend (RS_Blink, RS_Blink))
1019 { 1072 {
1020 hidden_text = !hidden_text; 1073 hidden_text = !hidden_text;
1021 want_refresh = 1; 1074 want_refresh = 1;
1022 w.start (w.at + TEXT_BLINK_INTERVAL); 1075 refresh_check ();
1023 } 1076 }
1077 else
1078 w.stop ();
1024} 1079}
1025#endif 1080#endif
1026 1081
1027#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1028void 1083void
1029rxvt_term::cont_scroll_cb (time_watcher &w) 1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1030{ 1085{
1031 if ((scrollbar_isUp() || scrollbar_isDn()) && 1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1032 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1033 { 1088 {
1034 refresh_type |= SMOOTH_REFRESH;
1035 want_refresh = 1; 1089 want_refresh = 1;
1036 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 refresh_check ();
1037 } 1091 }
1092 else
1093 w.stop ();
1038} 1094}
1039#endif 1095#endif
1040 1096
1041#ifdef SELECTION_SCROLLING 1097#ifdef SELECTION_SCROLLING
1042void 1098void
1043rxvt_term::sel_scroll_cb (time_watcher &w) 1099rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1044{ 1100{
1045 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1101 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1046 { 1102 {
1047 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1103 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1048 refresh_type |= SMOOTH_REFRESH;
1049 want_refresh = 1; 1104 want_refresh = 1;
1050 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1105 refresh_check ();
1051 } 1106 }
1107 else
1108 w.stop ();
1052} 1109}
1053#endif 1110#endif
1054 1111
1055#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1112#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1056void 1113void
1057rxvt_term::slip_wheel_cb (time_watcher &w) 1114rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1058{ 1115{
1059 if (mouse_slip_wheel_speed == 0 1116 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1060 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1061 : scr_page (UP, mouse_slip_wheel_speed))
1062 { 1117 {
1063 if (view_start == nsaved ||
1064 view_start == 0)
1065 mouse_slip_wheel_speed = 0;
1066
1067 refresh_type |= SMOOTH_REFRESH;
1068 want_refresh = 1; 1118 want_refresh = 1;
1069 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1119 refresh_check ();
1120 }
1121
1122 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1070 } 1123 {
1124 mouse_slip_wheel_speed = 0;
1125 w.stop ();
1126 }
1071} 1127}
1128#endif
1129
1130#if LINUX_YIELD_HACK
1131static struct event_handler
1132{
1133 ev::prepare yield_ev;
1134
1135 void yield_cb (ev::prepare &w, int revents)
1136 {
1137 // this should really be sched_yield(), but the linux guys thought
1138 // that giving a process calling sched_yield () less cpu time than
1139 // ones with high nice levels is a useful thing to do. It surely is is
1140 // allowed by the sus... as is returning ENOSYS.
1141 // since the linux guys additionally thought that breaking the only
1142 // known workaroudn against their unusable sched_yield hack is cool,
1143 // we just nanosleep a bit and hope for the best.
1144
1145 struct timespec ts = { 0, 1000 };
1146 nanosleep (&ts, 0);
1147
1148 w.stop ();
1149 }
1150
1151 event_handler ()
1152 : yield_ev (this, &event_handler::yield_cb)
1153 {
1154 }
1155} event_handler;
1072#endif 1156#endif
1073 1157
1074bool 1158bool
1075rxvt_term::pty_fill () 1159rxvt_term::pty_fill ()
1076{ 1160{
1077 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1078 1162
1079 if (CBUFSIZ == n) 1163 if (CBUFSIZ == n)
1080 { 1164 {
1081 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1082 n = 0; 1166 n = 0;
1083 } 1167 }
1084 1168
1085 memmove (cmdbuf_base, cmdbuf_ptr, n); 1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1086 cmdbuf_ptr = cmdbuf_base; 1170 cmdbuf_ptr = cmdbuf_base;
1087 cmdbuf_endp = cmdbuf_ptr + n; 1171 cmdbuf_endp = cmdbuf_ptr + n;
1088 1172
1089 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1090 1174
1091 if (r > 0) 1175 if (r > 0)
1092 { 1176 {
1093 cmdbuf_endp += r; 1177 cmdbuf_endp += r;
1094 return true; 1178 return true;
1095 } 1179 }
1096 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1180 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1097 { 1181 {
1098#if HAVE_SCHED_YIELD 1182#if LINUX_YIELD_HACK
1099 sched_yield (); 1183 if (display->is_local)
1184 event_handler.yield_ev.start ();
1100#endif 1185#endif
1101 } 1186 }
1102 else 1187 else
1103 { 1188 {
1104 pty_ev.stop (); 1189 pty_ev.stop ();
1105 1190
1106 if (!OPTION (Opt_hold)) 1191 if (!option (Opt_hold))
1107 destroy (); 1192 destroy ();
1108 } 1193 }
1109 1194
1110 return false; 1195 return false;
1111} 1196}
1112 1197
1113void 1198void
1114rxvt_term::pty_cb (io_watcher &w, short revents) 1199rxvt_term::pty_cb (ev::io &w, int revents)
1115{ 1200{
1116 SET_R (this); 1201 make_current ();
1117 SET_LOCALE (locale);
1118 1202
1119 if (revents & EVENT_READ) 1203 if (revents & ev::READ)
1120 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1121 while (pty_fill ()) 1205 for (int i = CBUFCNT; i-- && pty_fill (); )
1122 if (cmd_parse ()) 1206 cmd_parse ();
1123 break;
1124 1207
1125 if (revents & EVENT_WRITE) 1208 if (revents & ev::WRITE)
1126 pty_write (); 1209 pty_write ();
1210
1211 refresh_check ();
1127} 1212}
1128 1213
1129void 1214void
1130rxvt_term::pointer_unblank () 1215rxvt_term::pointer_unblank ()
1131{ 1216{
1132 XDefineCursor (display->display, vt, TermWin_cursor); 1217 XDefineCursor (dpy, vt, TermWin_cursor);
1133 recolour_cursor (); 1218 recolour_cursor ();
1134 1219
1135#ifdef POINTER_BLANK 1220#ifdef POINTER_BLANK
1136 hidden_pointer = 0; 1221 hidden_pointer = 0;
1137 1222
1138 if (OPTION (Opt_pointerBlank)) 1223 if (option (Opt_pointerBlank))
1139 pointer_ev.start (NOW + pointerBlankDelay); 1224 pointer_ev.start (pointerBlankDelay);
1140#endif 1225#endif
1141} 1226}
1142 1227
1143#ifdef POINTER_BLANK 1228#ifdef POINTER_BLANK
1144void 1229void
1145rxvt_term::pointer_blank () 1230rxvt_term::pointer_blank ()
1146{ 1231{
1147 if (! OPTION (Opt_pointerBlank)) 1232 if (!option (Opt_pointerBlank))
1148 return; 1233 return;
1149 1234
1150 XDefineCursor (display->display, vt, display->blank_cursor); 1235 XDefineCursor (dpy, vt, display->blank_cursor);
1151 XFlush (display->display); 1236 XFlush (dpy);
1152 1237
1153 hidden_pointer = 1; 1238 hidden_pointer = 1;
1154} 1239}
1155 1240
1156void 1241void
1157rxvt_term::pointer_cb (time_watcher &w) 1242rxvt_term::pointer_cb (ev::timer &w, int revents)
1158{ 1243{
1159 SET_R (this); 1244 make_current ();
1160 SET_LOCALE (locale);
1161 1245
1162 pointer_blank (); 1246 pointer_blank ();
1163} 1247}
1164#endif 1248#endif
1165 1249
1166void 1250void
1167rxvt_term::mouse_report (XButtonEvent &ev) 1251rxvt_term::mouse_report (XButtonEvent &ev)
1168{ 1252{
1169 int button_number, key_state = 0; 1253 int button_number, key_state = 0;
1170 int x, y; 1254 int x, y;
1255 int code = 32;
1171 1256
1172 x = ev.x; 1257 x = Pixel2Col (ev.x);
1173 y = ev.y; 1258 y = Pixel2Row (ev.y);
1174 pixel_position (&x, &y); 1259 if (ev.type == MotionNotify)
1260 {
1261 if (x == mouse_row && y == mouse_col)
1262 return;
1263 mouse_row = x;
1264 mouse_col = y;
1265 code += 32;
1266 }
1175 1267
1176 if (MEvent.button == AnyButton) 1268 if (MEvent.button == AnyButton)
1177 button_number = 3; 1269 button_number = 3;
1178 else 1270 else
1179 { 1271 {
… …
1225 x + 1, 1317 x + 1,
1226 y + 1); 1318 y + 1);
1227#endif 1319#endif
1228 1320
1229 tt_printf ("\033[M%c%c%c", 1321 tt_printf ("\033[M%c%c%c",
1230 (32 + button_number + key_state), 1322 (code + button_number + key_state),
1231 (32 + x + 1), 1323 (32 + x + 1),
1232 (32 + y + 1)); 1324 (32 + y + 1));
1233} 1325}
1234 1326
1235#ifdef USING_W11LIB
1236void
1237rxvt_W11_process_x_event (XEvent *ev)
1238{
1239 rxvt_t *r = rxvt_get_r ();
1240
1241 x_cb (*ev);
1242}
1243#endif
1244
1245/*{{{ process an X event */ 1327/*{{{ process an X event */
1246void 1328void
1247rxvt_term::x_cb (XEvent &ev) 1329rxvt_term::x_cb (XEvent &ev)
1248{ 1330{
1249 dDisp; 1331 make_current ();
1250 1332
1251 SET_R (this); 1333 dLocal (Display *, dpy);
1252 SET_LOCALE (locale);
1253 1334
1254#if defined(CURSOR_BLINK) 1335 if (ev.xany.window == vt
1255 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1336 && SHOULD_INVOKE (HOOK_X_EVENT)
1256 { 1337 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1257 if (hidden_cursor) 1338 return;
1258 {
1259 hidden_cursor = 0;
1260 want_refresh = 1;
1261 }
1262 1339
1263 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1340 // for XQueryPointer
1264 }
1265#endif
1266
1267#if defined(POINTER_BLANK)
1268 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1269 {
1270 if (ev.type == MotionNotify
1271 || ev.type == ButtonPress
1272 || ev.type == ButtonRelease)
1273 if (hidden_pointer)
1274 pointer_unblank ();
1275
1276 if (ev.type == KeyPress && hidden_pointer == 0)
1277 pointer_blank ();
1278 }
1279#endif
1280
1281 Window unused_root, unused_child; 1341 Window unused_root, unused_child;
1282 int unused_root_x, unused_root_y; 1342 int unused_root_x, unused_root_y;
1283 unsigned int unused_mask; 1343 unsigned int unused_mask;
1284 1344
1285 switch (ev.type) 1345 switch (ev.type)
1286 { 1346 {
1287 case KeyPress: 1347 case KeyPress:
1288#if ISO_14755 1348 key_press (ev.xkey);
1289 if (!(iso14755buf & ISO_14755_52))
1290#endif
1291 lookup_key (ev.xkey);
1292
1293 break; 1349 break;
1294 1350
1295 case KeyRelease: 1351 case KeyRelease:
1296 { 1352 key_release (ev.xkey);
1297#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1298 KeySym ks;
1299
1300 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1301#endif
1302
1303#if ENABLE_FRILLS || ISO_14755
1304 // ISO 14755 support
1305 if (iso14755buf)
1306 if (iso14755buf & ISO_14755_52)
1307 {
1308# if ENABLE_OVERLAY
1309 scr_overlay_off ();
1310# endif
1311# if ISO_14755
1312 // iso14755 part 5.2 handling: release time
1313 // first: controls
1314 if ((ev.xkey.state & ControlMask)
1315 && ((ks >= 0x40 && ks <= 0x5f)
1316 || (ks >= 0x61 && ks <= 0x7f)))
1317 {
1318 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1319 commit_iso14755 ();
1320 return; // case-break;
1321 }
1322
1323 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1324 if (i[0] == ks)
1325 {
1326 iso14755buf = ISO_14755_51 | i[1];
1327 commit_iso14755 ();
1328 return; // case-break;
1329 }
1330
1331 scr_bell ();
1332# endif
1333 iso14755buf = 0;
1334 break;
1335 }
1336 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1337 {
1338# if ENABLE_OVERLAY
1339 scr_overlay_off ();
1340# endif
1341 if (iso14755buf & ISO_14755_51)
1342 commit_iso14755 ();
1343#if ISO_14755
1344 else if (iso14755buf & ISO_14755_STARTED)
1345 {
1346 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1347
1348 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1349 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1350 }
1351# endif
1352 else
1353 iso14755buf = 0;
1354 }
1355#endif
1356
1357#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1358 if (!(ev.xkey.state & ControlMask))
1359 slip_wheel_ev.stop ();
1360 else if (ks == XK_Control_L || ks == XK_Control_R)
1361 mouse_slip_wheel_speed = 0;
1362#endif
1363 break; 1353 break;
1364 }
1365 1354
1366 case ButtonPress: 1355 case ButtonPress:
1367 button_press (ev.xbutton); 1356 button_press (ev.xbutton);
1368 break; 1357 break;
1369 1358
… …
1371 button_release (ev.xbutton); 1360 button_release (ev.xbutton);
1372 break; 1361 break;
1373 1362
1374 case ClientMessage: 1363 case ClientMessage:
1375 if (ev.xclient.format == 32 1364 if (ev.xclient.format == 32
1376 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1365 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1377 { 1366 {
1367 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1368 {
1369 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1370 {
1378 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1371 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1372 {
1373 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1379 destroy (); 1374 destroy ();
1375 }
1380#if ENABLE_EWMH 1376#if ENABLE_EWMH
1381 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1377 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1382 XSendEvent (disp, ev.xclient.window = display->root, 1378 XSendEvent (dpy, ev.xclient.window = display->root,
1383 False, SubstructureRedirectMask | SubstructureNotifyMask, 1379 False, SubstructureRedirectMask | SubstructureNotifyMask,
1384 &ev); 1380 &ev);
1381#endif
1382 }
1383 }
1384#if ENABLE_XEMBED
1385 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1386 {
1387 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1388 focus_in ();
1389 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1390 focus_out ();
1391 }
1385#endif 1392#endif
1386 } 1393 }
1387#if ENABLE_XEMBED
1388 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1389 {
1390 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1391 focus_in ();
1392 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1393 focus_out ();
1394 }
1395#endif
1396#ifdef OFFIX_DND
1397 /* OffiX Dnd (drag 'n' drop) protocol */
1398 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1399 && (ev.xclient.data.l[0] == DndFile
1400 || ev.xclient.data.l[0] == DndDir
1401 || ev.xclient.data.l[0] == DndLink))
1402 {
1403 /* Get Dnd data */
1404 Atom ActualType;
1405 int ActualFormat;
1406 unsigned char *data;
1407 unsigned long Size, RemainingBytes;
1408
1409 XGetWindowProperty (disp, display->root,
1410 xa[XA_DNDSELECTION],
1411 0L, 1000000L,
1412 False, AnyPropertyType,
1413 &ActualType, &ActualFormat,
1414 &Size, &RemainingBytes,
1415 &data);
1416 set_string_property (XA_CUT_BUFFER0, data);
1417 XFree (data);
1418 selection_paste (display->root, XA_CUT_BUFFER0, true);
1419 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1420 }
1421#endif /* OFFIX_DND */
1422 break;
1423
1424 case MappingNotify:
1425 XRefreshKeyboardMapping (&ev.xmapping);
1426 break; 1394 break;
1427 1395
1428 /* 1396 /*
1429 * XXX: this is not the _current_ arrangement 1397 * XXX: this is not the _current_ arrangement
1430 * Here's my conclusion: 1398 * Here's my conclusion:
… …
1449 break; 1417 break;
1450 } 1418 }
1451 break; 1419 break;
1452 1420
1453 case FocusIn: 1421 case FocusIn:
1422 if (ev.xfocus.detail != NotifyInferior
1423 && ev.xfocus.detail != NotifyPointer
1424 && ev.xfocus.mode != NotifyGrab)
1454 focus_in (); 1425 focus_in ();
1455 break; 1426 break;
1456 1427
1457 case FocusOut: 1428 case FocusOut:
1429 if (ev.xfocus.detail != NotifyInferior
1430 && ev.xfocus.detail != NotifyPointer
1431 && ev.xfocus.mode != NotifyGrab)
1458 focus_out (); 1432 focus_out ();
1459 break; 1433 break;
1460 1434
1461 case ConfigureNotify: 1435 case ConfigureNotify:
1436 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1437 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1438 szHint.width, szHint.height);*/
1462 if (ev.xconfigure.window == parent[0]) 1439 if (ev.xconfigure.window == parent[0])
1463 { 1440 {
1464 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1441 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1465 ; 1442 ;
1466 1443
1467 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1444 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1468 { 1445 {
1469 seen_resize = 1; 1446 seen_resize = 1;
1470 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1447 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1471 } 1448 }
1472 1449 else
1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1450 {
1474 if (OPTION (Opt_transparent)) 1451#ifdef HAVE_BG_PIXMAP
1475 check_our_parents (); 1452 if (bgPixmap.window_position_sensitive ())
1453 {
1454 if (mapped)
1455 update_background ();
1456 else
1457 bgPixmap.invalidate ();
1458 }
1476#endif 1459#endif
1460 }
1461
1462 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1477 } 1463 }
1478 break; 1464 break;
1479 1465
1480 case PropertyNotify: 1466 case PropertyNotify:
1467 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1481 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1468 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1482 && ev.xproperty.state == PropertyNewValue) 1469 && ev.xproperty.state == PropertyNewValue)
1483 selection_property (ev.xproperty.window, ev.xproperty.atom); 1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1484 1471
1485 break; 1472 break;
1486 1473
1487 case SelectionClear: 1474 case SelectionClear:
1488 selection_clear (); 1475 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1489 break; 1476 break;
1490 1477
1491 case SelectionNotify: 1478 case SelectionNotify:
1492 if (selection_wait == Sel_normal) 1479 if (selection_wait == Sel_normal)
1493 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1480 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1494 break; 1481 break;
1495 1482
1496 case SelectionRequest: 1483 case SelectionRequest:
1497 selection_send (ev.xselectionrequest); 1484 selection_send (ev.xselectionrequest);
1485 break;
1486
1487 case MapNotify:
1488#ifdef HAVE_BG_PIXMAP
1489 /* This is needed spcifically to fix the case of no window manager or a
1490 * non-reparenting window manager. In those cases we never get first
1491 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1492 * care of multiplicity of ConfigureNotify events arriwing while WM does
1493 * reparenting.
1494 * We should not render background immidiately, as there could be several
1495 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1496 * by scheduling background redraw as soon as we can, but giving a short
1497 * bit of time for ConfigureNotifies to arrive.
1498 * We should render background PRIOR to drawing any text, but AFTER all
1499 * of ConfigureNotifys for the best results.
1500 */
1501 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1502 update_background_ev.start (0.025);
1503#endif
1504 mapped = 1;
1505#ifdef TEXT_BLINK
1506 text_blink_ev.start ();
1507#endif
1508 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1498 break; 1509 break;
1499 1510
1500 case UnmapNotify: 1511 case UnmapNotify:
1501 mapped = 0; 1512 mapped = 0;
1502#ifdef TEXT_BLINK 1513#ifdef TEXT_BLINK
1503 text_blink_ev.stop (); 1514 text_blink_ev.stop ();
1504#endif 1515#endif
1516 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1505 break; 1517 break;
1506
1507 case MapNotify:
1508 mapped = 1;
1509#ifdef TEXT_BLINK
1510 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1511#endif
1512 break;
1513
1514#ifdef TRANSPARENT
1515 case ReparentNotify:
1516 rootwin_cb (ev);
1517 break;
1518#endif /* TRANSPARENT */
1519 1518
1520 case GraphicsExpose: 1519 case GraphicsExpose:
1521 case Expose: 1520 case Expose:
1522 if (ev.xany.window == vt) 1521 if (ev.xany.window == vt)
1523 { 1522 {
1524 do 1523 do
1524 {
1525 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1526 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1527 }
1527 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1528 1529
1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1530 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1530 1531
1531 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1533 {
1532 scr_expose (ev.xexpose.x, ev.xexpose.y, 1534 scr_expose (ev.xexpose.x, ev.xexpose.y,
1533 ev.xexpose.width, ev.xexpose.height, False); 1535 ev.xexpose.width, ev.xexpose.height, False);
1536 }
1534 1537
1535 scr_refresh (refresh_type); 1538 want_refresh = 1;
1536 } 1539 }
1537 else 1540 else
1538 { 1541 {
1539 XEvent unused_event; 1542 XEvent unused_event;
1540 1543
1541 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1544 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1542 ; 1545 ;
1543 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1546 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1544 ; 1547 ;
1545 1548
1546 if (isScrollbarWindow (ev.xany.window)) 1549 if (scrollBar.state && ev.xany.window == scrollBar.win)
1547 { 1550 {
1548 scrollBar.setIdle (); 1551 scrollBar.state = STATE_IDLE;
1549 scrollbar_show (0); 1552 scrollBar.show (0);
1550 } 1553 }
1551#ifdef MENUBAR
1552 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1553 menubar_expose ();
1554#endif
1555
1556#ifdef TRANSPARENT
1557 if (am_transparent && ev.xany.window == parent[0])
1558 XClearWindow (disp, ev.xany.window);
1559#endif
1560 } 1554 }
1561 break; 1555 break;
1562 1556
1563 case MotionNotify: 1557 case MotionNotify:
1564#ifdef POINTER_BLANK 1558#ifdef POINTER_BLANK
1565 if (hidden_pointer) 1559 if (hidden_pointer)
1566 pointer_unblank (); 1560 pointer_unblank ();
1567#endif 1561#endif
1568#if MENUBAR 1562 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1569 if (isMenuBarWindow (ev.xany.window)) 1563 || priv_modes & PrivMode_MouseAnyEvent)
1570 {
1571 menubar_control (ev.xbutton); 1564 mouse_report (ev.xbutton);
1572 break;
1573 }
1574#endif
1575 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1576 break; 1566 break;
1577 1567
1578 if (ev.xany.window == vt) 1568 if (ev.xany.window == vt)
1579 { 1569 {
1570 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1571 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1572 ; // nop
1580 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1573 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1581 { 1574 {
1582 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1575 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1583 ; 1576 ;
1584 1577
1585 XQueryPointer (disp, vt, 1578 XQueryPointer (dpy, vt,
1586 &unused_root, &unused_child, 1579 &unused_root, &unused_child,
1587 &unused_root_x, &unused_root_y, 1580 &unused_root_x, &unused_root_y,
1588 &ev.xbutton.x, &ev.xbutton.y, 1581 &ev.xbutton.x, &ev.xbutton.y,
1589 &ev.xbutton.state); 1582 &ev.xbutton.state);
1590#ifdef MOUSE_THRESHOLD 1583#ifdef MOUSE_THRESHOLD
… …
1610 int dist; 1603 int dist;
1611 1604
1612 /* don't clobber the current delay if we are 1605 /* don't clobber the current delay if we are
1613 * already in the middle of scrolling. 1606 * already in the middle of scrolling.
1614 */ 1607 */
1615 if (!sel_scroll_ev.active) 1608 if (!sel_scroll_ev.is_active ())
1616 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1609 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1617 1610
1618 /* save the event params so we can highlight 1611 /* save the event params so we can highlight
1619 * the selection in the pending-scroll loop 1612 * the selection in the pending-scroll loop
1620 */ 1613 */
1621 selection_save_x = ev.xbutton.x; 1614 selection_save_x = ev.xbutton.x;
… …
1643 else 1636 else
1644 { 1637 {
1645 /* we are within the text window, so we 1638 /* we are within the text window, so we
1646 * shouldn't be scrolling 1639 * shouldn't be scrolling
1647 */ 1640 */
1648 if (sel_scroll_ev.active)
1649 sel_scroll_ev.stop(); 1641 sel_scroll_ev.stop();
1650 } 1642 }
1651#endif 1643#endif
1652#ifdef MOUSE_THRESHOLD 1644#ifdef MOUSE_THRESHOLD
1653 } 1645 }
1654#endif 1646#endif
1655 } 1647 }
1656 } 1648 }
1657 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1649 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1658 { 1650 {
1659 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1651 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1660 MotionNotify, &ev)) 1652 MotionNotify, &ev))
1661 ; 1653 ;
1662 1654
1663 XQueryPointer (disp, scrollBar.win, 1655 XQueryPointer (dpy, scrollBar.win,
1664 &unused_root, &unused_child, 1656 &unused_root, &unused_child,
1665 &unused_root_x, &unused_root_y, 1657 &unused_root_x, &unused_root_y,
1666 &ev.xbutton.x, &ev.xbutton.y, 1658 &ev.xbutton.x, &ev.xbutton.y,
1667 &unused_mask); 1659 &unused_mask);
1668 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1660 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1669 scrollbar_size ()); 1661 scrollBar.size ());
1670 scr_refresh (refresh_type);
1671 refresh_limit = 0; 1662 want_refresh = 1;
1672 scrollbar_show (1); 1663 scrollBar.show (1);
1673 } 1664 }
1674 break; 1665 break;
1675 } 1666 }
1667
1668#if defined(CURSOR_BLINK)
1669 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1670 {
1671 if (hidden_cursor)
1672 {
1673 hidden_cursor = 0;
1674 want_refresh = 1;
1675 }
1676
1677 cursor_blink_ev.again ();
1678 }
1679#endif
1680
1681#if defined(POINTER_BLANK)
1682 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1683 {
1684 if (ev.type == MotionNotify
1685 || ev.type == ButtonPress
1686 || ev.type == ButtonRelease)
1687 if (hidden_pointer)
1688 pointer_unblank ();
1689
1690 if (ev.type == KeyPress && hidden_pointer == 0)
1691 pointer_blank ();
1692 }
1693#endif
1694
1695 refresh_check ();
1676} 1696}
1697
1698#if ENABLE_FRILLS
1699void
1700rxvt_term::set_urgency (bool enable)
1701{
1702 if (enable == urgency_hint)
1703 return;
1704
1705 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1706 {
1707 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1708 XSetWMHints (dpy, parent[0], h);
1709 urgency_hint = enable;
1710 }
1711}
1712#endif
1677 1713
1678void 1714void
1679rxvt_term::focus_in () 1715rxvt_term::focus_in ()
1680{ 1716{
1681 if (!focus) 1717 if (!focus)
1682 { 1718 {
1683 focus = 1; 1719 focus = 1;
1684 want_refresh = 1; 1720 want_refresh = 1;
1721
1685#if USE_XIM 1722#if USE_XIM
1686 if (Input_Context != NULL) 1723 if (Input_Context != NULL)
1687 { 1724 {
1688 IMSetStatusPosition (); 1725 IMSetPosition ();
1689 XSetICFocus (Input_Context); 1726 XSetICFocus (Input_Context);
1690 } 1727 }
1691#endif 1728#endif
1692#if CURSOR_BLINK 1729#if CURSOR_BLINK
1693 if (OPTION (Opt_cursorBlink)) 1730 if (option (Opt_cursorBlink))
1694 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1731 cursor_blink_ev.again ();
1695#endif 1732#endif
1696#if OFF_FOCUS_FADING 1733#if OFF_FOCUS_FADING
1697 if (rs[Rs_fade]) 1734 if (rs[Rs_fade])
1698 { 1735 {
1699 pix_colors = pix_colors_focused; 1736 pix_colors = pix_colors_focused;
1700 scr_recolour (); 1737 scr_recolour ();
1701 } 1738 }
1702#endif 1739#endif
1740#if ENABLE_FRILLS
1741 if (option (Opt_urgentOnBell))
1742 set_urgency (0);
1743#endif
1744
1745 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1703 } 1746 }
1704} 1747}
1705 1748
1706void 1749void
1707rxvt_term::focus_out () 1750rxvt_term::focus_out ()
… …
1709 if (focus) 1752 if (focus)
1710 { 1753 {
1711 focus = 0; 1754 focus = 0;
1712 want_refresh = 1; 1755 want_refresh = 1;
1713 1756
1757#if ENABLE_FRILLS
1758 if (option (Opt_urgentOnBell))
1759 set_urgency (0);
1760#endif
1714#if ENABLE_FRILLS || ISO_14755 1761#if ENABLE_FRILLS || ISO_14755
1762 if (iso14755buf)
1763 {
1715 iso14755buf = 0; 1764 iso14755buf = 0;
1716#endif 1765# if ISO_14755
1717#if ENABLE_OVERLAY
1718 scr_overlay_off (); 1766 scr_overlay_off ();
1767# endif
1768 }
1719#endif 1769#endif
1720#if USE_XIM 1770#if USE_XIM
1721 if (Input_Context != NULL) 1771 if (Input_Context != NULL)
1722 XUnsetICFocus (Input_Context); 1772 XUnsetICFocus (Input_Context);
1723#endif 1773#endif
1724#if CURSOR_BLINK 1774#if CURSOR_BLINK
1725 if (OPTION (Opt_cursorBlink)) 1775 if (option (Opt_cursorBlink))
1726 cursor_blink_ev.stop (); 1776 cursor_blink_ev.stop ();
1777
1727 hidden_cursor = 0; 1778 hidden_cursor = 0;
1728#endif 1779#endif
1729#if OFF_FOCUS_FADING 1780#if OFF_FOCUS_FADING
1730 if (rs[Rs_fade]) 1781 if (rs[Rs_fade])
1731 { 1782 {
1732 pix_colors = pix_colors_unfocused; 1783 pix_colors = pix_colors_unfocused;
1733 scr_recolour (); 1784 scr_recolour ();
1734 } 1785 }
1735#endif 1786#endif
1787
1788 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1789 }
1790}
1791
1792void
1793rxvt_term::update_fade_color (unsigned int idx)
1794{
1795#if OFF_FOCUS_FADING
1796 if (rs[Rs_fade])
1736 } 1797 {
1798 rgba c;
1799 pix_colors [Color_fade].get (c);
1800 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1801 }
1802#endif
1737} 1803}
1738 1804
1739#if TRANSPARENT 1805#if ENABLE_TRANSPARENCY || ENABLE_PERL
1740void 1806void
1741rxvt_term::rootwin_cb (XEvent &ev) 1807rxvt_term::rootwin_cb (XEvent &ev)
1742{ 1808{
1743 SET_R (this); 1809 make_current ();
1744 SET_LOCALE (locale);
1745 1810
1811 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1812 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1813 return;
1814
1815# if ENABLE_TRANSPARENCY
1746 switch (ev.type) 1816 switch (ev.type)
1747 { 1817 {
1748 case PropertyNotify: 1818 case PropertyNotify:
1749 /* 1819 /*
1750 * if user used some Esetroot compatible prog to set the root bg, 1820 * if user used some Esetroot compatible prog to set the root bg,
1751 * use the property to determine the pixmap. We use it later on. 1821 * use the property to determine the pixmap. We use it later on.
1752 */ 1822 */
1753 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1823 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1754 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1755 return; 1825 {
1826 bgPixmap.set_root_pixmap ();
1827 update_background ();
1828 }
1756 1829
1757 /* FALLTHROUGH */
1758 case ReparentNotify:
1759 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1760 want_refresh = want_full_refresh = 1;
1761 break; 1830 break;
1762 } 1831 }
1832# endif
1833
1834 refresh_check ();
1763} 1835}
1764#endif 1836#endif
1765 1837
1766void 1838void
1767rxvt_term::button_press (XButtonEvent &ev) 1839rxvt_term::button_press (XButtonEvent &ev)
1768{ 1840{
1769 int reportmode = 0, clickintime; 1841 int reportmode = 0, clickintime;
1770 1842
1771 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1843 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1844
1772 if (!bypass_keystate) 1845 if (!bypass_keystate)
1773 reportmode = !! (priv_modes & PrivMode_mouse_report); 1846 reportmode = !! (priv_modes & PrivMode_mouse_report);
1774 1847
1775 /* 1848 /*
1776 * VT window processing of button press 1849 * VT window processing of button press
1777 */ 1850 */
1778 if (ev.window == vt) 1851 if (ev.window == vt)
1779 { 1852 {
1853 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1854 return;
1855
1780#if ISO_14755 1856#if ISO_14755
1781 // 5.4 1857 // 5.4
1782 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1858 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1783 { 1859 {
1784 iso14755_54 (ev.x, ev.y); 1860 iso14755_54 (ev.x, ev.y);
… …
1796#ifdef MOUSE_REPORT_DOUBLECLICK 1872#ifdef MOUSE_REPORT_DOUBLECLICK
1797 if (ev.button == MEvent.button && clickintime) 1873 if (ev.button == MEvent.button && clickintime)
1798 { 1874 {
1799 /* same button, within alloted time */ 1875 /* same button, within alloted time */
1800 MEvent.clicks++; 1876 MEvent.clicks++;
1877
1801 if (MEvent.clicks > 1) 1878 if (MEvent.clicks > 1)
1802 { 1879 {
1803 /* only report double clicks */ 1880 /* only report double clicks */
1804 MEvent.clicks = 2; 1881 MEvent.clicks = 2;
1805 mouse_report (ev); 1882 mouse_report (ev);
… …
1817 mouse_report (ev); 1894 mouse_report (ev);
1818 } 1895 }
1819#else 1896#else
1820 MEvent.button = ev.button; 1897 MEvent.button = ev.button;
1821 mouse_report (ev); 1898 mouse_report (ev);
1822#endif /* MOUSE_REPORT_DOUBLECLICK */ 1899#endif /* MOUSE_REPORT_DOUBLECLICK */
1823 1900
1824 } 1901 }
1825 else 1902 else
1826 { 1903 {
1827 if (ev.button != MEvent.button) 1904 if (ev.button != MEvent.button)
… …
1837#else 1914#else
1838 selection.rect = false; 1915 selection.rect = false;
1839#endif 1916#endif
1840 1917
1841 /* allow shift+left click to extend selection */ 1918 /* allow shift+left click to extend selection */
1842 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1919 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1843 { 1920 {
1844 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1845 selection_rotate (ev.x, ev.y); 1922 selection_rotate (ev.x, ev.y);
1846 else 1923 else
1847 selection_extend (ev.x, ev.y, 1); 1924 selection_extend (ev.x, ev.y, 1);
… …
1875 } 1952 }
1876 1953
1877 /* 1954 /*
1878 * Scrollbar window processing of button press 1955 * Scrollbar window processing of button press
1879 */ 1956 */
1880 if (isScrollbarWindow (ev.window)) 1957 if (scrollBar.state && ev.window == scrollBar.win)
1881 { 1958 {
1882 scrollBar.setIdle (); 1959 page_dirn direction = NO_DIR;
1960
1961 if (scrollBar.upButton (ev.y))
1962 direction = UP; /* up */
1963 else if (scrollBar.dnButton (ev.y))
1964 direction = DN; /* down */
1965
1966 scrollBar.state = STATE_IDLE;
1883 /* 1967 /*
1884 * Rxvt-style scrollbar: 1968 * Rxvt-style scrollbar:
1885 * move up if mouse is above slider 1969 * move up if mouse is above slider
1886 * move dn if mouse is below slider 1970 * move dn if mouse is below slider
1887 * 1971 *
… …
1896 /* 1980 /*
1897 * Mouse report disabled scrollbar: 1981 * Mouse report disabled scrollbar:
1898 * arrow buttons - send up/down 1982 * arrow buttons - send up/down
1899 * click on scrollbar - send pageup/down 1983 * click on scrollbar - send pageup/down
1900 */ 1984 */
1901 if ((scrollBar.style == R_SB_NEXT 1985 if (direction == UP)
1902 && scrollbarnext_upButton (ev.y))
1903 || (scrollBar.style == R_SB_RXVT
1904 && scrollbarrxvt_upButton (ev.y)))
1905 tt_printf ("\033[A"); 1986 tt_printf ("\033[A");
1906 else if ((scrollBar.style == R_SB_NEXT 1987 else if (direction == DN)
1907 && scrollbarnext_dnButton (ev.y))
1908 || (scrollBar.style == R_SB_RXVT
1909 && scrollbarrxvt_dnButton (ev.y)))
1910 tt_printf ("\033[B"); 1988 tt_printf ("\033[B");
1911 else 1989 else
1912 switch (ev.button) 1990 switch (ev.button)
1913 { 1991 {
1914 case Button2: 1992 case Button2:
… …
1921 tt_printf ("\033[5~"); 1999 tt_printf ("\033[5~");
1922 break; 2000 break;
1923 } 2001 }
1924 } 2002 }
1925 else 2003 else
1926#endif /* NO_SCROLLBAR_REPORT */ 2004#endif /* NO_SCROLLBAR_REPORT */
1927
1928 {
1929 char upordown = 0;
1930
1931 if (scrollBar.style == R_SB_NEXT)
1932 { 2005 {
1933 if (scrollbarnext_upButton (ev.y)) 2006 if (direction != NO_DIR)
1934 upordown = -1; /* up */
1935 else if (scrollbarnext_dnButton (ev.y))
1936 upordown = 1; /* down */
1937 }
1938 else if (scrollBar.style == R_SB_RXVT)
1939 {
1940 if (scrollbarrxvt_upButton (ev.y))
1941 upordown = -1; /* up */
1942 else if (scrollbarrxvt_dnButton (ev.y))
1943 upordown = 1; /* down */
1944 }
1945 if (upordown)
1946 { 2007 {
1947#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2008#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2009 if (!cont_scroll_ev.is_active ())
1948 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2010 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1949#endif 2011#endif
1950 if (scr_page (upordown < 0 ? UP : DN, 1)) 2012 if (scr_page (direction, 1))
1951 { 2013 {
1952 if (upordown < 0) 2014 if (direction == UP)
1953 scrollBar.setUp (); 2015 scrollBar.state = STATE_UP;
1954 else 2016 else
1955 scrollBar.setDn (); 2017 scrollBar.state = STATE_DOWN;
1956 } 2018 }
1957 } 2019 }
1958 else 2020 else
1959 switch (ev.button) 2021 switch (ev.button)
1960 { 2022 {
1961 case Button2: 2023 case Button2:
1962 switch (scrollbar_align) 2024 switch (scrollBar.align)
1963 { 2025 {
1964 case R_SB_ALIGN_TOP: 2026 case R_SB_ALIGN_TOP:
1965 csrO = 0; 2027 csrO = 0;
1966 break; 2028 break;
1967 case R_SB_ALIGN_CENTRE: 2029 case R_SB_ALIGN_CENTRE:
… …
1973 } 2035 }
1974 2036
1975 if (scrollBar.style == R_SB_XTERM 2037 if (scrollBar.style == R_SB_XTERM
1976 || scrollbar_above_slider (ev.y) 2038 || scrollbar_above_slider (ev.y)
1977 || scrollbar_below_slider (ev.y)) 2039 || scrollbar_below_slider (ev.y))
1978 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2040 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
1979 2041
1980 scrollBar.setMotion (); 2042 scrollBar.state = STATE_MOTION;
1981 break; 2043 break;
1982 2044
1983 case Button1: 2045 case Button1:
1984 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2046 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1985 csrO = ev.y - scrollBar.top; 2047 csrO = ev.y - scrollBar.top;
1986 /* FALLTHROUGH */ 2048 /* FALLTHROUGH */
1987 2049
1988 case Button3: 2050 case Button3:
1989 if (scrollBar.style != R_SB_XTERM) 2051 if (scrollBar.style != R_SB_XTERM)
… …
1999 scr_page (DN, nrow - 1); 2061 scr_page (DN, nrow - 1);
2000# else 2062# else
2001 scr_page (DN, nrow / 4); 2063 scr_page (DN, nrow / 4);
2002# endif 2064# endif
2003 else 2065 else
2004 scrollBar.setMotion (); 2066 scrollBar.state = STATE_MOTION;
2005 } 2067 }
2006 else 2068 else
2007 { 2069 {
2008 scr_page ((ev.button == Button1 ? DN : UP), 2070 scr_page ((ev.button == Button1 ? DN : UP),
2009 (nrow 2071 (nrow
2010 * scrollbar_position (ev.y) 2072 * scrollbar_position (ev.y)
2011 / scrollbar_size ())); 2073 / scrollBar.size ()));
2012 } 2074 }
2013 2075
2014 break; 2076 break;
2015 } 2077 }
2016 } 2078 }
2079
2017 return; 2080 return;
2018 } 2081 }
2019#if MENUBAR
2020 /*
2021 * Menubar window processing of button press
2022 */
2023 if (isMenuBarWindow (ev.window))
2024 menubar_control (ev);
2025#endif
2026} 2082}
2027 2083
2028void 2084void
2029rxvt_term::button_release (XButtonEvent &ev) 2085rxvt_term::button_release (XButtonEvent &ev)
2030{ 2086{
… …
2032 2088
2033 csrO = 0; /* reset csr Offset */ 2089 csrO = 0; /* reset csr Offset */
2034 if (!bypass_keystate) 2090 if (!bypass_keystate)
2035 reportmode = !! (priv_modes & PrivMode_mouse_report); 2091 reportmode = !! (priv_modes & PrivMode_mouse_report);
2036 2092
2037 if (scrollbar_isUpDn ()) 2093 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2038 { 2094 {
2039 scrollBar.setIdle (); 2095 scrollBar.state = STATE_IDLE;
2040 scrollbar_show (0); 2096 scrollBar.show (0);
2041#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2042 refresh_type &= ~SMOOTH_REFRESH;
2043#endif
2044 } 2097 }
2045 2098
2046#ifdef SELECTION_SCROLLING 2099#ifdef SELECTION_SCROLLING
2047 if (sel_scroll_ev.active)
2048 sel_scroll_ev.stop(); 2100 sel_scroll_ev.stop();
2049#endif 2101#endif
2050 2102
2051 if (ev.window == vt) 2103 if (ev.window == vt)
2052 { 2104 {
2105 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2106 return;
2107
2053#if ISO_14755 2108#if ISO_14755
2054 // 5.4 2109 // 5.4
2055 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2110 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2056 return; 2111 return;
2057#endif 2112#endif
2113
2058 if (reportmode) 2114 if (reportmode)
2059 { 2115 {
2060 /* mouse report from vt window */ 2116 /* mouse report from vt window */
2061 /* don't report release of wheel "buttons" */ 2117 /* don't report release of wheel "buttons" */
2062 if (ev.button >= 4) 2118 if (ev.button >= 4)
… …
2073 mouse_report (ev); 2129 mouse_report (ev);
2074 } 2130 }
2075#else /* MOUSE_REPORT_DOUBLECLICK */ 2131#else /* MOUSE_REPORT_DOUBLECLICK */
2076 MEvent.button = AnyButton; 2132 MEvent.button = AnyButton;
2077 mouse_report (ev); 2133 mouse_report (ev);
2078#endif /* MOUSE_REPORT_DOUBLECLICK */ 2134#endif /* MOUSE_REPORT_DOUBLECLICK */
2079 return; 2135 return;
2080 } 2136 }
2081 2137
2082 /* 2138 /*
2083 * dumb hack to compensate for the failure of click-and-drag 2139 * dumb hack to compensate for the failure of click-and-drag
… …
2092 { 2148 {
2093 case Button1: 2149 case Button1:
2094 case Button3: 2150 case Button3:
2095 selection_make (ev.time); 2151 selection_make (ev.time);
2096 break; 2152 break;
2153
2097 case Button2: 2154 case Button2:
2098 selection_request (ev.time, ev.x, ev.y); 2155 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2156 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2099 break; 2157 break;
2158
2100#ifdef MOUSE_WHEEL 2159#ifdef MOUSE_WHEEL
2101 case Button4: 2160 case Button4:
2102 case Button5: 2161 case Button5:
2103 { 2162 {
2104 int i; 2163 int i;
… …
2106 2165
2107 v = ev.button == Button4 ? UP : DN; 2166 v = ev.button == Button4 ? UP : DN;
2108 2167
2109 if (ev.state & ShiftMask) 2168 if (ev.state & ShiftMask)
2110 i = 1; 2169 i = 1;
2111 else if (OPTION (Opt_mouseWheelScrollPage)) 2170 else if (option (Opt_mouseWheelScrollPage))
2112 i = nrow - 1; 2171 i = nrow - 1;
2113 else 2172 else
2114 i = 5; 2173 i = 5;
2115 2174
2116# ifdef MOUSE_SLIP_WHEELING 2175# ifdef MOUSE_SLIP_WHEELING
… …
2118 { 2177 {
2119 mouse_slip_wheel_speed += v ? -1 : 1; 2178 mouse_slip_wheel_speed += v ? -1 : 1;
2120 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2179 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2121 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2180 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2122 2181
2123 if (slip_wheel_ev.at < NOW) 2182 if (!slip_wheel_ev.is_active ())
2124 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2183 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2125
2126 slip_wheel_ev.start ();
2127 } 2184 }
2128 else 2185 else
2186# endif
2129 { 2187 {
2130# endif
2131# ifdef JUMP_MOUSE_WHEEL
2132 scr_page (v, i); 2188 scr_page (v, i);
2133 scr_refresh (SMOOTH_REFRESH);
2134 scrollbar_show (1); 2189 scrollBar.show (1);
2135# else
2136 while (i--)
2137 {
2138 scr_page (v, 1);
2139 scr_refresh (SMOOTH_REFRESH);
2140 scrollbar_show (1);
2141 }
2142# endif
2143# ifdef MOUSE_SLIP_WHEELING
2144 } 2190 }
2145#endif
2146 } 2191 }
2147 break; 2192 break;
2148#endif 2193#endif
2149 } 2194 }
2150 } 2195 }
2151#ifdef MENUBAR
2152 else if (isMenuBarWindow (ev.window))
2153 menubar_control (ev);
2154#endif
2155} 2196}
2156
2157#ifdef TRANSPARENT
2158#if TINTING
2159/* taken from aterm-0.4.2 */
2160
2161typedef uint32_t RUINT32T;
2162
2163void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2164{
2165 int sh_r, sh_g, sh_b;
2166 RUINT32T mask_r, mask_g, mask_b;
2167 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2168 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2169 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2170 int i;
2171
2172 Visual *visual = display->visual;
2173
2174 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2175
2176 /* for convenience */
2177 mask_r = visual->red_mask;
2178 mask_g = visual->green_mask;
2179 mask_b = visual->blue_mask;
2180
2181 /* boring lookup table pre-initialization */
2182 switch (srcImage->bits_per_pixel) {
2183 case 15:
2184 if ((mask_r != 0x7c00) ||
2185 (mask_g != 0x03e0) ||
2186 (mask_b != 0x001f))
2187 return;
2188 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2189 lookup_r = lookup;
2190 lookup_g = lookup+32;
2191 lookup_b = lookup+32+32;
2192 sh_r = 10;
2193 sh_g = 5;
2194 sh_b = 0;
2195 break;
2196 case 16:
2197 if ((mask_r != 0xf800) ||
2198 (mask_g != 0x07e0) ||
2199 (mask_b != 0x001f))
2200 return;
2201 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2202 lookup_r = lookup;
2203 lookup_g = lookup+32;
2204 lookup_b = lookup+32+64;
2205 sh_r = 11;
2206 sh_g = 5;
2207 sh_b = 0;
2208 break;
2209 case 24:
2210 if ((mask_r != 0xff0000) ||
2211 (mask_g != 0x00ff00) ||
2212 (mask_b != 0x0000ff))
2213 return;
2214 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2215 lookup_r = lookup;
2216 lookup_g = lookup+256;
2217 lookup_b = lookup+256+256;
2218 sh_r = 16;
2219 sh_g = 8;
2220 sh_b = 0;
2221 break;
2222 case 32:
2223 if ((mask_r != 0xff0000) ||
2224 (mask_g != 0x00ff00) ||
2225 (mask_b != 0x0000ff))
2226 return;
2227 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2228 lookup_r = lookup;
2229 lookup_g = lookup+256;
2230 lookup_b = lookup+256+256;
2231 sh_r = 16;
2232 sh_g = 8;
2233 sh_b = 0;
2234 break;
2235 default:
2236 return; /* we do not support this color depth */
2237 }
2238
2239 /* prepare limits for color transformation (each channel is handled separately) */
2240 if (shade < 0) {
2241 shade = -shade;
2242 if (shade < 0) shade = 0;
2243 if (shade > 100) shade = 100;
2244
2245 lower_lim_r = 65535-rm;
2246 lower_lim_g = 65535-gm;
2247 lower_lim_b = 65535-bm;
2248
2249 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2250 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2251 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2252
2253 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2254 } else {
2255 if (shade < 0) shade = 0;
2256 if (shade > 100) shade = 100;
2257
2258 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2259
2260 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2261 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2262 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2263 }
2264
2265 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2266 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2267 {
2268 unsigned int tmp;
2269
2270 tmp = lower_lim_r;
2271 lower_lim_r = lower_lim_b;
2272 lower_lim_b = tmp;
2273
2274 tmp = upper_lim_r;
2275 upper_lim_r = upper_lim_b;
2276 upper_lim_b = tmp;
2277 }
2278
2279 /* fill our lookup tables */
2280 for (i = 0; i <= mask_r>>sh_r; i++)
2281 {
2282 RUINT32T tmp;
2283 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2284 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2285 lookup_r[i] = (tmp/65535)<<sh_r;
2286 }
2287 for (i = 0; i <= mask_g>>sh_g; i++)
2288 {
2289 RUINT32T tmp;
2290 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2291 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2292 lookup_g[i] = (tmp/65535)<<sh_g;
2293 }
2294 for (i = 0; i <= mask_b>>sh_b; i++)
2295 {
2296 RUINT32T tmp;
2297 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2298 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2299 lookup_b[i] = (tmp/65535)<<sh_b;
2300 }
2301
2302 /* apply table to input image (replacing colors by newly calculated ones) */
2303 switch (srcImage->bits_per_pixel)
2304 {
2305 case 15:
2306 {
2307 unsigned short *p1, *pf, *p, *pl;
2308 p1 = (unsigned short *) srcImage->data;
2309 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2310 while (p1 < pf)
2311 {
2312 p = p1;
2313 pl = p1 + srcImage->width;
2314 for (; p < pl; p++)
2315 {
2316 *p = lookup_r[(*p & 0x7c00)>>10] |
2317 lookup_g[(*p & 0x03e0)>> 5] |
2318 lookup_b[(*p & 0x001f)];
2319 }
2320 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2321 }
2322 break;
2323 }
2324 case 16:
2325 {
2326 unsigned short *p1, *pf, *p, *pl;
2327 p1 = (unsigned short *) srcImage->data;
2328 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2329 while (p1 < pf)
2330 {
2331 p = p1;
2332 pl = p1 + srcImage->width;
2333 for (; p < pl; p++)
2334 {
2335 *p = lookup_r[(*p & 0xf800)>>11] |
2336 lookup_g[(*p & 0x07e0)>> 5] |
2337 lookup_b[(*p & 0x001f)];
2338 }
2339 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2340 }
2341 break;
2342 }
2343 case 24:
2344 {
2345 unsigned char *p1, *pf, *p, *pl;
2346 p1 = (unsigned char *) srcImage->data;
2347 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2348 while (p1 < pf)
2349 {
2350 p = p1;
2351 pl = p1 + srcImage->width * 3;
2352 for (; p < pl; p += 3)
2353 {
2354 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2355 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2356 p[2] = lookup_r[(p[2] & 0x0000ff)];
2357 }
2358 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2359 }
2360 break;
2361 }
2362 case 32:
2363 {
2364 RUINT32T *p1, *pf, *p, *pl;
2365 p1 = (RUINT32T *) srcImage->data;
2366 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2367
2368 while (p1 < pf)
2369 {
2370 p = p1;
2371 pl = p1 + srcImage->width;
2372 for (; p < pl; p++)
2373 {
2374 *p = lookup_r[(*p & 0xff0000)>>16] |
2375 lookup_g[(*p & 0x00ff00)>> 8] |
2376 lookup_b[(*p & 0x0000ff)] |
2377 (*p & ~0xffffff);
2378 }
2379 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2380 }
2381 break;
2382 }
2383 }
2384
2385 free (lookup);
2386}
2387#endif
2388
2389/*
2390 * Check our parents are still who we think they are.
2391 * Do transparency updates if required
2392 */
2393int
2394rxvt_term::check_our_parents ()
2395{
2396 int i, pchanged, aformat, have_pixmap, rootdepth;
2397 unsigned long nitems, bytes_after;
2398 Atom atype;
2399 unsigned char *prop = NULL;
2400 Window root, oldp, *list;
2401 Pixmap rootpixmap = None;
2402 XWindowAttributes wattr, wrootattr;
2403 dDisp;
2404
2405 pchanged = 0;
2406
2407 if (!OPTION (Opt_transparent))
2408 return pchanged; /* Don't try any more */
2409
2410 XGetWindowAttributes (disp, display->root, &wrootattr);
2411 rootdepth = wrootattr.depth;
2412
2413 XGetWindowAttributes (disp, parent[0], &wattr);
2414
2415 if (rootdepth != wattr.depth)
2416 {
2417 if (am_transparent)
2418 {
2419 pchanged = 1;
2420 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2421 am_transparent = am_pixmap_trans = 0;
2422 }
2423
2424 return pchanged; /* Don't try any more */
2425 }
2426
2427 /* Get all X ops out of the queue so that our information is up-to-date. */
2428 XSync (disp, False);
2429
2430 /*
2431 * Make the frame window set by the window manager have
2432 * the root background. Some window managers put multiple nested frame
2433 * windows for each client, so we have to take care about that.
2434 */
2435 i = (xa[XA_XROOTPMAP_ID]
2436 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2437 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2438 &nitems, &bytes_after, &prop) == Success);
2439
2440 if (!i || prop == NULL)
2441 i = (xa[XA_ESETROOT_PMAP_ID]
2442 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2443 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2444 &nitems, &bytes_after, &prop) == Success);
2445
2446 if (!i || prop == NULL
2447#if TINTING
2448 || !rs[Rs_color + Color_tint]
2449#endif
2450 )
2451 have_pixmap = 0;
2452 else
2453 {
2454 have_pixmap = 1;
2455 rootpixmap = *(Pixmap *)prop;
2456 XFree (prop);
2457 }
2458
2459 if (have_pixmap)
2460 {
2461 /*
2462 * Copy display->root pixmap transparency
2463 */
2464 int sx, sy, nx, ny;
2465 unsigned int nw, nh;
2466 Window cr;
2467 XImage *image;
2468 GC gc;
2469 XGCValues gcvalue;
2470
2471 XTranslateCoordinates (disp, parent[0], display->root,
2472 0, 0, &sx, &sy, &cr);
2473 nw = (unsigned int)szHint.width;
2474 nh = (unsigned int)szHint.height;
2475 nx = ny = 0;
2476
2477 if (sx < 0)
2478 {
2479 nw += sx;
2480 nx = -sx;
2481 sx = 0;
2482 }
2483
2484 if (sy < 0)
2485 {
2486 nh += sy;
2487 ny = -sy;
2488 sy = 0;
2489 }
2490
2491 min_it (nw, (unsigned int) (wrootattr.width - sx));
2492 min_it (nh, (unsigned int) (wrootattr.height - sy));
2493
2494 XSync (disp, False);
2495 allowedxerror = -1;
2496 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2497
2498 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2499 /* XXX: may need a delay here? */
2500 allowedxerror = 0;
2501
2502 if (image == NULL)
2503 {
2504 if (am_transparent && am_pixmap_trans)
2505 {
2506 pchanged = 1;
2507 if (pixmap != None)
2508 {
2509 XFreePixmap (disp, pixmap);
2510 pixmap = None;
2511 }
2512 }
2513
2514 am_pixmap_trans = 0;
2515 }
2516 else
2517 {
2518 if (pixmap != None)
2519 XFreePixmap (disp, pixmap);
2520
2521#if TINTING
2522 if (ISSET_PIXCOLOR (Color_tint))
2523 {
2524 unsigned short rm, gm, bm;
2525 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2526
2527 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2528
2529 ShadeXImage (display, image, shade, rm, gm, bm);
2530 }
2531#endif
2532
2533 pixmap = XCreatePixmap (disp, vt,
2534 szHint.width, szHint.height, image->depth);
2535 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2536 XPutImage (disp, pixmap, gc, image, 0, 0,
2537 nx, ny, image->width, image->height);
2538 XFreeGC (disp, gc);
2539 XDestroyImage (image);
2540 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2541 XClearWindow (disp, parent[0]);
2542
2543 if (!am_transparent || !am_pixmap_trans)
2544 pchanged = 1;
2545
2546 am_transparent = am_pixmap_trans = 1;
2547 }
2548 }
2549
2550 if (am_pixmap_trans)
2551 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2552 else
2553 {
2554 unsigned int n;
2555 /*
2556 * InheritPixmap transparency
2557 */
2558 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2559 {
2560 oldp = parent[i];
2561 XQueryTree (disp, parent[i - 1], &root,
2562 &parent[i], &list, &n);
2563 XFree (list);
2564
2565 if (parent[i] == display->root)
2566 {
2567 if (oldp != None)
2568 pchanged = 1;
2569
2570 break;
2571 }
2572
2573 if (oldp != parent[i])
2574 pchanged = 1;
2575 }
2576
2577 n = 0;
2578
2579 if (pchanged)
2580 {
2581 for (; n < (unsigned int)i; n++)
2582 {
2583 XGetWindowAttributes (disp, parent[n], &wattr);
2584 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2585 {
2586 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2587 break;
2588 }
2589 }
2590 }
2591
2592 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2593 {
2594 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2595 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2596 am_transparent = 0;
2597 /* XXX: also turn off Opt_transparent? */
2598 }
2599 else
2600 {
2601#if WAIT_FOR_WM
2602 /* wait (an arbitrary period) for the WM to do its thing
2603 * needed for fvwm2.2.2 (and before?) */
2604 sleep (1);
2605#endif
2606 for (n = 0; n < (unsigned int)i; n++)
2607 {
2608 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2609 XClearWindow (disp, parent[n]);
2610 }
2611
2612 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2613 am_transparent = 1;
2614 }
2615
2616 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2617 parent[i] = None;
2618 }
2619
2620 if (scrollBar.win)
2621 {
2622 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2623 scrollBar.setIdle ();
2624 scrollbar_show (0);
2625 }
2626
2627 if (am_transparent)
2628 {
2629 want_refresh = want_full_refresh = 1;
2630 if (am_pixmap_trans)
2631 flush ();
2632 }
2633
2634 return pchanged;
2635}
2636#endif
2637 2197
2638/*}}} */ 2198/*}}} */
2639 2199
2640bool 2200void
2641rxvt_term::cmd_parse () 2201rxvt_term::cmd_parse ()
2642{ 2202{
2643 bool flag = false;
2644 unicode_t ch = NOCHAR; 2203 wchar_t ch = NOCHAR;
2645 unsigned char *seq_begin; // remember start of esc-sequence here 2204 char *seq_begin; // remember start of esc-sequence here
2646 2205
2647 for (;;) 2206 for (;;)
2648 { 2207 {
2649 if (ch == NOCHAR) 2208 if (expect_false (ch == NOCHAR))
2650 { 2209 {
2651 seq_begin = cmdbuf_ptr; 2210 seq_begin = cmdbuf_ptr;
2652 ch = next_char (); 2211 ch = next_char ();
2653 }
2654 2212
2655 if (ch == NOCHAR) // TODO: improve 2213 if (ch == NOCHAR)
2656 break; 2214 break;
2215 }
2657 2216
2658 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2217 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2659 { 2218 {
2660 if (!seen_input) 2219 if (expect_false (!seen_input))
2661 { 2220 {
2662 seen_input = 1; 2221 seen_input = 1;
2663 // many badly-written programs (e.g. jed) contain a race condition: 2222 // many badly-written programs (e.g. jed) contain a race condition:
2664 // they first read the screensize and then install a SIGWINCH handler. 2223 // they first read the screensize and then install a SIGWINCH handler.
2665 // some window managers resize the window early, and these programs 2224 // some window managers resize the window early, and these programs
… …
2670 if (seen_resize && cmd_pid) 2229 if (seen_resize && cmd_pid)
2671 kill (-cmd_pid, SIGWINCH); 2230 kill (-cmd_pid, SIGWINCH);
2672 } 2231 }
2673 2232
2674 /* Read a text string from the input buffer */ 2233 /* Read a text string from the input buffer */
2675 unicode_t buf[UBUFSIZ]; 2234 wchar_t buf[UBUFSIZ];
2676 bool refreshnow = false; 2235 bool refreshnow = false;
2677 int nlines = 0; 2236 int nlines = 0;
2678 unicode_t *str = buf; 2237 wchar_t *str = buf;
2679 unicode_t *eol = str + min (ncol, UBUFSIZ); 2238 wchar_t *eol = str + min (ncol, UBUFSIZ);
2680 2239
2681 for (;;) 2240 for (;;)
2682 { 2241 {
2683 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2242 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2684 break; 2243 break;
2685 2244
2686 *str++ = ch; 2245 *str++ = ch;
2687 2246
2688 if (ch == C0_LF || str >= eol) 2247 if (expect_false (ch == C0_LF || str >= eol))
2689 { 2248 {
2690 if (ch == C0_LF) 2249 if (ch == C0_LF)
2691 nlines++; 2250 nlines++;
2692 2251
2693 refresh_count++; 2252 refresh_count++;
2694 2253
2695 if (!OPTION (Opt_jumpScroll) 2254 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2696 || (refresh_count >= refresh_limit * (nrow - 1)))
2697 { 2255 {
2698 refreshnow = true;
2699 refresh_count = 0; 2256 refresh_count = 0;
2257
2258 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2259 {
2260 refreshnow = true;
2700 ch = NOCHAR; 2261 ch = NOCHAR;
2701 break; 2262 break;
2263 }
2702 } 2264 }
2703 2265
2704 // scr_add_lines only works for nlines <= nrow - 1. 2266 // scr_add_lines only works for nlines <= nrow - 1.
2705 if (nlines >= nrow - 1) 2267 if (nlines >= nrow - 1)
2706 { 2268 {
2269 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2270 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2707 scr_add_lines (buf, nlines, str - buf); 2271 scr_add_lines (buf, str - buf, nlines);
2272
2708 nlines = 0; 2273 nlines = 0;
2709 str = buf; 2274 str = buf;
2710 eol = str + min (ncol, UBUFSIZ); 2275 eol = str + min (ncol, UBUFSIZ);
2711 } 2276 }
2712 2277
… …
2725 2290
2726 seq_begin = cmdbuf_ptr; 2291 seq_begin = cmdbuf_ptr;
2727 ch = next_char (); 2292 ch = next_char ();
2728 } 2293 }
2729 2294
2295 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2296 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2730 scr_add_lines (buf, nlines, str - buf); 2297 scr_add_lines (buf, str - buf, nlines);
2731 2298
2732 /* 2299 /*
2733 * If there have been a lot of new lines, then update the screen 2300 * If there have been a lot of new lines, then update the screen
2734 * What the heck I'll cheat and only refresh less than every page-full. 2301 * What the heck we'll cheat and only refresh less than every page-full.
2735 * the number of pages between refreshes is refresh_limit, which 2302 * if skipScroll is enabled.
2736 * is incremented here because we must be doing flat-out scrolling.
2737 */ 2303 */
2738 if (refreshnow) 2304 if (refreshnow)
2739 { 2305 {
2740 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2741 refresh_limit++;
2742 else
2743 {
2744 flag = true;
2745 scr_refresh (refresh_type); 2306 scr_refresh ();
2746 flush_ev.stop (); 2307 want_refresh = 1;
2747 }
2748 } 2308 }
2749
2750 } 2309 }
2751 else 2310 else
2752 { 2311 {
2753 try 2312 try
2754 { 2313 {
… …
2762 } 2321 }
2763 2322
2764 ch = NOCHAR; 2323 ch = NOCHAR;
2765 } 2324 }
2766 } 2325 }
2767
2768 return flag;
2769}
2770
2771// read the next octet
2772unicode_t
2773rxvt_term::next_octet ()
2774{
2775 return cmdbuf_ptr < cmdbuf_endp
2776 ? *cmdbuf_ptr++
2777 : NOCHAR;
2778} 2326}
2779 2327
2780// read the next character 2328// read the next character
2781unicode_t 2329wchar_t
2782rxvt_term::next_char () 2330rxvt_term::next_char () NOTHROW
2783{ 2331{
2784 while (cmdbuf_ptr < cmdbuf_endp) 2332 while (cmdbuf_ptr < cmdbuf_endp)
2785 { 2333 {
2786 // assume 7-bit to be ascii ALWAYS 2334 // assume 7-bit to be ascii ALWAYS
2787 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2335 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2788 return *cmdbuf_ptr++; 2336 return *cmdbuf_ptr++;
2789 2337
2790 wchar_t wc; 2338 wchar_t wc;
2791 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2339 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2792 2340
2793 if (len == (size_t)-2) 2341 if (len == (size_t)-2)
2794 { 2342 {
2795 // the mbstate stores incomplete sequences. didn't know this :/ 2343 // the mbstate stores incomplete sequences. didn't know this :/
2796 cmdbuf_ptr = cmdbuf_endp; 2344 cmdbuf_ptr = cmdbuf_endp;
2797 break; 2345 break;
2798 } 2346 }
2799 2347
2800 if (len == (size_t)-1) 2348 if (len == (size_t)-1)
2349 {
2350 mbstate.reset (); // reset now undefined conversion state
2801 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2351 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2352 }
2802 2353
2803 // assume wchar == unicode 2354 // assume wchar == unicode
2804 cmdbuf_ptr += len; 2355 cmdbuf_ptr += len;
2805 return wc & UNICODE_MASK; 2356 return wc & UNICODE_MASK;
2806 } 2357 }
2807 2358
2808 return NOCHAR; 2359 return NOCHAR;
2809} 2360}
2361
2362// read the next octet
2363uint32_t
2364rxvt_term::next_octet () NOTHROW
2365{
2366 return cmdbuf_ptr < cmdbuf_endp
2367 ? (unsigned char)*cmdbuf_ptr++
2368 : NOCHAR;
2369}
2370
2371static class out_of_input out_of_input;
2810 2372
2811/* rxvt_cmd_getc () - Return next input character */ 2373/* rxvt_cmd_getc () - Return next input character */
2812/* 2374/*
2813 * Return the next input character after first passing any keyboard input 2375 * Return the next input character after first passing any keyboard input
2814 * to the command. 2376 * to the command.
2815 */ 2377 */
2816unicode_t 2378wchar_t
2817rxvt_term::cmd_getc () 2379rxvt_term::cmd_getc () THROW ((class out_of_input))
2818{ 2380{
2819 unicode_t c = next_char (); 2381 wchar_t c = next_char ();
2820 2382
2821 if (c == NOCHAR) 2383 if (c == NOCHAR)
2822 throw out_of_input; 2384 throw out_of_input;
2823 2385
2824 return c; 2386 return c;
2825} 2387}
2826 2388
2827unicode_t 2389uint32_t
2828rxvt_term::cmd_get8 () 2390rxvt_term::cmd_get8 () THROW ((class out_of_input))
2829{ 2391{
2830 unicode_t c = next_octet (); 2392 uint32_t c = next_octet ();
2831 2393
2832 if (c == NOCHAR) 2394 if (c == NOCHAR)
2833 throw out_of_input; 2395 throw out_of_input;
2834 2396
2835 return c; 2397 return c;
… …
2839/*----------------------------------------------------------------------*/ 2401/*----------------------------------------------------------------------*/
2840#ifdef PRINTPIPE 2402#ifdef PRINTPIPE
2841FILE * 2403FILE *
2842rxvt_term::popen_printer () 2404rxvt_term::popen_printer ()
2843{ 2405{
2844 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2406 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2845 2407
2846 if (stream == NULL) 2408 if (stream == NULL)
2847 rxvt_warn ("can't open printer pipe, not printing.\n"); 2409 rxvt_warn ("can't open printer pipe, not printing.\n");
2848 2410
2849 return stream; 2411 return stream;
… …
2860 * simulate attached vt100 printer 2422 * simulate attached vt100 printer
2861 */ 2423 */
2862void 2424void
2863rxvt_term::process_print_pipe () 2425rxvt_term::process_print_pipe ()
2864{ 2426{
2865 int done; 2427 FILE *fd = popen_printer ();
2866 FILE *fd;
2867 2428
2868 if ((fd = popen_printer ()) == NULL) 2429 if (!fd)
2869 return; 2430 return;
2870 2431
2871 /* 2432 /*
2872 * Send all input to the printer until either ESC[4i or ESC[?4i 2433 * Send all input to the printer until either ESC[4i or ESC[?4i
2873 * is received. 2434 * is received.
2874 */ 2435 */
2875 for (done = 0; !done;) 2436 for (int done = 0; !done; )
2876 { 2437 {
2877 unsigned char buf[8]; 2438 unsigned char buf[8];
2878 unicode_t ch; 2439 unicode_t ch;
2879 unsigned int i, len; 2440 unsigned int i, len;
2880 2441
… …
2899 { 2460 {
2900 if ((buf[len++] = cmd_getc ()) == 'i') 2461 if ((buf[len++] = cmd_getc ()) == 'i')
2901 break; /* done = 1 */ 2462 break; /* done = 1 */
2902 } 2463 }
2903 } 2464 }
2904 2465
2905 for (i = 0; i < len; i++) 2466 for (i = 0; i < len; i++)
2906 if (putc (buf[i], fd) == EOF) 2467 if (putc (buf[i], fd) == EOF)
2907 { 2468 {
2908 done = 1; 2469 done = 1;
2909 break; 2470 break;
… …
2911 } 2472 }
2912 } 2473 }
2913 2474
2914 pclose_printer (fd); 2475 pclose_printer (fd);
2915} 2476}
2916#endif /* PRINTPIPE */ 2477#endif /* PRINTPIPE */
2917/*}}} */ 2478/*}}} */
2918 2479
2919/* *INDENT-OFF* */ 2480/* *INDENT-OFF* */
2920enum { 2481enum {
2921 C1_40 = 0x40, 2482 C1_40 = 0x40,
… …
2935 case C0_ESC: 2496 case C0_ESC:
2936 process_escape_seq (); 2497 process_escape_seq ();
2937 break; 2498 break;
2938 case C0_ENQ: /* terminal Status */ 2499 case C0_ENQ: /* terminal Status */
2939 if (rs[Rs_answerbackstring]) 2500 if (rs[Rs_answerbackstring])
2940 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2501 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2941 (unsigned int)strlen (rs[Rs_answerbackstring]));
2942 else 2502 else
2943 tt_write ((unsigned char *)VT100_ANS, 2503 tt_write (VT100_ANS, strlen (VT100_ANS));
2944 (unsigned int)strlen (VT100_ANS));
2945 break; 2504 break;
2946 case C0_BEL: /* bell */ 2505 case C0_BEL: /* bell */
2947 scr_bell (); 2506 scr_bell ();
2948 break; 2507 break;
2949 case C0_BS: /* backspace */ 2508 case C0_BS: /* backspace */
… …
2973 process_dcs_seq (); 2532 process_dcs_seq ();
2974 break; 2533 break;
2975 case 0x9b: /* CSI */ 2534 case 0x9b: /* CSI */
2976 process_csi_seq (); 2535 process_csi_seq ();
2977 break; 2536 break;
2978 case 0x9d: /* CSI */ 2537 case 0x9d: /* OSC */
2979 process_osc_seq (); 2538 process_osc_seq ();
2980 break; 2539 break;
2981#endif 2540#endif
2982 } 2541 }
2983} 2542}
… …
3027 break; 2586 break;
3028 case 'Z': /* identify the terminal type */ 2587 case 'Z': /* identify the terminal type */
3029 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2588 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3030 break; 2589 break;
3031 case '<': /* turn off VT52 mode */ 2590 case '<': /* turn off VT52 mode */
3032 PrivMode (0, PrivMode_vt52); 2591 set_privmode (PrivMode_vt52, 0);
3033 break; 2592 break;
3034 case 'F': /* use special graphics character set */ 2593 case 'F': /* use special graphics character set */
3035 case 'G': /* use regular character set */ 2594 case 'G': /* use regular character set */
3036 /* unimplemented */ 2595 /* unimplemented */
3037 break; 2596 break;
… …
3073 scr_charset_set (2, (unsigned int)cmd_getc ()); 2632 scr_charset_set (2, (unsigned int)cmd_getc ());
3074 break; 2633 break;
3075 case '+': 2634 case '+':
3076 scr_charset_set (3, (unsigned int)cmd_getc ()); 2635 scr_charset_set (3, (unsigned int)cmd_getc ());
3077 break; 2636 break;
3078#if ENABLE_FRILLS 2637#if !ENABLE_MINIMAL
3079 case '6': 2638 case '6':
3080 scr_backindex (); 2639 scr_backindex ();
3081 break; 2640 break;
3082#endif 2641#endif
3083 case '7': 2642 case '7':
3084 scr_cursor (SAVE); 2643 scr_cursor (SAVE);
3085 break; 2644 break;
3086 case '8': 2645 case '8':
3087 scr_cursor (RESTORE); 2646 scr_cursor (RESTORE);
3088 break; 2647 break;
3089#if ENABLE_FRILLS 2648#if !ENABLE_MINIMAL
3090 case '9': 2649 case '9':
3091 scr_forwardindex (); 2650 scr_forwardindex ();
3092 break; 2651 break;
3093#endif 2652#endif
3094 case '=': 2653 case '=':
3095 case '>': 2654 case '>':
3096 PrivMode ((ch == '='), PrivMode_aplKP); 2655 set_privmode (PrivMode_aplKP, ch == '=');
3097 break; 2656 break;
3098 2657
3099 case C1_40: 2658 case C1_40:
3100 cmd_getc (); 2659 cmd_getc ();
3101 break; 2660 break;
… …
3104 break; 2663 break;
3105 2664
3106 /* 8.3.87: NEXT LINE */ 2665 /* 8.3.87: NEXT LINE */
3107 case C1_NEL: /* ESC E */ 2666 case C1_NEL: /* ESC E */
3108 { 2667 {
3109 unicode_t nlcr[] = { C0_LF, C0_CR }; 2668 wchar_t nlcr[] = { C0_LF, C0_CR };
3110 scr_add_lines (nlcr, 1, 2); 2669 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3111 } 2670 }
3112 break; 2671 break;
3113 2672
3114 /* kidnapped escape sequence: Should be 8.3.48 */ 2673 /* kidnapped escape sequence: Should be 8.3.48 */
3115 case C1_ESA: /* ESC G */ 2674 case C1_ESA: /* ESC G */
… …
3137 process_dcs_seq (); 2696 process_dcs_seq ();
3138 break; 2697 break;
3139 2698
3140 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2699 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3141 case C1_SCI: /* ESC Z */ 2700 case C1_SCI: /* ESC Z */
3142 tt_write ((const unsigned char *)ESCZ_ANSWER, 2701 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3143 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3144 break; /* steal obsolete ESC [ c */ 2702 break; /* steal obsolete ESC [ c */
3145 2703
3146 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2704 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3147 case C1_CSI: /* ESC [ */ 2705 case C1_CSI: /* ESC [ */
3148 process_csi_seq (); 2706 process_csi_seq ();
3149 break; 2707 break;
3150 2708
3151 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2709 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3152 case C1_OSC: /* ESC ] */ 2710 case C1_OSC: /* ESC ] */
3153 process_osc_seq (); 2711 process_osc_seq ();
3154 break; 2712 break;
3155 2713
3156 /* 8.3.106: RESET TO INITIAL STATE */ 2714 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3157 case 'c': 2715 case 'c':
3158 mbstate.reset (); 2716 mbstate.reset ();
3159 scr_poweron (); 2717 scr_poweron ();
3160 scrollbar_show (1); 2718 scrollBar.show (1);
3161 break; 2719 break;
3162 2720
3163 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2721 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3164 case 'n': 2722 case 'n':
3165 scr_charset_choose (2); 2723 scr_charset_choose (2);
… …
3210rxvt_term::process_csi_seq () 2768rxvt_term::process_csi_seq ()
3211{ 2769{
3212 unicode_t ch, priv, i; 2770 unicode_t ch, priv, i;
3213 unsigned int nargs, p; 2771 unsigned int nargs, p;
3214 int n, ndef; 2772 int n, ndef;
3215 int arg[ESC_ARGS]; 2773 int arg[ESC_ARGS] = { };
3216 2774
3217 for (nargs = ESC_ARGS; nargs > 0;) 2775 nargs = 0;
3218 arg[--nargs] = 0;
3219 2776
3220 priv = 0; 2777 priv = 0;
3221 ch = cmd_getc (); 2778 ch = cmd_getc ();
3222 if (ch >= '<' && ch <= '?') 2779 if ((ch >= '<' && ch <= '?') || ch == '!')
2780 {
3223 { /* '<' '=' '>' '?' */ 2781 /* '<' '=' '>' '?' '!' */
3224 priv = ch; 2782 priv = ch;
3225 ch = cmd_getc (); 2783 ch = cmd_getc ();
3226 } 2784 }
3227 2785
3228 /* read any numerical arguments */ 2786 /* read any numerical arguments */
… …
3257 ndef = get_byte_array_bit (csi_defaults, i); 2815 ndef = get_byte_array_bit (csi_defaults, i);
3258 for (p = 0; p < nargs; p++) 2816 for (p = 0; p < nargs; p++)
3259 if (arg[p] == -1) 2817 if (arg[p] == -1)
3260 arg[p] = ndef; 2818 arg[p] = ndef;
3261 2819
3262#ifdef DEBUG_CMD
3263 fprintf (stderr, "CSI ");
3264 for (p = 0; p < nargs; p++)
3265 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3266 fprintf (stderr, "%c\n", ch);
3267#endif
3268
3269 /* 2820 /*
3270 * private mode handling 2821 * private mode handling
3271 */ 2822 */
3272 if (priv) 2823 if (priv)
3273 { 2824 {
3274 switch (priv) 2825 switch (priv)
3275 { 2826 {
3276 case '>': 2827 case '>':
3277 if (ch == CSI_DA) /* secondary device attributes */ 2828 if (ch == CSI_DA) /* secondary device attributes */
3278 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2829 {
2830 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2831 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2832 //
2833 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2834 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2835 // versions.
2836 //
2837 tt_printf ("\033[>%d;95;0c", 'U');
2838 }
3279 break; 2839 break;
2840
3280 case '?': 2841 case '?':
3281 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3282 process_terminal_mode (ch, priv, nargs, arg); 2843 process_terminal_mode (ch, priv, nargs, arg);
3283 break; 2844 break;
2845
2846 case '!':
2847 if (ch == CSI_70)
2848 {
2849 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2850 scr_soft_reset ();
2851
2852 static const int pm_h[] = { 7, 25 };
2853 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2854
2855 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2856 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
3284 } 2857 }
2858 break;
2859 }
2860
3285 return; 2861 return;
3286 } 2862 }
3287 2863
3288 switch (ch) 2864 switch (ch)
3289 { 2865 {
… …
3392 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2968 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3393 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 2969 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3394 break; 2970 break;
3395 2971
3396 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2972 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3397 tt_write ((const unsigned char *)VT100_ANS, 2973 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3398 (unsigned int) (sizeof (VT100_ANS) - 1));
3399 break; 2974 break;
3400 2975
3401 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2976 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3402 process_sgr_mode (nargs, arg); 2977 process_sgr_mode (nargs, arg);
3403 break; 2978 break;
… …
3410 break; 2985 break;
3411 case 6: /* CPR requested */ 2986 case 6: /* CPR requested */
3412 scr_report_position (); 2987 scr_report_position ();
3413 break; 2988 break;
3414 case 7: /* unofficial extension */ 2989 case 7: /* unofficial extension */
3415 if (OPTION (Opt_insecure)) 2990 if (option (Opt_insecure))
3416 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2991 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3417 break; 2992 break;
3418 case 8: /* unofficial extension */ 2993 case 8: /* unofficial extension */
3419 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2994 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3420 break; 2995 break;
… …
3487 break; 3062 break;
3488 case CSI_75: 3063 case CSI_75:
3489 scr_cursor (RESTORE); 3064 scr_cursor (RESTORE);
3490 break; 3065 break;
3491 3066
3492#if ENABLE_FRILLS 3067#if !ENABLE_MINIMAL
3493 case CSI_74: 3068 case CSI_74:
3494 process_window_ops (arg, nargs); 3069 process_window_ops (arg, nargs);
3495 break; 3070 break;
3496#endif 3071#endif
3497 3072
… …
3504 break; 3079 break;
3505 } 3080 }
3506} 3081}
3507/*}}} */ 3082/*}}} */
3508 3083
3509#if ENABLE_FRILLS 3084#if !ENABLE_MINIMAL
3510/* ARGSUSED */ 3085/* ARGSUSED */
3511void 3086void
3512rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3087rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3513{ 3088{
3514 int x, y; 3089 int x, y;
3515 XWindowAttributes wattr; 3090 XWindowAttributes wattr;
3516 Window wdummy; 3091 Window wdummy;
3517 dDisp; 3092
3093 dLocal (Display *, dpy);
3518 3094
3519 if (nargs == 0) 3095 if (nargs == 0)
3520 return; 3096 return;
3521 3097
3522 switch (args[0]) 3098 switch (args[0])
3523 { 3099 {
3524 /* 3100 /*
3525 * commands 3101 * commands
3526 */ 3102 */
3527 case 1: /* deiconify window */ 3103 case 1: /* deiconify window */
3528 XMapWindow (disp, parent[0]); 3104 XMapWindow (dpy, parent[0]);
3529 break; 3105 break;
3530 case 2: /* iconify window */ 3106 case 2: /* iconify window */
3531 XIconifyWindow (disp, parent[0], display->screen); 3107 XIconifyWindow (dpy, parent[0], display->screen);
3532 break; 3108 break;
3533 case 3: /* set position (pixels) */ 3109 case 3: /* set position (pixels) */
3534 XMoveWindow (disp, parent[0], args[1], args[2]); 3110 XMoveWindow (dpy, parent[0], args[1], args[2]);
3535 break; 3111 break;
3536 case 4: /* set size (pixels) */ 3112 case 4: /* set size (pixels) */
3537 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3113 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3538 break; 3114 break;
3539 case 5: /* raise window */ 3115 case 5: /* raise window */
3540 XRaiseWindow (disp, parent[0]); 3116 XRaiseWindow (dpy, parent[0]);
3541 break; 3117 break;
3542 case 6: /* lower window */ 3118 case 6: /* lower window */
3543 XLowerWindow (disp, parent[0]); 3119 XLowerWindow (dpy, parent[0]);
3544 break; 3120 break;
3545 case 7: /* refresh window */ 3121 case 7: /* refresh window */
3546 scr_touch (true); 3122 scr_touch (true);
3547 break; 3123 break;
3548 case 8: /* set size (chars) */ 3124 case 8: /* set size (chars) */
… …
3555 if (args[0] >= 24) /* set height (chars) */ 3131 if (args[0] >= 24) /* set height (chars) */
3556 set_widthheight ((unsigned int)width, 3132 set_widthheight ((unsigned int)width,
3557 (unsigned int) (args[1] * fheight)); 3133 (unsigned int) (args[1] * fheight));
3558 break; 3134 break;
3559 3135
3560
3561 /* 3136 /*
3562 * reports - some output format copied from XTerm 3137 * reports - some output format copied from XTerm
3563 */ 3138 */
3564 case 11: /* report window state */ 3139 case 11: /* report window state */
3565 XGetWindowAttributes (disp, parent[0], &wattr); 3140 XGetWindowAttributes (dpy, parent[0], &wattr);
3566 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3141 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3567 break; 3142 break;
3568 case 13: /* report window position */ 3143 case 13: /* report window position */
3569 XGetWindowAttributes (disp, parent[0], &wattr); 3144 XGetWindowAttributes (dpy, parent[0], &wattr);
3570 XTranslateCoordinates (disp, parent[0], wattr.root, 3145 XTranslateCoordinates (dpy, parent[0], wattr.root,
3571 -wattr.border_width, -wattr.border_width, 3146 -wattr.border_width, -wattr.border_width,
3572 &x, &y, &wdummy); 3147 &x, &y, &wdummy);
3573 tt_printf ("\033[3;%d;%dt", x, y); 3148 tt_printf ("\033[3;%d;%dt", x, y);
3574 break; 3149 break;
3575 case 14: /* report window size (pixels) */ 3150 case 14: /* report window size (pixels) */
3576 XGetWindowAttributes (disp, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent[0], &wattr);
3577 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3152 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3578 break; 3153 break;
3579 case 18: /* report text area size (chars) */ 3154 case 18: /* report text area size (chars) */
3580 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3155 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3581 break; 3156 break;
… …
3583 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3158 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3584 break; 3159 break;
3585 case 20: /* report icon label */ 3160 case 20: /* report icon label */
3586 { 3161 {
3587 char *s; 3162 char *s;
3588 XGetIconName (disp, parent[0], &s); 3163 XGetIconName (dpy, parent[0], &s);
3589 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3164 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3590 XFree (s); 3165 XFree (s);
3591 } 3166 }
3592 break; 3167 break;
3593 case 21: /* report window title */ 3168 case 21: /* report window title */
3594 { 3169 {
3595 char *s; 3170 char *s;
3596 XFetchName (disp, parent[0], &s); 3171 XFetchName (dpy, parent[0], &s);
3597 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3172 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3598 XFree (s); 3173 XFree (s);
3599 } 3174 }
3600 break; 3175 break;
3601 } 3176 }
3602} 3177}
… …
3605/*----------------------------------------------------------------------*/ 3180/*----------------------------------------------------------------------*/
3606/* 3181/*
3607 * get input up until STRING TERMINATOR (or BEL) 3182 * get input up until STRING TERMINATOR (or BEL)
3608 * ends_how is terminator used. returned input must be free()'d 3183 * ends_how is terminator used. returned input must be free()'d
3609 */ 3184 */
3610unsigned char * 3185char *
3611rxvt_term::get_to_st (unicode_t &ends_how) 3186rxvt_term::get_to_st (unicode_t &ends_how)
3612{ 3187{
3613 unicode_t ch; 3188 unicode_t ch;
3614 bool seen_esc = false; 3189 bool seen_esc = false;
3615 unsigned int n = 0; 3190 unsigned int n = 0;
… …
3629 seen_esc = true; 3204 seen_esc = true;
3630 continue; 3205 continue;
3631 } 3206 }
3632 else if (ch == C0_BEL || ch == CHAR_ST) 3207 else if (ch == C0_BEL || ch == CHAR_ST)
3633 break; 3208 break;
3209 else if (ch == C0_SYN)
3210 ch = cmd_get8 ();
3634 else if (ch < 0x20) 3211 else if (ch < 0x20)
3635 return NULL; /* other control character - exit */ 3212 return NULL; /* other control character - exit */
3636 3213
3637 seen_esc = false; 3214 seen_esc = false;
3638 3215
3639 if (n >= STRING_MAX - 1) 3216 if (n >= STRING_MAX - 1)
3640 // stop at some sane length 3217 // stop at some sane length
3641 return NULL; 3218 return NULL;
3642 3219
3643 if (ch == C0_SYN)
3644 string[n++] = cmd_get8 ();
3645 else
3646 string[n++] = ch; 3220 string[n++] = ch;
3647 } 3221 }
3648 3222
3649 string[n++] = '\0'; 3223 string[n++] = '\0';
3650 3224
3651 ends_how = (ch == 0x5c ? C0_ESC : ch); 3225 ends_how = (ch == 0x5c ? C0_ESC : ch);
3652 3226
3653 return (unsigned char *)rxvt_wcstombs (string); 3227 return rxvt_wcstombs (string);
3654} 3228}
3655 3229
3656/*----------------------------------------------------------------------*/ 3230/*----------------------------------------------------------------------*/
3657/* 3231/*
3658 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3232 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3659 */ 3233 */
3660void 3234void
3661rxvt_term::process_dcs_seq () 3235rxvt_term::process_dcs_seq ()
3662{ 3236{
3663 unsigned char *s; 3237 char *s;
3664 unicode_t eh; 3238 unicode_t eh;
3665 3239
3666 /* 3240 /*
3667 * Not handled yet 3241 * Not handled yet
3668 */ 3242 */
… …
3687 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3261 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3688 arg = arg * 10 + (ch - '0'); 3262 arg = arg * 10 + (ch - '0');
3689 3263
3690 if (ch == ';') 3264 if (ch == ';')
3691 { 3265 {
3692 unsigned char *s = get_to_st (eh); 3266 char *s = get_to_st (eh);
3693 3267
3694 if (s) 3268 if (s)
3695 { 3269 {
3696 process_xterm_seq (arg, (char *)s, eh); 3270 process_xterm_seq (arg, s, eh);
3697 free (s); 3271 free (s);
3698 } 3272 }
3699 } 3273 }
3700} 3274}
3701 3275
3702void 3276void
3703rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3277rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3704{ 3278{
3705 if (str[0] == '?' && !str[1]) 3279 if (str[0] == '?' && !str[1])
3706 { 3280 {
3707 unsigned short r, g, b; 3281 rgba c;
3708 pix_colors_focused[color].get (display, r, g, b); 3282 pix_colors_focused[color].get (c);
3283
3284#if XFT
3285 if (c.a != rgba::MAX_CC)
3286 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3287 else
3288#endif
3709 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3289 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3710 } 3290 }
3711 else 3291 else
3712 set_window_color (color, str); 3292 set_window_color (color, str);
3713} 3293}
3714 3294
3715/* 3295/*
3716 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3717 */ 3297 */
3718void 3298void
3719rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3299rxvt_term::process_xterm_seq (int op, char *str, char resp)
3720{ 3300{
3721 int changed = 0;
3722 int color; 3301 int color;
3723 char *buf, *name; 3302 char *buf, *name;
3724 bool query = str[0] == '?' && !str[1]; 3303 bool query = str[0] == '?' && !str[1];
3725 int saveop = op; 3304 int saveop = op;
3726 dDisp; 3305
3306 dLocal (Display *, dpy);
3727 3307
3728 assert (str != NULL); 3308 assert (str != NULL);
3309
3310 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3311 return;
3312
3729 switch (op) 3313 switch (op)
3730 { 3314 {
3731 case XTerm_name: 3315 case XTerm_name:
3732 set_title (str); 3316 set_title (str);
3733 /* FALLTHROUGH */ 3317 /* FALLTHROUGH */
… …
3747 unsigned long bytes_after; 3331 unsigned long bytes_after;
3748 unsigned char *value = 0; 3332 unsigned char *value = 0;
3749 const char *str = ""; 3333 const char *str = "";
3750 3334
3751 if (prop 3335 if (prop
3752 && XGetWindowProperty (disp, parent[0], 3336 && XGetWindowProperty (dpy, parent[0],
3753 prop, 0, 1<<16, 0, AnyPropertyType, 3337 prop, 0, 1<<16, 0, AnyPropertyType,
3754 &actual_type, &actual_format, 3338 &actual_type, &actual_format,
3755 &nitems, &bytes_after, &value) == Success 3339 &nitems, &bytes_after, &value) == Success
3756 && actual_type != None 3340 && actual_type != None
3757 && actual_format == 8) 3341 && actual_format == 8)
3758 str = (const char *)(value); 3342 str = (const char *)(value);
3759 3343
3760 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3344 tt_printf ("\033]%d;%s%c", op, str, resp);
3761 3345
3762 XFree (value); 3346 XFree (value);
3763 } 3347 }
3764 else 3348 else
3765 { 3349 {
3766 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3350 char *eq = strchr (str, '=');
3767 3351
3768 if (eq) 3352 if (eq)
3769 { 3353 {
3770 *eq = 0; 3354 *eq = 0;
3771 set_utf8_property (display->atom (str), eq + 1); 3355 set_utf8_property (display->atom (str), eq + 1);
3772 } 3356 }
3773 else 3357 else
3774 XDeleteProperty (disp, parent[0], 3358 XDeleteProperty (dpy, parent[0],
3775 display->atom (str)); 3359 display->atom (str));
3776 } 3360 }
3777 break; 3361 break;
3778 3362
3779 case XTerm_Color: 3363 case XTerm_Color:
… …
3781 { 3365 {
3782 if ((name = strchr (buf, ';')) == NULL) 3366 if ((name = strchr (buf, ';')) == NULL)
3783 break; 3367 break;
3784 3368
3785 *name++ = '\0'; 3369 *name++ = '\0';
3786 color = atoi (buf); 3370 color = atoi (buf) + minCOLOR;
3787 3371
3788 if (color < 0 || color >= TOTAL_COLORS) 3372 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3789 break; 3373 break;
3790 3374
3791 if ((buf = strchr (name, ';')) != NULL) 3375 if ((buf = strchr (name, ';')) != NULL)
3792 *buf++ = '\0'; 3376 *buf++ = '\0';
3793 3377
3794 if (name[0] == '?' && !name[1]) 3378 process_color_seq (op, color, name, resp);
3795 {
3796 unsigned short r, g, b;
3797 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3798 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3799 }
3800 else
3801 set_window_color (color + minCOLOR, name);
3802 } 3379 }
3803 break; 3380 break;
3381 case Rxvt_restoreFG:
3804 case XTerm_Color00: 3382 case XTerm_Color00:
3805 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3383 process_color_seq (op, Color_fg, str, resp);
3806 break; 3384 break;
3385 case Rxvt_restoreBG:
3807 case XTerm_Color01: 3386 case XTerm_Color01:
3808 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3387 process_color_seq (op, Color_bg, str, resp);
3809 break; 3388 break;
3810#ifndef NO_CURSORCOLOR 3389#ifndef NO_CURSORCOLOR
3811 case XTerm_Color_cursor: 3390 case XTerm_Color_cursor:
3812 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3391 process_color_seq (op, Color_cursor, str, resp);
3813 break; 3392 break;
3814#endif 3393#endif
3815 case XTerm_Color_pointer_fg: 3394 case XTerm_Color_pointer_fg:
3816 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3395 process_color_seq (op, Color_pointer_fg, str, resp);
3817 break; 3396 break;
3818 case XTerm_Color_pointer_bg: 3397 case XTerm_Color_pointer_bg:
3819 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3398 process_color_seq (op, Color_pointer_bg, str, resp);
3820 break; 3399 break;
3821#ifndef NO_BOLD_UNDERLINE_REVERSE 3400#ifndef NO_BOLD_UNDERLINE_REVERSE
3822 case XTerm_Color_BD:
3823 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3824 break;
3825 case XTerm_Color_UL:
3826 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3827 break;
3828 case XTerm_Color_RV: 3401 case XTerm_Color_RV:
3829 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3402 process_color_seq (op, Color_RV, str, resp);
3403 break;
3404 case Rxvt_Color_BD:
3405 case URxvt_Color_BD:
3406 process_color_seq (op, Color_BD, str, resp);
3407 break;
3408 case Rxvt_Color_UL:
3409 case URxvt_Color_UL:
3410 process_color_seq (op, Color_UL, str, resp);
3830 break; 3411 break;
3831 case URxvt_Color_IT: 3412 case URxvt_Color_IT:
3832 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3413 process_color_seq (op, Color_IT, str, resp);
3833 break; 3414 break;
3834#endif 3415#endif
3835#if TRANSPARENT && TINTING 3416 case URxvt_Color_border:
3417 process_color_seq (op, Color_border, str, resp);
3418 break;
3419#if ENABLE_TRANSPARENCY
3836 case URxvt_Color_tint: 3420 case URxvt_Color_tint:
3837 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3421 process_color_seq (op, Color_tint, str, resp);
3838 check_our_parents (); 3422 {
3839 if (am_transparent) 3423 bool changed = false;
3840 want_full_refresh = want_refresh = 1;
3841 break;
3842#endif
3843 3424
3425 if (ISSET_PIXCOLOR (Color_tint))
3426 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3427 else
3428 changed = bgPixmap.unset_tint ();
3429
3430 if (changed)
3431 update_background ();
3432 }
3433
3434 break;
3435#endif
3436
3437#if BG_IMAGE_FROM_FILE
3844 case XTerm_Pixmap: 3438 case Rxvt_Pixmap:
3845 if (*str != ';') 3439 if (!strcmp (str, "?"))
3846 { 3440 {
3847#if XPM_BACKGROUND 3441 char str[256];
3848 scale_pixmap (""); /* reset to default scaling */ 3442
3849 set_bgPixmap (str); /* change pixmap */ 3443 sprintf (str, "[%dx%d+%d+%d]",
3850#endif 3444 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3851 scr_touch (true); 3445 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3446 process_xterm_seq (XTerm_title, str, CHAR_ST);
3852 } 3447 }
3853 while ((str = strchr (str, ';')) != NULL) 3448 else
3854 { 3449 {
3450 int changed = 0;
3451
3452 if (*str != ';')
3453 {
3454 /* reset to default scaling :*/
3455 bgPixmap.unset_geometry ();
3456 if (bgPixmap.set_file (str)) /* change pixmap */
3457 changed++;
3458 str = strchr (str, ';');
3459 if (str == NULL)
3460 bgPixmap.set_defaultGeometry ();
3461 }
3462
3463 while (str)
3464 {
3855 str++; 3465 str++;
3856#if XPM_BACKGROUND 3466 if (bgPixmap.set_geometry (str))
3857 changed += scale_pixmap (str); 3467 changed++;
3858#endif 3468 str = strchr (str, ';');
3469 }
3470
3471 if (changed)
3472 update_background ();
3859 } 3473 }
3860
3861 if (changed)
3862 {
3863#ifdef XPM_BACKGROUND
3864 resize_pixmap ();
3865#endif
3866 scr_touch (true);
3867 }
3868 break; 3474 break;
3869 3475#endif
3870 case XTerm_restoreFG:
3871 set_window_color (Color_fg, str);
3872 break;
3873 case XTerm_restoreBG:
3874 set_window_color (Color_bg, str);
3875 break;
3876 3476
3877 case XTerm_logfile: 3477 case XTerm_logfile:
3878 // TODO, when secure mode? 3478 // TODO, when secure mode?
3879 break; 3479 break;
3880 3480
3881#ifdef MENUBAR
3882 case URxvt_Menu:
3883 if (OPTION (Opt_insecure))
3884 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3885 break;
3886#endif
3887#if 0 3481#if 0
3888 case XTerm_dumpscreen: /* no error notices */ 3482 case Rxvt_dumpscreen: /* no error notices */
3889 { 3483 {
3890 int fd; 3484 int fd;
3891 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3485 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3892 { 3486 {
3893 scr_dump (fd); 3487 scr_dump (fd);
… …
3904 case URxvt_italicFont: 3498 case URxvt_italicFont:
3905 case URxvt_boldItalicFont: 3499 case URxvt_boldItalicFont:
3906#endif 3500#endif
3907 if (query) 3501 if (query)
3908 tt_printf ("\33]%d;%-.250s%c", saveop, 3502 tt_printf ("\33]%d;%-.250s%c", saveop,
3909 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3503 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3910 ? fontset[op - URxvt_font]->fontdesc : "", 3504 ? fontset[op - URxvt_font]->fontdesc : "",
3911 resp); 3505 resp);
3912 else 3506 else
3913 { 3507 {
3914 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3508 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3917 allocated.push_back ((void *)res); 3511 allocated.push_back ((void *)res);
3918 set_fonts (); 3512 set_fonts ();
3919 } 3513 }
3920 break; 3514 break;
3921 3515
3922#if ENABLE_FRILLS 3516 case URxvt_version:
3517 if (query)
3518 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3519 op,
3520 rs[Rs_name], VERSION[0], VERSION[2],
3521 resp);
3522 break;
3523
3524#if !ENABLE_MINIMAL
3923 case URxvt_locale: 3525 case URxvt_locale:
3924 if (query) 3526 if (query)
3925 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3527 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3926 else 3528 else
3927 { 3529 {
3928 set_locale (str); 3530 set_locale (str);
3929 pty.set_utf8_mode (enc_utf8); 3531 pty->set_utf8_mode (enc_utf8);
3930 init_xlocale (); 3532 init_xlocale ();
3931 } 3533 }
3932 break; 3534 break;
3933 3535
3934 case URxvt_view_up: 3536 case URxvt_view_up:
3935 case URxvt_view_down: 3537 case URxvt_view_down:
3538 {
3936 int lines = atoi (str); 3539 int lines = atoi (str);
3937 3540
3938 if (lines) 3541 if (lines)
3939 scr_page (op == URxvt_view_up ? UP : DN, lines); 3542 scr_page (op == URxvt_view_up ? UP : DN, lines);
3940 else 3543 else
3941 {
3942 scr_erase_savelines (); 3544 scr_erase_savelines ();
3943 } 3545 }
3944 3546
3547 break;
3548#endif
3549
3550#if ENABLE_PERL
3551 case URxvt_perl:
3552 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3945 break; 3553 break;
3946#endif 3554#endif
3947 } 3555 }
3948} 3556}
3949/*----------------------------------------------------------------------*/ 3557/*----------------------------------------------------------------------*/
… …
3972 { 3580 {
3973 if (mode == 'r') 3581 if (mode == 'r')
3974 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3582 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3975 else 3583 else
3976 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3584 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3977 PrivMode (state, bit); 3585 set_privmode (bit, state);
3978 } 3586 }
3979 3587
3980 return state; 3588 return state;
3981} 3589}
3982 3590
3983/* we're not using priv _yet_ */ 3591/* we're not using priv _yet_ */
3984void 3592void
3985rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3593rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3986{ 3594{
3987 unsigned int i, j; 3595 unsigned int i, j;
3988 int state; 3596 int state;
3989 3597
3990 static const struct 3598 static const struct
3991 { 3599 {
3992 const int argval; 3600 const int argval;
3993 const unsigned long bit; 3601 const unsigned long bit;
3994 }
3995
3996 argtopriv[] = { 3602 } argtopriv[] = {
3997 { 1, PrivMode_aplCUR }, 3603 { 1, PrivMode_aplCUR }, // DECCKM
3998 { 2, PrivMode_vt52 }, 3604 { 2, PrivMode_vt52 },
3999 { 3, PrivMode_132 }, 3605 { 3, PrivMode_132 }, // DECCOLM
4000 { 4, PrivMode_smoothScroll }, 3606 { 4, PrivMode_smoothScroll }, // DECSCLM
4001 { 5, PrivMode_rVideo }, 3607 { 5, PrivMode_rVideo }, // DECSCNM
4002 { 6, PrivMode_relOrigin }, 3608 { 6, PrivMode_relOrigin }, // DECOM
4003 { 7, PrivMode_Autowrap }, 3609 { 7, PrivMode_Autowrap }, // DECAWM
4004 // 8, bi-directional support mode 3610 // 8, auto-repeat keys // DECARM
4005 { 9, PrivMode_MouseX10 }, 3611 { 9, PrivMode_MouseX10 },
4006#ifdef menuBar_esc 3612 // 18 end FF to printer after print screen
4007 { menuBar_esc, PrivMode_menuBar }, 3613 // 19 Print screen prints full screen/scorll region
4008#endif
4009 // 18, 19 printing-related
4010 { 25, PrivMode_VisibleCursor }, 3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4011#ifdef scrollBar_esc 3615#ifdef scrollBar_esc
4012 { scrollBar_esc, PrivMode_scrollBar }, 3616 { scrollBar_esc, PrivMode_scrollBar },
4013#endif 3617#endif
4014 { 35, PrivMode_ShiftKeys }, // rxvt extension 3618 { 35, PrivMode_ShiftKeys }, // rxvt extension
3619 // 38, tektronix mode // DECTEK
4015 { 40, PrivMode_132OK }, 3620 { 40, PrivMode_132OK },
4016 // 41 xterm more fixes NYI 3621 // 41 xterm more fixes NYI
4017 // 45 margin bell NYI 3622 // 45 margin bell NYI
4018 // 46 start logging 3623 // 46 start logging
4019 { 47, PrivMode_Screen }, 3624 { 47, PrivMode_Screen },
4020 { 66, PrivMode_aplKP }, 3625 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4021#ifndef NO_BACKSPACE_KEY 3626#ifndef NO_BACKSPACE_KEY
4022 { 67, PrivMode_BackSpace }, 3627 { 67, PrivMode_BackSpace }, // DECBKM
4023#endif 3628#endif
4024 { 1000, PrivMode_MouseX11 }, 3629 { 1000, PrivMode_MouseX11 },
4025 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3630 { 1002, PrivMode_MouseBtnEvent },
4026 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3631 { 1003, PrivMode_MouseAnyEvent },
4027 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4028 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3632 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4029 { 1011, PrivMode_Keypress }, // rxvt extension 3633 { 1011, PrivMode_Keypress }, // rxvt extension
4030 // 1035 enable modifiers for alt, numlock NYI 3634 // 1035 enable modifiers for alt, numlock NYI
4031 // 1036 send ESC for meta keys NYI 3635 // 1036 send ESC for meta keys NYI
4032 // 1037 send DEL for keypad delete NYI 3636 // 1037 send DEL for keypad delete NYI
4033 { 1047, PrivMode_Screen }, 3637 { 1047, PrivMode_Screen },
4034 // 1048 save and restore cursor 3638 // 1048 save and restore cursor
4035 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3639 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4036 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3640 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3641 { 2004, PrivMode_BracketPaste },
4037 }; 3642 };
4038 3643
4039 if (nargs == 0) 3644 if (nargs == 0)
4040 return; 3645 return;
4041 3646
… …
4060 /* extra handling for values with state unkept */ 3665 /* extra handling for values with state unkept */
4061 switch (arg[i]) 3666 switch (arg[i])
4062 { 3667 {
4063#if ENABLE_STYLES 3668#if ENABLE_STYLES
4064 case 1021: 3669 case 1021:
4065 if (mode) 3670 set_option (Opt_intensityStyles, mode);
4066 SET_OPTION (Opt_intensityStyles);
4067 else
4068 CLR_OPTION (Opt_intensityStyles);
4069 3671
4070 scr_touch (true); 3672 scr_touch (true);
4071 break; 3673 break;
4072#endif 3674#endif
4073 case 1048: /* alternative cursor save */ 3675 case 1048: /* alternative cursor save */
4074 case 1049:
4075 if (OPTION (Opt_secondaryScreen)) 3676 if (option (Opt_secondaryScreen))
4076 if (mode == 0) 3677 if (mode == 0)
4077 scr_cursor (RESTORE); 3678 scr_cursor (RESTORE);
4078 else if (mode == 1) 3679 else if (mode == 1)
4079 scr_cursor (SAVE); 3680 scr_cursor (SAVE);
4080 break; 3681 break;
… …
4088 case 2: /* VT52 mode */ 3689 case 2: /* VT52 mode */
4089 /* oddball mode. should be set regardless of set/reset 3690 /* oddball mode. should be set regardless of set/reset
4090 * parameter. Return from VT52 mode with an ESC < from 3691 * parameter. Return from VT52 mode with an ESC < from
4091 * within VT52 mode 3692 * within VT52 mode
4092 */ 3693 */
4093 PrivMode (1, PrivMode_vt52); 3694 set_privmode (PrivMode_vt52, 1);
4094 break; 3695 break;
4095 case 3: /* 80/132 */ 3696 case 3: /* 80/132 */
4096 if (priv_modes & PrivMode_132OK) 3697 if (priv_modes & PrivMode_132OK)
4097 set_widthheight (((state ? 132 : 80) * fwidth), height); 3698 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4098 break; 3699 break;
4099 case 4: /* smooth scrolling */ 3700 case 4: /* smooth scrolling */
4100 if (!state) 3701 set_option (Opt_jumpScroll, !state);
4101 SET_OPTION (Opt_jumpScroll);
4102 else
4103 CLR_OPTION (Opt_jumpScroll);
4104 break; 3702 break;
4105 case 5: /* reverse video */ 3703 case 5: /* reverse video */
4106 scr_rvideo_mode (state); 3704 scr_rvideo_mode (state);
4107 break; 3705 break;
4108 case 6: /* relative/absolute origins */ 3706 case 6: /* relative/absolute origins */
… …
4112 scr_autowrap (state); 3710 scr_autowrap (state);
4113 break; 3711 break;
4114 /* case 8: - auto repeat, can't do on a per window basis */ 3712 /* case 8: - auto repeat, can't do on a per window basis */
4115 case 9: /* X10 mouse reporting */ 3713 case 9: /* X10 mouse reporting */
4116 if (state) /* orthogonal */ 3714 if (state) /* orthogonal */
4117 priv_modes &= ~PrivMode_MouseX11; 3715 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4118 break; 3716 break;
4119#ifdef menuBar_esc
4120 case menuBar_esc:
4121#ifdef MENUBAR
4122 map_menuBar (state);
4123#endif
4124 break;
4125#endif
4126#ifdef scrollBar_esc 3717#ifdef scrollBar_esc
4127 case scrollBar_esc: 3718 case scrollBar_esc:
4128 if (scrollbar_mapping (state)) 3719 if (scrollBar.map (state))
4129 { 3720 {
4130 resize_all_windows (0, 0, 0); 3721 resize_all_windows (0, 0, 0);
4131 scr_touch (true); 3722 scr_touch (true);
4132 } 3723 }
4133 break; 3724 break;
… …
4142 break; 3733 break;
4143 /* case 66: - application key pad */ 3734 /* case 66: - application key pad */
4144 /* case 67: - backspace key */ 3735 /* case 67: - backspace key */
4145 case 1000: /* X11 mouse reporting */ 3736 case 1000: /* X11 mouse reporting */
4146 if (state) /* orthogonal */ 3737 if (state) /* orthogonal */
4147 priv_modes &= ~PrivMode_MouseX10; 3738 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4148 break; 3739 break;
4149#if 0
4150 case 1001: 3740 case 1002:
4151 break; /* X11 mouse highlighting */ 3741 case 1003:
4152#endif 3742 if (state)
3743 {
3744 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3745 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3746 vt_emask_mouse = PointerMotionMask;
3747 }
3748 else
3749 vt_emask_mouse = NoEventMask;
3750
3751 vt_select_input ();
3752 break;
4153 case 1010: /* scroll to bottom on TTY output inhibit */ 3753 case 1010: /* scroll to bottom on TTY output inhibit */
4154 if (!state) 3754 set_option (Opt_scrollTtyOutput, !state);
4155 SET_OPTION (Opt_scrollTtyOutput);
4156 else
4157 CLR_OPTION (Opt_scrollTtyOutput);
4158 break; 3755 break;
4159 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
4160 if (state) 3757 set_option (Opt_scrollTtyKeypress, state);
4161 SET_OPTION (Opt_scrollTtyKeypress);
4162 else
4163 CLR_OPTION (Opt_scrollTtyKeypress);
4164 break; 3758 break;
4165 case 1047: /* secondary screen w/ clearing last */ 3759 case 1047: /* secondary screen w/ clearing last */
4166 if (OPTION (Opt_secondaryScreen)) 3760 if (option (Opt_secondaryScreen))
4167 if (current_screen != PRIMARY) 3761 if (!state)
4168 scr_erase_screen (2); 3762 scr_erase_screen (2);
3763
4169 scr_change_screen (state); 3764 scr_change_screen (state);
4170 break; 3765 break;
4171 case 1049: /* secondary screen w/ clearing first */ 3766 case 1049: /* secondary screen w/ clearing first */
3767 if (option (Opt_secondaryScreen))
3768 if (state)
3769 scr_cursor (SAVE);
3770
4172 scr_change_screen (state); 3771 scr_change_screen (state);
3772
4173 if (OPTION (Opt_secondaryScreen)) 3773 if (option (Opt_secondaryScreen))
4174 if (current_screen != PRIMARY) 3774 if (state)
4175 scr_erase_screen (2); 3775 scr_erase_screen (2);
3776 else
3777 scr_cursor (RESTORE);
4176 break; 3778 break;
4177 default: 3779 default:
4178 break; 3780 break;
4179 } 3781 }
4180 } 3782 }
… …
4306 scr_color (Color_bg, Color_bg); 3908 scr_color (Color_bg, Color_bg);
4307 break; 3909 break;
4308 3910
4309 //case 50: // not variable spacing 3911 //case 50: // not variable spacing
4310 3912
4311#ifndef NO_BRIGHTCOLOR 3913#if !ENABLE_MINIMAL
4312 case 90: 3914 case 90:
4313 case 91: /* set bright fg color */ 3915 case 91: /* set bright fg color */
4314 case 92: 3916 case 92:
4315 case 93: 3917 case 93:
4316 case 94: 3918 case 94:
… …
4340rxvt_term::process_graphics () 3942rxvt_term::process_graphics ()
4341{ 3943{
4342 unicode_t ch, cmd = cmd_getc (); 3944 unicode_t ch, cmd = cmd_getc ();
4343 3945
4344 if (cmd == 'Q') 3946 if (cmd == 'Q')
3947 {
4345 { /* query graphics */ 3948 /* query graphics */
4346 tt_printf ("\033G0\012"); /* no graphics */ 3949 tt_printf ("\033G0\012"); /* no graphics */
4347 return; 3950 return;
4348 } 3951 }
4349 /* swallow other graphics sequences until terminating ':' */ 3952 /* swallow other graphics sequences until terminating ':' */
4350 do 3953 do
… …
4361 */ 3964 */
4362void 3965void
4363rxvt_term::tt_printf (const char *fmt,...) 3966rxvt_term::tt_printf (const char *fmt,...)
4364{ 3967{
4365 va_list arg_ptr; 3968 va_list arg_ptr;
4366 unsigned char buf[256]; 3969 char buf[256];
4367 3970
4368 va_start (arg_ptr, fmt); 3971 va_start (arg_ptr, fmt);
4369 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3972 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4370 va_end (arg_ptr); 3973 va_end (arg_ptr);
4371 tt_write (buf, strlen (buf)); 3974 tt_write (buf, strlen (buf));
… …
4376 * or generated by us in response to a query ESC sequence. 3979 * or generated by us in response to a query ESC sequence.
4377 */ 3980 */
4378const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3981const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4379 3982
4380void 3983void
4381rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3984rxvt_term::tt_write (const char *data, unsigned int len)
4382{ 3985{
3986 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3987 return;
3988
3989 if (pty->pty < 0)
3990 return;
3991
4383 if (v_buflen == 0) 3992 if (v_buflen == 0)
4384 { 3993 {
4385 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3994 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4386 3995
4387 if ((unsigned int)written == len) 3996 if ((unsigned int)written == len)
4388 return; 3997 return;
4389 3998
4390 data += written; 3999 data += written;
4391 len -= written; 4000 len -= written;
4392 } 4001 }
4393 4002
4394 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4395 4004
4396 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
4397 v_buflen += len; 4006 v_buflen += len;
4398 4007
4399 pty_ev.set (EVENT_READ | EVENT_WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);
4400} 4009}
4401 4010
4402void rxvt_term::pty_write () 4011void rxvt_term::pty_write ()
4403{ 4012{
4404 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4013 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4405 4014
4406 if (written > 0) 4015 if (written > 0)
4407 { 4016 {
4408 v_buflen -= written; 4017 v_buflen -= written;
4409 4018
4410 if (v_buflen == 0) 4019 if (v_buflen == 0)
4411 { 4020 {
4412 free (v_buffer); 4021 free (v_buffer);
4413 v_buffer = 0; 4022 v_buffer = 0;
4414 v_buflen = 0;
4415 4023
4416 pty_ev.set (EVENT_READ); 4024 pty_ev.set (ev::READ);
4417 return; 4025 return;
4418 } 4026 }
4419 4027
4420 memmove (v_buffer, v_buffer + written, v_buflen); 4028 memmove (v_buffer, v_buffer + written, v_buflen);
4421 } 4029 }
4422 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4423 pty_ev.set (EVENT_READ); 4031 pty_ev.set (ev::READ);
4424} 4032}
4425 4033
4426/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
4427 4035

Diff Legend

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