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.260 by root, Fri Jan 13 05:04:33 2006 UTC vs.
Revision 1.498 by sf-exg, Fri Sep 30 13:31:21 2011 UTC

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

Diff Legend

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