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

Diff Legend

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