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

Diff Legend

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