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

Diff Legend

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