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.293 by root, Mon Jan 30 04:27:17 2006 UTC vs.
Revision 1.489 by sf-exg, Sat Jul 9 13:40:13 2011 UTC

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

Diff Legend

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