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

Diff Legend

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