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.279 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.516 by root, Tue Jun 5 14:46:54 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 *
… …
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 423
320 if (numlock_state || (ev.state & ModNumLockMask))
321 {
322 numlock_state = (ev.state & ModNumLockMask);
323 PrivMode ((!numlock_state), PrivMode_aplKP);
324 }
325
326 kbuf[0] = 0; 424 kbuf[0] = 0;
327 425
328#ifdef USE_XIM 426#if USE_XIM
329 if (Input_Context) 427 if (Input_Context)
330 { 428 {
331 Status status_return; 429 Status status_return;
332 430
333#if 0 431#if 0
… …
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#if 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 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1467
1468#ifdef HAVE_BG_PIXMAP
1469 if (bg_window_position_sensitive ())
1470 want_position_change = true;
1471#endif
1472
1473 bool moved = false;
1474
1475 if (want_position_change)
1476 {
1477 int x, y;
1478
1479 if (ev.xconfigure.send_event)
1480 {
1481 x = ev.xconfigure.x;
1482 y = ev.xconfigure.y;
1483 }
1484 else
1485 get_window_origin (x, y);
1486
1487 if (x != parent_x || y != parent_y)
1488 {
1489 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1490 parent_x = x;
1491 parent_y = y;
1492 }
1493
1494 if (bg_set_position (x, y)
1495 || !(bg_flags & BG_IS_VALID))
1496 moved = true;
1497 }
1480 1498
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1499 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1500 {
1483 seen_resize = 1; 1501 seen_resize = 1;
1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1502 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1485 } 1503 }
1504 else
1505 {
1506#ifdef HAVE_BG_PIXMAP
1507 if (moved)
1508 update_background ();
1509#endif
1510 }
1486 1511
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 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 } 1513 }
1494 break; 1514 break;
1495 1515
1496 case PropertyNotify: 1516 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1517 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1499 && ev.xproperty.state == PropertyNewValue)
1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1501
1502 break; 1518 break;
1503 1519
1504 case SelectionClear: 1520 case SelectionClear:
1505 selection_clear (); 1521 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1506 break;
1507
1508 case SelectionNotify:
1509 if (selection_wait == Sel_normal)
1510 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1511 break; 1522 break;
1512 1523
1513 case SelectionRequest: 1524 case SelectionRequest:
1514 selection_send (ev.xselectionrequest); 1525 selection_send (ev.xselectionrequest);
1515 break; 1526 break;
1516 1527
1517 case MapNotify: 1528 case MapNotify:
1529#ifdef HAVE_BG_PIXMAP
1530 /* This is needed specifically to fix the case of no window manager or a
1531 * non-reparenting window manager. In those cases we never get first
1532 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1533 * care of multiplicity of ConfigureNotify events arriving while WM does
1534 * reparenting.
1535 * We should not render background immediately, as there could be several
1536 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1537 * by scheduling background redraw as soon as we can, but giving a short
1538 * bit of time for ConfigureNotifies to arrive.
1539 * We should render background PRIOR to drawing any text, but AFTER all
1540 * of ConfigureNotifys for the best results.
1541 */
1542 if (!(bg_flags & BG_IS_VALID))
1543 update_background_ev.start (0.025);
1544#endif
1518 mapped = 1; 1545 mapped = 1;
1519#ifdef TEXT_BLINK 1546#ifdef TEXT_BLINK
1520 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1547 text_blink_ev.start ();
1521#endif 1548#endif
1522 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1549 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1523 break; 1550 break;
1524 1551
1525 case UnmapNotify: 1552 case UnmapNotify:
… …
1527#ifdef TEXT_BLINK 1554#ifdef TEXT_BLINK
1528 text_blink_ev.stop (); 1555 text_blink_ev.stop ();
1529#endif 1556#endif
1530 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1557 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1531 break; 1558 break;
1532
1533#ifdef TRANSPARENT
1534 case ReparentNotify:
1535 rootwin_cb (ev);
1536 break;
1537#endif /* TRANSPARENT */
1538 1559
1539 case GraphicsExpose: 1560 case GraphicsExpose:
1540 case Expose: 1561 case Expose:
1541 if (ev.xany.window == vt) 1562 if (ev.xany.window == vt)
1542 { 1563 {
1543 do 1564 do
1565 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, false);
1568 }
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1569 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547 1570
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1571 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1572
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1574 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1575 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1576 ev.xexpose.width, ev.xexpose.height, false);
1577 }
1553 1578
1554 want_refresh = 1; 1579 want_refresh = 1;
1555 } 1580 }
1556 else 1581 else
1557 { 1582 {
1558 XEvent unused_event; 1583 XEvent unused_event;
1559 1584
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1585 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561 ; 1586 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1587 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1588 ;
1564 1589
1565 if (isScrollbarWindow (ev.xany.window)) 1590 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1591 {
1567 scrollBar.setIdle (); 1592 scrollBar.state = SB_STATE_IDLE;
1568 scrollbar_show (0); 1593 scrollBar.show (0);
1569 } 1594 }
1570
1571#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window);
1574#endif
1575 } 1595 }
1576 break; 1596 break;
1577 1597
1578 case MotionNotify: 1598 case MotionNotify:
1579#ifdef POINTER_BLANK 1599#ifdef POINTER_BLANK
1580 if (hidden_pointer) 1600 if (hidden_pointer)
1581 pointer_unblank (); 1601 pointer_unblank ();
1582#endif 1602#endif
1603 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1604 || priv_modes & PrivMode_MouseAnyEvent)
1605 mouse_report (ev.xbutton);
1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1606 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1584 break; 1607 break;
1585 1608
1586 if (ev.xany.window == vt) 1609 if (ev.xany.window == vt)
1587 { 1610 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1611 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1612 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1613 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1614 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1615 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1616 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1594 ; 1617 ;
1595 1618
1596 XQueryPointer (disp, vt, 1619 XQueryPointer (dpy, vt,
1597 &unused_root, &unused_child, 1620 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1621 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1622 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1623 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1624#ifdef MOUSE_THRESHOLD
… …
1621 int dist; 1644 int dist;
1622 1645
1623 /* don't clobber the current delay if we are 1646 /* don't clobber the current delay if we are
1624 * already in the middle of scrolling. 1647 * already in the middle of scrolling.
1625 */ 1648 */
1626 if (!sel_scroll_ev.active) 1649 if (!sel_scroll_ev.is_active ())
1627 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1650 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1628 1651
1629 /* save the event params so we can highlight 1652 /* save the event params so we can highlight
1630 * the selection in the pending-scroll loop 1653 * the selection in the pending-scroll loop
1631 */ 1654 */
1632 selection_save_x = ev.xbutton.x; 1655 selection_save_x = ev.xbutton.x;
… …
1640 dist = int_bwidth - ev.xbutton.y; 1663 dist = int_bwidth - ev.xbutton.y;
1641 } 1664 }
1642 else 1665 else
1643 { 1666 {
1644 scroll_selection_dir = DN; 1667 scroll_selection_dir = DN;
1645 dist = ev.xbutton.y - (int_bwidth + height); 1668 dist = ev.xbutton.y - (int_bwidth + vt_height);
1646 } 1669 }
1647 1670
1648 scroll_selection_lines = Pixel2Height (dist) 1671 scroll_selection_lines = Pixel2Height (dist)
1649 / SELECTION_SCROLL_LINE_SPEEDUP 1672 / SELECTION_SCROLL_LINE_SPEEDUP
1650 + 1; 1673 + 1;
… …
1654 else 1677 else
1655 { 1678 {
1656 /* we are within the text window, so we 1679 /* we are within the text window, so we
1657 * shouldn't be scrolling 1680 * shouldn't be scrolling
1658 */ 1681 */
1659 if (sel_scroll_ev.active)
1660 sel_scroll_ev.stop(); 1682 sel_scroll_ev.stop();
1661 } 1683 }
1662#endif 1684#endif
1663#ifdef MOUSE_THRESHOLD 1685#ifdef MOUSE_THRESHOLD
1664 } 1686 }
1665#endif 1687#endif
1666 } 1688 }
1667 } 1689 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1669 { 1691 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1693 MotionNotify, &ev))
1672 ; 1694 ;
1673 1695
1674 XQueryPointer (disp, scrollBar.win, 1696 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1697 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1698 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1699 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1700 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1701 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1680 scrollbar_size ()); 1702 scrollBar.size ());
1681 want_refresh = 1; 1703 want_refresh = 1;
1682 refresh_limit = 0;
1683 scrollbar_show (1); 1704 scrollBar.show (1);
1684 } 1705 }
1685 break; 1706 break;
1686 } 1707 }
1687 1708
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK) 1709#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1710 if (ev.type == KeyPress)
1692 { 1711 cursor_blink_reset ();
1693 if (hidden_cursor)
1694 {
1695 hidden_cursor = 0;
1696 want_refresh = 1;
1697 }
1698
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1700 }
1701#endif 1712#endif
1702 1713
1703#if defined(POINTER_BLANK) 1714#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1715 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 { 1716 {
1706 if (ev.type == MotionNotify 1717 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress 1718 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease) 1719 || ev.type == ButtonRelease)
1709 if (hidden_pointer) 1720 if (hidden_pointer)
… …
1711 1722
1712 if (ev.type == KeyPress && hidden_pointer == 0) 1723 if (ev.type == KeyPress && hidden_pointer == 0)
1713 pointer_blank (); 1724 pointer_blank ();
1714 } 1725 }
1715#endif 1726#endif
1716}
1717 1727
1718void 1728 refresh_check ();
1729}
1730
1731#if ENABLE_FRILLS
1732void ecb_cold
1733rxvt_term::set_urgency (bool enable)
1734{
1735 if (enable == urgency_hint)
1736 return;
1737
1738 if (XWMHints *h = XGetWMHints (dpy, parent))
1739 {
1740 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1741 XSetWMHints (dpy, parent, h);
1742 urgency_hint = enable;
1743 XFree (h);
1744 }
1745}
1746#endif
1747
1748void ecb_cold
1719rxvt_term::focus_in () 1749rxvt_term::focus_in ()
1720{ 1750{
1721 if (!focus) 1751 if (!focus)
1722 { 1752 {
1723 focus = 1; 1753 focus = 1;
1724 want_refresh = 1; 1754 want_refresh = 1;
1725 1755
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1727
1728#if USE_XIM 1756#if USE_XIM
1729 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1730 { 1758 {
1731 IMSetStatusPosition (); 1759 im_set_position ();
1732 XSetICFocus (Input_Context); 1760 XSetICFocus (Input_Context);
1733 } 1761 }
1734#endif 1762#endif
1735#if CURSOR_BLINK 1763#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1765 cursor_blink_ev.again ();
1738#endif 1766#endif
1739#if OFF_FOCUS_FADING 1767#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade]) 1768 if (rs[Rs_fade])
1741 { 1769 {
1742 pix_colors = pix_colors_focused; 1770 pix_colors = pix_colors_focused;
1743 scr_recolour (); 1771 scr_recolour ();
1744 } 1772 }
1745#endif 1773#endif
1746 } 1774#if ENABLE_FRILLS
1747} 1775 if (option (Opt_urgentOnBell))
1776 set_urgency (0);
1777#endif
1748 1778
1749void 1779 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1780 }
1781}
1782
1783void ecb_cold
1750rxvt_term::focus_out () 1784rxvt_term::focus_out ()
1751{ 1785{
1752 if (focus) 1786 if (focus)
1753 { 1787 {
1754 focus = 0; 1788 focus = 0;
1755 want_refresh = 1; 1789 want_refresh = 1;
1756 1790
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1791#if ENABLE_FRILLS
1758 1792 if (option (Opt_urgentOnBell))
1793 set_urgency (0);
1794#endif
1759#if ENABLE_FRILLS || ISO_14755 1795#if ENABLE_FRILLS || ISO_14755
1760 if (iso14755buf) 1796 if (iso14755buf)
1761 { 1797 {
1762 iso14755buf = 0; 1798 iso14755buf = 0;
1763# if ENABLE_OVERLAY 1799# if ISO_14755
1764 scr_overlay_off (); 1800 scr_overlay_off ();
1765# endif 1801# endif
1766 } 1802 }
1767#endif 1803#endif
1768#if USE_XIM 1804#if USE_XIM
1769 if (Input_Context != NULL) 1805 if (Input_Context != NULL)
1770 XUnsetICFocus (Input_Context); 1806 XUnsetICFocus (Input_Context);
1771#endif 1807#endif
1772#if CURSOR_BLINK 1808#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1809 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.stop (); 1810 cursor_blink_ev.stop ();
1811
1775 hidden_cursor = 0; 1812 hidden_cursor = 0;
1776#endif 1813#endif
1777#if OFF_FOCUS_FADING 1814#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade]) 1815 if (rs[Rs_fade])
1779 { 1816 {
1780 pix_colors = pix_colors_unfocused; 1817 pix_colors = pix_colors_unfocused;
1781 scr_recolour (); 1818 scr_recolour ();
1782 } 1819 }
1783#endif 1820#endif
1821
1822 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1823 }
1824}
1825
1826void ecb_cold
1827rxvt_term::update_fade_color (unsigned int idx)
1828{
1829#if OFF_FOCUS_FADING
1830 if (rs[Rs_fade])
1784 } 1831 {
1832 rgba c;
1833 pix_colors [Color_fade].get (c);
1834 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1835 }
1836#endif
1785} 1837}
1786 1838
1787#if TRANSPARENT 1839#if ENABLE_TRANSPARENCY || ENABLE_PERL
1788void 1840void ecb_hot
1789rxvt_term::rootwin_cb (XEvent &ev) 1841rxvt_term::rootwin_cb (XEvent &ev)
1790{ 1842{
1791 make_current (); 1843 make_current ();
1844
1845 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1846 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1847 return;
1792 1848
1793 switch (ev.type) 1849 switch (ev.type)
1794 { 1850 {
1795 case PropertyNotify: 1851 case PropertyNotify:
1796 /* 1852 /*
1797 * if user used some Esetroot compatible prog to set the root bg, 1853 * if user used some Esetroot compatible prog to set the root bg,
1798 * use the property to determine the pixmap. We use it later on. 1854 * use the property to determine the pixmap. We use it later on.
1799 */ 1855 */
1800 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1856 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1857 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1802 return; 1858 {
1859# if ENABLE_TRANSPARENCY
1860 bg_set_root_pixmap ();
1861 update_background ();
1862#endif
1863#if ENABLE_PERL
1864 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1865#endif
1866 }
1803 1867
1804 /* FALLTHROUGH */
1805 case ReparentNotify:
1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1807 want_refresh = want_full_refresh = 1;
1808 break; 1868 break;
1809 } 1869 }
1870
1871 refresh_check ();
1810} 1872}
1811#endif 1873#endif
1812 1874
1813void 1875void
1814rxvt_term::button_press (XButtonEvent &ev) 1876rxvt_term::button_press (XButtonEvent &ev)
… …
1823 /* 1885 /*
1824 * VT window processing of button press 1886 * VT window processing of button press
1825 */ 1887 */
1826 if (ev.window == vt) 1888 if (ev.window == vt)
1827 { 1889 {
1890 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1891 return;
1892
1828#if ISO_14755 1893#if ISO_14755
1829 // 5.4 1894 // 5.4
1830 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1895 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1831 { 1896 {
1832 iso14755_54 (ev.x, ev.y); 1897 iso14755_54 (ev.x, ev.y);
… …
1842 /* save the xbutton state (for ButtonRelease) */ 1907 /* save the xbutton state (for ButtonRelease) */
1843 MEvent.state = ev.state; 1908 MEvent.state = ev.state;
1844#ifdef MOUSE_REPORT_DOUBLECLICK 1909#ifdef MOUSE_REPORT_DOUBLECLICK
1845 if (ev.button == MEvent.button && clickintime) 1910 if (ev.button == MEvent.button && clickintime)
1846 { 1911 {
1847 /* same button, within alloted time */ 1912 /* same button, within allowed time */
1848 MEvent.clicks++; 1913 MEvent.clicks++;
1849 1914
1850 if (MEvent.clicks > 1) 1915 if (MEvent.clicks > 1)
1851 { 1916 {
1852 /* only report double clicks */ 1917 /* only report double clicks */
… …
1866 mouse_report (ev); 1931 mouse_report (ev);
1867 } 1932 }
1868#else 1933#else
1869 MEvent.button = ev.button; 1934 MEvent.button = ev.button;
1870 mouse_report (ev); 1935 mouse_report (ev);
1871#endif /* MOUSE_REPORT_DOUBLECLICK */ 1936#endif /* MOUSE_REPORT_DOUBLECLICK */
1872 1937
1873 } 1938 }
1874 else 1939 else
1875 { 1940 {
1876 if (ev.button != MEvent.button) 1941 if (ev.button != MEvent.button)
1877 MEvent.clicks = 0; 1942 MEvent.clicks = 0;
1878 1943
1879 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1880 switch (ev.button) 1944 switch (ev.button)
1881 { 1945 {
1882 case Button1: 1946 case Button1:
1883 /* allow meta + click to select rectangular areas */ 1947 /* allow meta + click to select rectangular areas */
1884 /* should be done in screen.C */ 1948 /* should be done in screen.C */
1885#if ENABLE_FRILLS 1949#if ENABLE_FRILLS
1886 selection.rect = !!(ev.state & ModMetaMask); 1950 selection.rect = !!(ev.state & ModMetaMask);
1887#else 1951#else
1888 selection.rect = false; 1952 selection.rect = false;
1889#endif 1953#endif
1890 1954
1891 /* allow shift+left click to extend selection */ 1955 /* allow shift+left click to extend selection */
1892 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1956 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1893 { 1957 {
1894 if (MEvent.button == Button1 && clickintime) 1958 if (MEvent.button == Button1 && clickintime)
1895 selection_rotate (ev.x, ev.y); 1959 selection_rotate (ev.x, ev.y);
1896 else 1960 else
1897 selection_extend (ev.x, ev.y, 1); 1961 selection_extend (ev.x, ev.y, 1);
1898 } 1962 }
1899 else 1963 else
1900 { 1964 {
1901 if (MEvent.button == Button1 && clickintime) 1965 if (MEvent.button == Button1 && clickintime)
1902 MEvent.clicks++; 1966 MEvent.clicks++;
1903 else 1967 else
1904 MEvent.clicks = 1; 1968 MEvent.clicks = 1;
1905 1969
1906 selection_click (MEvent.clicks, ev.x, ev.y); 1970 selection_click (MEvent.clicks, ev.x, ev.y);
1907 } 1971 }
1908 1972
1909 MEvent.button = Button1; 1973 MEvent.button = Button1;
1910 break; 1974 break;
1911 1975
1912 case Button3: 1976 case Button3:
1913 if (MEvent.button == Button3 && clickintime) 1977 if (MEvent.button == Button3 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1978 selection_rotate (ev.x, ev.y);
1915 else 1979 else
1916 selection_extend (ev.x, ev.y, 1); 1980 selection_extend (ev.x, ev.y, 1);
1917 1981
1918 MEvent.button = Button3; 1982 MEvent.button = Button3;
1919 break; 1983 break;
1920 } 1984 }
1921 } 1985 }
1922 1986
1923 MEvent.time = ev.time; 1987 MEvent.time = ev.time;
1924 return; 1988 return;
1925 } 1989 }
1926 1990
1927 /* 1991 /*
1928 * Scrollbar window processing of button press 1992 * Scrollbar window processing of button press
1929 */ 1993 */
1930 if (isScrollbarWindow (ev.window)) 1994 if (scrollBar.state && ev.window == scrollBar.win)
1931 { 1995 {
1932 scrollBar.setIdle (); 1996 page_dirn direction = NO_DIR;
1997
1998 if (scrollBar.upButton (ev.y))
1999 direction = UP; /* up */
2000 else if (scrollBar.dnButton (ev.y))
2001 direction = DN; /* down */
2002
2003 scrollBar.state = SB_STATE_IDLE;
1933 /* 2004 /*
1934 * Rxvt-style scrollbar: 2005 * Rxvt-style scrollbar:
1935 * move up if mouse is above slider 2006 * move up if mouse is above slider
1936 * move dn if mouse is below slider 2007 * move dn if mouse is below slider
1937 * 2008 *
… …
1946 /* 2017 /*
1947 * Mouse report disabled scrollbar: 2018 * Mouse report disabled scrollbar:
1948 * arrow buttons - send up/down 2019 * arrow buttons - send up/down
1949 * click on scrollbar - send pageup/down 2020 * click on scrollbar - send pageup/down
1950 */ 2021 */
1951 if ((scrollBar.style == R_SB_NEXT 2022 if (direction == UP)
1952 && scrollbarnext_upButton (ev.y))
1953 || (scrollBar.style == R_SB_RXVT
1954 && scrollbarrxvt_upButton (ev.y)))
1955 tt_printf ("\033[A"); 2023 tt_printf ("\033[A");
1956 else if ((scrollBar.style == R_SB_NEXT 2024 else if (direction == DN)
1957 && scrollbarnext_dnButton (ev.y))
1958 || (scrollBar.style == R_SB_RXVT
1959 && scrollbarrxvt_dnButton (ev.y)))
1960 tt_printf ("\033[B"); 2025 tt_printf ("\033[B");
1961 else 2026 else
1962 switch (ev.button) 2027 switch (ev.button)
1963 { 2028 {
1964 case Button2: 2029 case Button2:
… …
1971 tt_printf ("\033[5~"); 2036 tt_printf ("\033[5~");
1972 break; 2037 break;
1973 } 2038 }
1974 } 2039 }
1975 else 2040 else
1976#endif /* NO_SCROLLBAR_REPORT */ 2041#endif /* NO_SCROLLBAR_REPORT */
1977
1978 {
1979 char upordown = 0;
1980
1981 if (scrollBar.style == R_SB_NEXT)
1982 { 2042 {
1983 if (scrollbarnext_upButton (ev.y)) 2043 if (direction != NO_DIR)
1984 upordown = -1; /* up */
1985 else if (scrollbarnext_dnButton (ev.y))
1986 upordown = 1; /* down */
1987 }
1988 else if (scrollBar.style == R_SB_RXVT)
1989 {
1990 if (scrollbarrxvt_upButton (ev.y))
1991 upordown = -1; /* up */
1992 else if (scrollbarrxvt_dnButton (ev.y))
1993 upordown = 1; /* down */
1994 }
1995 if (upordown)
1996 { 2044 {
1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2046 if (!cont_scroll_ev.is_active ())
1998 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2047 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1999#endif 2048#endif
2000 if (scr_page (upordown < 0 ? UP : DN, 1)) 2049 if (scr_page (direction, 1))
2001 { 2050 {
2002 if (upordown < 0) 2051 if (direction == UP)
2003 scrollBar.setUp (); 2052 scrollBar.state = SB_STATE_UP;
2004 else 2053 else
2005 scrollBar.setDn (); 2054 scrollBar.state = SB_STATE_DOWN;
2006 } 2055 }
2007 } 2056 }
2008 else 2057 else
2009 switch (ev.button) 2058 switch (ev.button)
2010 { 2059 {
2011 case Button2: 2060 case Button2:
2012 switch (scrollbar_align) 2061 switch (scrollBar.align)
2013 { 2062 {
2014 case R_SB_ALIGN_TOP: 2063 case SB_ALIGN_TOP:
2015 csrO = 0; 2064 csrO = 0;
2016 break; 2065 break;
2017 case R_SB_ALIGN_CENTRE: 2066 case SB_ALIGN_CENTRE:
2018 csrO = (scrollBar.bot - scrollBar.top) / 2; 2067 csrO = (scrollBar.bot - scrollBar.top) / 2;
2019 break; 2068 break;
2020 case R_SB_ALIGN_BOTTOM: 2069 case SB_ALIGN_BOTTOM:
2021 csrO = scrollBar.bot - scrollBar.top; 2070 csrO = scrollBar.bot - scrollBar.top;
2022 break; 2071 break;
2023 } 2072 }
2024 2073
2025 if (scrollBar.style == R_SB_XTERM 2074 if (scrollBar.style == SB_STYLE_XTERM
2026 || scrollbar_above_slider (ev.y) 2075 || scrollBar.above_slider (ev.y)
2027 || scrollbar_below_slider (ev.y)) 2076 || scrollBar.below_slider (ev.y))
2028 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2077 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2029 2078
2030 scrollBar.setMotion (); 2079 scrollBar.state = SB_STATE_MOTION;
2031 break; 2080 break;
2032 2081
2033 case Button1: 2082 case Button1:
2034 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2083 if (scrollBar.align == SB_ALIGN_CENTRE)
2035 csrO = ev.y - scrollBar.top; 2084 csrO = ev.y - scrollBar.top;
2036 /* FALLTHROUGH */ 2085 /* FALLTHROUGH */
2037 2086
2038 case Button3: 2087 case Button3:
2039 if (scrollBar.style != R_SB_XTERM) 2088 if (scrollBar.style != SB_STYLE_XTERM)
2040 { 2089 {
2041 if (scrollbar_above_slider (ev.y)) 2090 if (scrollBar.above_slider (ev.y))
2042# ifdef RXVT_SCROLL_FULL 2091# ifdef RXVT_SCROLL_FULL
2043 scr_page (UP, nrow - 1); 2092 scr_page (UP, nrow - 1);
2044# else 2093# else
2045 scr_page (UP, nrow / 4); 2094 scr_page (UP, nrow / 4);
2046# endif 2095# endif
2047 else if (scrollbar_below_slider (ev.y)) 2096 else if (scrollBar.below_slider (ev.y))
2048# ifdef RXVT_SCROLL_FULL 2097# ifdef RXVT_SCROLL_FULL
2049 scr_page (DN, nrow - 1); 2098 scr_page (DN, nrow - 1);
2050# else 2099# else
2051 scr_page (DN, nrow / 4); 2100 scr_page (DN, nrow / 4);
2052# endif 2101# endif
2053 else 2102 else
2054 scrollBar.setMotion (); 2103 scrollBar.state = SB_STATE_MOTION;
2055 } 2104 }
2056 else 2105 else
2057 { 2106 {
2058 scr_page ((ev.button == Button1 ? DN : UP), 2107 scr_page ((ev.button == Button1 ? DN : UP),
2059 (nrow 2108 (nrow
2060 * scrollbar_position (ev.y) 2109 * scrollBar.position (ev.y)
2061 / scrollbar_size ())); 2110 / scrollBar.size ()));
2062 } 2111 }
2063 2112
2064 break; 2113 break;
2065 } 2114 }
2066 } 2115 }
… …
2076 2125
2077 csrO = 0; /* reset csr Offset */ 2126 csrO = 0; /* reset csr Offset */
2078 if (!bypass_keystate) 2127 if (!bypass_keystate)
2079 reportmode = !! (priv_modes & PrivMode_mouse_report); 2128 reportmode = !! (priv_modes & PrivMode_mouse_report);
2080 2129
2081 if (scrollbar_isUpDn ()) 2130 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2082 { 2131 {
2083 scrollBar.setIdle (); 2132 scrollBar.state = SB_STATE_IDLE;
2084 scrollbar_show (0); 2133 scrollBar.show (0);
2085 } 2134 }
2086 2135
2087#ifdef SELECTION_SCROLLING 2136#ifdef SELECTION_SCROLLING
2088 if (sel_scroll_ev.active)
2089 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
2090#endif 2138#endif
2091 2139
2092 if (ev.window == vt) 2140 if (ev.window == vt)
2093 { 2141 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2143 return;
2144
2094#if ISO_14755 2145#if ISO_14755
2095 // 5.4 2146 // 5.4
2096 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2147 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2097 return; 2148 return;
2098#endif 2149#endif
2150
2099 if (reportmode) 2151 if (reportmode)
2100 { 2152 {
2101 /* mouse report from vt window */ 2153 /* mouse report from vt window */
2102 /* don't report release of wheel "buttons" */ 2154 /* don't report release of wheel "buttons" */
2103 if (ev.button >= 4) 2155 if (ev.button >= 4)
… …
2114 mouse_report (ev); 2166 mouse_report (ev);
2115 } 2167 }
2116#else /* MOUSE_REPORT_DOUBLECLICK */ 2168#else /* MOUSE_REPORT_DOUBLECLICK */
2117 MEvent.button = AnyButton; 2169 MEvent.button = AnyButton;
2118 mouse_report (ev); 2170 mouse_report (ev);
2119#endif /* MOUSE_REPORT_DOUBLECLICK */ 2171#endif /* MOUSE_REPORT_DOUBLECLICK */
2120 return; 2172 return;
2121 } 2173 }
2122 2174
2123 /* 2175 /*
2124 * dumb hack to compensate for the failure of click-and-drag 2176 * dumb hack to compensate for the failure of click-and-drag
… …
2127 if (priv_modes & PrivMode_mouse_report 2179 if (priv_modes & PrivMode_mouse_report
2128 && bypass_keystate 2180 && bypass_keystate
2129 && ev.button == Button1 && MEvent.clicks <= 1) 2181 && ev.button == Button1 && MEvent.clicks <= 1)
2130 selection_extend (ev.x, ev.y, 0); 2182 selection_extend (ev.x, ev.y, 0);
2131 2183
2132 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2133 return;
2134
2135 switch (ev.button) 2184 switch (ev.button)
2136 { 2185 {
2137 case Button1: 2186 case Button1:
2138 case Button3: 2187 case Button3:
2139 selection_make (ev.time); 2188 selection_make (ev.time);
2140 break; 2189 break;
2141 2190
2142 case Button2: 2191 case Button2:
2143 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2192 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2144 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2145 break; 2194 break;
2146 2195
2147#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2148 case Button4: 2197 case Button4:
2149 case Button5: 2198 case Button5:
… …
2153 2202
2154 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2155 2204
2156 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2157 i = 1; 2206 i = 1;
2158 else if (OPTION (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2159 i = nrow - 1; 2208 i = nrow - 1;
2160 else 2209 else
2161 i = 5; 2210 i = 5;
2162 2211
2163# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
… …
2165 { 2214 {
2166 mouse_slip_wheel_speed += v ? -1 : 1; 2215 mouse_slip_wheel_speed += v ? -1 : 1;
2167 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2168 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2169 2218
2170 if (slip_wheel_ev.at < NOW) 2219 if (!slip_wheel_ev.is_active ())
2171 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2220 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2172
2173 slip_wheel_ev.start ();
2174 } 2221 }
2175 else 2222 else
2223# endif
2176 { 2224 {
2177# endif
2178 scr_page (v, i); 2225 scr_page (v, i);
2179 scrollbar_show (1); 2226 scrollBar.show (1);
2180# ifdef MOUSE_SLIP_WHEELING
2181 } 2227 }
2182# endif
2183 } 2228 }
2184 break; 2229 break;
2185#endif 2230#endif
2186 } 2231 }
2187 } 2232 }
2188} 2233}
2189 2234
2190#ifdef TRANSPARENT
2191#if TINTING
2192/* taken from aterm-0.4.2 */
2193
2194typedef uint32_t RUINT32T;
2195
2196void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2197{
2198 int sh_r, sh_g, sh_b;
2199 RUINT32T mask_r, mask_g, mask_b;
2200 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2201 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2202 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2203 int i;
2204
2205 Visual *visual = display->visual;
2206
2207 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2208
2209 /* for convenience */
2210 mask_r = visual->red_mask;
2211 mask_g = visual->green_mask;
2212 mask_b = visual->blue_mask;
2213
2214 /* boring lookup table pre-initialization */
2215 switch (srcImage->bits_per_pixel) {
2216 case 15:
2217 if ((mask_r != 0x7c00) ||
2218 (mask_g != 0x03e0) ||
2219 (mask_b != 0x001f))
2220 return;
2221 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2222 lookup_r = lookup;
2223 lookup_g = lookup+32;
2224 lookup_b = lookup+32+32;
2225 sh_r = 10;
2226 sh_g = 5;
2227 sh_b = 0;
2228 break;
2229 case 16:
2230 if ((mask_r != 0xf800) ||
2231 (mask_g != 0x07e0) ||
2232 (mask_b != 0x001f))
2233 return;
2234 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2235 lookup_r = lookup;
2236 lookup_g = lookup+32;
2237 lookup_b = lookup+32+64;
2238 sh_r = 11;
2239 sh_g = 5;
2240 sh_b = 0;
2241 break;
2242 case 24:
2243 if ((mask_r != 0xff0000) ||
2244 (mask_g != 0x00ff00) ||
2245 (mask_b != 0x0000ff))
2246 return;
2247 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2248 lookup_r = lookup;
2249 lookup_g = lookup+256;
2250 lookup_b = lookup+256+256;
2251 sh_r = 16;
2252 sh_g = 8;
2253 sh_b = 0;
2254 break;
2255 case 32:
2256 if ((mask_r != 0xff0000) ||
2257 (mask_g != 0x00ff00) ||
2258 (mask_b != 0x0000ff))
2259 return;
2260 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2261 lookup_r = lookup;
2262 lookup_g = lookup+256;
2263 lookup_b = lookup+256+256;
2264 sh_r = 16;
2265 sh_g = 8;
2266 sh_b = 0;
2267 break;
2268 default:
2269 return; /* we do not support this color depth */
2270 }
2271
2272 /* prepare limits for color transformation (each channel is handled separately) */
2273 if (shade < 0) {
2274 shade = -shade;
2275 if (shade < 0) shade = 0;
2276 if (shade > 100) shade = 100;
2277
2278 lower_lim_r = 65535-rm;
2279 lower_lim_g = 65535-gm;
2280 lower_lim_b = 65535-bm;
2281
2282 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2283 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2284 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2285
2286 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2287 } else {
2288 if (shade < 0) shade = 0;
2289 if (shade > 100) shade = 100;
2290
2291 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2292
2293 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2294 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2295 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2296 }
2297
2298 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2299 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2300 {
2301 unsigned int tmp;
2302
2303 tmp = lower_lim_r;
2304 lower_lim_r = lower_lim_b;
2305 lower_lim_b = tmp;
2306
2307 tmp = upper_lim_r;
2308 upper_lim_r = upper_lim_b;
2309 upper_lim_b = tmp;
2310 }
2311
2312 /* fill our lookup tables */
2313 for (i = 0; i <= mask_r>>sh_r; i++)
2314 {
2315 RUINT32T tmp;
2316 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2317 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2318 lookup_r[i] = (tmp/65535)<<sh_r;
2319 }
2320 for (i = 0; i <= mask_g>>sh_g; i++)
2321 {
2322 RUINT32T tmp;
2323 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2324 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2325 lookup_g[i] = (tmp/65535)<<sh_g;
2326 }
2327 for (i = 0; i <= mask_b>>sh_b; i++)
2328 {
2329 RUINT32T tmp;
2330 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2331 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2332 lookup_b[i] = (tmp/65535)<<sh_b;
2333 }
2334
2335 /* apply table to input image (replacing colors by newly calculated ones) */
2336 switch (srcImage->bits_per_pixel)
2337 {
2338 case 15:
2339 {
2340 unsigned short *p1, *pf, *p, *pl;
2341 p1 = (unsigned short *) srcImage->data;
2342 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2343 while (p1 < pf)
2344 {
2345 p = p1;
2346 pl = p1 + srcImage->width;
2347 for (; p < pl; p++)
2348 {
2349 *p = lookup_r[(*p & 0x7c00)>>10] |
2350 lookup_g[(*p & 0x03e0)>> 5] |
2351 lookup_b[(*p & 0x001f)];
2352 }
2353 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2354 }
2355 break;
2356 }
2357 case 16:
2358 {
2359 unsigned short *p1, *pf, *p, *pl;
2360 p1 = (unsigned short *) srcImage->data;
2361 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2362 while (p1 < pf)
2363 {
2364 p = p1;
2365 pl = p1 + srcImage->width;
2366 for (; p < pl; p++)
2367 {
2368 *p = lookup_r[(*p & 0xf800)>>11] |
2369 lookup_g[(*p & 0x07e0)>> 5] |
2370 lookup_b[(*p & 0x001f)];
2371 }
2372 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2373 }
2374 break;
2375 }
2376 case 24:
2377 {
2378 unsigned char *p1, *pf, *p, *pl;
2379 p1 = (unsigned char *) srcImage->data;
2380 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2381 while (p1 < pf)
2382 {
2383 p = p1;
2384 pl = p1 + srcImage->width * 3;
2385 for (; p < pl; p += 3)
2386 {
2387 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2388 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2389 p[2] = lookup_r[(p[2] & 0x0000ff)];
2390 }
2391 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2392 }
2393 break;
2394 }
2395 case 32:
2396 {
2397 RUINT32T *p1, *pf, *p, *pl;
2398 p1 = (RUINT32T *) srcImage->data;
2399 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2400
2401 while (p1 < pf)
2402 {
2403 p = p1;
2404 pl = p1 + srcImage->width;
2405 for (; p < pl; p++)
2406 {
2407 *p = lookup_r[(*p & 0xff0000)>>16] |
2408 lookup_g[(*p & 0x00ff00)>> 8] |
2409 lookup_b[(*p & 0x0000ff)] |
2410 (*p & ~0xffffff);
2411 }
2412 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2413 }
2414 break;
2415 }
2416 }
2417
2418 free (lookup);
2419}
2420#endif
2421
2422/*
2423 * Check our parents are still who we think they are.
2424 * Do transparency updates if required
2425 */
2426int
2427rxvt_term::check_our_parents ()
2428{
2429 int i, pchanged, aformat, have_pixmap, rootdepth;
2430 unsigned long nitems, bytes_after;
2431 Atom atype;
2432 unsigned char *prop = NULL;
2433 Window root, oldp, *list;
2434 Pixmap rootpixmap = None;
2435 XWindowAttributes wattr, wrootattr;
2436 dDisp;
2437
2438 pchanged = 0;
2439
2440 if (!OPTION (Opt_transparent))
2441 return pchanged; /* Don't try any more */
2442
2443 XGetWindowAttributes (disp, display->root, &wrootattr);
2444 rootdepth = wrootattr.depth;
2445
2446 XGetWindowAttributes (disp, parent[0], &wattr);
2447
2448 if (rootdepth != wattr.depth)
2449 {
2450 if (am_transparent)
2451 {
2452 pchanged = 1;
2453 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2454 am_transparent = am_pixmap_trans = 0;
2455 }
2456
2457 return pchanged; /* Don't try any more */
2458 }
2459
2460 /* Get all X ops out of the queue so that our information is up-to-date. */
2461 XSync (disp, False);
2462
2463 /*
2464 * Make the frame window set by the window manager have
2465 * the root background. Some window managers put multiple nested frame
2466 * windows for each client, so we have to take care about that.
2467 */
2468 i = (xa[XA_XROOTPMAP_ID]
2469 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2470 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2471 &nitems, &bytes_after, &prop) == Success);
2472
2473 if (!i || prop == NULL)
2474 i = (xa[XA_ESETROOT_PMAP_ID]
2475 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2476 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2477 &nitems, &bytes_after, &prop) == Success);
2478
2479 if (!i || prop == NULL
2480#if TINTING
2481 || !rs[Rs_color + Color_tint]
2482#endif
2483 )
2484 have_pixmap = 0;
2485 else
2486 {
2487 have_pixmap = 1;
2488 rootpixmap = *(Pixmap *)prop;
2489 XFree (prop);
2490 }
2491
2492 if (have_pixmap)
2493 {
2494 /*
2495 * Copy display->root pixmap transparency
2496 */
2497 int sx, sy, nx, ny;
2498 unsigned int nw, nh;
2499 Window cr;
2500 XImage *image;
2501 GC gc;
2502 XGCValues gcvalue;
2503
2504 XTranslateCoordinates (disp, parent[0], display->root,
2505 0, 0, &sx, &sy, &cr);
2506 nw = (unsigned int)szHint.width;
2507 nh = (unsigned int)szHint.height;
2508 nx = ny = 0;
2509
2510 if (sx < 0)
2511 {
2512 nw += sx;
2513 nx = -sx;
2514 sx = 0;
2515 }
2516
2517 if (sy < 0)
2518 {
2519 nh += sy;
2520 ny = -sy;
2521 sy = 0;
2522 }
2523
2524 min_it (nw, (unsigned int) (wrootattr.width - sx));
2525 min_it (nh, (unsigned int) (wrootattr.height - sy));
2526
2527 XSync (disp, False);
2528 allowedxerror = -1;
2529 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2530
2531 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2532 /* XXX: may need a delay here? */
2533 allowedxerror = 0;
2534
2535 if (image == NULL)
2536 {
2537 if (am_transparent && am_pixmap_trans)
2538 {
2539 pchanged = 1;
2540 if (pixmap != None)
2541 {
2542 XFreePixmap (disp, pixmap);
2543 pixmap = None;
2544 }
2545 }
2546
2547 am_pixmap_trans = 0;
2548 }
2549 else
2550 {
2551 if (pixmap != None)
2552 XFreePixmap (disp, pixmap);
2553
2554#if TINTING
2555 if (ISSET_PIXCOLOR (Color_tint))
2556 {
2557 unsigned short rm, gm, bm;
2558 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2559
2560 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2561
2562 ShadeXImage (display, image, shade, rm, gm, bm);
2563 }
2564#endif
2565
2566 pixmap = XCreatePixmap (disp, vt,
2567 szHint.width, szHint.height, image->depth);
2568 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2569 XPutImage (disp, pixmap, gc, image, 0, 0,
2570 nx, ny, image->width, image->height);
2571 XFreeGC (disp, gc);
2572 XDestroyImage (image);
2573 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2574 XClearWindow (disp, parent[0]);
2575
2576 if (!am_transparent || !am_pixmap_trans)
2577 pchanged = 1;
2578
2579 am_transparent = am_pixmap_trans = 1;
2580 }
2581 }
2582
2583 if (am_pixmap_trans)
2584 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2585 else
2586 {
2587 unsigned int n;
2588 /*
2589 * InheritPixmap transparency
2590 */
2591 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2592 {
2593 oldp = parent[i];
2594 XQueryTree (disp, parent[i - 1], &root,
2595 &parent[i], &list, &n);
2596 XFree (list);
2597
2598 if (parent[i] == display->root)
2599 {
2600 if (oldp != None)
2601 pchanged = 1;
2602
2603 break;
2604 }
2605
2606 if (oldp != parent[i])
2607 pchanged = 1;
2608 }
2609
2610 n = 0;
2611
2612 if (pchanged)
2613 {
2614 for (; n < (unsigned int)i; n++)
2615 {
2616 XGetWindowAttributes (disp, parent[n], &wattr);
2617 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2618 {
2619 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2620 break;
2621 }
2622 }
2623 }
2624
2625 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2626 {
2627 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2628 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2629 am_transparent = 0;
2630 /* XXX: also turn off Opt_transparent? */
2631 }
2632 else
2633 {
2634 for (n = 0; n < (unsigned int)i; n++)
2635 {
2636 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2637 XClearWindow (disp, parent[n]);
2638 }
2639
2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2641 am_transparent = 1;
2642 }
2643
2644 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2645 parent[i] = None;
2646 }
2647
2648 if (scrollBar.win)
2649 {
2650 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2651 scrollBar.setIdle ();
2652 scrollbar_show (0);
2653 }
2654
2655 if (am_transparent)
2656 {
2657 want_refresh = want_full_refresh = 1;
2658 if (am_pixmap_trans)
2659 flush ();
2660 }
2661
2662 return pchanged;
2663}
2664#endif
2665
2666/*}}} */ 2235/*}}} */
2667 2236
2668bool 2237void ecb_hot
2669rxvt_term::cmd_parse () 2238rxvt_term::cmd_parse ()
2670{ 2239{
2671 bool flag = false;
2672 wchar_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
2673 char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
2674 2242
2675 for (;;) 2243 for (;;)
2676 { 2244 {
2677 if (ch == NOCHAR) 2245 if (ecb_unlikely (ch == NOCHAR))
2678 { 2246 {
2679 seq_begin = cmdbuf_ptr; 2247 seq_begin = cmdbuf_ptr;
2680 ch = next_char (); 2248 ch = next_char ();
2681 2249
2682 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
2683 break; 2251 break;
2684 } 2252 }
2685 2253
2686 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2254 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2687 { 2255 {
2688 if (!seen_input) 2256 if (ecb_unlikely (!seen_input))
2689 { 2257 {
2690 seen_input = 1; 2258 seen_input = 1;
2691 // many badly-written programs (e.g. jed) contain a race condition: 2259 // many badly-written programs (e.g. jed) contain a race condition:
2692 // they first read the screensize and then install a SIGWINCH handler. 2260 // they first read the screensize and then install a SIGWINCH handler.
2693 // some window managers resize the window early, and these programs 2261 // some window managers resize the window early, and these programs
… …
2706 wchar_t *str = buf; 2274 wchar_t *str = buf;
2707 wchar_t *eol = str + min (ncol, UBUFSIZ); 2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
2708 2276
2709 for (;;) 2277 for (;;)
2710 { 2278 {
2711 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2279 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2712 break; 2280 break;
2713 2281
2714 *str++ = ch; 2282 *str++ = ch;
2715 2283
2716 if (ch == C0_LF || str >= eol) 2284 if (ecb_unlikely (ch == C0_LF || str >= eol))
2717 { 2285 {
2718 if (ch == C0_LF) 2286 if (ch == C0_LF)
2719 nlines++; 2287 nlines++;
2720 2288
2721 refresh_count++; 2289 refresh_count++;
2722 2290
2723 if (!OPTION (Opt_jumpScroll) 2291 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2724 || (refresh_count >= refresh_limit * (nrow - 1)))
2725 { 2292 {
2726 refreshnow = true;
2727 refresh_count = 0; 2293 refresh_count = 0;
2294
2295 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2296 {
2297 refreshnow = true;
2728 ch = NOCHAR; 2298 ch = NOCHAR;
2729 break; 2299 break;
2300 }
2730 } 2301 }
2731 2302
2732 // scr_add_lines only works for nlines <= nrow - 1. 2303 // scr_add_lines only works for nlines <= nrow - 1.
2733 if (nlines >= nrow - 1) 2304 if (nlines >= nrow - 1)
2734 { 2305 {
… …
2762 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2333 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2763 scr_add_lines (buf, str - buf, nlines); 2334 scr_add_lines (buf, str - buf, nlines);
2764 2335
2765 /* 2336 /*
2766 * If there have been a lot of new lines, then update the screen 2337 * If there have been a lot of new lines, then update the screen
2767 * What the heck I'll cheat and only refresh less than every page-full. 2338 * What the heck we'll cheat and only refresh less than every page-full.
2768 * the number of pages between refreshes is refresh_limit, which 2339 * if skipScroll is enabled.
2769 * is incremented here because we must be doing flat-out scrolling.
2770 */ 2340 */
2771 if (refreshnow) 2341 if (refreshnow)
2772 { 2342 {
2773 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2774 refresh_limit++;
2775 else
2776 {
2777 flag = true;
2778 scr_refresh (); 2343 scr_refresh ();
2779 want_refresh = 1; 2344 want_refresh = 1;
2780 }
2781 } 2345 }
2782
2783 } 2346 }
2784 else 2347 else
2785 { 2348 {
2786 try 2349 try
2787 { 2350 {
… …
2795 } 2358 }
2796 2359
2797 ch = NOCHAR; 2360 ch = NOCHAR;
2798 } 2361 }
2799 } 2362 }
2800
2801 return flag;
2802} 2363}
2803 2364
2804// read the next character 2365// read the next character
2805wchar_t 2366wchar_t ecb_hot
2806rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () NOTHROW
2807{ 2368{
2808 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2809 { 2370 {
2810 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS
2811 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2812 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2813 2374
2814 wchar_t wc; 2375 wchar_t wc;
2815 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2376 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2816 2377
… …
2820 cmdbuf_ptr = cmdbuf_endp; 2381 cmdbuf_ptr = cmdbuf_endp;
2821 break; 2382 break;
2822 } 2383 }
2823 2384
2824 if (len == (size_t)-1) 2385 if (len == (size_t)-1)
2386 {
2387 mbstate.reset (); // reset now undefined conversion state
2825 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2388 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2389 }
2826 2390
2827 // assume wchar == unicode 2391 // assume wchar == unicode
2828 cmdbuf_ptr += len; 2392 cmdbuf_ptr += len;
2829 return wc & UNICODE_MASK; 2393 return wc & UNICODE_MASK;
2830 } 2394 }
2831 2395
2832 return NOCHAR; 2396 return NOCHAR;
2833} 2397}
2834 2398
2835// read the next octet 2399// read the next octet
2836uint32_t 2400uint32_t ecb_hot
2837rxvt_term::next_octet () NOTHROW 2401rxvt_term::next_octet () NOTHROW
2838{ 2402{
2839 return cmdbuf_ptr < cmdbuf_endp 2403 return cmdbuf_ptr < cmdbuf_endp
2840 ? (unsigned char)*cmdbuf_ptr++ 2404 ? (unsigned char)*cmdbuf_ptr++
2841 : NOCHAR; 2405 : NOCHAR;
2842} 2406}
2843 2407
2844static class out_of_input out_of_input; 2408static class out_of_input out_of_input;
2845 2409
2846/* rxvt_cmd_getc () - Return next input character */ 2410wchar_t ecb_hot
2847/*
2848 * Return the next input character after first passing any keyboard input
2849 * to the command.
2850 */
2851wchar_t
2852rxvt_term::cmd_getc () THROW ((class out_of_input)) 2411rxvt_term::cmd_getc () THROW ((class out_of_input))
2853{ 2412{
2854 wchar_t c = next_char (); 2413 wchar_t c = next_char ();
2855 2414
2856 if (c == NOCHAR) 2415 if (c == NOCHAR)
2857 throw out_of_input; 2416 throw out_of_input;
2858 2417
2859 return c; 2418 return c;
2860} 2419}
2861 2420
2862uint32_t 2421uint32_t ecb_hot
2863rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2422rxvt_term::cmd_get8 () THROW ((class out_of_input))
2864{ 2423{
2865 uint32_t c = next_octet (); 2424 uint32_t c = next_octet ();
2866 2425
2867 if (c == NOCHAR) 2426 if (c == NOCHAR)
… …
2871} 2430}
2872 2431
2873/*{{{ print pipe */ 2432/*{{{ print pipe */
2874/*----------------------------------------------------------------------*/ 2433/*----------------------------------------------------------------------*/
2875#ifdef PRINTPIPE 2434#ifdef PRINTPIPE
2876FILE * 2435FILE * ecb_cold
2877rxvt_term::popen_printer () 2436rxvt_term::popen_printer ()
2878{ 2437{
2879 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2438 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2880 2439
2881 if (stream == NULL) 2440 if (stream == NULL)
2882 rxvt_warn ("can't open printer pipe, not printing.\n"); 2441 rxvt_warn ("can't open printer pipe, not printing.\n");
2883 2442
2884 return stream; 2443 return stream;
2885} 2444}
2886 2445
2887int 2446int ecb_cold
2888rxvt_term::pclose_printer (FILE *stream) 2447rxvt_term::pclose_printer (FILE *stream)
2889{ 2448{
2890 fflush (stream); 2449 fflush (stream);
2891 return pclose (stream); 2450 return pclose (stream);
2892} 2451}
2893 2452
2894/* 2453/*
2895 * simulate attached vt100 printer 2454 * simulate attached vt100 printer
2896 */ 2455 */
2897void 2456void ecb_cold
2898rxvt_term::process_print_pipe () 2457rxvt_term::process_print_pipe ()
2899{ 2458{
2900 int done; 2459 FILE *fd = popen_printer ();
2901 FILE *fd;
2902 2460
2903 if ((fd = popen_printer ()) == NULL) 2461 if (!fd)
2904 return; 2462 return;
2905 2463
2906 /* 2464 /*
2907 * Send all input to the printer until either ESC[4i or ESC[?4i 2465 * Send all input to the printer until either ESC[4i or ESC[?4i
2908 * is received. 2466 * is received.
2909 */ 2467 */
2910 for (done = 0; !done;) 2468 for (int done = 0; !done; )
2911 { 2469 {
2912 unsigned char buf[8]; 2470 unsigned char buf[8];
2913 unicode_t ch; 2471 unicode_t ch;
2914 unsigned int i, len; 2472 unsigned int i, len;
2915 2473
… …
2934 { 2492 {
2935 if ((buf[len++] = cmd_getc ()) == 'i') 2493 if ((buf[len++] = cmd_getc ()) == 'i')
2936 break; /* done = 1 */ 2494 break; /* done = 1 */
2937 } 2495 }
2938 } 2496 }
2939 2497
2940 for (i = 0; i < len; i++) 2498 for (i = 0; i < len; i++)
2941 if (putc (buf[i], fd) == EOF) 2499 if (putc (buf[i], fd) == EOF)
2942 { 2500 {
2943 done = 1; 2501 done = 1;
2944 break; 2502 break;
… …
2946 } 2504 }
2947 } 2505 }
2948 2506
2949 pclose_printer (fd); 2507 pclose_printer (fd);
2950} 2508}
2951#endif /* PRINTPIPE */ 2509#endif /* PRINTPIPE */
2952/*}}} */ 2510/*}}} */
2953 2511
2954/* *INDENT-OFF* */
2955enum { 2512enum {
2956 C1_40 = 0x40, 2513 C1_40 = 0x40,
2957 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2514 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2958 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2515 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2959 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2516 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2960 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2517 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2961}; 2518};
2962/* *INDENT-ON* */
2963 2519
2964/*{{{ process non-printing single characters */ 2520/*{{{ process non-printing single characters */
2965void 2521void ecb_hot
2966rxvt_term::process_nonprinting (unicode_t ch) 2522rxvt_term::process_nonprinting (unicode_t ch)
2967{ 2523{
2968 switch (ch) 2524 switch (ch)
2969 { 2525 {
2970 case C0_ESC: 2526 case C0_ESC:
… …
3006 process_dcs_seq (); 2562 process_dcs_seq ();
3007 break; 2563 break;
3008 case 0x9b: /* CSI */ 2564 case 0x9b: /* CSI */
3009 process_csi_seq (); 2565 process_csi_seq ();
3010 break; 2566 break;
3011 case 0x9d: /* CSI */ 2567 case 0x9d: /* OSC */
3012 process_osc_seq (); 2568 process_osc_seq ();
3013 break; 2569 break;
3014#endif 2570#endif
3015 } 2571 }
3016} 2572}
3017/*}}} */ 2573/*}}} */
3018 2574
3019 2575
3020/*{{{ process VT52 escape sequences */ 2576/*{{{ process VT52 escape sequences */
3021void 2577void ecb_cold
3022rxvt_term::process_escape_vt52 (unicode_t ch) 2578rxvt_term::process_escape_vt52 (unicode_t ch)
3023{ 2579{
3024 int row, col; 2580 int row, col;
3025 2581
3026 switch (ch) 2582 switch (ch)
… …
3060 break; 2616 break;
3061 case 'Z': /* identify the terminal type */ 2617 case 'Z': /* identify the terminal type */
3062 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2618 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3063 break; 2619 break;
3064 case '<': /* turn off VT52 mode */ 2620 case '<': /* turn off VT52 mode */
3065 PrivMode (0, PrivMode_vt52); 2621 priv_modes &= ~PrivMode_vt52;
3066 break; 2622 break;
3067 case 'F': /* use special graphics character set */ 2623 case 'F': /* use special graphics character set */
3068 case 'G': /* use regular character set */ 2624 case 'G': /* use regular character set */
3069 /* unimplemented */ 2625 /* unimplemented */
3070 break; 2626 break;
… …
3076} 2632}
3077/*}}} */ 2633/*}}} */
3078 2634
3079 2635
3080/*{{{ process escape sequences */ 2636/*{{{ process escape sequences */
3081void 2637void ecb_hot
3082rxvt_term::process_escape_seq () 2638rxvt_term::process_escape_seq ()
3083{ 2639{
3084 unicode_t ch = cmd_getc (); 2640 unicode_t ch = cmd_getc ();
3085 2641
3086 if (priv_modes & PrivMode_vt52) 2642 if (priv_modes & PrivMode_vt52)
… …
3089 return; 2645 return;
3090 } 2646 }
3091 2647
3092 switch (ch) 2648 switch (ch)
3093 { 2649 {
3094 /* case 1: do_tek_mode (); break; */
3095 case '#': 2650 case '#':
3096 if (cmd_getc () == '8') 2651 if (cmd_getc () == '8')
3097 scr_E (); 2652 scr_E ();
3098 break; 2653 break;
3099 case '(': 2654 case '(':
… …
3106 scr_charset_set (2, (unsigned int)cmd_getc ()); 2661 scr_charset_set (2, (unsigned int)cmd_getc ());
3107 break; 2662 break;
3108 case '+': 2663 case '+':
3109 scr_charset_set (3, (unsigned int)cmd_getc ()); 2664 scr_charset_set (3, (unsigned int)cmd_getc ());
3110 break; 2665 break;
3111#if ENABLE_FRILLS 2666#if !ENABLE_MINIMAL
3112 case '6': 2667 case '6':
3113 scr_backindex (); 2668 scr_backindex ();
3114 break; 2669 break;
3115#endif 2670#endif
3116 case '7': 2671 case '7':
3117 scr_cursor (SAVE); 2672 scr_cursor (SAVE);
3118 break; 2673 break;
3119 case '8': 2674 case '8':
3120 scr_cursor (RESTORE); 2675 scr_cursor (RESTORE);
3121 break; 2676 break;
3122#if ENABLE_FRILLS 2677#if !ENABLE_MINIMAL
3123 case '9': 2678 case '9':
3124 scr_forwardindex (); 2679 scr_forwardindex ();
3125 break; 2680 break;
3126#endif 2681#endif
2682 // DECPAM/DECPNM
3127 case '=': 2683 case '=':
2684 priv_modes |= PrivMode_aplKP;
2685 break;
3128 case '>': 2686 case '>':
3129 PrivMode ((ch == '='), PrivMode_aplKP); 2687 priv_modes &= ~PrivMode_aplKP;
3130 break; 2688 break;
3131 2689
3132 case C1_40: 2690 case C1_40:
3133 cmd_getc (); 2691 cmd_getc ();
3134 break; 2692 break;
… …
3138 2696
3139 /* 8.3.87: NEXT LINE */ 2697 /* 8.3.87: NEXT LINE */
3140 case C1_NEL: /* ESC E */ 2698 case C1_NEL: /* ESC E */
3141 { 2699 {
3142 wchar_t nlcr[] = { C0_LF, C0_CR }; 2700 wchar_t nlcr[] = { C0_LF, C0_CR };
3143 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2701 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3144 } 2702 }
3145 break; 2703 break;
3146 2704
3147 /* kidnapped escape sequence: Should be 8.3.48 */ 2705 /* kidnapped escape sequence: Should be 8.3.48 */
3148 case C1_ESA: /* ESC G */ 2706 case C1_ESA: /* ESC G */
3149 process_graphics (); 2707 // used by original rxvt for rob nations own graphics mode
2708 if (cmd_getc () == 'Q')
2709 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3150 break; 2710 break;
3151 2711
3152 /* 8.3.63: CHARACTER TABULATION SET */ 2712 /* 8.3.63: CHARACTER TABULATION SET */
3153 case C1_HTS: /* ESC H */ 2713 case C1_HTS: /* ESC H */
3154 scr_set_tab (1); 2714 scr_set_tab (1);
… …
3158 case C1_RI: /* ESC M */ 2718 case C1_RI: /* ESC M */
3159 scr_index (DN); 2719 scr_index (DN);
3160 break; 2720 break;
3161 2721
3162 /* 8.3.142: SINGLE-SHIFT TWO */ 2722 /* 8.3.142: SINGLE-SHIFT TWO */
3163 /*case C1_SS2: scr_single_shift (2); break; */ 2723 /* case C1_SS2: break; */
3164 2724
3165 /* 8.3.143: SINGLE-SHIFT THREE */ 2725 /* 8.3.143: SINGLE-SHIFT THREE */
3166 /*case C1_SS3: scr_single_shift (3); break; */ 2726 /* case C1_SS3: break; */
3167 2727
3168 /* 8.3.27: DEVICE CONTROL STRING */ 2728 /* 8.3.27: DEVICE CONTROL STRING */
3169 case C1_DCS: /* ESC P */ 2729 case C1_DCS: /* ESC P */
3170 process_dcs_seq (); 2730 process_dcs_seq ();
3171 break; 2731 break;
… …
3173 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2733 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3174 case C1_SCI: /* ESC Z */ 2734 case C1_SCI: /* ESC Z */
3175 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2735 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3176 break; /* steal obsolete ESC [ c */ 2736 break; /* steal obsolete ESC [ c */
3177 2737
3178 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2738 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3179 case C1_CSI: /* ESC [ */ 2739 case C1_CSI: /* ESC [ */
3180 process_csi_seq (); 2740 process_csi_seq ();
3181 break; 2741 break;
3182 2742
3183 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2743 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3184 case C1_OSC: /* ESC ] */ 2744 case C1_OSC: /* ESC ] */
3185 process_osc_seq (); 2745 process_osc_seq ();
3186 break; 2746 break;
3187 2747
3188 /* 8.3.106: RESET TO INITIAL STATE */ 2748 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3189 case 'c': 2749 case 'c':
3190 mbstate.reset (); 2750 mbstate.reset ();
3191 scr_poweron (); 2751 scr_poweron ();
3192 scrollbar_show (1); 2752 scrollBar.show (1);
3193 break; 2753 break;
3194 2754
3195 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2755 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3196 case 'n': 2756 case 'n':
3197 scr_charset_choose (2); 2757 scr_charset_choose (2);
… …
3204 } 2764 }
3205} 2765}
3206/*}}} */ 2766/*}}} */
3207 2767
3208/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2768/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3209/* *INDENT-OFF* */
3210enum { 2769enum {
3211 CSI_ICH = 0x40, 2770 CSI_ICH = 0x40,
3212 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2771 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3213 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2772 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3214 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2773 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3217 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2776 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3218 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2777 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3219 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2778 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3220}; 2779};
3221 2780
3222#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2781#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3223 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2782 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3224 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2783 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3225#define get_byte_array_bit(array, bit) \ 2784#define get_byte_array_bit(array, bit) \
3226 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2785 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3227 2786
3228const unsigned char csi_defaults[] = 2787static const unsigned char csi_defaults[] =
3229 { 2788 {
3230 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2789 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3231 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2790 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3232 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2791 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3233 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2792 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3234 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2793 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3235 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2794 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3236 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2795 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3237 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2796 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3238 }; 2797 };
3239/* *INDENT-ON* */
3240 2798
3241void 2799void ecb_hot
3242rxvt_term::process_csi_seq () 2800rxvt_term::process_csi_seq ()
3243{ 2801{
3244 unicode_t ch, priv, i; 2802 unicode_t ch, priv, i;
3245 unsigned int nargs, p; 2803 unsigned int nargs, p;
3246 int n, ndef; 2804 int n, ndef;
3247 int arg[ESC_ARGS]; 2805 int arg[ESC_ARGS] = { };
3248 2806
3249 for (nargs = ESC_ARGS; nargs > 0;) 2807 nargs = 0;
3250 arg[--nargs] = 0;
3251 2808
3252 priv = 0; 2809 priv = 0;
3253 ch = cmd_getc (); 2810 ch = cmd_getc ();
3254 if (ch >= '<' && ch <= '?') 2811 if ((ch >= '<' && ch <= '?') || ch == '!')
2812 {
3255 { /* '<' '=' '>' '?' */ 2813 /* '<' '=' '>' '?' '!' */
3256 priv = ch; 2814 priv = ch;
3257 ch = cmd_getc (); 2815 ch = cmd_getc ();
3258 } 2816 }
3259 2817
3260 /* read any numerical arguments */ 2818 /* read any numerical arguments */
… …
3289 ndef = get_byte_array_bit (csi_defaults, i); 2847 ndef = get_byte_array_bit (csi_defaults, i);
3290 for (p = 0; p < nargs; p++) 2848 for (p = 0; p < nargs; p++)
3291 if (arg[p] == -1) 2849 if (arg[p] == -1)
3292 arg[p] = ndef; 2850 arg[p] = ndef;
3293 2851
3294#ifdef DEBUG_CMD
3295 fprintf (stderr, "CSI ");
3296 for (p = 0; p < nargs; p++)
3297 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3298 fprintf (stderr, "%c\n", ch);
3299#endif
3300
3301 /* 2852 /*
3302 * private mode handling 2853 * private mode handling
3303 */ 2854 */
3304 if (priv) 2855 if (priv)
3305 { 2856 {
3306 switch (priv) 2857 switch (priv)
3307 { 2858 {
3308 case '>': 2859 case '>':
3309 if (ch == CSI_DA) /* secondary device attributes */ 2860 if (ch == CSI_DA) /* secondary device attributes */
3310 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2861 {
2862 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2863 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2864 //
2865 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2866 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2867 // versions.
2868 //
2869 tt_printf ("\033[>%d;95;0c", 'U');
2870 }
3311 break; 2871 break;
2872
3312 case '?': 2873 case '?':
3313 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2874 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3314 process_terminal_mode (ch, priv, nargs, arg); 2875 process_terminal_mode (ch, priv, nargs, arg);
3315 break; 2876 break;
2877
2878 case '!':
2879 if (ch == CSI_70)
2880 {
2881 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2882 scr_soft_reset ();
2883
2884 static const int pm_h[] = { 7, 25 };
2885 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2886
2887 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2888 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3316 } 2889 }
2890 break;
2891 }
2892
3317 return; 2893 return;
3318 } 2894 }
3319 2895
3320 switch (ch) 2896 switch (ch)
3321 { 2897 {
… …
3335 } 2911 }
3336 break; 2912 break;
3337#endif 2913#endif
3338 2914
3339 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2915 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3340 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2916 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3341 arg[0] = -arg[0]; 2917 arg[0] = -arg[0];
3342 /* FALLTHROUGH */ 2918 /* FALLTHROUGH */
3343 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2919 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3344 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2920 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3345 scr_gotorc (arg[0], 0, RELATIVE); 2921 scr_gotorc (arg[0], 0, RELATIVE);
3346 break; 2922 break;
3347 2923
3348 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2924 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3349 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2925 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3441 break; 3017 break;
3442 case 6: /* CPR requested */ 3018 case 6: /* CPR requested */
3443 scr_report_position (); 3019 scr_report_position ();
3444 break; 3020 break;
3445 case 7: /* unofficial extension */ 3021 case 7: /* unofficial extension */
3446 if (OPTION (Opt_insecure)) 3022 if (option (Opt_insecure))
3447 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3023 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3448 break; 3024 break;
3449 case 8: /* unofficial extension */ 3025 case 8: /* unofficial extension */
3450 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3026 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3451 break; 3027 break;
… …
3518 break; 3094 break;
3519 case CSI_75: 3095 case CSI_75:
3520 scr_cursor (RESTORE); 3096 scr_cursor (RESTORE);
3521 break; 3097 break;
3522 3098
3523#if ENABLE_FRILLS 3099#if !ENABLE_MINIMAL
3524 case CSI_74: 3100 case CSI_74:
3525 process_window_ops (arg, nargs); 3101 process_window_ops (arg, nargs);
3526 break; 3102 break;
3527#endif 3103#endif
3528 3104
… …
3535 break; 3111 break;
3536 } 3112 }
3537} 3113}
3538/*}}} */ 3114/*}}} */
3539 3115
3540#if ENABLE_FRILLS 3116#if !ENABLE_MINIMAL
3541/* ARGSUSED */
3542void 3117void
3543rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3118rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3544{ 3119{
3545 int x, y; 3120 int x, y;
3546 XWindowAttributes wattr; 3121 XWindowAttributes wattr;
3547 Window wdummy; 3122 Window wdummy;
3548 dDisp; 3123
3124 dLocal (Display *, dpy);
3549 3125
3550 if (nargs == 0) 3126 if (nargs == 0)
3551 return; 3127 return;
3552 3128
3553 switch (args[0]) 3129 switch (args[0])
3554 { 3130 {
3555 /* 3131 /*
3556 * commands 3132 * commands
3557 */ 3133 */
3558 case 1: /* deiconify window */ 3134 case 1: /* deiconify window */
3559 XMapWindow (disp, parent[0]); 3135 XMapWindow (dpy, parent);
3560 break; 3136 break;
3561 case 2: /* iconify window */ 3137 case 2: /* iconify window */
3562 XIconifyWindow (disp, parent[0], display->screen); 3138 XIconifyWindow (dpy, parent, display->screen);
3563 break; 3139 break;
3564 case 3: /* set position (pixels) */ 3140 case 3: /* set position (pixels) */
3565 XMoveWindow (disp, parent[0], args[1], args[2]); 3141 XMoveWindow (dpy, parent, args[1], args[2]);
3566 break; 3142 break;
3567 case 4: /* set size (pixels) */ 3143 case 4: /* set size (pixels) */
3568 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3144 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3569 break; 3145 break;
3570 case 5: /* raise window */ 3146 case 5: /* raise window */
3571 XRaiseWindow (disp, parent[0]); 3147 XRaiseWindow (dpy, parent);
3572 break; 3148 break;
3573 case 6: /* lower window */ 3149 case 6: /* lower window */
3574 XLowerWindow (disp, parent[0]); 3150 XLowerWindow (dpy, parent);
3575 break; 3151 break;
3576 case 7: /* refresh window */ 3152 case 7: /* refresh window */
3577 scr_touch (true); 3153 scr_touch (true);
3578 break; 3154 break;
3579 case 8: /* set size (chars) */ 3155 case 8: /* set size (chars) */
… …
3582 break; 3158 break;
3583 3159
3584 //case 9: NYI, TODO, restore maximized window or maximize window 3160 //case 9: NYI, TODO, restore maximized window or maximize window
3585 default: 3161 default:
3586 if (args[0] >= 24) /* set height (chars) */ 3162 if (args[0] >= 24) /* set height (chars) */
3587 set_widthheight ((unsigned int)width, 3163 set_widthheight ((unsigned int)vt_width,
3588 (unsigned int) (args[1] * fheight)); 3164 (unsigned int) (args[1] * fheight));
3589 break; 3165 break;
3590
3591 3166
3592 /* 3167 /*
3593 * reports - some output format copied from XTerm 3168 * reports - some output format copied from XTerm
3594 */ 3169 */
3595 case 11: /* report window state */ 3170 case 11: /* report window state */
3596 XGetWindowAttributes (disp, parent[0], &wattr); 3171 XGetWindowAttributes (dpy, parent, &wattr);
3597 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3172 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3598 break; 3173 break;
3599 case 13: /* report window position */ 3174 case 13: /* report window position */
3600 XGetWindowAttributes (disp, parent[0], &wattr); 3175 XGetWindowAttributes (dpy, parent, &wattr);
3601 XTranslateCoordinates (disp, parent[0], wattr.root, 3176 XTranslateCoordinates (dpy, parent, wattr.root,
3602 -wattr.border_width, -wattr.border_width, 3177 -wattr.border_width, -wattr.border_width,
3603 &x, &y, &wdummy); 3178 &x, &y, &wdummy);
3604 tt_printf ("\033[3;%d;%dt", x, y); 3179 tt_printf ("\033[3;%d;%dt", x, y);
3605 break; 3180 break;
3606 case 14: /* report window size (pixels) */ 3181 case 14: /* report window size (pixels) */
3607 XGetWindowAttributes (disp, parent[0], &wattr); 3182 XGetWindowAttributes (dpy, parent, &wattr);
3608 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3183 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3609 break; 3184 break;
3610 case 18: /* report text area size (chars) */ 3185 case 18: /* report text area size (chars) */
3611 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3186 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3612 break; 3187 break;
… …
3614 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3189 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3615 break; 3190 break;
3616 case 20: /* report icon label */ 3191 case 20: /* report icon label */
3617 { 3192 {
3618 char *s; 3193 char *s;
3619 XGetIconName (disp, parent[0], &s); 3194 XGetIconName (dpy, parent, &s);
3620 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3195 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621 XFree (s); 3196 XFree (s);
3622 } 3197 }
3623 break; 3198 break;
3624 case 21: /* report window title */ 3199 case 21: /* report window title */
3625 { 3200 {
3626 char *s; 3201 char *s;
3627 XFetchName (disp, parent[0], &s); 3202 XFetchName (dpy, parent, &s);
3628 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3203 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3629 XFree (s); 3204 XFree (s);
3630 } 3205 }
3631 break; 3206 break;
3632 } 3207 }
3633} 3208}
… …
3660 seen_esc = true; 3235 seen_esc = true;
3661 continue; 3236 continue;
3662 } 3237 }
3663 else if (ch == C0_BEL || ch == CHAR_ST) 3238 else if (ch == C0_BEL || ch == CHAR_ST)
3664 break; 3239 break;
3240 else if (ch == C0_SYN)
3241 ch = cmd_get8 ();
3665 else if (ch < 0x20) 3242 else if (ch < 0x20)
3666 return NULL; /* other control character - exit */ 3243 return NULL; /* other control character - exit */
3667 3244
3668 seen_esc = false; 3245 seen_esc = false;
3669 3246
3670 if (n >= STRING_MAX - 1) 3247 if (n >= STRING_MAX - 1)
3671 // stop at some sane length 3248 // stop at some sane length
3672 return NULL; 3249 return NULL;
3673 3250
3674 if (ch == C0_SYN)
3675 string[n++] = cmd_get8 ();
3676 else
3677 string[n++] = ch; 3251 string[n++] = ch;
3678 } 3252 }
3679 3253
3680 string[n++] = '\0'; 3254 string[n++] = '\0';
3681 3255
3682 ends_how = (ch == 0x5c ? C0_ESC : ch); 3256 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3689 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3263 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3690 */ 3264 */
3691void 3265void
3692rxvt_term::process_dcs_seq () 3266rxvt_term::process_dcs_seq ()
3693{ 3267{
3694 char *s;
3695 unicode_t eh;
3696
3697 /* 3268 /*
3698 * Not handled yet 3269 * Not handled yet
3699 */ 3270 */
3271
3272 unicode_t eh;
3700 s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3701 if (s) 3274 if (s)
3702 free (s); 3275 free (s);
3703 3276
3704 return; 3277 return;
3705} 3278}
… …
3709 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3282 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3710 */ 3283 */
3711void 3284void
3712rxvt_term::process_osc_seq () 3285rxvt_term::process_osc_seq ()
3713{ 3286{
3714 unicode_t ch, eh;
3715 int arg; 3287 int arg;
3716 3288
3717 ch = cmd_getc (); 3289 unicode_t ch = cmd_getc ();
3718 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3290 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3719 arg = arg * 10 + (ch - '0'); 3291 arg = arg * 10 + (ch - '0');
3720 3292
3721 if (ch == ';') 3293 if (ch == ';')
3722 { 3294 {
3295 unicode_t eh;
3723 char *s = get_to_st (eh); 3296 char *s = get_to_st (eh);
3724 3297
3725 if (s) 3298 if (s)
3726 { 3299 {
3727 process_xterm_seq (arg, s, eh); 3300 process_xterm_seq (arg, s, eh);
… …
3733void 3306void
3734rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3307rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3735{ 3308{
3736 if (str[0] == '?' && !str[1]) 3309 if (str[0] == '?' && !str[1])
3737 { 3310 {
3738 unsigned short r, g, b; 3311 rgba c;
3739 pix_colors_focused[color].get (display, r, g, b); 3312 pix_colors_focused[color].get (c);
3313
3314#if XFT
3315 if (c.a != rgba::MAX_CC)
3316 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3317 else
3318#endif
3740 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3319 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3741 } 3320 }
3742 else 3321 else
3743 set_window_color (color, str); 3322 set_window_color (color, str);
3744} 3323}
3745 3324
3746/* 3325/*
3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3326 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3748 */ 3327 */
3749void 3328void
3750rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3329rxvt_term::process_xterm_seq (int op, char *str, char resp)
3751{ 3330{
3752 int color; 3331 int color;
3753 char *buf, *name; 3332 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3333 bool query = str[0] == '?' && !str[1];
3755 int saveop = op; 3334 int saveop = op;
3756 dDisp; 3335
3336 dLocal (Display *, dpy);
3757 3337
3758 assert (str != NULL); 3338 assert (str != NULL);
3339
3340 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3341 return;
3342
3759 switch (op) 3343 switch (op)
3760 { 3344 {
3761 case XTerm_name: 3345 case XTerm_name:
3762 set_title (str); 3346 set_title (str);
3763 /* FALLTHROUGH */ 3347 /* FALLTHROUGH */
… …
3777 unsigned long bytes_after; 3361 unsigned long bytes_after;
3778 unsigned char *value = 0; 3362 unsigned char *value = 0;
3779 const char *str = ""; 3363 const char *str = "";
3780 3364
3781 if (prop 3365 if (prop
3782 && XGetWindowProperty (disp, parent[0], 3366 && XGetWindowProperty (dpy, parent,
3783 prop, 0, 1<<16, 0, AnyPropertyType, 3367 prop, 0, 1<<16, 0, AnyPropertyType,
3784 &actual_type, &actual_format, 3368 &actual_type, &actual_format,
3785 &nitems, &bytes_after, &value) == Success 3369 &nitems, &bytes_after, &value) == Success
3786 && actual_type != None 3370 && actual_type != None
3787 && actual_format == 8) 3371 && actual_format == 8)
3788 str = (const char *)(value); 3372 str = (const char *)(value);
3789 3373
3790 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3374 tt_printf ("\033]%d;%s%c", op, str, resp);
3791 3375
3792 XFree (value); 3376 XFree (value);
3793 } 3377 }
3794 else 3378 else
3795 { 3379 {
3796 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3380 char *eq = strchr (str, '=');
3797 3381
3798 if (eq) 3382 if (eq)
3799 { 3383 {
3800 *eq = 0; 3384 *eq = 0;
3801 set_utf8_property (display->atom (str), eq + 1); 3385 set_utf8_property (display->atom (str), eq + 1);
3802 } 3386 }
3803 else 3387 else
3804 XDeleteProperty (disp, parent[0], 3388 XDeleteProperty (dpy, parent,
3805 display->atom (str)); 3389 display->atom (str));
3806 } 3390 }
3807 break; 3391 break;
3808 3392
3809 case XTerm_Color: 3393 case XTerm_Color:
… …
3819 break; 3403 break;
3820 3404
3821 if ((buf = strchr (name, ';')) != NULL) 3405 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3406 *buf++ = '\0';
3823 3407
3824 if (name[0] == '?' && !name[1]) 3408 process_color_seq (op, color, name, resp);
3409 }
3410 break;
3411 case Rxvt_restoreFG:
3412 case XTerm_Color00:
3413 process_color_seq (op, Color_fg, str, resp);
3414 break;
3415 case Rxvt_restoreBG:
3416 case XTerm_Color01:
3417 process_color_seq (op, Color_bg, str, resp);
3418 break;
3419#ifndef NO_CURSORCOLOR
3420 case XTerm_Color_cursor:
3421 process_color_seq (op, Color_cursor, str, resp);
3422 break;
3423#endif
3424 case XTerm_Color_pointer_fg:
3425 process_color_seq (op, Color_pointer_fg, str, resp);
3426 break;
3427 case XTerm_Color_pointer_bg:
3428 process_color_seq (op, Color_pointer_bg, str, resp);
3429 break;
3430#ifdef OPTION_HC
3431 case XTerm_Color_HC:
3432 process_color_seq (op, Color_HC, str, resp);
3433 break;
3434 case XTerm_Color_HTC:
3435 process_color_seq (op, Color_HTC, str, resp);
3436 break;
3437#endif
3438#ifndef NO_BOLD_UNDERLINE_REVERSE
3439 case URxvt_Color_BD:
3440 process_color_seq (op, Color_BD, str, resp);
3441 break;
3442 case URxvt_Color_UL:
3443 process_color_seq (op, Color_UL, str, resp);
3444 break;
3445 case URxvt_Color_IT:
3446 process_color_seq (op, Color_IT, str, resp);
3447 break;
3448#endif
3449 case URxvt_Color_border:
3450 process_color_seq (op, Color_border, str, resp);
3451 break;
3452#if ENABLE_TRANSPARENCY
3453 case URxvt_Color_tint:
3454 process_color_seq (op, Color_tint, str, resp);
3455 {
3456 bool changed = false;
3457
3458 if (ISSET_PIXCOLOR (Color_tint))
3459 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3460
3461 if (changed)
3462 update_background ();
3463 }
3464
3465 break;
3466#endif
3467
3468#if BG_IMAGE_FROM_FILE
3469 case Rxvt_Pixmap:
3470 if (!strcmp (str, "?"))
3471 {
3472 char str[256];
3473 int h_scale = 0, v_scale = 0;
3474 int h_align = 0, v_align = 0;
3475 if (image_vec.size () > 0)
3825 { 3476 {
3826 unsigned short r, g, b; 3477 h_scale = image_vec[0].h_scale;
3827 pix_colors_focused[color].get (display, r, g, b); 3478 v_scale = image_vec[0].v_scale;
3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3479 h_align = image_vec[0].h_align;
3480 v_align = image_vec[0].v_align;
3481 }
3482
3483 sprintf (str, "[%dx%d+%d+%d]",
3484 h_scale, v_scale,
3485 h_align, v_align);
3486 process_xterm_seq (XTerm_title, str, CHAR_ST);
3487 }
3488 else
3489 {
3490 bool changed = false;
3491
3492 if (*str != ';')
3493 {
3494 if (image_vec.size () > 0)
3495 changed = image_vec[0].set_file_geometry (str);
3496 else
3497 {
3498 rxvt_image *image = new_image ();
3499 if (!image->set_file_geometry (str))
3500 image_vec.pop_back ();
3501 else
3502 changed = true;
3503 }
3829 } 3504 }
3830 else 3505 else
3831 set_window_color (color, name); 3506 {
3507 str++;
3508 if (image_vec.size () > 0)
3509 changed = image_vec[0].set_geometry (str, true);
3510 }
3511
3512 if (changed)
3513 {
3514 if (bg_window_position_sensitive ())
3515 {
3516 int x, y;
3517 get_window_origin (x, y);
3518 bg_set_position (x, y);
3519 }
3520 update_background ();
3521 }
3832 } 3522 }
3833 break; 3523 break;
3834 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3836 break;
3837 case XTerm_Color01:
3838 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3839 break;
3840#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3843 break;
3844#endif 3524#endif
3845 case XTerm_Color_pointer_fg:
3846 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3847 break;
3848 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3850 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE
3852 case XTerm_Color_RV:
3853 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3854 break;
3855 case Rxvt_Color_BD:
3856 case URxvt_Color_BD:
3857 process_color_seq (op, Color_BD, str, resp);
3858 break;
3859 case Rxvt_Color_UL:
3860 case URxvt_Color_UL:
3861 process_color_seq (op, Color_UL, str, resp);
3862 break;
3863 case URxvt_Color_IT:
3864 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3865 break;
3866#endif
3867#if TRANSPARENT && TINTING
3868 case URxvt_Color_tint:
3869 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3870 check_our_parents ();
3871 if (am_transparent)
3872 want_full_refresh = want_refresh = 1;
3873 break;
3874#endif
3875
3876 case Rxvt_Pixmap:
3877 {
3878 if (*str != ';')
3879 {
3880#if XPM_BACKGROUND
3881 scale_pixmap (""); /* reset to default scaling */
3882 set_bgPixmap (str); /* change pixmap */
3883 scr_touch (true);
3884#endif
3885 }
3886
3887 int changed = 0;
3888
3889 while ((str = strchr (str, ';')) != NULL)
3890 {
3891 str++;
3892#if XPM_BACKGROUND
3893 changed += scale_pixmap (str);
3894#endif
3895 }
3896
3897 if (changed)
3898 {
3899#ifdef XPM_BACKGROUND
3900 resize_pixmap ();
3901 scr_touch (true);
3902#endif
3903 }
3904 }
3905 break;
3906
3907 case Rxvt_restoreFG:
3908 set_window_color (Color_fg, str);
3909 break;
3910 case Rxvt_restoreBG:
3911 set_window_color (Color_bg, str);
3912 break;
3913 3525
3914 case XTerm_logfile: 3526 case XTerm_logfile:
3915 // TODO, when secure mode? 3527 // TODO, when secure mode?
3916 break; 3528 break;
3917 3529
… …
3935 case URxvt_italicFont: 3547 case URxvt_italicFont:
3936 case URxvt_boldItalicFont: 3548 case URxvt_boldItalicFont:
3937#endif 3549#endif
3938 if (query) 3550 if (query)
3939 tt_printf ("\33]%d;%-.250s%c", saveop, 3551 tt_printf ("\33]%d;%-.250s%c", saveop,
3940 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3552 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3941 ? fontset[op - URxvt_font]->fontdesc : "", 3553 ? fontset[op - URxvt_font]->fontdesc : "",
3942 resp); 3554 resp);
3943 else 3555 else
3944 { 3556 {
3945 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3557 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3948 allocated.push_back ((void *)res); 3560 allocated.push_back ((void *)res);
3949 set_fonts (); 3561 set_fonts ();
3950 } 3562 }
3951 break; 3563 break;
3952 3564
3953#if ENABLE_FRILLS 3565 case URxvt_version:
3566 if (query)
3567 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3568 op,
3569 rs[Rs_name], VERSION[0], VERSION[2],
3570 resp);
3571 break;
3572
3573#if !ENABLE_MINIMAL
3954 case URxvt_locale: 3574 case URxvt_locale:
3955 if (query) 3575 if (query)
3956 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3576 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3957 else 3577 else
3958 { 3578 {
3959 set_locale (str); 3579 set_locale (str);
3960 pty->set_utf8_mode (enc_utf8); 3580 pty->set_utf8_mode (enc_utf8);
3961 init_xlocale (); 3581 init_xlocale ();
… …
3976 break; 3596 break;
3977#endif 3597#endif
3978 3598
3979#if ENABLE_PERL 3599#if ENABLE_PERL
3980 case URxvt_perl: 3600 case URxvt_perl:
3981 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3601 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3982 ; // no responses yet
3983 break; 3602 break;
3984#endif 3603#endif
3985 } 3604 }
3986} 3605}
3987/*----------------------------------------------------------------------*/ 3606/*----------------------------------------------------------------------*/
… …
3994 * 's' = save 3613 * 's' = save
3995 * 'r' = restore 3614 * 'r' = restore
3996 * 't' = toggle 3615 * 't' = toggle
3997 * so no need for fancy checking 3616 * so no need for fancy checking
3998 */ 3617 */
3999int 3618int ecb_cold
4000rxvt_term::privcases (int mode, unsigned long bit) 3619rxvt_term::privcases (int mode, unsigned long bit)
4001{ 3620{
4002 int state; 3621 int state;
4003 3622
4004 if (mode == 's') 3623 if (mode == 's')
4005 { 3624 {
4006 SavedModes |= (priv_modes & bit); 3625 if (priv_modes & bit)
3626 SavedModes |= bit;
3627 else
3628 SavedModes &= ~bit;
4007 return -1; 3629 return -1;
4008 } 3630 }
4009 else 3631 else
4010 { 3632 {
4011 if (mode == 'r') 3633 if (mode == 'r')
4012 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3634 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4013 else 3635 else
4014 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3636 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4015 PrivMode (state, bit); 3637
3638 if (state)
3639 priv_modes |= bit;
3640 else
3641 priv_modes &= ~bit;
4016 } 3642 }
4017 3643
4018 return state; 3644 return state;
4019} 3645}
4020 3646
4021/* we're not using priv _yet_ */ 3647/* we're not using priv _yet_ */
4022void 3648void
4023rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3649rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
4024{ 3650{
4025 unsigned int i, j; 3651 unsigned int i, j;
4026 int state; 3652 int state;
4027 3653
4028 static const struct 3654 static const struct
4029 { 3655 {
4030 const int argval; 3656 const int argval;
4031 const unsigned long bit; 3657 const unsigned long bit;
4032 }
4033
4034 argtopriv[] = { 3658 } argtopriv[] = {
4035 { 1, PrivMode_aplCUR }, 3659 { 1, PrivMode_aplCUR }, // DECCKM
4036 { 2, PrivMode_vt52 }, 3660 { 2, PrivMode_vt52 }, // DECANM
4037 { 3, PrivMode_132 }, 3661 { 3, PrivMode_132 }, // DECCOLM
4038 { 4, PrivMode_smoothScroll }, 3662 { 4, PrivMode_smoothScroll }, // DECSCLM
4039 { 5, PrivMode_rVideo }, 3663 { 5, PrivMode_rVideo }, // DECSCNM
4040 { 6, PrivMode_relOrigin }, 3664 { 6, PrivMode_relOrigin }, // DECOM
4041 { 7, PrivMode_Autowrap }, 3665 { 7, PrivMode_Autowrap }, // DECAWM
4042 // 8, bi-directional support mode 3666 // 8, auto-repeat keys // DECARM
4043 { 9, PrivMode_MouseX10 }, 3667 { 9, PrivMode_MouseX10 },
4044 // 18, 19 printing-related 3668 // 18 end FF to printer after print screen
3669 // 19 Print screen prints full screen/scroll region
4045 { 25, PrivMode_VisibleCursor }, 3670 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
4046#ifdef scrollBar_esc 3671#ifdef scrollBar_esc
4047 { scrollBar_esc, PrivMode_scrollBar }, 3672 { scrollBar_esc, PrivMode_scrollBar },
4048#endif 3673#endif
4049 { 35, PrivMode_ShiftKeys }, // rxvt extension 3674 { 35, PrivMode_ShiftKeys }, // rxvt extension
3675 // 38, tektronix mode // DECTEK
4050 { 40, PrivMode_132OK }, 3676 { 40, PrivMode_132OK },
4051 // 41 xterm more fixes NYI 3677 // 41 xterm more fixes NYI
4052 // 45 margin bell NYI 3678 // 45 margin bell NYI
4053 // 46 start logging 3679 // 46 start logging
4054 { 47, PrivMode_Screen }, 3680 { 47, PrivMode_Screen },
4055 { 66, PrivMode_aplKP }, 3681 { 66, PrivMode_aplKP }, // DECNKM
4056#ifndef NO_BACKSPACE_KEY 3682#ifndef NO_BACKSPACE_KEY
4057 { 67, PrivMode_BackSpace }, 3683 { 67, PrivMode_BackSpace }, // DECBKM
4058#endif 3684#endif
4059 { 1000, PrivMode_MouseX11 }, 3685 { 1000, PrivMode_MouseX11 },
4060 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3686 { 1002, PrivMode_MouseBtnEvent },
4061 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3687 { 1003, PrivMode_MouseAnyEvent },
4062 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3688#if ENABLE_FRILLS
3689 { 1005, PrivMode_ExtModeMouse },
3690#endif
4063 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3691 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4064 { 1011, PrivMode_Keypress }, // rxvt extension 3692 { 1011, PrivMode_Keypress }, // rxvt extension
3693#if ENABLE_FRILLS
3694 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3695#endif
4065 // 1035 enable modifiers for alt, numlock NYI 3696 // 1035 enable modifiers for alt, numlock NYI
4066 // 1036 send ESC for meta keys NYI 3697 // 1036 send ESC for meta keys NYI
4067 // 1037 send DEL for keypad delete NYI 3698 // 1037 send DEL for keypad delete NYI
4068 { 1047, PrivMode_Screen }, 3699 { 1047, PrivMode_Screen },
4069 // 1048 save and restore cursor 3700 // 1048 save and restore cursor, implemented in code
4070 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3701 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4071 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3702 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3703 { 2004, PrivMode_BracketPaste },
4072 }; 3704 };
4073 3705
4074 if (nargs == 0) 3706 if (nargs == 0)
4075 return; 3707 return;
4076 3708
… …
4083 for (i = 0; i < nargs; i++) 3715 for (i = 0; i < nargs; i++)
4084 { 3716 {
4085 state = -1; 3717 state = -1;
4086 3718
4087 /* basic handling */ 3719 /* basic handling */
4088 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3720 for (j = 0; j < ecb_array_length (argtopriv); j++)
4089 if (argtopriv[j].argval == arg[i]) 3721 if (argtopriv[j].argval == arg[i])
4090 { 3722 {
4091 state = privcases (mode, argtopriv[j].bit); 3723 state = privcases (mode, argtopriv[j].bit);
4092 break; 3724 break;
4093 } 3725 }
… …
4101 3733
4102 scr_touch (true); 3734 scr_touch (true);
4103 break; 3735 break;
4104#endif 3736#endif
4105 case 1048: /* alternative cursor save */ 3737 case 1048: /* alternative cursor save */
4106 case 1049:
4107 if (OPTION (Opt_secondaryScreen)) 3738 if (option (Opt_secondaryScreen))
4108 if (mode == 0) 3739 if (mode == 0)
4109 scr_cursor (RESTORE); 3740 scr_cursor (RESTORE);
4110 else if (mode == 1) 3741 else if (mode == 1)
4111 scr_cursor (SAVE); 3742 scr_cursor (SAVE);
4112 break; 3743 break;
… …
4120 case 2: /* VT52 mode */ 3751 case 2: /* VT52 mode */
4121 /* oddball mode. should be set regardless of set/reset 3752 /* oddball mode. should be set regardless of set/reset
4122 * parameter. Return from VT52 mode with an ESC < from 3753 * parameter. Return from VT52 mode with an ESC < from
4123 * within VT52 mode 3754 * within VT52 mode
4124 */ 3755 */
4125 PrivMode (1, PrivMode_vt52); 3756 priv_modes |= PrivMode_vt52;
4126 break; 3757 break;
4127 case 3: /* 80/132 */ 3758 case 3: /* 80/132 */
4128 if (priv_modes & PrivMode_132OK) 3759 if (priv_modes & PrivMode_132OK)
4129 set_widthheight (((state ? 132 : 80) * fwidth), height); 3760 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4130 break; 3761 break;
4131 case 4: /* smooth scrolling */ 3762 case 4: /* smooth scrolling */
4132 set_option (Opt_jumpScroll, !state); 3763 set_option (Opt_jumpScroll, !state);
4133 break; 3764 break;
4134 case 5: /* reverse video */ 3765 case 5: /* reverse video */
… …
4141 scr_autowrap (state); 3772 scr_autowrap (state);
4142 break; 3773 break;
4143 /* case 8: - auto repeat, can't do on a per window basis */ 3774 /* case 8: - auto repeat, can't do on a per window basis */
4144 case 9: /* X10 mouse reporting */ 3775 case 9: /* X10 mouse reporting */
4145 if (state) /* orthogonal */ 3776 if (state) /* orthogonal */
4146 priv_modes &= ~PrivMode_MouseX11; 3777 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4147 break; 3778 break;
4148#ifdef scrollBar_esc 3779#ifdef scrollBar_esc
4149 case scrollBar_esc: 3780 case scrollBar_esc:
4150 if (scrollbar_mapping (state)) 3781 scrollBar.map (state);
4151 {
4152 resize_all_windows (0, 0, 0); 3782 resize_all_windows (0, 0, 0);
4153 scr_touch (true); 3783 scr_touch (true);
4154 }
4155 break; 3784 break;
4156#endif 3785#endif
4157 case 25: /* visible/invisible cursor */ 3786 case 25: /* visible/invisible cursor */
4158 scr_cursor_visible (state); 3787 scr_cursor_visible (state);
4159 break; 3788 break;
… …
4164 break; 3793 break;
4165 /* case 66: - application key pad */ 3794 /* case 66: - application key pad */
4166 /* case 67: - backspace key */ 3795 /* case 67: - backspace key */
4167 case 1000: /* X11 mouse reporting */ 3796 case 1000: /* X11 mouse reporting */
4168 if (state) /* orthogonal */ 3797 if (state) /* orthogonal */
4169 priv_modes &= ~PrivMode_MouseX10; 3798 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4170 break; 3799 break;
4171#if 0
4172 case 1001: 3800 case 1002:
4173 break; /* X11 mouse highlighting */ 3801 case 1003:
4174#endif 3802 if (state)
3803 {
3804 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3805 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3806 mouse_row = mouse_col = 0;
3807 vt_emask_mouse = PointerMotionMask;
3808 }
3809 else
3810 vt_emask_mouse = NoEventMask;
3811
3812 vt_select_input ();
3813 break;
4175 case 1010: /* scroll to bottom on TTY output inhibit */ 3814 case 1010: /* scroll to bottom on TTY output inhibit */
4176 set_option (Opt_scrollTtyOutput, !state); 3815 set_option (Opt_scrollTtyOutput, !state);
4177 break; 3816 break;
4178 case 1011: /* scroll to bottom on key press */ 3817 case 1011: /* scroll to bottom on key press */
4179 set_option (Opt_scrollTtyKeypress, state); 3818 set_option (Opt_scrollTtyKeypress, state);
4180 break; 3819 break;
4181 case 1047: /* secondary screen w/ clearing last */ 3820 case 1047: /* secondary screen w/ clearing last */
4182 if (OPTION (Opt_secondaryScreen)) 3821 if (option (Opt_secondaryScreen))
4183 if (current_screen != PRIMARY) 3822 if (!state)
4184 scr_erase_screen (2); 3823 scr_erase_screen (2);
3824
4185 scr_change_screen (state); 3825 scr_change_screen (state);
4186 break; 3826 break;
4187 case 1049: /* secondary screen w/ clearing first */ 3827 case 1049: /* secondary screen w/ clearing first */
3828 if (option (Opt_secondaryScreen))
3829 if (state)
3830 scr_cursor (SAVE);
3831
4188 scr_change_screen (state); 3832 scr_change_screen (state);
3833
4189 if (OPTION (Opt_secondaryScreen)) 3834 if (option (Opt_secondaryScreen))
4190 if (current_screen != PRIMARY) 3835 if (state)
4191 scr_erase_screen (2); 3836 scr_erase_screen (2);
3837 else
3838 scr_cursor (RESTORE);
4192 break; 3839 break;
4193 default: 3840 default:
4194 break; 3841 break;
4195 } 3842 }
4196 } 3843 }
4197} 3844}
4198/*}}} */ 3845/*}}} */
4199 3846
4200/*{{{ process sgr sequences */ 3847/*{{{ process sgr sequences */
4201void 3848void ecb_hot
4202rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3849rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
4203{ 3850{
4204 unsigned int i; 3851 unsigned int i;
4205 short rendset; 3852 short rendset;
4206 int rendstyle; 3853 int rendstyle;
… …
4322 scr_color (Color_bg, Color_bg); 3969 scr_color (Color_bg, Color_bg);
4323 break; 3970 break;
4324 3971
4325 //case 50: // not variable spacing 3972 //case 50: // not variable spacing
4326 3973
4327#if ENABLE_FRILLS 3974#if !ENABLE_MINIMAL
4328 case 90: 3975 case 90:
4329 case 91: /* set bright fg color */ 3976 case 91: /* set bright fg color */
4330 case 92: 3977 case 92:
4331 case 93: 3978 case 93:
4332 case 94: 3979 case 94:
… …
4349 } 3996 }
4350 } 3997 }
4351} 3998}
4352/*}}} */ 3999/*}}} */
4353 4000
4354/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4355void
4356rxvt_term::process_graphics ()
4357{
4358 unicode_t ch, cmd = cmd_getc ();
4359
4360 if (cmd == 'Q')
4361 { /* query graphics */
4362 tt_printf ("\033G0\012"); /* no graphics */
4363 return;
4364 }
4365 /* swallow other graphics sequences until terminating ':' */
4366 do
4367 ch = cmd_getc ();
4368 while (ch != ':');
4369}
4370/*}}} */
4371
4372/* ------------------------------------------------------------------------- */ 4001/* ------------------------------------------------------------------------- */
4373 4002
4374/* 4003/*
4375 * Send printf () formatted output to the command. 4004 * Send printf () formatted output to the command.
4376 * Only use for small amounts of data. 4005 * Only use for small amounts of data.
… …
4389 4018
4390/* ---------------------------------------------------------------------- */ 4019/* ---------------------------------------------------------------------- */
4391/* Write data to the pty as typed by the user, pasted with the mouse, 4020/* Write data to the pty as typed by the user, pasted with the mouse,
4392 * or generated by us in response to a query ESC sequence. 4021 * or generated by us in response to a query ESC sequence.
4393 */ 4022 */
4394const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4023static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4395 4024
4396void 4025void
4397rxvt_term::tt_write (const char *data, unsigned int len) 4026rxvt_term::tt_write (const char *data, unsigned int len)
4398{ 4027{
4399 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4028 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4404 4033
4405 if (v_buflen == 0) 4034 if (v_buflen == 0)
4406 { 4035 {
4407 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4036 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4408 4037
4038 max_it (written, 0);
4039
4409 if ((unsigned int)written == len) 4040 if (written == len)
4410 return; 4041 return;
4411 4042
4412 data += written; 4043 data += written;
4413 len -= written; 4044 len -= written;
4414 } 4045 }
4415 4046
4416 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4047 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4417 4048
4418 memcpy (v_buffer + v_buflen, data, len); 4049 memcpy (v_buffer + v_buflen, data, len);
4419 v_buflen += len; 4050 v_buflen += len;
4420 4051
4421 pty_ev.set (EVENT_READ | EVENT_WRITE); 4052 pty_ev.set (ev::READ | ev::WRITE);
4422} 4053}
4423 4054
4424void rxvt_term::pty_write () 4055void rxvt_term::pty_write ()
4425{ 4056{
4426 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4057 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4431 4062
4432 if (v_buflen == 0) 4063 if (v_buflen == 0)
4433 { 4064 {
4434 free (v_buffer); 4065 free (v_buffer);
4435 v_buffer = 0; 4066 v_buffer = 0;
4436 v_buflen = 0;
4437 4067
4438 pty_ev.set (EVENT_READ); 4068 pty_ev.set (ev::READ);
4439 return; 4069 return;
4440 } 4070 }
4441 4071
4442 memmove (v_buffer, v_buffer + written, v_buflen); 4072 memmove (v_buffer, v_buffer + written, v_buflen);
4443 } 4073 }
4444 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4074 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4445 pty_ev.set (EVENT_READ); 4075 pty_ev.set (ev::READ);
4446} 4076}
4447 4077
4448/*----------------------- end-of-file (C source) -----------------------*/ 4078/*----------------------- end-of-file (C source) -----------------------*/
4449 4079

Diff Legend

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