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.254 by root, Wed Jan 11 02:13:56 2006 UTC vs.
Revision 1.480 by sf-exg, Mon Mar 7 11:48:55 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-2011 Marc Lehmann <schmorp@schmorp.de>
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;
986 line_t *l; 1000 line_t *l;
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
… …
1138rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1139{ 1159{
1140 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1141 1161
1142 if (CBUFSIZ == n) 1162 if (CBUFSIZ == n)
1143 { 1163 n = 0; // normally this indicates a "too long" command sequence - just drop the data we have
1144 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1145 n = 0;
1146 }
1147 1164
1148 memmove (cmdbuf_base, cmdbuf_ptr, n); 1165 memmove (cmdbuf_base, cmdbuf_ptr, n);
1149 cmdbuf_ptr = cmdbuf_base; 1166 cmdbuf_ptr = cmdbuf_base;
1150 cmdbuf_endp = cmdbuf_ptr + n; 1167 cmdbuf_endp = cmdbuf_ptr + n;
1151 1168
1152 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1169 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1153 1170
1154 if (r > 0) 1171 if (r > 0)
1155 { 1172 {
1156 cmdbuf_endp += r; 1173 cmdbuf_endp += r;
1157 return true; 1174 return true;
1158 } 1175 }
1159 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1176 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1160 { 1177 {
1161#if HAVE_SCHED_YIELD 1178#if LINUX_YIELD_HACK
1162 if (display->is_local) 1179 if (display->is_local)
1163 event_handler.cw_yield.start (); 1180 event_handler.yield_ev.start ();
1164#endif 1181#endif
1165 } 1182 }
1166 else 1183 else
1167 { 1184 {
1168 pty_ev.stop (); 1185 pty_ev.stop ();
1169 1186
1170 if (!OPTION (Opt_hold)) 1187 if (!option (Opt_hold))
1171 destroy (); 1188 destroy ();
1172 } 1189 }
1173 1190
1174 return false; 1191 return false;
1175} 1192}
1176 1193
1177void 1194void
1178rxvt_term::pty_cb (io_watcher &w, short revents) 1195rxvt_term::pty_cb (ev::io &w, int revents)
1179{ 1196{
1180 SET_R (this); 1197 make_current ();
1181 SET_LOCALE (locale);
1182 1198
1183 if (revents & EVENT_READ) 1199 if (revents & ev::READ)
1184 // loop, but don't allow a single term to monopolize us 1200 // loop, but don't allow a single term to monopolize us
1185 while (pty_fill ()) 1201 for (int i = CBUFCNT; i-- && pty_fill (); )
1186 if (cmd_parse ()) 1202 cmd_parse ();
1187 break;
1188 1203
1189 if (revents & EVENT_WRITE) 1204 if (revents & ev::WRITE)
1190 pty_write (); 1205 pty_write ();
1206
1207 refresh_check ();
1191} 1208}
1192 1209
1193void 1210void
1194rxvt_term::pointer_unblank () 1211rxvt_term::pointer_unblank ()
1195{ 1212{
1196 XDefineCursor (display->display, vt, TermWin_cursor); 1213 XDefineCursor (dpy, vt, TermWin_cursor);
1197 recolour_cursor (); 1214 recolour_cursor ();
1198 1215
1199#ifdef POINTER_BLANK 1216#ifdef POINTER_BLANK
1200 hidden_pointer = 0; 1217 hidden_pointer = 0;
1201 1218
1202 if (OPTION (Opt_pointerBlank)) 1219 if (option (Opt_pointerBlank))
1203 pointer_ev.start (NOW + pointerBlankDelay); 1220 pointer_ev.start (pointerBlankDelay);
1204#endif 1221#endif
1205} 1222}
1206 1223
1207#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
1208void 1225void
1209rxvt_term::pointer_blank () 1226rxvt_term::pointer_blank ()
1210{ 1227{
1211 if (!OPTION (Opt_pointerBlank)) 1228 if (!option (Opt_pointerBlank))
1212 return; 1229 return;
1213 1230
1214 XDefineCursor (display->display, vt, display->blank_cursor); 1231 XDefineCursor (dpy, vt, display->blank_cursor);
1215 XFlush (display->display); 1232 XFlush (dpy);
1216 1233
1217 hidden_pointer = 1; 1234 hidden_pointer = 1;
1218} 1235}
1219 1236
1220void 1237void
1221rxvt_term::pointer_cb (time_watcher &w) 1238rxvt_term::pointer_cb (ev::timer &w, int revents)
1222{ 1239{
1223 SET_R (this); 1240 make_current ();
1224 SET_LOCALE (locale);
1225 1241
1226 pointer_blank (); 1242 pointer_blank ();
1227} 1243}
1228#endif 1244#endif
1229 1245
1230void 1246void
1231rxvt_term::mouse_report (XButtonEvent &ev) 1247rxvt_term::mouse_report (XButtonEvent &ev)
1232{ 1248{
1233 int button_number, key_state = 0; 1249 int button_number, key_state = 0;
1234 int x, y; 1250 int x, y;
1251 int code = 32;
1235 1252
1236 x = ev.x; 1253 x = Pixel2Col (ev.x) + 1;
1237 y = ev.y; 1254 y = Pixel2Row (ev.y) + 1;
1238 pixel_position (&x, &y); 1255
1256 if (ev.type == MotionNotify)
1257 {
1258 if (x == mouse_row && y == mouse_col)
1259 return;
1260
1261 mouse_row = x;
1262 mouse_col = y;
1263 code += 32;
1264 }
1239 1265
1240 if (MEvent.button == AnyButton) 1266 if (MEvent.button == AnyButton)
1241 button_number = 3; 1267 button_number = 3;
1242 else 1268 else
1243 { 1269 {
1244 button_number = MEvent.button - Button1; 1270 button_number = MEvent.button - Button1;
1245 /* add 0x3D for wheel events, like xterm does */ 1271 /* add 0x3D for wheel events, like xterm does */
1246 if (button_number >= 3) 1272 if (button_number >= 3)
1247 button_number += (64 - 3); 1273 button_number += 64 - 3;
1248 } 1274 }
1249 1275
1250 if (priv_modes & PrivMode_MouseX10) 1276 if (priv_modes & PrivMode_MouseX10)
1251 { 1277 {
1252 /* 1278 /*
… …
1284 fputc ('A', stderr); 1310 fputc ('A', stderr);
1285 if (key_state & 32) 1311 if (key_state & 32)
1286 fputc ('2', stderr); 1312 fputc ('2', stderr);
1287 fprintf (stderr, "]: <%d>, %d/%d\n", 1313 fprintf (stderr, "]: <%d>, %d/%d\n",
1288 button_number, 1314 button_number,
1289 x + 1, 1315 x,
1290 y + 1); 1316 y);
1291#endif 1317#endif
1292 1318
1319#if ENABLE_FRILLS
1320 if (priv_modes & PrivMode_ExtMouseRight)
1321 tt_printf ("\033[%d;%d;%dM",
1322 code + button_number + key_state,
1323 x,
1324 y);
1325 else if (priv_modes & PrivMode_ExtModeMouse)
1326 tt_printf ("\033[M%c%lc%lc",
1327 code + button_number + key_state,
1328 wint_t (32 + x),
1329 wint_t (32 + y));
1330 else
1331#endif
1293 tt_printf ("\033[M%c%c%c", 1332 tt_printf ("\033[M%c%c%c",
1294 (32 + button_number + key_state), 1333 code + button_number + key_state,
1295 (32 + x + 1), 1334 32 + x,
1296 (32 + y + 1)); 1335 32 + y);
1297} 1336}
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 1337
1309/*{{{ process an X event */ 1338/*{{{ process an X event */
1310void 1339void
1311rxvt_term::x_cb (XEvent &ev) 1340rxvt_term::x_cb (XEvent &ev)
1312{ 1341{
1313 dDisp; 1342 make_current ();
1314 1343
1315 SET_R (this); 1344 dLocal (Display *, dpy);
1316 SET_LOCALE (locale);
1317 1345
1346 if (ev.xany.window == vt
1347 && SHOULD_INVOKE (HOOK_X_EVENT)
1348 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1349 return;
1350
1351 // for XQueryPointer
1318 Window unused_root, unused_child; 1352 Window unused_root, unused_child;
1319 int unused_root_x, unused_root_y; 1353 int unused_root_x, unused_root_y;
1320 unsigned int unused_mask; 1354 unsigned int unused_mask;
1321 1355
1322 switch (ev.type) 1356 switch (ev.type)
1323 { 1357 {
1324 case KeyPress: 1358 case KeyPress:
1325#if ISO_14755 1359 key_press (ev.xkey);
1326 if (!(iso14755buf & ISO_14755_52))
1327#endif
1328 lookup_key (ev.xkey);
1329
1330 break; 1360 break;
1331 1361
1332 case KeyRelease: 1362 case KeyRelease:
1333 { 1363 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; 1364 break;
1405 }
1406 1365
1407 case ButtonPress: 1366 case ButtonPress:
1408 button_press (ev.xbutton); 1367 button_press (ev.xbutton);
1409 break; 1368 break;
1410 1369
… …
1412 button_release (ev.xbutton); 1371 button_release (ev.xbutton);
1413 break; 1372 break;
1414 1373
1415 case ClientMessage: 1374 case ClientMessage:
1416 if (ev.xclient.format == 32 1375 if (ev.xclient.format == 32
1417 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1376 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1418 { 1377 {
1378 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1379 {
1380 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1381 {
1419 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1382 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1383 {
1384 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1420 destroy (); 1385 destroy ();
1386 }
1421#if ENABLE_EWMH 1387#if ENABLE_EWMH
1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1388 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1423 XSendEvent (disp, ev.xclient.window = display->root, 1389 XSendEvent (dpy, ev.xclient.window = display->root,
1424 False, SubstructureRedirectMask | SubstructureNotifyMask, 1390 False, SubstructureRedirectMask | SubstructureNotifyMask,
1425 &ev); 1391 &ev);
1392#endif
1393 }
1394 }
1395#if ENABLE_XEMBED
1396 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1397 {
1398 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1399 focus_in ();
1400 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1401 focus_out ();
1402 }
1426#endif 1403#endif
1427 } 1404 }
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; 1405 break;
1468 1406
1469 /* 1407 /*
1470 * XXX: this is not the _current_ arrangement 1408 * XXX: this is not the _current_ arrangement
1471 * Here's my conclusion: 1409 * Here's my conclusion:
… …
1490 break; 1428 break;
1491 } 1429 }
1492 break; 1430 break;
1493 1431
1494 case FocusIn: 1432 case FocusIn:
1433 if (ev.xfocus.detail != NotifyInferior
1434 && ev.xfocus.detail != NotifyPointer
1435 && ev.xfocus.mode != NotifyGrab)
1495 focus_in (); 1436 focus_in ();
1496 break; 1437 break;
1497 1438
1498 case FocusOut: 1439 case FocusOut:
1440 if (ev.xfocus.detail != NotifyInferior
1441 && ev.xfocus.detail != NotifyPointer
1442 && ev.xfocus.mode != NotifyGrab)
1499 focus_out (); 1443 focus_out ();
1500 break; 1444 break;
1501 1445
1502 case ConfigureNotify: 1446 case ConfigureNotify:
1503 if (ev.xconfigure.window == parent[0]) 1447 if (ev.xconfigure.window == parent[0])
1504 { 1448 {
1505 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1449 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1506 ; 1450 ;
1451
1452#ifdef HAVE_BG_PIXMAP
1453 bool moved = false;
1454 if (bg_window_position_sensitive ())
1455 {
1456 int x, y;
1457 if (ev.xconfigure.send_event)
1458 {
1459 x = ev.xconfigure.x;
1460 y = ev.xconfigure.y;
1461 }
1462 else
1463 get_window_origin (x, y);
1464
1465 if (bg_set_position (x, y)
1466 || !(bg_flags & BG_IS_VALID))
1467 moved = true;
1468 }
1469#endif
1507 1470
1508 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1509 { 1472 {
1510 seen_resize = 1; 1473 seen_resize = 1;
1511 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1512 } 1475 }
1513 1476 else
1514#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1477 {
1515 if (OPTION (Opt_transparent)) 1478#ifdef HAVE_BG_PIXMAP
1516 check_our_parents (); 1479 if (moved)
1480 {
1481 if (mapped)
1482 update_background ();
1483 else
1484 bg_invalidate ();
1485 }
1517#endif 1486#endif
1487 }
1488
1489 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 } 1490 }
1519 break; 1491 break;
1520 1492
1521 case PropertyNotify: 1493 case PropertyNotify:
1522 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1494 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; 1495 break;
1527 1496
1528 case SelectionClear: 1497 case SelectionClear:
1529 selection_clear (); 1498 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; 1499 break;
1536 1500
1537 case SelectionRequest: 1501 case SelectionRequest:
1538 selection_send (ev.xselectionrequest); 1502 selection_send (ev.xselectionrequest);
1539 break; 1503 break;
1540 1504
1541 case MapNotify: 1505 case MapNotify:
1506#ifdef HAVE_BG_PIXMAP
1507 /* This is needed specifically to fix the case of no window manager or a
1508 * non-reparenting window manager. In those cases we never get first
1509 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1510 * care of multiplicity of ConfigureNotify events arriving while WM does
1511 * reparenting.
1512 * We should not render background immediately, as there could be several
1513 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1514 * by scheduling background redraw as soon as we can, but giving a short
1515 * bit of time for ConfigureNotifies to arrive.
1516 * We should render background PRIOR to drawing any text, but AFTER all
1517 * of ConfigureNotifys for the best results.
1518 */
1519 if (!(bg_flags & BG_IS_VALID))
1520 update_background_ev.start (0.025);
1521#endif
1542 mapped = 1; 1522 mapped = 1;
1543#ifdef TEXT_BLINK 1523#ifdef TEXT_BLINK
1544 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1524 text_blink_ev.start ();
1545#endif 1525#endif
1546 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1526 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break; 1527 break;
1548 1528
1549 case UnmapNotify: 1529 case UnmapNotify:
… …
1551#ifdef TEXT_BLINK 1531#ifdef TEXT_BLINK
1552 text_blink_ev.stop (); 1532 text_blink_ev.stop ();
1553#endif 1533#endif
1554 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1534 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1555 break; 1535 break;
1556
1557#ifdef TRANSPARENT
1558 case ReparentNotify:
1559 rootwin_cb (ev);
1560 break;
1561#endif /* TRANSPARENT */
1562 1536
1563 case GraphicsExpose: 1537 case GraphicsExpose:
1564 case Expose: 1538 case Expose:
1565 if (ev.xany.window == vt) 1539 if (ev.xany.window == vt)
1566 { 1540 {
1567 do 1541 do
1542 {
1568 scr_expose (ev.xexpose.x, ev.xexpose.y, 1543 scr_expose (ev.xexpose.x, ev.xexpose.y,
1569 ev.xexpose.width, ev.xexpose.height, False); 1544 ev.xexpose.width, ev.xexpose.height, false);
1545 }
1570 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1546 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1571 1547
1572 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1573 1549
1574 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1550 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1551 {
1575 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1576 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1554 }
1577 1555
1578 want_refresh = 1; 1556 want_refresh = 1;
1579 } 1557 }
1580 else 1558 else
1581 { 1559 {
1582 XEvent unused_event; 1560 XEvent unused_event;
1583 1561
1584 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1585 ; 1563 ;
1586 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1564 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1587 ; 1565 ;
1588 1566
1589 if (isScrollbarWindow (ev.xany.window)) 1567 if (scrollBar.state && ev.xany.window == scrollBar.win)
1590 { 1568 {
1591 scrollBar.setIdle (); 1569 scrollBar.state = STATE_IDLE;
1592 scrollbar_show (0); 1570 scrollBar.show (0);
1593 } 1571 }
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 } 1572 }
1604 break; 1573 break;
1605 1574
1606 case MotionNotify: 1575 case MotionNotify:
1607#ifdef POINTER_BLANK 1576#ifdef POINTER_BLANK
1608 if (hidden_pointer) 1577 if (hidden_pointer)
1609 pointer_unblank (); 1578 pointer_unblank ();
1610#endif 1579#endif
1611#if MENUBAR 1580 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1612 if (isMenuBarWindow (ev.xany.window)) 1581 || priv_modes & PrivMode_MouseAnyEvent)
1613 {
1614 menubar_control (ev.xbutton); 1582 mouse_report (ev.xbutton);
1615 break;
1616 }
1617#endif
1618 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1619 break; 1584 break;
1620 1585
1621 if (ev.xany.window == vt) 1586 if (ev.xany.window == vt)
1622 { 1587 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1623 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1624 ; // nop 1590 ; // nop
1625 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1626 { 1592 {
1627 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1593 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1628 ; 1594 ;
1629 1595
1630 XQueryPointer (disp, vt, 1596 XQueryPointer (dpy, vt,
1631 &unused_root, &unused_child, 1597 &unused_root, &unused_child,
1632 &unused_root_x, &unused_root_y, 1598 &unused_root_x, &unused_root_y,
1633 &ev.xbutton.x, &ev.xbutton.y, 1599 &ev.xbutton.x, &ev.xbutton.y,
1634 &ev.xbutton.state); 1600 &ev.xbutton.state);
1635#ifdef MOUSE_THRESHOLD 1601#ifdef MOUSE_THRESHOLD
… …
1655 int dist; 1621 int dist;
1656 1622
1657 /* don't clobber the current delay if we are 1623 /* don't clobber the current delay if we are
1658 * already in the middle of scrolling. 1624 * already in the middle of scrolling.
1659 */ 1625 */
1660 if (!sel_scroll_ev.active) 1626 if (!sel_scroll_ev.is_active ())
1661 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1627 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1662 1628
1663 /* save the event params so we can highlight 1629 /* save the event params so we can highlight
1664 * the selection in the pending-scroll loop 1630 * the selection in the pending-scroll loop
1665 */ 1631 */
1666 selection_save_x = ev.xbutton.x; 1632 selection_save_x = ev.xbutton.x;
… …
1688 else 1654 else
1689 { 1655 {
1690 /* we are within the text window, so we 1656 /* we are within the text window, so we
1691 * shouldn't be scrolling 1657 * shouldn't be scrolling
1692 */ 1658 */
1693 if (sel_scroll_ev.active)
1694 sel_scroll_ev.stop(); 1659 sel_scroll_ev.stop();
1695 } 1660 }
1696#endif 1661#endif
1697#ifdef MOUSE_THRESHOLD 1662#ifdef MOUSE_THRESHOLD
1698 } 1663 }
1699#endif 1664#endif
1700 } 1665 }
1701 } 1666 }
1702 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1667 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1703 { 1668 {
1704 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1669 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1705 MotionNotify, &ev)) 1670 MotionNotify, &ev))
1706 ; 1671 ;
1707 1672
1708 XQueryPointer (disp, scrollBar.win, 1673 XQueryPointer (dpy, scrollBar.win,
1709 &unused_root, &unused_child, 1674 &unused_root, &unused_child,
1710 &unused_root_x, &unused_root_y, 1675 &unused_root_x, &unused_root_y,
1711 &ev.xbutton.x, &ev.xbutton.y, 1676 &ev.xbutton.x, &ev.xbutton.y,
1712 &unused_mask); 1677 &unused_mask);
1713 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1714 scrollbar_size ()); 1679 scrollBar.size ());
1715 want_refresh = 1; 1680 want_refresh = 1;
1716 refresh_limit = 0;
1717 scrollbar_show (1); 1681 scrollBar.show (1);
1718 } 1682 }
1719 break; 1683 break;
1720 } 1684 }
1721 1685
1722skip_switch: ;
1723
1724#if defined(CURSOR_BLINK) 1686#if defined(CURSOR_BLINK)
1725 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1687 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1726 { 1688 {
1727 if (hidden_cursor) 1689 if (hidden_cursor)
1728 { 1690 {
1729 hidden_cursor = 0; 1691 hidden_cursor = 0;
1730 want_refresh = 1; 1692 want_refresh = 1;
1731 } 1693 }
1732 1694
1733 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1695 cursor_blink_ev.again ();
1734 } 1696 }
1735#endif 1697#endif
1736 1698
1737#if defined(POINTER_BLANK) 1699#if defined(POINTER_BLANK)
1738 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1700 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1739 { 1701 {
1740 if (ev.type == MotionNotify 1702 if (ev.type == MotionNotify
1741 || ev.type == ButtonPress 1703 || ev.type == ButtonPress
1742 || ev.type == ButtonRelease) 1704 || ev.type == ButtonRelease)
1743 if (hidden_pointer) 1705 if (hidden_pointer)
… …
1745 1707
1746 if (ev.type == KeyPress && hidden_pointer == 0) 1708 if (ev.type == KeyPress && hidden_pointer == 0)
1747 pointer_blank (); 1709 pointer_blank ();
1748 } 1710 }
1749#endif 1711#endif
1712
1713 refresh_check ();
1750} 1714}
1715
1716#if ENABLE_FRILLS
1717void
1718rxvt_term::set_urgency (bool enable)
1719{
1720 if (enable == urgency_hint)
1721 return;
1722
1723 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1724 {
1725 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1726 XSetWMHints (dpy, parent[0], h);
1727 urgency_hint = enable;
1728 }
1729}
1730#endif
1751 1731
1752void 1732void
1753rxvt_term::focus_in () 1733rxvt_term::focus_in ()
1754{ 1734{
1755 if (!focus) 1735 if (!focus)
1756 { 1736 {
1757 focus = 1; 1737 focus = 1;
1758 want_refresh = 1; 1738 want_refresh = 1;
1759 1739
1760 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1761
1762#if USE_XIM 1740#if USE_XIM
1763 if (Input_Context != NULL) 1741 if (Input_Context != NULL)
1764 { 1742 {
1765 IMSetStatusPosition (); 1743 IMSetPosition ();
1766 XSetICFocus (Input_Context); 1744 XSetICFocus (Input_Context);
1767 } 1745 }
1768#endif 1746#endif
1769#if CURSOR_BLINK 1747#if CURSOR_BLINK
1770 if (OPTION (Opt_cursorBlink)) 1748 if (option (Opt_cursorBlink))
1771 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1749 cursor_blink_ev.again ();
1772#endif 1750#endif
1773#if OFF_FOCUS_FADING 1751#if OFF_FOCUS_FADING
1774 if (rs[Rs_fade]) 1752 if (rs[Rs_fade])
1775 { 1753 {
1776 pix_colors = pix_colors_focused; 1754 pix_colors = pix_colors_focused;
1777 scr_recolour (); 1755 scr_recolour ();
1778 } 1756 }
1779#endif 1757#endif
1758#if ENABLE_FRILLS
1759 if (option (Opt_urgentOnBell))
1760 set_urgency (0);
1761#endif
1762
1763 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1780 } 1764 }
1781} 1765}
1782 1766
1783void 1767void
1784rxvt_term::focus_out () 1768rxvt_term::focus_out ()
… …
1786 if (focus) 1770 if (focus)
1787 { 1771 {
1788 focus = 0; 1772 focus = 0;
1789 want_refresh = 1; 1773 want_refresh = 1;
1790 1774
1791 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1775#if ENABLE_FRILLS
1792 1776 if (option (Opt_urgentOnBell))
1777 set_urgency (0);
1778#endif
1793#if ENABLE_FRILLS || ISO_14755 1779#if ENABLE_FRILLS || ISO_14755
1794 if (iso14755buf) 1780 if (iso14755buf)
1795 { 1781 {
1796 iso14755buf = 0; 1782 iso14755buf = 0;
1797# if ENABLE_OVERLAY 1783# if ISO_14755
1798 scr_overlay_off (); 1784 scr_overlay_off ();
1799# endif 1785# endif
1800 } 1786 }
1801#endif 1787#endif
1802#if USE_XIM 1788#if USE_XIM
1803 if (Input_Context != NULL) 1789 if (Input_Context != NULL)
1804 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1805#endif 1791#endif
1806#if CURSOR_BLINK 1792#if CURSOR_BLINK
1807 if (OPTION (Opt_cursorBlink)) 1793 if (option (Opt_cursorBlink))
1808 cursor_blink_ev.stop (); 1794 cursor_blink_ev.stop ();
1795
1809 hidden_cursor = 0; 1796 hidden_cursor = 0;
1810#endif 1797#endif
1811#if OFF_FOCUS_FADING 1798#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade]) 1799 if (rs[Rs_fade])
1813 { 1800 {
1814 pix_colors = pix_colors_unfocused; 1801 pix_colors = pix_colors_unfocused;
1815 scr_recolour (); 1802 scr_recolour ();
1816 } 1803 }
1817#endif 1804#endif
1805
1806 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1807 }
1808}
1809
1810void
1811rxvt_term::update_fade_color (unsigned int idx)
1812{
1813#if OFF_FOCUS_FADING
1814 if (rs[Rs_fade])
1818 } 1815 {
1816 rgba c;
1817 pix_colors [Color_fade].get (c);
1818 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1819 }
1820#endif
1819} 1821}
1820 1822
1821#if TRANSPARENT 1823#if ENABLE_TRANSPARENCY || ENABLE_PERL
1822void 1824void
1823rxvt_term::rootwin_cb (XEvent &ev) 1825rxvt_term::rootwin_cb (XEvent &ev)
1824{ 1826{
1825 SET_R (this); 1827 make_current ();
1826 SET_LOCALE (locale);
1827 1828
1829 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1830 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1831 return;
1832
1833# if ENABLE_TRANSPARENCY
1828 switch (ev.type) 1834 switch (ev.type)
1829 { 1835 {
1830 case PropertyNotify: 1836 case PropertyNotify:
1831 /* 1837 /*
1832 * if user used some Esetroot compatible prog to set the root bg, 1838 * 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. 1839 * use the property to determine the pixmap. We use it later on.
1834 */ 1840 */
1835 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1841 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1836 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1842 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1837 return; 1843 {
1844 bg_set_root_pixmap ();
1845 update_background ();
1846 }
1838 1847
1839 /* FALLTHROUGH */
1840 case ReparentNotify:
1841 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1842 want_refresh = want_full_refresh = 1;
1843 break; 1848 break;
1844 } 1849 }
1850# endif
1851
1852 refresh_check ();
1845} 1853}
1846#endif 1854#endif
1847 1855
1848void 1856void
1849rxvt_term::button_press (XButtonEvent &ev) 1857rxvt_term::button_press (XButtonEvent &ev)
… …
1858 /* 1866 /*
1859 * VT window processing of button press 1867 * VT window processing of button press
1860 */ 1868 */
1861 if (ev.window == vt) 1869 if (ev.window == vt)
1862 { 1870 {
1871 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1872 return;
1873
1863#if ISO_14755 1874#if ISO_14755
1864 // 5.4 1875 // 5.4
1865 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1876 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1866 { 1877 {
1867 iso14755_54 (ev.x, ev.y); 1878 iso14755_54 (ev.x, ev.y);
… …
1877 /* save the xbutton state (for ButtonRelease) */ 1888 /* save the xbutton state (for ButtonRelease) */
1878 MEvent.state = ev.state; 1889 MEvent.state = ev.state;
1879#ifdef MOUSE_REPORT_DOUBLECLICK 1890#ifdef MOUSE_REPORT_DOUBLECLICK
1880 if (ev.button == MEvent.button && clickintime) 1891 if (ev.button == MEvent.button && clickintime)
1881 { 1892 {
1882 /* same button, within alloted time */ 1893 /* same button, within allowed time */
1883 MEvent.clicks++; 1894 MEvent.clicks++;
1884 1895
1885 if (MEvent.clicks > 1) 1896 if (MEvent.clicks > 1)
1886 { 1897 {
1887 /* only report double clicks */ 1898 /* only report double clicks */
… …
1901 mouse_report (ev); 1912 mouse_report (ev);
1902 } 1913 }
1903#else 1914#else
1904 MEvent.button = ev.button; 1915 MEvent.button = ev.button;
1905 mouse_report (ev); 1916 mouse_report (ev);
1906#endif /* MOUSE_REPORT_DOUBLECLICK */ 1917#endif /* MOUSE_REPORT_DOUBLECLICK */
1907 1918
1908 } 1919 }
1909 else 1920 else
1910 { 1921 {
1911 if (ev.button != MEvent.button) 1922 if (ev.button != MEvent.button)
1912 MEvent.clicks = 0; 1923 MEvent.clicks = 0;
1913 1924
1914 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1915 switch (ev.button) 1925 switch (ev.button)
1916 { 1926 {
1917 case Button1: 1927 case Button1:
1918 /* allow meta + click to select rectangular areas */ 1928 /* allow meta + click to select rectangular areas */
1919 /* should be done in screen.C */ 1929 /* should be done in screen.C */
1920#if ENABLE_FRILLS 1930#if ENABLE_FRILLS
1921 selection.rect = !!(ev.state & ModMetaMask); 1931 selection.rect = !!(ev.state & ModMetaMask);
1922#else 1932#else
1923 selection.rect = false; 1933 selection.rect = false;
1924#endif 1934#endif
1925 1935
1926 /* allow shift+left click to extend selection */ 1936 /* allow shift+left click to extend selection */
1927 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1937 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1928 { 1938 {
1929 if (MEvent.button == Button1 && clickintime) 1939 if (MEvent.button == Button1 && clickintime)
1930 selection_rotate (ev.x, ev.y); 1940 selection_rotate (ev.x, ev.y);
1931 else 1941 else
1932 selection_extend (ev.x, ev.y, 1); 1942 selection_extend (ev.x, ev.y, 1);
1933 } 1943 }
1934 else 1944 else
1935 { 1945 {
1936 if (MEvent.button == Button1 && clickintime) 1946 if (MEvent.button == Button1 && clickintime)
1937 MEvent.clicks++; 1947 MEvent.clicks++;
1938 else 1948 else
1939 MEvent.clicks = 1; 1949 MEvent.clicks = 1;
1940 1950
1941 selection_click (MEvent.clicks, ev.x, ev.y); 1951 selection_click (MEvent.clicks, ev.x, ev.y);
1942 } 1952 }
1943 1953
1944 MEvent.button = Button1; 1954 MEvent.button = Button1;
1945 break; 1955 break;
1946 1956
1947 case Button3: 1957 case Button3:
1948 if (MEvent.button == Button3 && clickintime) 1958 if (MEvent.button == Button3 && clickintime)
1949 selection_rotate (ev.x, ev.y); 1959 selection_rotate (ev.x, ev.y);
1950 else 1960 else
1951 selection_extend (ev.x, ev.y, 1); 1961 selection_extend (ev.x, ev.y, 1);
1952 1962
1953 MEvent.button = Button3; 1963 MEvent.button = Button3;
1954 break; 1964 break;
1955 } 1965 }
1956 } 1966 }
1957 1967
1958 MEvent.time = ev.time; 1968 MEvent.time = ev.time;
1959 return; 1969 return;
1960 } 1970 }
1961 1971
1962 /* 1972 /*
1963 * Scrollbar window processing of button press 1973 * Scrollbar window processing of button press
1964 */ 1974 */
1965 if (isScrollbarWindow (ev.window)) 1975 if (scrollBar.state && ev.window == scrollBar.win)
1966 { 1976 {
1967 scrollBar.setIdle (); 1977 page_dirn direction = NO_DIR;
1978
1979 if (scrollBar.upButton (ev.y))
1980 direction = UP; /* up */
1981 else if (scrollBar.dnButton (ev.y))
1982 direction = DN; /* down */
1983
1984 scrollBar.state = STATE_IDLE;
1968 /* 1985 /*
1969 * Rxvt-style scrollbar: 1986 * Rxvt-style scrollbar:
1970 * move up if mouse is above slider 1987 * move up if mouse is above slider
1971 * move dn if mouse is below slider 1988 * move dn if mouse is below slider
1972 * 1989 *
… …
1981 /* 1998 /*
1982 * Mouse report disabled scrollbar: 1999 * Mouse report disabled scrollbar:
1983 * arrow buttons - send up/down 2000 * arrow buttons - send up/down
1984 * click on scrollbar - send pageup/down 2001 * click on scrollbar - send pageup/down
1985 */ 2002 */
1986 if ((scrollBar.style == R_SB_NEXT 2003 if (direction == UP)
1987 && scrollbarnext_upButton (ev.y))
1988 || (scrollBar.style == R_SB_RXVT
1989 && scrollbarrxvt_upButton (ev.y)))
1990 tt_printf ("\033[A"); 2004 tt_printf ("\033[A");
1991 else if ((scrollBar.style == R_SB_NEXT 2005 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"); 2006 tt_printf ("\033[B");
1996 else 2007 else
1997 switch (ev.button) 2008 switch (ev.button)
1998 { 2009 {
1999 case Button2: 2010 case Button2:
… …
2006 tt_printf ("\033[5~"); 2017 tt_printf ("\033[5~");
2007 break; 2018 break;
2008 } 2019 }
2009 } 2020 }
2010 else 2021 else
2011#endif /* NO_SCROLLBAR_REPORT */ 2022#endif /* NO_SCROLLBAR_REPORT */
2012
2013 {
2014 char upordown = 0;
2015
2016 if (scrollBar.style == R_SB_NEXT)
2017 { 2023 {
2018 if (scrollbarnext_upButton (ev.y)) 2024 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 { 2025 {
2032#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2026#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2027 if (!cont_scroll_ev.is_active ())
2033 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2028 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2034#endif 2029#endif
2035 if (scr_page (upordown < 0 ? UP : DN, 1)) 2030 if (scr_page (direction, 1))
2036 { 2031 {
2037 if (upordown < 0) 2032 if (direction == UP)
2038 scrollBar.setUp (); 2033 scrollBar.state = STATE_UP;
2039 else 2034 else
2040 scrollBar.setDn (); 2035 scrollBar.state = STATE_DOWN;
2041 } 2036 }
2042 } 2037 }
2043 else 2038 else
2044 switch (ev.button) 2039 switch (ev.button)
2045 { 2040 {
2046 case Button2: 2041 case Button2:
2047 switch (scrollbar_align) 2042 switch (scrollBar.align)
2048 { 2043 {
2049 case R_SB_ALIGN_TOP: 2044 case R_SB_ALIGN_TOP:
2050 csrO = 0; 2045 csrO = 0;
2051 break; 2046 break;
2052 case R_SB_ALIGN_CENTRE: 2047 case R_SB_ALIGN_CENTRE:
… …
2058 } 2053 }
2059 2054
2060 if (scrollBar.style == R_SB_XTERM 2055 if (scrollBar.style == R_SB_XTERM
2061 || scrollbar_above_slider (ev.y) 2056 || scrollbar_above_slider (ev.y)
2062 || scrollbar_below_slider (ev.y)) 2057 || scrollbar_below_slider (ev.y))
2063 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2058 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2064 2059
2065 scrollBar.setMotion (); 2060 scrollBar.state = STATE_MOTION;
2066 break; 2061 break;
2067 2062
2068 case Button1: 2063 case Button1:
2069 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2064 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2070 csrO = ev.y - scrollBar.top; 2065 csrO = ev.y - scrollBar.top;
2071 /* FALLTHROUGH */ 2066 /* FALLTHROUGH */
2072 2067
2073 case Button3: 2068 case Button3:
2074 if (scrollBar.style != R_SB_XTERM) 2069 if (scrollBar.style != R_SB_XTERM)
… …
2084 scr_page (DN, nrow - 1); 2079 scr_page (DN, nrow - 1);
2085# else 2080# else
2086 scr_page (DN, nrow / 4); 2081 scr_page (DN, nrow / 4);
2087# endif 2082# endif
2088 else 2083 else
2089 scrollBar.setMotion (); 2084 scrollBar.state = STATE_MOTION;
2090 } 2085 }
2091 else 2086 else
2092 { 2087 {
2093 scr_page ((ev.button == Button1 ? DN : UP), 2088 scr_page ((ev.button == Button1 ? DN : UP),
2094 (nrow 2089 (nrow
2095 * scrollbar_position (ev.y) 2090 * scrollbar_position (ev.y)
2096 / scrollbar_size ())); 2091 / scrollBar.size ()));
2097 } 2092 }
2098 2093
2099 break; 2094 break;
2100 } 2095 }
2101 } 2096 }
2102 2097
2103 return; 2098 return;
2104 } 2099 }
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} 2100}
2114 2101
2115void 2102void
2116rxvt_term::button_release (XButtonEvent &ev) 2103rxvt_term::button_release (XButtonEvent &ev)
2117{ 2104{
… …
2119 2106
2120 csrO = 0; /* reset csr Offset */ 2107 csrO = 0; /* reset csr Offset */
2121 if (!bypass_keystate) 2108 if (!bypass_keystate)
2122 reportmode = !! (priv_modes & PrivMode_mouse_report); 2109 reportmode = !! (priv_modes & PrivMode_mouse_report);
2123 2110
2124 if (scrollbar_isUpDn ()) 2111 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2125 { 2112 {
2126 scrollBar.setIdle (); 2113 scrollBar.state = STATE_IDLE;
2127 scrollbar_show (0); 2114 scrollBar.show (0);
2128#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2129 refresh_type &= ~SMOOTH_REFRESH;
2130#endif
2131 } 2115 }
2132 2116
2133#ifdef SELECTION_SCROLLING 2117#ifdef SELECTION_SCROLLING
2134 if (sel_scroll_ev.active)
2135 sel_scroll_ev.stop(); 2118 sel_scroll_ev.stop();
2136#endif 2119#endif
2137 2120
2138 if (ev.window == vt) 2121 if (ev.window == vt)
2139 { 2122 {
2123 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2124 return;
2125
2140#if ISO_14755 2126#if ISO_14755
2141 // 5.4 2127 // 5.4
2142 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2128 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2143 return; 2129 return;
2144#endif 2130#endif
2131
2145 if (reportmode) 2132 if (reportmode)
2146 { 2133 {
2147 /* mouse report from vt window */ 2134 /* mouse report from vt window */
2148 /* don't report release of wheel "buttons" */ 2135 /* don't report release of wheel "buttons" */
2149 if (ev.button >= 4) 2136 if (ev.button >= 4)
… …
2160 mouse_report (ev); 2147 mouse_report (ev);
2161 } 2148 }
2162#else /* MOUSE_REPORT_DOUBLECLICK */ 2149#else /* MOUSE_REPORT_DOUBLECLICK */
2163 MEvent.button = AnyButton; 2150 MEvent.button = AnyButton;
2164 mouse_report (ev); 2151 mouse_report (ev);
2165#endif /* MOUSE_REPORT_DOUBLECLICK */ 2152#endif /* MOUSE_REPORT_DOUBLECLICK */
2166 return; 2153 return;
2167 } 2154 }
2168 2155
2169 /* 2156 /*
2170 * dumb hack to compensate for the failure of click-and-drag 2157 * dumb hack to compensate for the failure of click-and-drag
… …
2173 if (priv_modes & PrivMode_mouse_report 2160 if (priv_modes & PrivMode_mouse_report
2174 && bypass_keystate 2161 && bypass_keystate
2175 && ev.button == Button1 && MEvent.clicks <= 1) 2162 && ev.button == Button1 && MEvent.clicks <= 1)
2176 selection_extend (ev.x, ev.y, 0); 2163 selection_extend (ev.x, ev.y, 0);
2177 2164
2178 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2179 return;
2180
2181 switch (ev.button) 2165 switch (ev.button)
2182 { 2166 {
2183 case Button1: 2167 case Button1:
2184 case Button3: 2168 case Button3:
2185 selection_make (ev.time); 2169 selection_make (ev.time);
2186 break; 2170 break;
2171
2187 case Button2: 2172 case Button2:
2188 selection_request (ev.time, ev.x, ev.y); 2173 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2174 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2189 break; 2175 break;
2176
2190#ifdef MOUSE_WHEEL 2177#ifdef MOUSE_WHEEL
2191 case Button4: 2178 case Button4:
2192 case Button5: 2179 case Button5:
2193 { 2180 {
2194 int i; 2181 int i;
… …
2196 2183
2197 v = ev.button == Button4 ? UP : DN; 2184 v = ev.button == Button4 ? UP : DN;
2198 2185
2199 if (ev.state & ShiftMask) 2186 if (ev.state & ShiftMask)
2200 i = 1; 2187 i = 1;
2201 else if (OPTION (Opt_mouseWheelScrollPage)) 2188 else if (option (Opt_mouseWheelScrollPage))
2202 i = nrow - 1; 2189 i = nrow - 1;
2203 else 2190 else
2204 i = 5; 2191 i = 5;
2205 2192
2206# ifdef MOUSE_SLIP_WHEELING 2193# ifdef MOUSE_SLIP_WHEELING
… …
2208 { 2195 {
2209 mouse_slip_wheel_speed += v ? -1 : 1; 2196 mouse_slip_wheel_speed += v ? -1 : 1;
2210 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2197 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2211 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2198 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2212 2199
2213 if (slip_wheel_ev.at < NOW) 2200 if (!slip_wheel_ev.is_active ())
2214 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2201 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2215
2216 slip_wheel_ev.start ();
2217 } 2202 }
2218 else 2203 else
2204# endif
2219 { 2205 {
2220# endif
2221 scr_page (v, i); 2206 scr_page (v, i);
2222 scrollbar_show (1); 2207 scrollBar.show (1);
2223# ifdef MOUSE_SLIP_WHEELING
2224 } 2208 }
2225# endif
2226 } 2209 }
2227 break; 2210 break;
2228#endif 2211#endif
2229 } 2212 }
2230 } 2213 }
2231#ifdef MENUBAR
2232 else if (isMenuBarWindow (ev.window))
2233 menubar_control (ev);
2234#endif
2235} 2214}
2236
2237#ifdef TRANSPARENT
2238#if TINTING
2239/* taken from aterm-0.4.2 */
2240
2241typedef uint32_t RUINT32T;
2242
2243void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2244{
2245 int sh_r, sh_g, sh_b;
2246 RUINT32T mask_r, mask_g, mask_b;
2247 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2248 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2249 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2250 int i;
2251
2252 Visual *visual = display->visual;
2253
2254 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2255
2256 /* for convenience */
2257 mask_r = visual->red_mask;
2258 mask_g = visual->green_mask;
2259 mask_b = visual->blue_mask;
2260
2261 /* boring lookup table pre-initialization */
2262 switch (srcImage->bits_per_pixel) {
2263 case 15:
2264 if ((mask_r != 0x7c00) ||
2265 (mask_g != 0x03e0) ||
2266 (mask_b != 0x001f))
2267 return;
2268 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2269 lookup_r = lookup;
2270 lookup_g = lookup+32;
2271 lookup_b = lookup+32+32;
2272 sh_r = 10;
2273 sh_g = 5;
2274 sh_b = 0;
2275 break;
2276 case 16:
2277 if ((mask_r != 0xf800) ||
2278 (mask_g != 0x07e0) ||
2279 (mask_b != 0x001f))
2280 return;
2281 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2282 lookup_r = lookup;
2283 lookup_g = lookup+32;
2284 lookup_b = lookup+32+64;
2285 sh_r = 11;
2286 sh_g = 5;
2287 sh_b = 0;
2288 break;
2289 case 24:
2290 if ((mask_r != 0xff0000) ||
2291 (mask_g != 0x00ff00) ||
2292 (mask_b != 0x0000ff))
2293 return;
2294 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2295 lookup_r = lookup;
2296 lookup_g = lookup+256;
2297 lookup_b = lookup+256+256;
2298 sh_r = 16;
2299 sh_g = 8;
2300 sh_b = 0;
2301 break;
2302 case 32:
2303 if ((mask_r != 0xff0000) ||
2304 (mask_g != 0x00ff00) ||
2305 (mask_b != 0x0000ff))
2306 return;
2307 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2308 lookup_r = lookup;
2309 lookup_g = lookup+256;
2310 lookup_b = lookup+256+256;
2311 sh_r = 16;
2312 sh_g = 8;
2313 sh_b = 0;
2314 break;
2315 default:
2316 return; /* we do not support this color depth */
2317 }
2318
2319 /* prepare limits for color transformation (each channel is handled separately) */
2320 if (shade < 0) {
2321 shade = -shade;
2322 if (shade < 0) shade = 0;
2323 if (shade > 100) shade = 100;
2324
2325 lower_lim_r = 65535-rm;
2326 lower_lim_g = 65535-gm;
2327 lower_lim_b = 65535-bm;
2328
2329 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2330 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2331 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2332
2333 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2334 } else {
2335 if (shade < 0) shade = 0;
2336 if (shade > 100) shade = 100;
2337
2338 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2339
2340 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2341 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2342 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2343 }
2344
2345 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2346 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2347 {
2348 unsigned int tmp;
2349
2350 tmp = lower_lim_r;
2351 lower_lim_r = lower_lim_b;
2352 lower_lim_b = tmp;
2353
2354 tmp = upper_lim_r;
2355 upper_lim_r = upper_lim_b;
2356 upper_lim_b = tmp;
2357 }
2358
2359 /* fill our lookup tables */
2360 for (i = 0; i <= mask_r>>sh_r; i++)
2361 {
2362 RUINT32T tmp;
2363 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2364 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2365 lookup_r[i] = (tmp/65535)<<sh_r;
2366 }
2367 for (i = 0; i <= mask_g>>sh_g; i++)
2368 {
2369 RUINT32T tmp;
2370 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2371 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2372 lookup_g[i] = (tmp/65535)<<sh_g;
2373 }
2374 for (i = 0; i <= mask_b>>sh_b; i++)
2375 {
2376 RUINT32T tmp;
2377 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2378 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2379 lookup_b[i] = (tmp/65535)<<sh_b;
2380 }
2381
2382 /* apply table to input image (replacing colors by newly calculated ones) */
2383 switch (srcImage->bits_per_pixel)
2384 {
2385 case 15:
2386 {
2387 unsigned short *p1, *pf, *p, *pl;
2388 p1 = (unsigned short *) srcImage->data;
2389 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2390 while (p1 < pf)
2391 {
2392 p = p1;
2393 pl = p1 + srcImage->width;
2394 for (; p < pl; p++)
2395 {
2396 *p = lookup_r[(*p & 0x7c00)>>10] |
2397 lookup_g[(*p & 0x03e0)>> 5] |
2398 lookup_b[(*p & 0x001f)];
2399 }
2400 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2401 }
2402 break;
2403 }
2404 case 16:
2405 {
2406 unsigned short *p1, *pf, *p, *pl;
2407 p1 = (unsigned short *) srcImage->data;
2408 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2409 while (p1 < pf)
2410 {
2411 p = p1;
2412 pl = p1 + srcImage->width;
2413 for (; p < pl; p++)
2414 {
2415 *p = lookup_r[(*p & 0xf800)>>11] |
2416 lookup_g[(*p & 0x07e0)>> 5] |
2417 lookup_b[(*p & 0x001f)];
2418 }
2419 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2420 }
2421 break;
2422 }
2423 case 24:
2424 {
2425 unsigned char *p1, *pf, *p, *pl;
2426 p1 = (unsigned char *) srcImage->data;
2427 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2428 while (p1 < pf)
2429 {
2430 p = p1;
2431 pl = p1 + srcImage->width * 3;
2432 for (; p < pl; p += 3)
2433 {
2434 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2435 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2436 p[2] = lookup_r[(p[2] & 0x0000ff)];
2437 }
2438 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2439 }
2440 break;
2441 }
2442 case 32:
2443 {
2444 RUINT32T *p1, *pf, *p, *pl;
2445 p1 = (RUINT32T *) srcImage->data;
2446 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2447
2448 while (p1 < pf)
2449 {
2450 p = p1;
2451 pl = p1 + srcImage->width;
2452 for (; p < pl; p++)
2453 {
2454 *p = lookup_r[(*p & 0xff0000)>>16] |
2455 lookup_g[(*p & 0x00ff00)>> 8] |
2456 lookup_b[(*p & 0x0000ff)] |
2457 (*p & ~0xffffff);
2458 }
2459 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2460 }
2461 break;
2462 }
2463 }
2464
2465 free (lookup);
2466}
2467#endif
2468
2469/*
2470 * Check our parents are still who we think they are.
2471 * Do transparency updates if required
2472 */
2473int
2474rxvt_term::check_our_parents ()
2475{
2476 int i, pchanged, aformat, have_pixmap, rootdepth;
2477 unsigned long nitems, bytes_after;
2478 Atom atype;
2479 unsigned char *prop = NULL;
2480 Window root, oldp, *list;
2481 Pixmap rootpixmap = None;
2482 XWindowAttributes wattr, wrootattr;
2483 dDisp;
2484
2485 pchanged = 0;
2486
2487 if (!OPTION (Opt_transparent))
2488 return pchanged; /* Don't try any more */
2489
2490 XGetWindowAttributes (disp, display->root, &wrootattr);
2491 rootdepth = wrootattr.depth;
2492
2493 XGetWindowAttributes (disp, parent[0], &wattr);
2494
2495 if (rootdepth != wattr.depth)
2496 {
2497 if (am_transparent)
2498 {
2499 pchanged = 1;
2500 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2501 am_transparent = am_pixmap_trans = 0;
2502 }
2503
2504 return pchanged; /* Don't try any more */
2505 }
2506
2507 /* Get all X ops out of the queue so that our information is up-to-date. */
2508 XSync (disp, False);
2509
2510 /*
2511 * Make the frame window set by the window manager have
2512 * the root background. Some window managers put multiple nested frame
2513 * windows for each client, so we have to take care about that.
2514 */
2515 i = (xa[XA_XROOTPMAP_ID]
2516 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2518 &nitems, &bytes_after, &prop) == Success);
2519
2520 if (!i || prop == NULL)
2521 i = (xa[XA_ESETROOT_PMAP_ID]
2522 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2523 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2524 &nitems, &bytes_after, &prop) == Success);
2525
2526 if (!i || prop == NULL
2527#if TINTING
2528 || !rs[Rs_color + Color_tint]
2529#endif
2530 )
2531 have_pixmap = 0;
2532 else
2533 {
2534 have_pixmap = 1;
2535 rootpixmap = *(Pixmap *)prop;
2536 XFree (prop);
2537 }
2538
2539 if (have_pixmap)
2540 {
2541 /*
2542 * Copy display->root pixmap transparency
2543 */
2544 int sx, sy, nx, ny;
2545 unsigned int nw, nh;
2546 Window cr;
2547 XImage *image;
2548 GC gc;
2549 XGCValues gcvalue;
2550
2551 XTranslateCoordinates (disp, parent[0], display->root,
2552 0, 0, &sx, &sy, &cr);
2553 nw = (unsigned int)szHint.width;
2554 nh = (unsigned int)szHint.height;
2555 nx = ny = 0;
2556
2557 if (sx < 0)
2558 {
2559 nw += sx;
2560 nx = -sx;
2561 sx = 0;
2562 }
2563
2564 if (sy < 0)
2565 {
2566 nh += sy;
2567 ny = -sy;
2568 sy = 0;
2569 }
2570
2571 min_it (nw, (unsigned int) (wrootattr.width - sx));
2572 min_it (nh, (unsigned int) (wrootattr.height - sy));
2573
2574 XSync (disp, False);
2575 allowedxerror = -1;
2576 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2577
2578 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2579 /* XXX: may need a delay here? */
2580 allowedxerror = 0;
2581
2582 if (image == NULL)
2583 {
2584 if (am_transparent && am_pixmap_trans)
2585 {
2586 pchanged = 1;
2587 if (pixmap != None)
2588 {
2589 XFreePixmap (disp, pixmap);
2590 pixmap = None;
2591 }
2592 }
2593
2594 am_pixmap_trans = 0;
2595 }
2596 else
2597 {
2598 if (pixmap != None)
2599 XFreePixmap (disp, pixmap);
2600
2601#if TINTING
2602 if (ISSET_PIXCOLOR (Color_tint))
2603 {
2604 unsigned short rm, gm, bm;
2605 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2606
2607 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2608
2609 ShadeXImage (display, image, shade, rm, gm, bm);
2610 }
2611#endif
2612
2613 pixmap = XCreatePixmap (disp, vt,
2614 szHint.width, szHint.height, image->depth);
2615 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2616 XPutImage (disp, pixmap, gc, image, 0, 0,
2617 nx, ny, image->width, image->height);
2618 XFreeGC (disp, gc);
2619 XDestroyImage (image);
2620 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2621 XClearWindow (disp, parent[0]);
2622
2623 if (!am_transparent || !am_pixmap_trans)
2624 pchanged = 1;
2625
2626 am_transparent = am_pixmap_trans = 1;
2627 }
2628 }
2629
2630 if (am_pixmap_trans)
2631 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2632 else
2633 {
2634 unsigned int n;
2635 /*
2636 * InheritPixmap transparency
2637 */
2638 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2639 {
2640 oldp = parent[i];
2641 XQueryTree (disp, parent[i - 1], &root,
2642 &parent[i], &list, &n);
2643 XFree (list);
2644
2645 if (parent[i] == display->root)
2646 {
2647 if (oldp != None)
2648 pchanged = 1;
2649
2650 break;
2651 }
2652
2653 if (oldp != parent[i])
2654 pchanged = 1;
2655 }
2656
2657 n = 0;
2658
2659 if (pchanged)
2660 {
2661 for (; n < (unsigned int)i; n++)
2662 {
2663 XGetWindowAttributes (disp, parent[n], &wattr);
2664 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2665 {
2666 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2667 break;
2668 }
2669 }
2670 }
2671
2672 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2673 {
2674 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2675 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2676 am_transparent = 0;
2677 /* XXX: also turn off Opt_transparent? */
2678 }
2679 else
2680 {
2681#if WAIT_FOR_WM
2682 /* wait (an arbitrary period) for the WM to do its thing
2683 * needed for fvwm2.2.2 (and before?) */
2684 sleep (1);
2685#endif
2686 for (n = 0; n < (unsigned int)i; n++)
2687 {
2688 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2689 XClearWindow (disp, parent[n]);
2690 }
2691
2692 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2693 am_transparent = 1;
2694 }
2695
2696 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2697 parent[i] = None;
2698 }
2699
2700 if (scrollBar.win)
2701 {
2702 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2703 scrollBar.setIdle ();
2704 scrollbar_show (0);
2705 }
2706
2707 if (am_transparent)
2708 {
2709 want_refresh = want_full_refresh = 1;
2710 if (am_pixmap_trans)
2711 flush ();
2712 }
2713
2714 return pchanged;
2715}
2716#endif
2717 2215
2718/*}}} */ 2216/*}}} */
2719 2217
2720bool 2218void
2721rxvt_term::cmd_parse () 2219rxvt_term::cmd_parse ()
2722{ 2220{
2723 bool flag = false;
2724 wchar_t ch = NOCHAR; 2221 wchar_t ch = NOCHAR;
2725 char *seq_begin; // remember start of esc-sequence here 2222 char *seq_begin; // remember start of esc-sequence here
2726 2223
2727 for (;;) 2224 for (;;)
2728 { 2225 {
2729 if (ch == NOCHAR) 2226 if (expect_false (ch == NOCHAR))
2730 { 2227 {
2731 seq_begin = cmdbuf_ptr; 2228 seq_begin = cmdbuf_ptr;
2732 ch = next_char (); 2229 ch = next_char ();
2733 2230
2734 if (ch == NOCHAR) 2231 if (ch == NOCHAR)
2735 break; 2232 break;
2736 } 2233 }
2737 2234
2738 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2235 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2739 { 2236 {
2740 if (!seen_input) 2237 if (expect_false (!seen_input))
2741 { 2238 {
2742 seen_input = 1; 2239 seen_input = 1;
2743 // many badly-written programs (e.g. jed) contain a race condition: 2240 // many badly-written programs (e.g. jed) contain a race condition:
2744 // they first read the screensize and then install a SIGWINCH handler. 2241 // they first read the screensize and then install a SIGWINCH handler.
2745 // some window managers resize the window early, and these programs 2242 // some window managers resize the window early, and these programs
… …
2758 wchar_t *str = buf; 2255 wchar_t *str = buf;
2759 wchar_t *eol = str + min (ncol, UBUFSIZ); 2256 wchar_t *eol = str + min (ncol, UBUFSIZ);
2760 2257
2761 for (;;) 2258 for (;;)
2762 { 2259 {
2763 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2260 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2764 break; 2261 break;
2765 2262
2766 *str++ = ch; 2263 *str++ = ch;
2767 2264
2768 if (ch == C0_LF || str >= eol) 2265 if (expect_false (ch == C0_LF || str >= eol))
2769 { 2266 {
2770 if (ch == C0_LF) 2267 if (ch == C0_LF)
2771 nlines++; 2268 nlines++;
2772 2269
2773 refresh_count++; 2270 refresh_count++;
2774 2271
2775 if (!OPTION (Opt_jumpScroll) 2272 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2776 || (refresh_count >= refresh_limit * (nrow - 1)))
2777 { 2273 {
2778 refreshnow = true;
2779 refresh_count = 0; 2274 refresh_count = 0;
2275
2276 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2277 {
2278 refreshnow = true;
2780 ch = NOCHAR; 2279 ch = NOCHAR;
2781 break; 2280 break;
2281 }
2782 } 2282 }
2783 2283
2784 // scr_add_lines only works for nlines <= nrow - 1. 2284 // scr_add_lines only works for nlines <= nrow - 1.
2785 if (nlines >= nrow - 1) 2285 if (nlines >= nrow - 1)
2786 { 2286 {
2287 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2787 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2288 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2788 scr_add_lines (buf, str - buf, nlines); 2289 scr_add_lines (buf, str - buf, nlines);
2789 2290
2790 nlines = 0; 2291 nlines = 0;
2791 str = buf; 2292 str = buf;
2792 eol = str + min (ncol, UBUFSIZ); 2293 eol = str + min (ncol, UBUFSIZ);
… …
2807 2308
2808 seq_begin = cmdbuf_ptr; 2309 seq_begin = cmdbuf_ptr;
2809 ch = next_char (); 2310 ch = next_char ();
2810 } 2311 }
2811 2312
2313 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2812 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2314 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2813 scr_add_lines (buf, str - buf, nlines); 2315 scr_add_lines (buf, str - buf, nlines);
2814 2316
2815 /* 2317 /*
2816 * If there have been a lot of new lines, then update the screen 2318 * If there have been a lot of new lines, then update the screen
2817 * What the heck I'll cheat and only refresh less than every page-full. 2319 * What the heck we'll cheat and only refresh less than every page-full.
2818 * the number of pages between refreshes is refresh_limit, which 2320 * if skipScroll is enabled.
2819 * is incremented here because we must be doing flat-out scrolling.
2820 */ 2321 */
2821 if (refreshnow) 2322 if (refreshnow)
2822 { 2323 {
2823 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2824 refresh_limit++;
2825 else
2826 {
2827 flag = true;
2828 scr_refresh (refresh_type); 2324 scr_refresh ();
2829 want_refresh = 1; 2325 want_refresh = 1;
2830 }
2831 } 2326 }
2832
2833 } 2327 }
2834 else 2328 else
2835 { 2329 {
2836 try 2330 try
2837 { 2331 {
… …
2845 } 2339 }
2846 2340
2847 ch = NOCHAR; 2341 ch = NOCHAR;
2848 } 2342 }
2849 } 2343 }
2850
2851 return flag;
2852} 2344}
2853 2345
2854// read the next character 2346// read the next character
2855wchar_t 2347wchar_t
2856rxvt_term::next_char () 2348rxvt_term::next_char () NOTHROW
2857{ 2349{
2858 while (cmdbuf_ptr < cmdbuf_endp) 2350 while (cmdbuf_ptr < cmdbuf_endp)
2859 { 2351 {
2860 // assume 7-bit to be ascii ALWAYS 2352 // assume 7-bit to be ascii ALWAYS
2861 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2353 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2862 return *cmdbuf_ptr++; 2354 return *cmdbuf_ptr++;
2863 2355
2864 wchar_t wc; 2356 wchar_t wc;
2865 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2357 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2866 2358
… …
2870 cmdbuf_ptr = cmdbuf_endp; 2362 cmdbuf_ptr = cmdbuf_endp;
2871 break; 2363 break;
2872 } 2364 }
2873 2365
2874 if (len == (size_t)-1) 2366 if (len == (size_t)-1)
2367 {
2368 mbstate.reset (); // reset now undefined conversion state
2875 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2369 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2370 }
2876 2371
2877 // assume wchar == unicode 2372 // assume wchar == unicode
2878 cmdbuf_ptr += len; 2373 cmdbuf_ptr += len;
2879 return wc & UNICODE_MASK; 2374 return wc & UNICODE_MASK;
2880 } 2375 }
… …
2882 return NOCHAR; 2377 return NOCHAR;
2883} 2378}
2884 2379
2885// read the next octet 2380// read the next octet
2886uint32_t 2381uint32_t
2887rxvt_term::next_octet () 2382rxvt_term::next_octet () NOTHROW
2888{ 2383{
2889 return cmdbuf_ptr < cmdbuf_endp 2384 return cmdbuf_ptr < cmdbuf_endp
2890 ? (unsigned char)*cmdbuf_ptr++ 2385 ? (unsigned char)*cmdbuf_ptr++
2891 : NOCHAR; 2386 : NOCHAR;
2892} 2387}
2388
2389static class out_of_input out_of_input;
2893 2390
2894/* rxvt_cmd_getc () - Return next input character */ 2391/* rxvt_cmd_getc () - Return next input character */
2895/* 2392/*
2896 * Return the next input character after first passing any keyboard input 2393 * Return the next input character after first passing any keyboard input
2897 * to the command. 2394 * to the command.
2898 */ 2395 */
2899wchar_t 2396wchar_t
2900rxvt_term::cmd_getc () 2397rxvt_term::cmd_getc () THROW ((class out_of_input))
2901{ 2398{
2902 wchar_t c = next_char (); 2399 wchar_t c = next_char ();
2903 2400
2904 if (c == NOCHAR) 2401 if (c == NOCHAR)
2905 throw out_of_input; 2402 throw out_of_input;
2906 2403
2907 return c; 2404 return c;
2908} 2405}
2909 2406
2910uint32_t 2407uint32_t
2911rxvt_term::cmd_get8 () 2408rxvt_term::cmd_get8 () THROW ((class out_of_input))
2912{ 2409{
2913 uint32_t c = next_octet (); 2410 uint32_t c = next_octet ();
2914 2411
2915 if (c == NOCHAR) 2412 if (c == NOCHAR)
2916 throw out_of_input; 2413 throw out_of_input;
… …
2922/*----------------------------------------------------------------------*/ 2419/*----------------------------------------------------------------------*/
2923#ifdef PRINTPIPE 2420#ifdef PRINTPIPE
2924FILE * 2421FILE *
2925rxvt_term::popen_printer () 2422rxvt_term::popen_printer ()
2926{ 2423{
2927 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2424 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2928 2425
2929 if (stream == NULL) 2426 if (stream == NULL)
2930 rxvt_warn ("can't open printer pipe, not printing.\n"); 2427 rxvt_warn ("can't open printer pipe, not printing.\n");
2931 2428
2932 return stream; 2429 return stream;
… …
2943 * simulate attached vt100 printer 2440 * simulate attached vt100 printer
2944 */ 2441 */
2945void 2442void
2946rxvt_term::process_print_pipe () 2443rxvt_term::process_print_pipe ()
2947{ 2444{
2948 int done; 2445 FILE *fd = popen_printer ();
2949 FILE *fd;
2950 2446
2951 if ((fd = popen_printer ()) == NULL) 2447 if (!fd)
2952 return; 2448 return;
2953 2449
2954 /* 2450 /*
2955 * Send all input to the printer until either ESC[4i or ESC[?4i 2451 * Send all input to the printer until either ESC[4i or ESC[?4i
2956 * is received. 2452 * is received.
2957 */ 2453 */
2958 for (done = 0; !done;) 2454 for (int done = 0; !done; )
2959 { 2455 {
2960 unsigned char buf[8]; 2456 unsigned char buf[8];
2961 unicode_t ch; 2457 unicode_t ch;
2962 unsigned int i, len; 2458 unsigned int i, len;
2963 2459
… …
2982 { 2478 {
2983 if ((buf[len++] = cmd_getc ()) == 'i') 2479 if ((buf[len++] = cmd_getc ()) == 'i')
2984 break; /* done = 1 */ 2480 break; /* done = 1 */
2985 } 2481 }
2986 } 2482 }
2987 2483
2988 for (i = 0; i < len; i++) 2484 for (i = 0; i < len; i++)
2989 if (putc (buf[i], fd) == EOF) 2485 if (putc (buf[i], fd) == EOF)
2990 { 2486 {
2991 done = 1; 2487 done = 1;
2992 break; 2488 break;
… …
2994 } 2490 }
2995 } 2491 }
2996 2492
2997 pclose_printer (fd); 2493 pclose_printer (fd);
2998} 2494}
2999#endif /* PRINTPIPE */ 2495#endif /* PRINTPIPE */
3000/*}}} */ 2496/*}}} */
3001 2497
3002/* *INDENT-OFF* */ 2498/* *INDENT-OFF* */
3003enum { 2499enum {
3004 C1_40 = 0x40, 2500 C1_40 = 0x40,
… …
3054 process_dcs_seq (); 2550 process_dcs_seq ();
3055 break; 2551 break;
3056 case 0x9b: /* CSI */ 2552 case 0x9b: /* CSI */
3057 process_csi_seq (); 2553 process_csi_seq ();
3058 break; 2554 break;
3059 case 0x9d: /* CSI */ 2555 case 0x9d: /* OSC */
3060 process_osc_seq (); 2556 process_osc_seq ();
3061 break; 2557 break;
3062#endif 2558#endif
3063 } 2559 }
3064} 2560}
… …
3108 break; 2604 break;
3109 case 'Z': /* identify the terminal type */ 2605 case 'Z': /* identify the terminal type */
3110 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2606 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3111 break; 2607 break;
3112 case '<': /* turn off VT52 mode */ 2608 case '<': /* turn off VT52 mode */
3113 PrivMode (0, PrivMode_vt52); 2609 set_privmode (PrivMode_vt52, 0);
3114 break; 2610 break;
3115 case 'F': /* use special graphics character set */ 2611 case 'F': /* use special graphics character set */
3116 case 'G': /* use regular character set */ 2612 case 'G': /* use regular character set */
3117 /* unimplemented */ 2613 /* unimplemented */
3118 break; 2614 break;
… …
3154 scr_charset_set (2, (unsigned int)cmd_getc ()); 2650 scr_charset_set (2, (unsigned int)cmd_getc ());
3155 break; 2651 break;
3156 case '+': 2652 case '+':
3157 scr_charset_set (3, (unsigned int)cmd_getc ()); 2653 scr_charset_set (3, (unsigned int)cmd_getc ());
3158 break; 2654 break;
3159#if ENABLE_FRILLS 2655#if !ENABLE_MINIMAL
3160 case '6': 2656 case '6':
3161 scr_backindex (); 2657 scr_backindex ();
3162 break; 2658 break;
3163#endif 2659#endif
3164 case '7': 2660 case '7':
3165 scr_cursor (SAVE); 2661 scr_cursor (SAVE);
3166 break; 2662 break;
3167 case '8': 2663 case '8':
3168 scr_cursor (RESTORE); 2664 scr_cursor (RESTORE);
3169 break; 2665 break;
3170#if ENABLE_FRILLS 2666#if !ENABLE_MINIMAL
3171 case '9': 2667 case '9':
3172 scr_forwardindex (); 2668 scr_forwardindex ();
3173 break; 2669 break;
3174#endif 2670#endif
3175 case '=': 2671 case '=':
3176 case '>': 2672 case '>':
3177 PrivMode ((ch == '='), PrivMode_aplKP); 2673 set_privmode (PrivMode_aplKP, ch == '=');
3178 break; 2674 break;
3179 2675
3180 case C1_40: 2676 case C1_40:
3181 cmd_getc (); 2677 cmd_getc ();
3182 break; 2678 break;
… …
3186 2682
3187 /* 8.3.87: NEXT LINE */ 2683 /* 8.3.87: NEXT LINE */
3188 case C1_NEL: /* ESC E */ 2684 case C1_NEL: /* ESC E */
3189 { 2685 {
3190 wchar_t nlcr[] = { C0_LF, C0_CR }; 2686 wchar_t nlcr[] = { C0_LF, C0_CR };
3191 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2687 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
3192 } 2688 }
3193 break; 2689 break;
3194 2690
3195 /* kidnapped escape sequence: Should be 8.3.48 */ 2691 /* kidnapped escape sequence: Should be 8.3.48 */
3196 case C1_ESA: /* ESC G */ 2692 case C1_ESA: /* ESC G */
3197 process_graphics (); 2693 // used by original rxvt for rob nations own graphics mode
2694 if (cmd_getc () == 'Q')
2695 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3198 break; 2696 break;
3199 2697
3200 /* 8.3.63: CHARACTER TABULATION SET */ 2698 /* 8.3.63: CHARACTER TABULATION SET */
3201 case C1_HTS: /* ESC H */ 2699 case C1_HTS: /* ESC H */
3202 scr_set_tab (1); 2700 scr_set_tab (1);
… …
3221 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2719 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3222 case C1_SCI: /* ESC Z */ 2720 case C1_SCI: /* ESC Z */
3223 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2721 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3224 break; /* steal obsolete ESC [ c */ 2722 break; /* steal obsolete ESC [ c */
3225 2723
3226 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2724 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3227 case C1_CSI: /* ESC [ */ 2725 case C1_CSI: /* ESC [ */
3228 process_csi_seq (); 2726 process_csi_seq ();
3229 break; 2727 break;
3230 2728
3231 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2729 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3232 case C1_OSC: /* ESC ] */ 2730 case C1_OSC: /* ESC ] */
3233 process_osc_seq (); 2731 process_osc_seq ();
3234 break; 2732 break;
3235 2733
3236 /* 8.3.106: RESET TO INITIAL STATE */ 2734 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3237 case 'c': 2735 case 'c':
3238 mbstate.reset (); 2736 mbstate.reset ();
3239 scr_poweron (); 2737 scr_poweron ();
3240 scrollbar_show (1); 2738 scrollBar.show (1);
3241 break; 2739 break;
3242 2740
3243 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2741 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3244 case 'n': 2742 case 'n':
3245 scr_charset_choose (2); 2743 scr_charset_choose (2);
… …
3265 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2763 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3266 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2764 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3267 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2765 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3268}; 2766};
3269 2767
3270#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2768#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3271 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2769 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3272 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2770 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3273#define get_byte_array_bit(array, bit) \ 2771#define get_byte_array_bit(array, bit) \
3274 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2772 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3275 2773
3276const unsigned char csi_defaults[] = 2774static const unsigned char csi_defaults[] =
3277 { 2775 {
3278 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2776 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3279 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2777 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3280 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2778 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3281 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2779 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
3290rxvt_term::process_csi_seq () 2788rxvt_term::process_csi_seq ()
3291{ 2789{
3292 unicode_t ch, priv, i; 2790 unicode_t ch, priv, i;
3293 unsigned int nargs, p; 2791 unsigned int nargs, p;
3294 int n, ndef; 2792 int n, ndef;
3295 int arg[ESC_ARGS]; 2793 int arg[ESC_ARGS] = { };
3296 2794
3297 for (nargs = ESC_ARGS; nargs > 0;) 2795 nargs = 0;
3298 arg[--nargs] = 0;
3299 2796
3300 priv = 0; 2797 priv = 0;
3301 ch = cmd_getc (); 2798 ch = cmd_getc ();
3302 if (ch >= '<' && ch <= '?') 2799 if ((ch >= '<' && ch <= '?') || ch == '!')
2800 {
3303 { /* '<' '=' '>' '?' */ 2801 /* '<' '=' '>' '?' '!' */
3304 priv = ch; 2802 priv = ch;
3305 ch = cmd_getc (); 2803 ch = cmd_getc ();
3306 } 2804 }
3307 2805
3308 /* read any numerical arguments */ 2806 /* read any numerical arguments */
… …
3337 ndef = get_byte_array_bit (csi_defaults, i); 2835 ndef = get_byte_array_bit (csi_defaults, i);
3338 for (p = 0; p < nargs; p++) 2836 for (p = 0; p < nargs; p++)
3339 if (arg[p] == -1) 2837 if (arg[p] == -1)
3340 arg[p] = ndef; 2838 arg[p] = ndef;
3341 2839
3342#ifdef DEBUG_CMD
3343 fprintf (stderr, "CSI ");
3344 for (p = 0; p < nargs; p++)
3345 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3346 fprintf (stderr, "%c\n", ch);
3347#endif
3348
3349 /* 2840 /*
3350 * private mode handling 2841 * private mode handling
3351 */ 2842 */
3352 if (priv) 2843 if (priv)
3353 { 2844 {
3354 switch (priv) 2845 switch (priv)
3355 { 2846 {
3356 case '>': 2847 case '>':
3357 if (ch == CSI_DA) /* secondary device attributes */ 2848 if (ch == CSI_DA) /* secondary device attributes */
3358 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2849 {
2850 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2851 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2852 //
2853 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2854 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2855 // versions.
2856 //
2857 tt_printf ("\033[>%d;95;0c", 'U');
2858 }
3359 break; 2859 break;
2860
3360 case '?': 2861 case '?':
3361 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2862 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3362 process_terminal_mode (ch, priv, nargs, arg); 2863 process_terminal_mode (ch, priv, nargs, arg);
3363 break; 2864 break;
2865
2866 case '!':
2867 if (ch == CSI_70)
2868 {
2869 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2870 scr_soft_reset ();
2871
2872 static const int pm_h[] = { 7, 25 };
2873 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2874
2875 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2876 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
3364 } 2877 }
2878 break;
2879 }
2880
3365 return; 2881 return;
3366 } 2882 }
3367 2883
3368 switch (ch) 2884 switch (ch)
3369 { 2885 {
… …
3489 break; 3005 break;
3490 case 6: /* CPR requested */ 3006 case 6: /* CPR requested */
3491 scr_report_position (); 3007 scr_report_position ();
3492 break; 3008 break;
3493 case 7: /* unofficial extension */ 3009 case 7: /* unofficial extension */
3494 if (OPTION (Opt_insecure)) 3010 if (option (Opt_insecure))
3495 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3011 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3496 break; 3012 break;
3497 case 8: /* unofficial extension */ 3013 case 8: /* unofficial extension */
3498 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3014 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3499 break; 3015 break;
… …
3566 break; 3082 break;
3567 case CSI_75: 3083 case CSI_75:
3568 scr_cursor (RESTORE); 3084 scr_cursor (RESTORE);
3569 break; 3085 break;
3570 3086
3571#if ENABLE_FRILLS 3087#if !ENABLE_MINIMAL
3572 case CSI_74: 3088 case CSI_74:
3573 process_window_ops (arg, nargs); 3089 process_window_ops (arg, nargs);
3574 break; 3090 break;
3575#endif 3091#endif
3576 3092
… …
3583 break; 3099 break;
3584 } 3100 }
3585} 3101}
3586/*}}} */ 3102/*}}} */
3587 3103
3588#if ENABLE_FRILLS 3104#if !ENABLE_MINIMAL
3589/* ARGSUSED */ 3105/* ARGSUSED */
3590void 3106void
3591rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3107rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3592{ 3108{
3593 int x, y; 3109 int x, y;
3594 XWindowAttributes wattr; 3110 XWindowAttributes wattr;
3595 Window wdummy; 3111 Window wdummy;
3596 dDisp; 3112
3113 dLocal (Display *, dpy);
3597 3114
3598 if (nargs == 0) 3115 if (nargs == 0)
3599 return; 3116 return;
3600 3117
3601 switch (args[0]) 3118 switch (args[0])
3602 { 3119 {
3603 /* 3120 /*
3604 * commands 3121 * commands
3605 */ 3122 */
3606 case 1: /* deiconify window */ 3123 case 1: /* deiconify window */
3607 XMapWindow (disp, parent[0]); 3124 XMapWindow (dpy, parent[0]);
3608 break; 3125 break;
3609 case 2: /* iconify window */ 3126 case 2: /* iconify window */
3610 XIconifyWindow (disp, parent[0], display->screen); 3127 XIconifyWindow (dpy, parent[0], display->screen);
3611 break; 3128 break;
3612 case 3: /* set position (pixels) */ 3129 case 3: /* set position (pixels) */
3613 XMoveWindow (disp, parent[0], args[1], args[2]); 3130 XMoveWindow (dpy, parent[0], args[1], args[2]);
3614 break; 3131 break;
3615 case 4: /* set size (pixels) */ 3132 case 4: /* set size (pixels) */
3616 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3133 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3617 break; 3134 break;
3618 case 5: /* raise window */ 3135 case 5: /* raise window */
3619 XRaiseWindow (disp, parent[0]); 3136 XRaiseWindow (dpy, parent[0]);
3620 break; 3137 break;
3621 case 6: /* lower window */ 3138 case 6: /* lower window */
3622 XLowerWindow (disp, parent[0]); 3139 XLowerWindow (dpy, parent[0]);
3623 break; 3140 break;
3624 case 7: /* refresh window */ 3141 case 7: /* refresh window */
3625 scr_touch (true); 3142 scr_touch (true);
3626 break; 3143 break;
3627 case 8: /* set size (chars) */ 3144 case 8: /* set size (chars) */
… …
3634 if (args[0] >= 24) /* set height (chars) */ 3151 if (args[0] >= 24) /* set height (chars) */
3635 set_widthheight ((unsigned int)width, 3152 set_widthheight ((unsigned int)width,
3636 (unsigned int) (args[1] * fheight)); 3153 (unsigned int) (args[1] * fheight));
3637 break; 3154 break;
3638 3155
3639
3640 /* 3156 /*
3641 * reports - some output format copied from XTerm 3157 * reports - some output format copied from XTerm
3642 */ 3158 */
3643 case 11: /* report window state */ 3159 case 11: /* report window state */
3644 XGetWindowAttributes (disp, parent[0], &wattr); 3160 XGetWindowAttributes (dpy, parent[0], &wattr);
3645 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3161 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3646 break; 3162 break;
3647 case 13: /* report window position */ 3163 case 13: /* report window position */
3648 XGetWindowAttributes (disp, parent[0], &wattr); 3164 XGetWindowAttributes (dpy, parent[0], &wattr);
3649 XTranslateCoordinates (disp, parent[0], wattr.root, 3165 XTranslateCoordinates (dpy, parent[0], wattr.root,
3650 -wattr.border_width, -wattr.border_width, 3166 -wattr.border_width, -wattr.border_width,
3651 &x, &y, &wdummy); 3167 &x, &y, &wdummy);
3652 tt_printf ("\033[3;%d;%dt", x, y); 3168 tt_printf ("\033[3;%d;%dt", x, y);
3653 break; 3169 break;
3654 case 14: /* report window size (pixels) */ 3170 case 14: /* report window size (pixels) */
3655 XGetWindowAttributes (disp, parent[0], &wattr); 3171 XGetWindowAttributes (dpy, parent[0], &wattr);
3656 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3172 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3657 break; 3173 break;
3658 case 18: /* report text area size (chars) */ 3174 case 18: /* report text area size (chars) */
3659 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3175 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3660 break; 3176 break;
… …
3662 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3178 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3663 break; 3179 break;
3664 case 20: /* report icon label */ 3180 case 20: /* report icon label */
3665 { 3181 {
3666 char *s; 3182 char *s;
3667 XGetIconName (disp, parent[0], &s); 3183 XGetIconName (dpy, parent[0], &s);
3668 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3184 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3669 XFree (s); 3185 XFree (s);
3670 } 3186 }
3671 break; 3187 break;
3672 case 21: /* report window title */ 3188 case 21: /* report window title */
3673 { 3189 {
3674 char *s; 3190 char *s;
3675 XFetchName (disp, parent[0], &s); 3191 XFetchName (dpy, parent[0], &s);
3676 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3192 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3677 XFree (s); 3193 XFree (s);
3678 } 3194 }
3679 break; 3195 break;
3680 } 3196 }
3681} 3197}
… …
3708 seen_esc = true; 3224 seen_esc = true;
3709 continue; 3225 continue;
3710 } 3226 }
3711 else if (ch == C0_BEL || ch == CHAR_ST) 3227 else if (ch == C0_BEL || ch == CHAR_ST)
3712 break; 3228 break;
3229 else if (ch == C0_SYN)
3230 ch = cmd_get8 ();
3713 else if (ch < 0x20) 3231 else if (ch < 0x20)
3714 return NULL; /* other control character - exit */ 3232 return NULL; /* other control character - exit */
3715 3233
3716 seen_esc = false; 3234 seen_esc = false;
3717 3235
3718 if (n >= STRING_MAX - 1) 3236 if (n >= STRING_MAX - 1)
3719 // stop at some sane length 3237 // stop at some sane length
3720 return NULL; 3238 return NULL;
3721 3239
3722 if (ch == C0_SYN)
3723 string[n++] = cmd_get8 ();
3724 else
3725 string[n++] = ch; 3240 string[n++] = ch;
3726 } 3241 }
3727 3242
3728 string[n++] = '\0'; 3243 string[n++] = '\0';
3729 3244
3730 ends_how = (ch == 0x5c ? C0_ESC : ch); 3245 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3737 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3252 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3738 */ 3253 */
3739void 3254void
3740rxvt_term::process_dcs_seq () 3255rxvt_term::process_dcs_seq ()
3741{ 3256{
3742 char *s;
3743 unicode_t eh;
3744
3745 /* 3257 /*
3746 * Not handled yet 3258 * Not handled yet
3747 */ 3259 */
3260
3261 unicode_t eh;
3748 s = get_to_st (eh); 3262 char *s = get_to_st (eh);
3749 if (s) 3263 if (s)
3750 free (s); 3264 free (s);
3751 3265
3752 return; 3266 return;
3753} 3267}
… …
3757 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3271 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3758 */ 3272 */
3759void 3273void
3760rxvt_term::process_osc_seq () 3274rxvt_term::process_osc_seq ()
3761{ 3275{
3762 unicode_t ch, eh;
3763 int arg; 3276 int arg;
3764 3277
3765 ch = cmd_getc (); 3278 unicode_t ch = cmd_getc ();
3766 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3279 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3767 arg = arg * 10 + (ch - '0'); 3280 arg = arg * 10 + (ch - '0');
3768 3281
3769 if (ch == ';') 3282 if (ch == ';')
3770 { 3283 {
3284 unicode_t eh;
3771 char *s = get_to_st (eh); 3285 char *s = get_to_st (eh);
3772 3286
3773 if (s) 3287 if (s)
3774 { 3288 {
3775 process_xterm_seq (arg, s, eh); 3289 process_xterm_seq (arg, s, eh);
… …
3781void 3295void
3782rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3296rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3783{ 3297{
3784 if (str[0] == '?' && !str[1]) 3298 if (str[0] == '?' && !str[1])
3785 { 3299 {
3786 unsigned short r, g, b; 3300 rgba c;
3787 pix_colors_focused[color].get (display, r, g, b); 3301 pix_colors_focused[color].get (c);
3302
3303#if XFT
3304 if (c.a != rgba::MAX_CC)
3305 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3306 else
3307#endif
3788 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3308 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3789 } 3309 }
3790 else 3310 else
3791 set_window_color (color, str); 3311 set_window_color (color, str);
3792} 3312}
3793 3313
3794/* 3314/*
3795 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3315 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3796 */ 3316 */
3797void 3317void
3798rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3318rxvt_term::process_xterm_seq (int op, char *str, char resp)
3799{ 3319{
3800 int changed = 0;
3801 int color; 3320 int color;
3802 char *buf, *name; 3321 char *buf, *name;
3803 bool query = str[0] == '?' && !str[1]; 3322 bool query = str[0] == '?' && !str[1];
3804 int saveop = op; 3323 int saveop = op;
3805 dDisp; 3324
3325 dLocal (Display *, dpy);
3806 3326
3807 assert (str != NULL); 3327 assert (str != NULL);
3328
3329 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3330 return;
3331
3808 switch (op) 3332 switch (op)
3809 { 3333 {
3810 case XTerm_name: 3334 case XTerm_name:
3811 set_title (str); 3335 set_title (str);
3812 /* FALLTHROUGH */ 3336 /* FALLTHROUGH */
… …
3826 unsigned long bytes_after; 3350 unsigned long bytes_after;
3827 unsigned char *value = 0; 3351 unsigned char *value = 0;
3828 const char *str = ""; 3352 const char *str = "";
3829 3353
3830 if (prop 3354 if (prop
3831 && XGetWindowProperty (disp, parent[0], 3355 && XGetWindowProperty (dpy, parent[0],
3832 prop, 0, 1<<16, 0, AnyPropertyType, 3356 prop, 0, 1<<16, 0, AnyPropertyType,
3833 &actual_type, &actual_format, 3357 &actual_type, &actual_format,
3834 &nitems, &bytes_after, &value) == Success 3358 &nitems, &bytes_after, &value) == Success
3835 && actual_type != None 3359 && actual_type != None
3836 && actual_format == 8) 3360 && actual_format == 8)
3837 str = (const char *)(value); 3361 str = (const char *)(value);
3838 3362
3839 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3363 tt_printf ("\033]%d;%s%c", op, str, resp);
3840 3364
3841 XFree (value); 3365 XFree (value);
3842 } 3366 }
3843 else 3367 else
3844 { 3368 {
3845 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3369 char *eq = strchr (str, '=');
3846 3370
3847 if (eq) 3371 if (eq)
3848 { 3372 {
3849 *eq = 0; 3373 *eq = 0;
3850 set_utf8_property (display->atom (str), eq + 1); 3374 set_utf8_property (display->atom (str), eq + 1);
3851 } 3375 }
3852 else 3376 else
3853 XDeleteProperty (disp, parent[0], 3377 XDeleteProperty (dpy, parent[0],
3854 display->atom (str)); 3378 display->atom (str));
3855 } 3379 }
3856 break; 3380 break;
3857 3381
3858 case XTerm_Color: 3382 case XTerm_Color:
… …
3860 { 3384 {
3861 if ((name = strchr (buf, ';')) == NULL) 3385 if ((name = strchr (buf, ';')) == NULL)
3862 break; 3386 break;
3863 3387
3864 *name++ = '\0'; 3388 *name++ = '\0';
3865 color = atoi (buf); 3389 color = atoi (buf) + minCOLOR;
3866 3390
3867 if (color < 0 || color >= TOTAL_COLORS) 3391 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3868 break; 3392 break;
3869 3393
3870 if ((buf = strchr (name, ';')) != NULL) 3394 if ((buf = strchr (name, ';')) != NULL)
3871 *buf++ = '\0'; 3395 *buf++ = '\0';
3872 3396
3873 if (name[0] == '?' && !name[1]) 3397 process_color_seq (op, color, name, resp);
3398 }
3399 break;
3400 case Rxvt_restoreFG:
3401 case XTerm_Color00:
3402 process_color_seq (op, Color_fg, str, resp);
3403 break;
3404 case Rxvt_restoreBG:
3405 case XTerm_Color01:
3406 process_color_seq (op, Color_bg, str, resp);
3407 break;
3408#ifndef NO_CURSORCOLOR
3409 case XTerm_Color_cursor:
3410 process_color_seq (op, Color_cursor, str, resp);
3411 break;
3412#endif
3413 case XTerm_Color_pointer_fg:
3414 process_color_seq (op, Color_pointer_fg, str, resp);
3415 break;
3416 case XTerm_Color_pointer_bg:
3417 process_color_seq (op, Color_pointer_bg, str, resp);
3418 break;
3419#ifdef OPTION_HC
3420 case XTerm_Color_HC:
3421 process_color_seq (op, Color_HC, str, resp);
3422 break;
3423 case XTerm_Color_HTC:
3424 process_color_seq (op, Color_HTC, str, resp);
3425 break;
3426#endif
3427#ifndef NO_BOLD_UNDERLINE_REVERSE
3428 case URxvt_Color_BD:
3429 process_color_seq (op, Color_BD, str, resp);
3430 break;
3431 case URxvt_Color_UL:
3432 process_color_seq (op, Color_UL, str, resp);
3433 break;
3434 case URxvt_Color_IT:
3435 process_color_seq (op, Color_IT, str, resp);
3436 break;
3437#endif
3438 case URxvt_Color_border:
3439 process_color_seq (op, Color_border, str, resp);
3440 break;
3441#if ENABLE_TRANSPARENCY
3442 case URxvt_Color_tint:
3443 process_color_seq (op, Color_tint, str, resp);
3444 {
3445 bool changed = false;
3446
3447 if (ISSET_PIXCOLOR (Color_tint))
3448 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3449
3450 if (changed)
3451 update_background ();
3452 }
3453
3454 break;
3455#endif
3456
3457#if BG_IMAGE_FROM_FILE
3458 case Rxvt_Pixmap:
3459 if (!strcmp (str, "?"))
3460 {
3461 char str[256];
3462
3463 sprintf (str, "[%dx%d+%d+%d]",
3464 min (h_scale, 32767), min (v_scale, 32767),
3465 min (h_align, 32767), min (v_align, 32767));
3466 process_xterm_seq (XTerm_title, str, CHAR_ST);
3467 }
3468 else
3469 {
3470 int changed = 0;
3471
3472 if (*str != ';')
3874 { 3473 {
3875 unsigned short r, g, b; 3474 if (bg_set_file (str)) /* change pixmap */
3876 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3475 {
3877 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3476 changed++;
3477 str = strchr (str, ';');
3478 if (str == NULL)
3479 bg_set_default_geometry ();
3480 else
3481 bg_set_geometry (str+1);
3482 }
3878 } 3483 }
3879 else 3484 else
3880 set_window_color (color + minCOLOR, name); 3485 {
3486 str++;
3487 if (bg_set_geometry (str, true))
3488 changed++;
3489 }
3490
3491 if (changed)
3492 {
3493 if (bg_window_position_sensitive ())
3494 {
3495 int x, y;
3496 get_window_origin (x, y);
3497 bg_set_position (x, y);
3498 }
3499 update_background ();
3500 }
3881 } 3501 }
3882 break; 3502 break;
3883 case XTerm_Color00:
3884 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3885 break;
3886 case XTerm_Color01:
3887 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3888 break;
3889#ifndef NO_CURSORCOLOR
3890 case XTerm_Color_cursor:
3891 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3892 break;
3893#endif 3503#endif
3894 case XTerm_Color_pointer_fg:
3895 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3896 break;
3897 case XTerm_Color_pointer_bg:
3898 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3899 break;
3900#ifndef NO_BOLD_UNDERLINE_REVERSE
3901 case XTerm_Color_BD:
3902 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3903 break;
3904 case XTerm_Color_UL:
3905 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3906 break;
3907 case XTerm_Color_RV:
3908 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3909 break;
3910 case URxvt_Color_IT:
3911 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3912 break;
3913#endif
3914#if TRANSPARENT && TINTING
3915 case URxvt_Color_tint:
3916 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3917 check_our_parents ();
3918 if (am_transparent)
3919 want_full_refresh = want_refresh = 1;
3920 break;
3921#endif
3922
3923 case XTerm_Pixmap:
3924 if (*str != ';')
3925 {
3926#if XPM_BACKGROUND
3927 scale_pixmap (""); /* reset to default scaling */
3928 set_bgPixmap (str); /* change pixmap */
3929#endif
3930 scr_touch (true);
3931 }
3932 while ((str = strchr (str, ';')) != NULL)
3933 {
3934 str++;
3935#if XPM_BACKGROUND
3936 changed += scale_pixmap (str);
3937#endif
3938 }
3939
3940 if (changed)
3941 {
3942#ifdef XPM_BACKGROUND
3943 resize_pixmap ();
3944#endif
3945 scr_touch (true);
3946 }
3947 break;
3948
3949 case XTerm_restoreFG:
3950 set_window_color (Color_fg, str);
3951 break;
3952 case XTerm_restoreBG:
3953 set_window_color (Color_bg, str);
3954 break;
3955 3504
3956 case XTerm_logfile: 3505 case XTerm_logfile:
3957 // TODO, when secure mode? 3506 // TODO, when secure mode?
3958 break; 3507 break;
3959 3508
3960#ifdef MENUBAR
3961 case URxvt_Menu:
3962 if (OPTION (Opt_insecure))
3963 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3964 break;
3965#endif
3966#if 0 3509#if 0
3967 case XTerm_dumpscreen: /* no error notices */ 3510 case Rxvt_dumpscreen: /* no error notices */
3968 { 3511 {
3969 int fd; 3512 int fd;
3970 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3513 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3971 { 3514 {
3972 scr_dump (fd); 3515 scr_dump (fd);
… …
3983 case URxvt_italicFont: 3526 case URxvt_italicFont:
3984 case URxvt_boldItalicFont: 3527 case URxvt_boldItalicFont:
3985#endif 3528#endif
3986 if (query) 3529 if (query)
3987 tt_printf ("\33]%d;%-.250s%c", saveop, 3530 tt_printf ("\33]%d;%-.250s%c", saveop,
3988 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3531 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3989 ? fontset[op - URxvt_font]->fontdesc : "", 3532 ? fontset[op - URxvt_font]->fontdesc : "",
3990 resp); 3533 resp);
3991 else 3534 else
3992 { 3535 {
3993 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3536 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3996 allocated.push_back ((void *)res); 3539 allocated.push_back ((void *)res);
3997 set_fonts (); 3540 set_fonts ();
3998 } 3541 }
3999 break; 3542 break;
4000 3543
4001#if ENABLE_FRILLS 3544 case URxvt_version:
3545 if (query)
3546 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3547 op,
3548 rs[Rs_name], VERSION[0], VERSION[2],
3549 resp);
3550 break;
3551
3552#if !ENABLE_MINIMAL
4002 case URxvt_locale: 3553 case URxvt_locale:
4003 if (query) 3554 if (query)
4004 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3555 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4005 else 3556 else
4006 { 3557 {
4007 set_locale (str); 3558 set_locale (str);
4008 pty.set_utf8_mode (enc_utf8); 3559 pty->set_utf8_mode (enc_utf8);
4009 init_xlocale (); 3560 init_xlocale ();
4010 } 3561 }
4011 break; 3562 break;
4012 3563
4013 case URxvt_view_up: 3564 case URxvt_view_up:
… …
4024 break; 3575 break;
4025#endif 3576#endif
4026 3577
4027#if ENABLE_PERL 3578#if ENABLE_PERL
4028 case URxvt_perl: 3579 case URxvt_perl:
4029 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3580 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4030 ; // no responses yet
4031 break; 3581 break;
4032#endif 3582#endif
4033 } 3583 }
4034} 3584}
4035/*----------------------------------------------------------------------*/ 3585/*----------------------------------------------------------------------*/
… …
4058 { 3608 {
4059 if (mode == 'r') 3609 if (mode == 'r')
4060 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3610 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4061 else 3611 else
4062 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3612 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4063 PrivMode (state, bit); 3613
3614 set_privmode (bit, state);
4064 } 3615 }
4065 3616
4066 return state; 3617 return state;
4067} 3618}
4068 3619
4069/* we're not using priv _yet_ */ 3620/* we're not using priv _yet_ */
4070void 3621void
4071rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3622rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4072{ 3623{
4073 unsigned int i, j; 3624 unsigned int i, j;
4074 int state; 3625 int state;
4075 3626
4076 static const struct 3627 static const struct
4077 { 3628 {
4078 const int argval; 3629 const int argval;
4079 const unsigned long bit; 3630 const unsigned long bit;
4080 }
4081
4082 argtopriv[] = { 3631 } argtopriv[] = {
4083 { 1, PrivMode_aplCUR }, 3632 { 1, PrivMode_aplCUR }, // DECCKM
4084 { 2, PrivMode_vt52 }, 3633 { 2, PrivMode_vt52 },
4085 { 3, PrivMode_132 }, 3634 { 3, PrivMode_132 }, // DECCOLM
4086 { 4, PrivMode_smoothScroll }, 3635 { 4, PrivMode_smoothScroll }, // DECSCLM
4087 { 5, PrivMode_rVideo }, 3636 { 5, PrivMode_rVideo }, // DECSCNM
4088 { 6, PrivMode_relOrigin }, 3637 { 6, PrivMode_relOrigin }, // DECOM
4089 { 7, PrivMode_Autowrap }, 3638 { 7, PrivMode_Autowrap }, // DECAWM
4090 // 8, bi-directional support mode 3639 // 8, auto-repeat keys // DECARM
4091 { 9, PrivMode_MouseX10 }, 3640 { 9, PrivMode_MouseX10 },
4092#ifdef menuBar_esc 3641 // 18 end FF to printer after print screen
4093 { menuBar_esc, PrivMode_menuBar }, 3642 // 19 Print screen prints full screen/scroll region
4094#endif
4095 // 18, 19 printing-related
4096 { 25, PrivMode_VisibleCursor }, 3643 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4097#ifdef scrollBar_esc 3644#ifdef scrollBar_esc
4098 { scrollBar_esc, PrivMode_scrollBar }, 3645 { scrollBar_esc, PrivMode_scrollBar },
4099#endif 3646#endif
4100 { 35, PrivMode_ShiftKeys }, // rxvt extension 3647 { 35, PrivMode_ShiftKeys }, // rxvt extension
3648 // 38, tektronix mode // DECTEK
4101 { 40, PrivMode_132OK }, 3649 { 40, PrivMode_132OK },
4102 // 41 xterm more fixes NYI 3650 // 41 xterm more fixes NYI
4103 // 45 margin bell NYI 3651 // 45 margin bell NYI
4104 // 46 start logging 3652 // 46 start logging
4105 { 47, PrivMode_Screen }, 3653 { 47, PrivMode_Screen },
4106 { 66, PrivMode_aplKP }, 3654 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4107#ifndef NO_BACKSPACE_KEY 3655#ifndef NO_BACKSPACE_KEY
4108 { 67, PrivMode_BackSpace }, 3656 { 67, PrivMode_BackSpace }, // DECBKM
4109#endif 3657#endif
4110 { 1000, PrivMode_MouseX11 }, 3658 { 1000, PrivMode_MouseX11 },
4111 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3659 { 1002, PrivMode_MouseBtnEvent },
4112 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3660 { 1003, PrivMode_MouseAnyEvent },
4113 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3661#if ENABLE_FRILLS
3662 { 1005, PrivMode_ExtModeMouse },
3663#endif
4114 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3664 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4115 { 1011, PrivMode_Keypress }, // rxvt extension 3665 { 1011, PrivMode_Keypress }, // rxvt extension
3666#if ENABLE_FRILLS
3667 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3668#endif
4116 // 1035 enable modifiers for alt, numlock NYI 3669 // 1035 enable modifiers for alt, numlock NYI
4117 // 1036 send ESC for meta keys NYI 3670 // 1036 send ESC for meta keys NYI
4118 // 1037 send DEL for keypad delete NYI 3671 // 1037 send DEL for keypad delete NYI
4119 { 1047, PrivMode_Screen }, 3672 { 1047, PrivMode_Screen },
4120 // 1048 save and restore cursor 3673 // 1048 save and restore cursor, implemented in code
4121 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3674 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4122 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3675 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3676 { 2004, PrivMode_BracketPaste },
4123 }; 3677 };
4124 3678
4125 if (nargs == 0) 3679 if (nargs == 0)
4126 return; 3680 return;
4127 3681
… …
4134 for (i = 0; i < nargs; i++) 3688 for (i = 0; i < nargs; i++)
4135 { 3689 {
4136 state = -1; 3690 state = -1;
4137 3691
4138 /* basic handling */ 3692 /* basic handling */
4139 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3693 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
4140 if (argtopriv[j].argval == arg[i]) 3694 if (argtopriv[j].argval == arg[i])
4141 { 3695 {
4142 state = privcases (mode, argtopriv[j].bit); 3696 state = privcases (mode, argtopriv[j].bit);
4143 break; 3697 break;
4144 } 3698 }
… …
4152 3706
4153 scr_touch (true); 3707 scr_touch (true);
4154 break; 3708 break;
4155#endif 3709#endif
4156 case 1048: /* alternative cursor save */ 3710 case 1048: /* alternative cursor save */
4157 case 1049:
4158 if (OPTION (Opt_secondaryScreen)) 3711 if (option (Opt_secondaryScreen))
4159 if (mode == 0) 3712 if (mode == 0)
4160 scr_cursor (RESTORE); 3713 scr_cursor (RESTORE);
4161 else if (mode == 1) 3714 else if (mode == 1)
4162 scr_cursor (SAVE); 3715 scr_cursor (SAVE);
4163 break; 3716 break;
… …
4171 case 2: /* VT52 mode */ 3724 case 2: /* VT52 mode */
4172 /* oddball mode. should be set regardless of set/reset 3725 /* oddball mode. should be set regardless of set/reset
4173 * parameter. Return from VT52 mode with an ESC < from 3726 * parameter. Return from VT52 mode with an ESC < from
4174 * within VT52 mode 3727 * within VT52 mode
4175 */ 3728 */
4176 PrivMode (1, PrivMode_vt52); 3729 set_privmode (PrivMode_vt52, 1);
4177 break; 3730 break;
4178 case 3: /* 80/132 */ 3731 case 3: /* 80/132 */
4179 if (priv_modes & PrivMode_132OK) 3732 if (priv_modes & PrivMode_132OK)
4180 set_widthheight (((state ? 132 : 80) * fwidth), height); 3733 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4181 break; 3734 break;
4182 case 4: /* smooth scrolling */ 3735 case 4: /* smooth scrolling */
4183 set_option (Opt_jumpScroll, !state); 3736 set_option (Opt_jumpScroll, !state);
4184 break; 3737 break;
4185 case 5: /* reverse video */ 3738 case 5: /* reverse video */
… …
4192 scr_autowrap (state); 3745 scr_autowrap (state);
4193 break; 3746 break;
4194 /* case 8: - auto repeat, can't do on a per window basis */ 3747 /* case 8: - auto repeat, can't do on a per window basis */
4195 case 9: /* X10 mouse reporting */ 3748 case 9: /* X10 mouse reporting */
4196 if (state) /* orthogonal */ 3749 if (state) /* orthogonal */
4197 priv_modes &= ~PrivMode_MouseX11; 3750 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4198 break; 3751 break;
4199#ifdef menuBar_esc
4200 case menuBar_esc:
4201#ifdef MENUBAR
4202 map_menuBar (state);
4203#endif
4204 break;
4205#endif
4206#ifdef scrollBar_esc 3752#ifdef scrollBar_esc
4207 case scrollBar_esc: 3753 case scrollBar_esc:
4208 if (scrollbar_mapping (state)) 3754 if (scrollBar.map (state))
4209 { 3755 {
4210 resize_all_windows (0, 0, 0); 3756 resize_all_windows (0, 0, 0);
4211 scr_touch (true); 3757 scr_touch (true);
4212 } 3758 }
4213 break; 3759 break;
… …
4222 break; 3768 break;
4223 /* case 66: - application key pad */ 3769 /* case 66: - application key pad */
4224 /* case 67: - backspace key */ 3770 /* case 67: - backspace key */
4225 case 1000: /* X11 mouse reporting */ 3771 case 1000: /* X11 mouse reporting */
4226 if (state) /* orthogonal */ 3772 if (state) /* orthogonal */
4227 priv_modes &= ~PrivMode_MouseX10; 3773 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4228 break; 3774 break;
4229#if 0
4230 case 1001: 3775 case 1002:
4231 break; /* X11 mouse highlighting */ 3776 case 1003:
4232#endif 3777 if (state)
3778 {
3779 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3780 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3781 mouse_row = mouse_col = 0;
3782 vt_emask_mouse = PointerMotionMask;
3783 }
3784 else
3785 vt_emask_mouse = NoEventMask;
3786
3787 vt_select_input ();
3788 break;
4233 case 1010: /* scroll to bottom on TTY output inhibit */ 3789 case 1010: /* scroll to bottom on TTY output inhibit */
4234 set_option (Opt_scrollTtyOutput, !state); 3790 set_option (Opt_scrollTtyOutput, !state);
4235 break; 3791 break;
4236 case 1011: /* scroll to bottom on key press */ 3792 case 1011: /* scroll to bottom on key press */
4237 set_option (Opt_scrollTtyKeypress, state); 3793 set_option (Opt_scrollTtyKeypress, state);
4238 break; 3794 break;
4239 case 1047: /* secondary screen w/ clearing last */ 3795 case 1047: /* secondary screen w/ clearing last */
4240 if (OPTION (Opt_secondaryScreen)) 3796 if (option (Opt_secondaryScreen))
4241 if (current_screen != PRIMARY) 3797 if (!state)
4242 scr_erase_screen (2); 3798 scr_erase_screen (2);
3799
4243 scr_change_screen (state); 3800 scr_change_screen (state);
4244 break; 3801 break;
4245 case 1049: /* secondary screen w/ clearing first */ 3802 case 1049: /* secondary screen w/ clearing first */
3803 if (option (Opt_secondaryScreen))
3804 if (state)
3805 scr_cursor (SAVE);
3806
4246 scr_change_screen (state); 3807 scr_change_screen (state);
3808
4247 if (OPTION (Opt_secondaryScreen)) 3809 if (option (Opt_secondaryScreen))
4248 if (current_screen != PRIMARY) 3810 if (state)
4249 scr_erase_screen (2); 3811 scr_erase_screen (2);
3812 else
3813 scr_cursor (RESTORE);
4250 break; 3814 break;
4251 default: 3815 default:
4252 break; 3816 break;
4253 } 3817 }
4254 } 3818 }
… …
4380 scr_color (Color_bg, Color_bg); 3944 scr_color (Color_bg, Color_bg);
4381 break; 3945 break;
4382 3946
4383 //case 50: // not variable spacing 3947 //case 50: // not variable spacing
4384 3948
4385#if ENABLE_FRILLS 3949#if !ENABLE_MINIMAL
4386 case 90: 3950 case 90:
4387 case 91: /* set bright fg color */ 3951 case 91: /* set bright fg color */
4388 case 92: 3952 case 92:
4389 case 93: 3953 case 93:
4390 case 94: 3954 case 94:
… …
4407 } 3971 }
4408 } 3972 }
4409} 3973}
4410/*}}} */ 3974/*}}} */
4411 3975
4412/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4413void
4414rxvt_term::process_graphics ()
4415{
4416 unicode_t ch, cmd = cmd_getc ();
4417
4418 if (cmd == 'Q')
4419 { /* query graphics */
4420 tt_printf ("\033G0\012"); /* no graphics */
4421 return;
4422 }
4423 /* swallow other graphics sequences until terminating ':' */
4424 do
4425 ch = cmd_getc ();
4426 while (ch != ':');
4427}
4428/*}}} */
4429
4430/* ------------------------------------------------------------------------- */ 3976/* ------------------------------------------------------------------------- */
4431 3977
4432/* 3978/*
4433 * Send printf () formatted output to the command. 3979 * Send printf () formatted output to the command.
4434 * Only use for small amounts of data. 3980 * Only use for small amounts of data.
… …
4447 3993
4448/* ---------------------------------------------------------------------- */ 3994/* ---------------------------------------------------------------------- */
4449/* Write data to the pty as typed by the user, pasted with the mouse, 3995/* Write data to the pty as typed by the user, pasted with the mouse,
4450 * or generated by us in response to a query ESC sequence. 3996 * or generated by us in response to a query ESC sequence.
4451 */ 3997 */
4452const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3998static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4453 3999
4454void 4000void
4455rxvt_term::tt_write (const char *data, unsigned int len) 4001rxvt_term::tt_write (const char *data, unsigned int len)
4456{ 4002{
4457 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4003 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4458 return; 4004 return;
4459 4005
4460 if (pty.pty < 0) 4006 if (pty->pty < 0)
4461 return; 4007 return;
4462 4008
4463 if (v_buflen == 0) 4009 if (v_buflen == 0)
4464 { 4010 {
4465 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4011 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4466 4012
4013 max_it (written, 0);
4014
4467 if ((unsigned int)written == len) 4015 if (written == len)
4468 return; 4016 return;
4469 4017
4470 data += written; 4018 data += written;
4471 len -= written; 4019 len -= written;
4472 } 4020 }
4473 4021
4474 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4022 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4475 4023
4476 memcpy (v_buffer + v_buflen, data, len); 4024 memcpy (v_buffer + v_buflen, data, len);
4477 v_buflen += len; 4025 v_buflen += len;
4478 4026
4479 pty_ev.set (EVENT_READ | EVENT_WRITE); 4027 pty_ev.set (ev::READ | ev::WRITE);
4480} 4028}
4481 4029
4482void rxvt_term::pty_write () 4030void rxvt_term::pty_write ()
4483{ 4031{
4484 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4032 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4485 4033
4486 if (written > 0) 4034 if (written > 0)
4487 { 4035 {
4488 v_buflen -= written; 4036 v_buflen -= written;
4489 4037
4490 if (v_buflen == 0) 4038 if (v_buflen == 0)
4491 { 4039 {
4492 free (v_buffer); 4040 free (v_buffer);
4493 v_buffer = 0; 4041 v_buffer = 0;
4494 v_buflen = 0;
4495 4042
4496 pty_ev.set (EVENT_READ); 4043 pty_ev.set (ev::READ);
4497 return; 4044 return;
4498 } 4045 }
4499 4046
4500 memmove (v_buffer, v_buffer + written, v_buflen); 4047 memmove (v_buffer, v_buffer + written, v_buflen);
4501 } 4048 }
4502 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4049 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4503 pty_ev.set (EVENT_READ); 4050 pty_ev.set (ev::READ);
4504} 4051}
4505 4052
4506/*----------------------- end-of-file (C source) -----------------------*/ 4053/*----------------------- end-of-file (C source) -----------------------*/
4507 4054

Diff Legend

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