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

Diff Legend

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