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.409 by ayin, Sat Feb 16 15:39:20 2008 UTC vs.
Revision 1.515 by root, Tue Jun 5 11:00:40 2012 UTC

… …
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-2007 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 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * 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
34 * 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
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_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)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 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);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
250} 256}
251#endif 257#endif
252 258
253void 259void ecb_cold
254rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
255{ 261{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 263
261 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
262 { 265 {
263 char mb[16]; 266 char mb[MB_LEN_MAX];
264 int len; 267 int len;
265 268
266 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
269 else 272 else
270 { 273 {
271 mb[0] = ch[0]; 274 mb[0] = ch;
272 len = 1; 275 len = 1;
273 } 276 }
274 277
275 if (len > 0) 278 if (len > 0)
276 tt_write (mb, len); 279 tt_write (mb, len);
… …
279 } 282 }
280 283
281 iso14755buf = 0; 284 iso14755buf = 0;
282} 285}
283 286
284static int 287static int ecb_cold
285hex_keyval (XKeyEvent &ev) 288hex_keyval (XKeyEvent &ev)
286{ 289{
287 // check wether this event corresponds to a hex digit 290 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 291 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 292 for (int index = 0; index < 8; index++)
290 { 293 {
291 KeySym k = XLookupKeysym (&ev, index); 294 KeySym k = XLookupKeysym (&ev, index);
292 295
… …
298 301
299 return -1; 302 return -1;
300} 303}
301#endif 304#endif
302 305
303static inline KeySym 306static inline KeySym ecb_cold
304translate_keypad (KeySym keysym, bool kp) 307translate_keypad (KeySym keysym, bool kp)
305{ 308{
306#ifdef XK_KP_Home 309#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = { 310 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home 311 XK_KP_7, // XK_KP_Home
… …
334# endif 337# endif
335#endif 338#endif
336 return keysym; 339 return keysym;
337} 340}
338 341
339static inline int 342static inline int ecb_cold
340map_function_key (KeySym keysym) 343map_function_key (KeySym keysym)
341{ 344{
342 int param = 0; 345 int param = 0;
343 346
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
376 param = 5; 379 param = 5;
377 break; 380 break;
378 case XK_Next: 381 case XK_Next:
379 param = 6; 382 param = 6;
380 break; 383 break;
384 case XK_Home:
385 param = 7;
386 break;
387 case XK_End:
388 param = 8;
389 break;
381#endif 390#endif
382 case XK_Help: 391 case XK_Help:
383 param = 28; 392 param = 28;
384 break; 393 break;
385 case XK_Menu: 394 case XK_Menu:
… …
387 break; 396 break;
388 } 397 }
389 return param; 398 return param;
390} 399}
391 400
392void 401void ecb_cold
393rxvt_term::key_press (XKeyEvent &ev) 402rxvt_term::key_press (XKeyEvent &ev)
394{ 403{
395 int ctrl, meta, shft, len; 404 int ctrl, meta, shft, len;
396 KeySym keysym; 405 KeySym keysym;
397 int valid_keysym; 406 int valid_keysym;
… …
410 */ 419 */
411 shft = ev.state & ShiftMask; 420 shft = ev.state & ShiftMask;
412 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
413 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
414 423
415 if (numlock_state || (ev.state & ModNumLockMask))
416 {
417 numlock_state = (ev.state & ModNumLockMask);
418 PrivMode ((!numlock_state), PrivMode_aplKP);
419 }
420
421 kbuf[0] = 0; 424 kbuf[0] = 0;
422 425
423#ifdef USE_XIM 426#if USE_XIM
424 if (Input_Context) 427 if (Input_Context)
425 { 428 {
426 Status status_return; 429 Status status_return;
427 430
428#if 0 431#if 0
… …
499#ifdef PAGING_CONTEXT_LINES 502#ifdef PAGING_CONTEXT_LINES
500 lnsppg = nrow - PAGING_CONTEXT_LINES; 503 lnsppg = nrow - PAGING_CONTEXT_LINES;
501#else 504#else
502 lnsppg = nrow * 4 / 5; 505 lnsppg = nrow * 4 / 5;
503#endif 506#endif
507 max_it (lnsppg, 1);
508
504 if (keysym == XK_Prior) 509 if (keysym == XK_Prior)
505 { 510 {
506 scr_page (UP, lnsppg); 511 scr_page (UP, lnsppg);
507 return; 512 return;
508 } 513 }
… …
561 selection_request (ev.time); 566 selection_request (ev.time);
562 return; 567 return;
563#if TODO 568#if TODO
564 /* rxvt extras */ 569 /* rxvt extras */
565 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
566 change_font (FONT_UP);
567 return; 571 return;
568 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
569 change_font (FONT_DN);
570 return; 573 return;
571#endif 574#endif
572 } 575 }
573 } 576 }
574 } 577 }
575 578
576#if ENABLE_FRILLS || ISO_14755 579#if ENABLE_FRILLS || ISO_14755
577 // ISO 14755 support 580 // ISO 14755 support
578 if (shft && ctrl) 581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
579 { 582 {
580 int hv; 583 int hv;
581 584
582 if (iso14755buf & ISO_14755_51 585 if (iso14755buf & ISO_14755_51
583 && (keysym == XK_space || keysym == XK_KP_Space 586 && (keysym == XK_space || keysym == XK_KP_Space
… …
613 scr_overlay_off (); 616 scr_overlay_off ();
614# endif 617# endif
615 iso14755buf = 0; 618 iso14755buf = 0;
616 } 619 }
617 } 620 }
621 else if (option (Opt_iso14755) &&
618 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 622 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
619 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 623 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
620 if (!(iso14755buf & ISO_14755_STARTED)) 624 if (!(iso14755buf & ISO_14755_STARTED))
621 { 625 {
622 iso14755buf |= ISO_14755_STARTED; 626 iso14755buf |= ISO_14755_STARTED;
623# if ISO_14755 627# if ISO_14755
624 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 628 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
635 } 639 }
636#endif 640#endif
637 641
638 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
639 { 643 {
640 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
641 unsigned int newlen = 1; 645 unsigned int newlen = 1;
642 646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
643 switch (translate_keypad (keysym, kp)) 650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
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
684 newlen = 0;
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:
644 { 768 {
645#ifndef NO_BACKSPACE_KEY
646 case XK_BackSpace:
647 if (priv_modes & PrivMode_HaveBackSpace)
648 {
649 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
650 ^ !!ctrl) ? '\b' : '\177';
651 kbuf[1] = '\0';
652 }
653 else
654 strcpy (kbuf, rs[Rs_backspace_key]);
655 break;
656#endif
657#ifndef NO_DELETE_KEY
658 case XK_Delete:
659 strcpy (kbuf, rs[Rs_delete_key]);
660 break;
661#endif
662 case XK_Tab:
663 if (shft)
664 strcpy (kbuf, "\033[Z");
665 else
666 {
667#ifdef CTRL_TAB_MAKES_META
668 if (ctrl)
669 meta = 1;
670#endif
671#ifdef MOD4_TAB_MAKES_META
672 if (ev.state & Mod4Mask)
673 meta = 1;
674#endif
675 newlen = 0;
676 }
677 break;
678
679 case XK_Up: /* "\033[A" */
680 case XK_Down: /* "\033[B" */
681 case XK_Right: /* "\033[C" */
682 case XK_Left: /* "\033[D" */
683 strcpy (kbuf, "\033[Z");
684 kbuf[2] = "DACB"[keysym - XK_Left];
685 /* do Shift first */
686 if (shft)
687 kbuf[2] = "dacb"[keysym - XK_Left];
688 else if (ctrl)
689 {
690 kbuf[1] = 'O';
691 kbuf[2] = "dacb"[keysym - XK_Left];
692 }
693 else if (priv_modes & PrivMode_aplCUR)
694 kbuf[1] = 'O';
695 break;
696
697 case XK_KP_Enter:
698 /* allow shift to override */
699 if (kp)
700 {
701 strcpy (kbuf, "\033OM");
702 break;
703 }
704
705 /* FALLTHROUGH */
706
707 case XK_Return:
708 if (priv_modes & PrivMode_LFNL)
709 {
710 kbuf[0] = '\015';
711 kbuf[1] = '\012';
712 kbuf[2] = '\0';
713 }
714 else
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\0';
718 }
719 break;
720
721 case XK_KP_F1: /* "\033OP" */
722 case XK_KP_F2: /* "\033OQ" */
723 case XK_KP_F3: /* "\033OR" */
724 case XK_KP_F4: /* "\033OS" */
725 strcpy (kbuf, "\033OP");
726 kbuf[2] += (keysym - XK_KP_F1);
727 break;
728
729 case XK_KP_Multiply: /* "\033Oj" : "*" */
730 case XK_KP_Add: /* "\033Ok" : "+" */
731 case XK_KP_Separator: /* "\033Ol" : "," */
732 case XK_KP_Subtract: /* "\033Om" : "-" */
733 case XK_KP_Decimal: /* "\033On" : "." */
734 case XK_KP_Divide: /* "\033Oo" : "/" */
735 case XK_KP_0: /* "\033Op" : "0" */
736 case XK_KP_1: /* "\033Oq" : "1" */
737 case XK_KP_2: /* "\033Or" : "2" */
738 case XK_KP_3: /* "\033Os" : "3" */
739 case XK_KP_4: /* "\033Ot" : "4" */
740 case XK_KP_5: /* "\033Ou" : "5" */
741 case XK_KP_6: /* "\033Ov" : "6" */
742 case XK_KP_7: /* "\033Ow" : "7" */
743 case XK_KP_8: /* "\033Ox" : "8" */
744 case XK_KP_9: /* "\033Oy" : "9" */
745 /* allow shift to override */
746 if (kp)
747 {
748 strcpy (kbuf, "\033Oj");
749 kbuf[2] += (keysym - XK_KP_Multiply);
750 }
751 else
752 {
753 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
754 kbuf[1] = '\0';
755 }
756 break;
757
758 case XK_End:
759 strcpy (kbuf, KS_END);
760 break;
761 case XK_Home:
762 strcpy (kbuf, KS_HOME);
763 break;
764
765 default:
766 {
767 int param = map_function_key (keysym); 769 int param = map_function_key (keysym);
768 if (param > 0) 770 if (param > 0)
769 sprintf (kbuf,"\033[%d~", param); 771 sprintf (kbuf,"\033[%d~", param);
770 else 772 else
771 newlen = 0; 773 newlen = 0;
772 }
773 break;
774 } 774 }
775 break;
776 }
775 777
776 if (newlen) 778 if (newlen)
777 len = strlen (kbuf); 779 len = strlen (kbuf);
778 780
781 if (len > 0)
782 {
779 /* 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 /*
780 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
781 */ 797 */
782#ifdef META8_OPTION 798#ifdef META8_OPTION
783 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
784 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
785#endif 801#endif
802 }
786 803
787 } 804 }
788 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
789 { 806 {
790 len = 1; 807 len = 1;
… …
824 { 841 {
825 view_start = 0; 842 view_start = 0;
826 want_refresh = 1; 843 want_refresh = 1;
827 } 844 }
828 845
829 /*
830 * these modifications only affect the static keybuffer
831 * pass Shift/Control indicators for function keys ending with `~'
832 *
833 * eg,
834 * Prior = "ESC[5~"
835 * Shift+Prior = "ESC[5$"
836 * Ctrl+Prior = "ESC[5^"
837 * Ctrl+Shift+Prior = "ESC[5@"
838 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
839 */
840 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
841 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
842
843 /* escape prefix */ 846 /* escape prefix */
844 if (meta 847 if (meta
845#ifdef META8_OPTION 848#ifdef META8_OPTION
846 && meta_char == C0_ESC 849 && meta_char == C0_ESC
847#endif 850#endif
… …
852 } 855 }
853 856
854 tt_write (kbuf, (unsigned int)len); 857 tt_write (kbuf, (unsigned int)len);
855} 858}
856 859
857void 860void ecb_cold
858rxvt_term::key_release (XKeyEvent &ev) 861rxvt_term::key_release (XKeyEvent &ev)
859{ 862{
860#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 863#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
861 KeySym keysym; 864 KeySym keysym;
862 865
… …
882 commit_iso14755 (); 885 commit_iso14755 ();
883 886
884 return; 887 return;
885 } 888 }
886 889
887 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 890 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
888 if (i[0] == keysym) 891 if (i[0] == keysym)
889 { 892 {
890 iso14755buf = ISO_14755_51 | i[1]; 893 iso14755buf = ISO_14755_51 | i[1];
891 commit_iso14755 (); 894 commit_iso14755 ();
892 895
… …
929 else if (keysym == XK_Control_L || keysym == XK_Control_R) 932 else if (keysym == XK_Control_L || keysym == XK_Control_R)
930 mouse_slip_wheel_speed = 0; 933 mouse_slip_wheel_speed = 0;
931#endif 934#endif
932} 935}
933 936
934#if defined (KEYSYM_RESOURCE)
935unsigned int
936rxvt_term::cmd_write (const char *str, unsigned int count)
937{
938 unsigned int n, s;
939
940 n = cmdbuf_ptr - cmdbuf_base;
941 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
942
943 if (n > 0 && s < count)
944 {
945 memmove (cmdbuf_base, cmdbuf_ptr,
946 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
947 cmdbuf_ptr = cmdbuf_base;
948 cmdbuf_endp -= n;
949 s += n;
950 }
951
952 if (count > s)
953 {
954 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
955 count = s;
956 }
957
958 for (; count--;)
959 *cmdbuf_endp++ = *str++;
960
961 cmd_parse ();
962
963 return 0;
964}
965#endif
966
967void 937void
968rxvt_term::flush () 938rxvt_term::flush ()
969{ 939{
970 flush_ev.stop (); 940 flush_ev.stop ();
971 941
972#ifdef HAVE_BG_PIXMAP 942#ifdef HAVE_BG_PIXMAP
973 if (bgPixmap.check_clearChanged ()) 943 if (bg_flags & BG_NEEDS_REFRESH)
974 { 944 {
975// scr_clear (true); This needs to be researched further! 945 bg_flags &= ~BG_NEEDS_REFRESH;
976 scr_touch (false); 946 scr_touch (false);
977 } 947 }
978#endif 948#endif
979 949
980 if (want_refresh) 950 if (want_refresh)
… …
1016 } 986 }
1017 while (row < end_row); 987 while (row < end_row);
1018 } 988 }
1019 989
1020 scr_refresh (); 990 scr_refresh ();
1021 scrollbar_show (1); 991 scrollBar.show (1);
1022#ifdef USE_XIM 992#if USE_XIM
1023 IMSendSpot (); 993 im_send_spot ();
1024#endif 994#endif
1025 } 995 }
1026 996
1027 display->flush (); 997 display->flush ();
1028} 998}
1029 999
1030/* checks wether a refresh is requested and starts the refresh timer */ 1000/* checks whether a refresh is requested and starts the refresh timer */
1031void 1001void
1032rxvt_term::refresh_check () 1002rxvt_term::refresh_check ()
1033{ 1003{
1034 if (want_refresh && !flush_ev.is_active ()) 1004 if (want_refresh && !flush_ev.is_active ())
1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1005 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1045 refresh_count = 0; 1015 refresh_count = 0;
1046 flush (); 1016 flush ();
1047} 1017}
1048 1018
1049#ifdef CURSOR_BLINK 1019#ifdef CURSOR_BLINK
1020void
1021rxvt_term::cursor_blink_reset ()
1022{
1023 if (hidden_cursor)
1024 {
1025 hidden_cursor = 0;
1026 want_refresh = 1;
1027 }
1028
1029 if (option (Opt_cursorBlink))
1030 cursor_blink_ev.again ();
1031 else
1032 cursor_blink_ev.stop ();
1033}
1034
1050void 1035void
1051rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1052{ 1037{
1053 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1054 want_refresh = 1; 1039 want_refresh = 1;
… …
1073 1058
1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1075void 1060void
1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1077{ 1062{
1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1080 { 1065 {
1081 want_refresh = 1; 1066 want_refresh = 1;
1082 refresh_check (); 1067 refresh_check ();
1083 } 1068 }
1084 else 1069 else
… …
1128 { 1113 {
1129 // this should really be sched_yield(), but the linux guys thought 1114 // this should really be sched_yield(), but the linux guys thought
1130 // that giving a process calling sched_yield () less cpu time than 1115 // that giving a process calling sched_yield () less cpu time than
1131 // ones with high nice levels is a useful thing to do. It surely is is 1116 // ones with high nice levels is a useful thing to do. It surely is is
1132 // allowed by the sus... as is returning ENOSYS. 1117 // allowed by the sus... as is returning ENOSYS.
1118 // since the linux guys additionally thought that breaking the only
1119 // known workaround against their unusable sched_yield hack is cool,
1120 // we just nanosleep a bit and hope for the best.
1133 1121
1134 struct timespec ts = { 0, 0 }; 1122 struct timespec ts = { 0, 1000 };
1135 nanosleep (&ts, 0); 1123 nanosleep (&ts, 0);
1136 1124
1137 w.stop (); 1125 w.stop ();
1138 } 1126 }
1139 1127
… …
1142 { 1130 {
1143 } 1131 }
1144} event_handler; 1132} event_handler;
1145#endif 1133#endif
1146 1134
1135/* make sure all the cmd data is at beginning of cmdbuf */
1136void
1137rxvt_term::cmdbuf_reify ()
1138{
1139 if (cmdbuf_ptr == cmdbuf_base)
1140 return;
1141
1142 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1143
1144 memmove (cmdbuf_base, cmdbuf_ptr, used);
1145 cmdbuf_ptr = cmdbuf_base;
1146 cmdbuf_endp = cmdbuf_ptr + used;
1147
1148}
1149
1150#if defined (KEYSYM_RESOURCE)
1151void
1152rxvt_term::cmdbuf_append (const char *str, size_t count)
1153{
1154 cmdbuf_reify ();
1155
1156 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1157
1158 if (count > avail)
1159 return;
1160
1161 memcpy (cmdbuf_endp, str, count);
1162 cmdbuf_endp += count;
1163
1164 cmd_parse ();
1165}
1166#endif
1167
1147bool 1168bool
1148rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1149{ 1170{
1150 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 cmdbuf_reify ();
1151 1172
1152 if (CBUFSIZ == n) 1173 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1153 { 1174
1154 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1175 if (!avail)
1155 n = 0;
1156 } 1176 {
1157 1177 // normally this indicates a "too long" command sequence - just drop the data we have
1158 memmove (cmdbuf_base, cmdbuf_ptr, n);
1159 cmdbuf_ptr = cmdbuf_base; 1178 cmdbuf_ptr = cmdbuf_base;
1160 cmdbuf_endp = cmdbuf_ptr + n; 1179 cmdbuf_endp = cmdbuf_ptr;
1180 avail = CBUFSIZ;
1181 }
1161 1182
1162 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1163 1184
1164 if (r > 0) 1185 if (r > 0)
1165 { 1186 {
1166 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1167 return true; 1188 return true;
… …
1189{ 1210{
1190 make_current (); 1211 make_current ();
1191 1212
1192 if (revents & ev::READ) 1213 if (revents & ev::READ)
1193 // loop, but don't allow a single term to monopolize us 1214 // loop, but don't allow a single term to monopolize us
1194 while (pty_fill ()) 1215 for (int i = CBUFCNT; i-- && pty_fill (); )
1195 if (cmd_parse ()) 1216 cmd_parse ();
1196 break;
1197 1217
1198 if (revents & ev::WRITE) 1218 if (revents & ev::WRITE)
1199 pty_write (); 1219 pty_write ();
1200 1220
1201 refresh_check (); 1221 refresh_check ();
1202} 1222}
1203 1223
1204void 1224void ecb_cold
1205rxvt_term::pointer_unblank () 1225rxvt_term::pointer_unblank ()
1206{ 1226{
1207 XDefineCursor (dpy, vt, TermWin_cursor); 1227 XDefineCursor (dpy, vt, TermWin_cursor);
1208 recolour_cursor (); 1228 recolour_cursor ();
1209 1229
… …
1214 pointer_ev.start (pointerBlankDelay); 1234 pointer_ev.start (pointerBlankDelay);
1215#endif 1235#endif
1216} 1236}
1217 1237
1218#ifdef POINTER_BLANK 1238#ifdef POINTER_BLANK
1219void 1239void ecb_cold
1220rxvt_term::pointer_blank () 1240rxvt_term::pointer_blank ()
1221{ 1241{
1222 if (!option (Opt_pointerBlank)) 1242 if (!option (Opt_pointerBlank))
1223 return; 1243 return;
1224 1244
… …
1226 XFlush (dpy); 1246 XFlush (dpy);
1227 1247
1228 hidden_pointer = 1; 1248 hidden_pointer = 1;
1229} 1249}
1230 1250
1231void 1251void ecb_cold
1232rxvt_term::pointer_cb (ev::timer &w, int revents) 1252rxvt_term::pointer_cb (ev::timer &w, int revents)
1233{ 1253{
1234 make_current (); 1254 make_current ();
1235 1255
1236 pointer_blank (); 1256 pointer_blank ();
… …
1242{ 1262{
1243 int button_number, key_state = 0; 1263 int button_number, key_state = 0;
1244 int x, y; 1264 int x, y;
1245 int code = 32; 1265 int code = 32;
1246 1266
1247 x = Pixel2Col (ev.x); 1267 x = Pixel2Col (ev.x) + 1;
1248 y = Pixel2Row (ev.y); 1268 y = Pixel2Row (ev.y) + 1;
1269
1249 if (ev.type == MotionNotify) 1270 if (ev.type == MotionNotify)
1250 { 1271 {
1251 if (x == mouse_row && y == mouse_col) 1272 if (x == mouse_row && y == mouse_col)
1252 return; 1273 return;
1274
1253 mouse_row = x; 1275 mouse_row = x;
1254 mouse_col = y; 1276 mouse_col = y;
1255 code += 32; 1277 code += 32;
1256 } 1278 }
1257 1279
… …
1260 else 1282 else
1261 { 1283 {
1262 button_number = MEvent.button - Button1; 1284 button_number = MEvent.button - Button1;
1263 /* add 0x3D for wheel events, like xterm does */ 1285 /* add 0x3D for wheel events, like xterm does */
1264 if (button_number >= 3) 1286 if (button_number >= 3)
1265 button_number += (64 - 3); 1287 button_number += 64 - 3;
1266 } 1288 }
1267 1289
1268 if (priv_modes & PrivMode_MouseX10) 1290 if (priv_modes & PrivMode_MouseX10)
1269 { 1291 {
1270 /* 1292 /*
… …
1302 fputc ('A', stderr); 1324 fputc ('A', stderr);
1303 if (key_state & 32) 1325 if (key_state & 32)
1304 fputc ('2', stderr); 1326 fputc ('2', stderr);
1305 fprintf (stderr, "]: <%d>, %d/%d\n", 1327 fprintf (stderr, "]: <%d>, %d/%d\n",
1306 button_number, 1328 button_number,
1307 x + 1, 1329 x,
1308 y + 1); 1330 y);
1309#endif 1331#endif
1310 1332
1333#if ENABLE_FRILLS
1334 if (priv_modes & PrivMode_ExtMouseRight)
1335 tt_printf ("\033[%d;%d;%dM",
1336 code + button_number + key_state,
1337 x,
1338 y);
1339 else if (priv_modes & PrivMode_ExtModeMouse)
1340 tt_printf ("\033[M%c%lc%lc",
1341 code + button_number + key_state,
1342 wint_t (32 + x),
1343 wint_t (32 + y));
1344 else
1345#endif
1311 tt_printf ("\033[M%c%c%c", 1346 tt_printf ("\033[M%c%c%c",
1312 (code + button_number + key_state), 1347 code + button_number + key_state,
1313 (32 + x + 1), 1348 32 + x,
1314 (32 + y + 1)); 1349 32 + y);
1315} 1350}
1316 1351
1317/*{{{ process an X event */ 1352/*{{{ process an X event */
1318void 1353void ecb_hot
1319rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
1320{ 1355{
1321 make_current (); 1356 make_current ();
1322 1357
1323 dLocal (Display *, dpy); 1358 dLocal (Display *, dpy);
… …
1421 && ev.xfocus.mode != NotifyGrab) 1456 && ev.xfocus.mode != NotifyGrab)
1422 focus_out (); 1457 focus_out ();
1423 break; 1458 break;
1424 1459
1425 case ConfigureNotify: 1460 case ConfigureNotify:
1426 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1427 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1428 szHint.width, szHint.height);*/
1429 if (ev.xconfigure.window == parent[0]) 1461 if (ev.xconfigure.window == parent)
1430 { 1462 {
1431 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1432 ; 1464 ;
1465
1466 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1467
1468#ifdef HAVE_BG_PIXMAP
1469 if (bg_window_position_sensitive ())
1470 want_position_change = true;
1471#endif
1472
1473 bool moved = false;
1474
1475 if (want_position_change)
1476 {
1477 int x, y;
1478
1479 if (ev.xconfigure.send_event)
1480 {
1481 x = ev.xconfigure.x;
1482 y = ev.xconfigure.y;
1483 }
1484 else
1485 get_window_origin (x, y);
1486
1487 if (x != parent_x || y != parent_y)
1488 {
1489 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1490 parent_x = x;
1491 parent_y = y;
1492 }
1493
1494 if (bg_set_position (x, y)
1495 || !(bg_flags & BG_IS_VALID))
1496 moved = true;
1497 }
1433 1498
1434 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1499 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1435 { 1500 {
1436 seen_resize = 1; 1501 seen_resize = 1;
1437 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1502 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1438 } 1503 }
1439 else 1504 else
1440 { 1505 {
1441#ifdef HAVE_BG_PIXMAP 1506#ifdef HAVE_BG_PIXMAP
1442 if (bgPixmap.window_position_sensitive ())
1443 {
1444 if (mapped) 1507 if (moved)
1445 update_background (); 1508 update_background ();
1446 else
1447 bgPixmap.invalidate ();
1448 }
1449#endif 1509#endif
1450 } 1510 }
1451 1511
1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1453 } 1513 }
1454 break; 1514 break;
1455 1515
1456 case PropertyNotify: 1516 case PropertyNotify:
1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1517 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1458 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1459 && ev.xproperty.state == PropertyNewValue)
1460 selection_property (ev.xproperty.window, ev.xproperty.atom);
1461
1462 break; 1518 break;
1463 1519
1464 case SelectionClear: 1520 case SelectionClear:
1465 selection_clear (); 1521 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1466 break;
1467
1468 case SelectionNotify:
1469 if (selection_wait == Sel_normal)
1470 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1471 break; 1522 break;
1472 1523
1473 case SelectionRequest: 1524 case SelectionRequest:
1474 selection_send (ev.xselectionrequest); 1525 selection_send (ev.xselectionrequest);
1475 break; 1526 break;
1476 1527
1477 case MapNotify: 1528 case MapNotify:
1478#ifdef HAVE_BG_PIXMAP 1529#ifdef HAVE_BG_PIXMAP
1479 /* This is needed spcifically to fix the case of no window manager or a 1530 /* This is needed specifically to fix the case of no window manager or a
1480 * non-reparenting window manager. In those cases we never get first 1531 * non-reparenting window manager. In those cases we never get first
1481 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1532 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1482 * care of multiplicity of ConfigureNotify events arriwing while WM does 1533 * care of multiplicity of ConfigureNotify events arriving while WM does
1483 * reparenting. 1534 * reparenting.
1484 * We should not render background immidiately, as there could be several 1535 * We should not render background immediately, as there could be several
1485 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1536 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1486 * by scheduling background redraw as soon as we can, but giving a short 1537 * by scheduling background redraw as soon as we can, but giving a short
1487 * bit of time for ConfigureNotifies to arrive. 1538 * bit of time for ConfigureNotifies to arrive.
1488 * We should render background PRIOR to drawing any text, but AFTER all 1539 * We should render background PRIOR to drawing any text, but AFTER all
1489 * of ConfigureNotifys for the best results. 1540 * of ConfigureNotifys for the best results.
1490 */ 1541 */
1491 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1542 if (!(bg_flags & BG_IS_VALID))
1492 update_background_ev.start (0.025); 1543 update_background_ev.start (0.025);
1493#endif 1544#endif
1494 mapped = 1; 1545 mapped = 1;
1495#ifdef TEXT_BLINK 1546#ifdef TEXT_BLINK
1496 text_blink_ev.start (); 1547 text_blink_ev.start ();
… …
1511 if (ev.xany.window == vt) 1562 if (ev.xany.window == vt)
1512 { 1563 {
1513 do 1564 do
1514 { 1565 {
1515 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1516 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, false);
1517 } 1568 }
1518 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1569 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1519 1570
1520 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1571 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1521 1572
1522 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1523 { 1574 {
1524 scr_expose (ev.xexpose.x, ev.xexpose.y, 1575 scr_expose (ev.xexpose.x, ev.xexpose.y,
1525 ev.xexpose.width, ev.xexpose.height, False); 1576 ev.xexpose.width, ev.xexpose.height, false);
1526 } 1577 }
1527 1578
1528 want_refresh = 1; 1579 want_refresh = 1;
1529 } 1580 }
1530 else 1581 else
… …
1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1587 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1537 ; 1588 ;
1538 1589
1539 if (scrollBar.state && ev.xany.window == scrollBar.win) 1590 if (scrollBar.state && ev.xany.window == scrollBar.win)
1540 { 1591 {
1541 scrollBar.state = STATE_IDLE; 1592 scrollBar.state = SB_STATE_IDLE;
1542 scrollbar_show (0); 1593 scrollBar.show (0);
1543 } 1594 }
1544 } 1595 }
1545 break; 1596 break;
1546 1597
1547 case MotionNotify: 1598 case MotionNotify:
… …
1612 dist = int_bwidth - ev.xbutton.y; 1663 dist = int_bwidth - ev.xbutton.y;
1613 } 1664 }
1614 else 1665 else
1615 { 1666 {
1616 scroll_selection_dir = DN; 1667 scroll_selection_dir = DN;
1617 dist = ev.xbutton.y - (int_bwidth + height); 1668 dist = ev.xbutton.y - (int_bwidth + vt_height);
1618 } 1669 }
1619 1670
1620 scroll_selection_lines = Pixel2Height (dist) 1671 scroll_selection_lines = Pixel2Height (dist)
1621 / SELECTION_SCROLL_LINE_SPEEDUP 1672 / SELECTION_SCROLL_LINE_SPEEDUP
1622 + 1; 1673 + 1;
… …
1634#ifdef MOUSE_THRESHOLD 1685#ifdef MOUSE_THRESHOLD
1635 } 1686 }
1636#endif 1687#endif
1637 } 1688 }
1638 } 1689 }
1639 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1640 { 1691 {
1641 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1642 MotionNotify, &ev)) 1693 MotionNotify, &ev))
1643 ; 1694 ;
1644 1695
1645 XQueryPointer (dpy, scrollBar.win, 1696 XQueryPointer (dpy, scrollBar.win,
1646 &unused_root, &unused_child, 1697 &unused_root, &unused_child,
1647 &unused_root_x, &unused_root_y, 1698 &unused_root_x, &unused_root_y,
1648 &ev.xbutton.x, &ev.xbutton.y, 1699 &ev.xbutton.x, &ev.xbutton.y,
1649 &unused_mask); 1700 &unused_mask);
1650 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1701 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1651 scrollbar_size ()); 1702 scrollBar.size ());
1652 want_refresh = 1; 1703 want_refresh = 1;
1653 scrollbar_show (1); 1704 scrollBar.show (1);
1654 } 1705 }
1655 break; 1706 break;
1656 } 1707 }
1657 1708
1658#if defined(CURSOR_BLINK) 1709#if defined(CURSOR_BLINK)
1659 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1710 if (ev.type == KeyPress)
1660 {
1661 if (hidden_cursor)
1662 {
1663 hidden_cursor = 0;
1664 want_refresh = 1;
1665 }
1666
1667 cursor_blink_ev.again (); 1711 cursor_blink_reset ();
1668 }
1669#endif 1712#endif
1670 1713
1671#if defined(POINTER_BLANK) 1714#if defined(POINTER_BLANK)
1672 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1715 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1673 { 1716 {
… …
1683#endif 1726#endif
1684 1727
1685 refresh_check (); 1728 refresh_check ();
1686} 1729}
1687 1730
1688void 1731#if ENABLE_FRILLS
1732void ecb_cold
1733rxvt_term::set_urgency (bool enable)
1734{
1735 if (enable == urgency_hint)
1736 return;
1737
1738 if (XWMHints *h = XGetWMHints (dpy, parent))
1739 {
1740 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1741 XSetWMHints (dpy, parent, h);
1742 urgency_hint = enable;
1743 XFree (h);
1744 }
1745}
1746#endif
1747
1748void ecb_cold
1689rxvt_term::focus_in () 1749rxvt_term::focus_in ()
1690{ 1750{
1691 if (!focus) 1751 if (!focus)
1692 { 1752 {
1693 focus = 1; 1753 focus = 1;
1694 want_refresh = 1; 1754 want_refresh = 1;
1695 1755
1696 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1697
1698#if USE_XIM 1756#if USE_XIM
1699 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1700 { 1758 {
1701 IMSetPosition (); 1759 im_set_position ();
1702 XSetICFocus (Input_Context); 1760 XSetICFocus (Input_Context);
1703 } 1761 }
1704#endif 1762#endif
1705#if CURSOR_BLINK 1763#if CURSOR_BLINK
1706 if (option (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
… …
1713 scr_recolour (); 1771 scr_recolour ();
1714 } 1772 }
1715#endif 1773#endif
1716#if ENABLE_FRILLS 1774#if ENABLE_FRILLS
1717 if (option (Opt_urgentOnBell)) 1775 if (option (Opt_urgentOnBell))
1718 { 1776 set_urgency (0);
1719 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1720 {
1721 h->flags &= ~XUrgencyHint;
1722 XSetWMHints (dpy, parent[0], h);
1723 }
1724 }
1725#endif 1777#endif
1726 }
1727}
1728 1778
1729void 1779 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1780 }
1781}
1782
1783void ecb_cold
1730rxvt_term::focus_out () 1784rxvt_term::focus_out ()
1731{ 1785{
1732 if (focus) 1786 if (focus)
1733 { 1787 {
1734 focus = 0; 1788 focus = 0;
1735 want_refresh = 1; 1789 want_refresh = 1;
1736 1790
1737 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1791#if ENABLE_FRILLS
1738 1792 if (option (Opt_urgentOnBell))
1793 set_urgency (0);
1794#endif
1739#if ENABLE_FRILLS || ISO_14755 1795#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1796 if (iso14755buf)
1741 { 1797 {
1742 iso14755buf = 0; 1798 iso14755buf = 0;
1743# if ISO_14755 1799# if ISO_14755
… …
1760 { 1816 {
1761 pix_colors = pix_colors_unfocused; 1817 pix_colors = pix_colors_unfocused;
1762 scr_recolour (); 1818 scr_recolour ();
1763 } 1819 }
1764#endif 1820#endif
1765 }
1766}
1767 1821
1768void 1822 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1823 }
1824}
1825
1826void ecb_cold
1769rxvt_term::update_fade_color (unsigned int idx) 1827rxvt_term::update_fade_color (unsigned int idx)
1770{ 1828{
1771#if OFF_FOCUS_FADING 1829#if OFF_FOCUS_FADING
1772 if (rs[Rs_fade]) 1830 if (rs[Rs_fade])
1773 { 1831 {
… …
1777 } 1835 }
1778#endif 1836#endif
1779} 1837}
1780 1838
1781#if ENABLE_TRANSPARENCY || ENABLE_PERL 1839#if ENABLE_TRANSPARENCY || ENABLE_PERL
1782void 1840void ecb_hot
1783rxvt_term::rootwin_cb (XEvent &ev) 1841rxvt_term::rootwin_cb (XEvent &ev)
1784{ 1842{
1785 make_current (); 1843 make_current ();
1786 1844
1787 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1845 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
… …
1797 * use the property to determine the pixmap. We use it later on. 1855 * use the property to determine the pixmap. We use it later on.
1798 */ 1856 */
1799 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1857 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1800 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1858 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1801 { 1859 {
1802 bgPixmap.set_root_pixmap (); 1860 bg_set_root_pixmap ();
1803 update_background (); 1861 update_background ();
1804 } 1862 }
1805 1863
1806 break; 1864 break;
1807 } 1865 }
… …
1846 /* save the xbutton state (for ButtonRelease) */ 1904 /* save the xbutton state (for ButtonRelease) */
1847 MEvent.state = ev.state; 1905 MEvent.state = ev.state;
1848#ifdef MOUSE_REPORT_DOUBLECLICK 1906#ifdef MOUSE_REPORT_DOUBLECLICK
1849 if (ev.button == MEvent.button && clickintime) 1907 if (ev.button == MEvent.button && clickintime)
1850 { 1908 {
1851 /* same button, within alloted time */ 1909 /* same button, within allowed time */
1852 MEvent.clicks++; 1910 MEvent.clicks++;
1853 1911
1854 if (MEvent.clicks > 1) 1912 if (MEvent.clicks > 1)
1855 { 1913 {
1856 /* only report double clicks */ 1914 /* only report double clicks */
… …
1937 if (scrollBar.upButton (ev.y)) 1995 if (scrollBar.upButton (ev.y))
1938 direction = UP; /* up */ 1996 direction = UP; /* up */
1939 else if (scrollBar.dnButton (ev.y)) 1997 else if (scrollBar.dnButton (ev.y))
1940 direction = DN; /* down */ 1998 direction = DN; /* down */
1941 1999
1942 scrollBar.state = STATE_IDLE; 2000 scrollBar.state = SB_STATE_IDLE;
1943 /* 2001 /*
1944 * Rxvt-style scrollbar: 2002 * Rxvt-style scrollbar:
1945 * move up if mouse is above slider 2003 * move up if mouse is above slider
1946 * move dn if mouse is below slider 2004 * move dn if mouse is below slider
1947 * 2005 *
… …
1986 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2044 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1987#endif 2045#endif
1988 if (scr_page (direction, 1)) 2046 if (scr_page (direction, 1))
1989 { 2047 {
1990 if (direction == UP) 2048 if (direction == UP)
1991 scrollBar.state = STATE_UP; 2049 scrollBar.state = SB_STATE_UP;
1992 else 2050 else
1993 scrollBar.state = STATE_DOWN; 2051 scrollBar.state = SB_STATE_DOWN;
1994 } 2052 }
1995 } 2053 }
1996 else 2054 else
1997 switch (ev.button) 2055 switch (ev.button)
1998 { 2056 {
1999 case Button2: 2057 case Button2:
2000 switch (scrollBar.align) 2058 switch (scrollBar.align)
2001 { 2059 {
2002 case R_SB_ALIGN_TOP: 2060 case SB_ALIGN_TOP:
2003 csrO = 0; 2061 csrO = 0;
2004 break; 2062 break;
2005 case R_SB_ALIGN_CENTRE: 2063 case SB_ALIGN_CENTRE:
2006 csrO = (scrollBar.bot - scrollBar.top) / 2; 2064 csrO = (scrollBar.bot - scrollBar.top) / 2;
2007 break; 2065 break;
2008 case R_SB_ALIGN_BOTTOM: 2066 case SB_ALIGN_BOTTOM:
2009 csrO = scrollBar.bot - scrollBar.top; 2067 csrO = scrollBar.bot - scrollBar.top;
2010 break; 2068 break;
2011 } 2069 }
2012 2070
2013 if (scrollBar.style == R_SB_XTERM 2071 if (scrollBar.style == SB_STYLE_XTERM
2014 || scrollbar_above_slider (ev.y) 2072 || scrollBar.above_slider (ev.y)
2015 || scrollbar_below_slider (ev.y)) 2073 || scrollBar.below_slider (ev.y))
2016 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2074 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2017 2075
2018 scrollBar.state = STATE_MOTION; 2076 scrollBar.state = SB_STATE_MOTION;
2019 break; 2077 break;
2020 2078
2021 case Button1: 2079 case Button1:
2022 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2080 if (scrollBar.align == SB_ALIGN_CENTRE)
2023 csrO = ev.y - scrollBar.top; 2081 csrO = ev.y - scrollBar.top;
2024 /* FALLTHROUGH */ 2082 /* FALLTHROUGH */
2025 2083
2026 case Button3: 2084 case Button3:
2027 if (scrollBar.style != R_SB_XTERM) 2085 if (scrollBar.style != SB_STYLE_XTERM)
2028 { 2086 {
2029 if (scrollbar_above_slider (ev.y)) 2087 if (scrollBar.above_slider (ev.y))
2030# ifdef RXVT_SCROLL_FULL 2088# ifdef RXVT_SCROLL_FULL
2031 scr_page (UP, nrow - 1); 2089 scr_page (UP, nrow - 1);
2032# else 2090# else
2033 scr_page (UP, nrow / 4); 2091 scr_page (UP, nrow / 4);
2034# endif 2092# endif
2035 else if (scrollbar_below_slider (ev.y)) 2093 else if (scrollBar.below_slider (ev.y))
2036# ifdef RXVT_SCROLL_FULL 2094# ifdef RXVT_SCROLL_FULL
2037 scr_page (DN, nrow - 1); 2095 scr_page (DN, nrow - 1);
2038# else 2096# else
2039 scr_page (DN, nrow / 4); 2097 scr_page (DN, nrow / 4);
2040# endif 2098# endif
2041 else 2099 else
2042 scrollBar.state = STATE_MOTION; 2100 scrollBar.state = SB_STATE_MOTION;
2043 } 2101 }
2044 else 2102 else
2045 { 2103 {
2046 scr_page ((ev.button == Button1 ? DN : UP), 2104 scr_page ((ev.button == Button1 ? DN : UP),
2047 (nrow 2105 (nrow
2048 * scrollbar_position (ev.y) 2106 * scrollBar.position (ev.y)
2049 / scrollbar_size ())); 2107 / scrollBar.size ()));
2050 } 2108 }
2051 2109
2052 break; 2110 break;
2053 } 2111 }
2054 } 2112 }
… …
2064 2122
2065 csrO = 0; /* reset csr Offset */ 2123 csrO = 0; /* reset csr Offset */
2066 if (!bypass_keystate) 2124 if (!bypass_keystate)
2067 reportmode = !! (priv_modes & PrivMode_mouse_report); 2125 reportmode = !! (priv_modes & PrivMode_mouse_report);
2068 2126
2069 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2127 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2070 { 2128 {
2071 scrollBar.state = STATE_IDLE; 2129 scrollBar.state = SB_STATE_IDLE;
2072 scrollbar_show (0); 2130 scrollBar.show (0);
2073 } 2131 }
2074 2132
2075#ifdef SELECTION_SCROLLING 2133#ifdef SELECTION_SCROLLING
2076 sel_scroll_ev.stop(); 2134 sel_scroll_ev.stop();
2077#endif 2135#endif
… …
2126 case Button3: 2184 case Button3:
2127 selection_make (ev.time); 2185 selection_make (ev.time);
2128 break; 2186 break;
2129 2187
2130 case Button2: 2188 case Button2:
2131 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2189 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2132 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2190 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2133 break; 2191 break;
2134 2192
2135#ifdef MOUSE_WHEEL 2193#ifdef MOUSE_WHEEL
2136 case Button4: 2194 case Button4:
2137 case Button5: 2195 case Button5:
… …
2160 } 2218 }
2161 else 2219 else
2162# endif 2220# endif
2163 { 2221 {
2164 scr_page (v, i); 2222 scr_page (v, i);
2165 scrollbar_show (1); 2223 scrollBar.show (1);
2166 } 2224 }
2167 } 2225 }
2168 break; 2226 break;
2169#endif 2227#endif
2170 } 2228 }
2171 } 2229 }
2172} 2230}
2173 2231
2174/*}}} */ 2232/*}}} */
2175 2233
2176bool 2234void ecb_hot
2177rxvt_term::cmd_parse () 2235rxvt_term::cmd_parse ()
2178{ 2236{
2179 bool flag = false;
2180 wchar_t ch = NOCHAR; 2237 wchar_t ch = NOCHAR;
2181 char *seq_begin; // remember start of esc-sequence here 2238 char *seq_begin; // remember start of esc-sequence here
2182 2239
2183 for (;;) 2240 for (;;)
2184 { 2241 {
2185 if (ch == NOCHAR) 2242 if (ecb_unlikely (ch == NOCHAR))
2186 { 2243 {
2187 seq_begin = cmdbuf_ptr; 2244 seq_begin = cmdbuf_ptr;
2188 ch = next_char (); 2245 ch = next_char ();
2189 2246
2190 if (ch == NOCHAR) 2247 if (ch == NOCHAR)
2191 break; 2248 break;
2192 } 2249 }
2193 2250
2194 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2251 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2195 { 2252 {
2196 if (!seen_input) 2253 if (ecb_unlikely (!seen_input))
2197 { 2254 {
2198 seen_input = 1; 2255 seen_input = 1;
2199 // many badly-written programs (e.g. jed) contain a race condition: 2256 // many badly-written programs (e.g. jed) contain a race condition:
2200 // they first read the screensize and then install a SIGWINCH handler. 2257 // they first read the screensize and then install a SIGWINCH handler.
2201 // some window managers resize the window early, and these programs 2258 // some window managers resize the window early, and these programs
… …
2214 wchar_t *str = buf; 2271 wchar_t *str = buf;
2215 wchar_t *eol = str + min (ncol, UBUFSIZ); 2272 wchar_t *eol = str + min (ncol, UBUFSIZ);
2216 2273
2217 for (;;) 2274 for (;;)
2218 { 2275 {
2219 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2276 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2220 break; 2277 break;
2221 2278
2222 *str++ = ch; 2279 *str++ = ch;
2223 2280
2224 if (ch == C0_LF || str >= eol) 2281 if (ecb_unlikely (ch == C0_LF || str >= eol))
2225 { 2282 {
2226 if (ch == C0_LF) 2283 if (ch == C0_LF)
2227 nlines++; 2284 nlines++;
2228 2285
2229 refresh_count++; 2286 refresh_count++;
… …
2278 * What the heck we'll cheat and only refresh less than every page-full. 2335 * What the heck we'll cheat and only refresh less than every page-full.
2279 * if skipScroll is enabled. 2336 * if skipScroll is enabled.
2280 */ 2337 */
2281 if (refreshnow) 2338 if (refreshnow)
2282 { 2339 {
2283 flag = true;
2284 scr_refresh (); 2340 scr_refresh ();
2285 want_refresh = 1; 2341 want_refresh = 1;
2286 } 2342 }
2287
2288 } 2343 }
2289 else 2344 else
2290 { 2345 {
2291 try 2346 try
2292 { 2347 {
… …
2300 } 2355 }
2301 2356
2302 ch = NOCHAR; 2357 ch = NOCHAR;
2303 } 2358 }
2304 } 2359 }
2305
2306 return flag;
2307} 2360}
2308 2361
2309// read the next character 2362// read the next character
2310wchar_t 2363wchar_t ecb_hot
2311rxvt_term::next_char () NOTHROW 2364rxvt_term::next_char () NOTHROW
2312{ 2365{
2313 while (cmdbuf_ptr < cmdbuf_endp) 2366 while (cmdbuf_ptr < cmdbuf_endp)
2314 { 2367 {
2315 // assume 7-bit to be ascii ALWAYS 2368 // assume 7-bit to be ascii ALWAYS
2316 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2369 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2317 return *cmdbuf_ptr++; 2370 return *cmdbuf_ptr++;
2318 2371
2319 wchar_t wc; 2372 wchar_t wc;
2320 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2373 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2321 2374
… …
2325 cmdbuf_ptr = cmdbuf_endp; 2378 cmdbuf_ptr = cmdbuf_endp;
2326 break; 2379 break;
2327 } 2380 }
2328 2381
2329 if (len == (size_t)-1) 2382 if (len == (size_t)-1)
2383 {
2384 mbstate.reset (); // reset now undefined conversion state
2330 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2385 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2386 }
2331 2387
2332 // assume wchar == unicode 2388 // assume wchar == unicode
2333 cmdbuf_ptr += len; 2389 cmdbuf_ptr += len;
2334 return wc & UNICODE_MASK; 2390 return wc & UNICODE_MASK;
2335 } 2391 }
2336 2392
2337 return NOCHAR; 2393 return NOCHAR;
2338} 2394}
2339 2395
2340// read the next octet 2396// read the next octet
2341uint32_t 2397uint32_t ecb_hot
2342rxvt_term::next_octet () NOTHROW 2398rxvt_term::next_octet () NOTHROW
2343{ 2399{
2344 return cmdbuf_ptr < cmdbuf_endp 2400 return cmdbuf_ptr < cmdbuf_endp
2345 ? (unsigned char)*cmdbuf_ptr++ 2401 ? (unsigned char)*cmdbuf_ptr++
2346 : NOCHAR; 2402 : NOCHAR;
2347} 2403}
2348 2404
2349static class out_of_input out_of_input; 2405static class out_of_input out_of_input;
2350 2406
2351/* rxvt_cmd_getc () - Return next input character */ 2407wchar_t ecb_hot
2352/*
2353 * Return the next input character after first passing any keyboard input
2354 * to the command.
2355 */
2356wchar_t
2357rxvt_term::cmd_getc () THROW ((class out_of_input)) 2408rxvt_term::cmd_getc () THROW ((class out_of_input))
2358{ 2409{
2359 wchar_t c = next_char (); 2410 wchar_t c = next_char ();
2360 2411
2361 if (c == NOCHAR) 2412 if (c == NOCHAR)
2362 throw out_of_input; 2413 throw out_of_input;
2363 2414
2364 return c; 2415 return c;
2365} 2416}
2366 2417
2367uint32_t 2418uint32_t ecb_hot
2368rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2419rxvt_term::cmd_get8 () THROW ((class out_of_input))
2369{ 2420{
2370 uint32_t c = next_octet (); 2421 uint32_t c = next_octet ();
2371 2422
2372 if (c == NOCHAR) 2423 if (c == NOCHAR)
… …
2376} 2427}
2377 2428
2378/*{{{ print pipe */ 2429/*{{{ print pipe */
2379/*----------------------------------------------------------------------*/ 2430/*----------------------------------------------------------------------*/
2380#ifdef PRINTPIPE 2431#ifdef PRINTPIPE
2381FILE * 2432FILE * ecb_cold
2382rxvt_term::popen_printer () 2433rxvt_term::popen_printer ()
2383{ 2434{
2384 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2435 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2385 2436
2386 if (stream == NULL) 2437 if (stream == NULL)
2387 rxvt_warn ("can't open printer pipe, not printing.\n"); 2438 rxvt_warn ("can't open printer pipe, not printing.\n");
2388 2439
2389 return stream; 2440 return stream;
2390} 2441}
2391 2442
2392int 2443int ecb_cold
2393rxvt_term::pclose_printer (FILE *stream) 2444rxvt_term::pclose_printer (FILE *stream)
2394{ 2445{
2395 fflush (stream); 2446 fflush (stream);
2396 return pclose (stream); 2447 return pclose (stream);
2397} 2448}
2398 2449
2399/* 2450/*
2400 * simulate attached vt100 printer 2451 * simulate attached vt100 printer
2401 */ 2452 */
2402void 2453void ecb_cold
2403rxvt_term::process_print_pipe () 2454rxvt_term::process_print_pipe ()
2404{ 2455{
2405 int done; 2456 FILE *fd = popen_printer ();
2406 FILE *fd;
2407 2457
2408 if ((fd = popen_printer ()) == NULL) 2458 if (!fd)
2409 return; 2459 return;
2410 2460
2411 /* 2461 /*
2412 * Send all input to the printer until either ESC[4i or ESC[?4i 2462 * Send all input to the printer until either ESC[4i or ESC[?4i
2413 * is received. 2463 * is received.
2414 */ 2464 */
2415 for (done = 0; !done;) 2465 for (int done = 0; !done; )
2416 { 2466 {
2417 unsigned char buf[8]; 2467 unsigned char buf[8];
2418 unicode_t ch; 2468 unicode_t ch;
2419 unsigned int i, len; 2469 unsigned int i, len;
2420 2470
… …
2454 pclose_printer (fd); 2504 pclose_printer (fd);
2455} 2505}
2456#endif /* PRINTPIPE */ 2506#endif /* PRINTPIPE */
2457/*}}} */ 2507/*}}} */
2458 2508
2459/* *INDENT-OFF* */
2460enum { 2509enum {
2461 C1_40 = 0x40, 2510 C1_40 = 0x40,
2462 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2511 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2463 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2512 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2464 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2513 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2465 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2514 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2466}; 2515};
2467/* *INDENT-ON* */
2468 2516
2469/*{{{ process non-printing single characters */ 2517/*{{{ process non-printing single characters */
2470void 2518void ecb_hot
2471rxvt_term::process_nonprinting (unicode_t ch) 2519rxvt_term::process_nonprinting (unicode_t ch)
2472{ 2520{
2473 switch (ch) 2521 switch (ch)
2474 { 2522 {
2475 case C0_ESC: 2523 case C0_ESC:
… …
2521} 2569}
2522/*}}} */ 2570/*}}} */
2523 2571
2524 2572
2525/*{{{ process VT52 escape sequences */ 2573/*{{{ process VT52 escape sequences */
2526void 2574void ecb_cold
2527rxvt_term::process_escape_vt52 (unicode_t ch) 2575rxvt_term::process_escape_vt52 (unicode_t ch)
2528{ 2576{
2529 int row, col; 2577 int row, col;
2530 2578
2531 switch (ch) 2579 switch (ch)
… …
2565 break; 2613 break;
2566 case 'Z': /* identify the terminal type */ 2614 case 'Z': /* identify the terminal type */
2567 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2615 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2568 break; 2616 break;
2569 case '<': /* turn off VT52 mode */ 2617 case '<': /* turn off VT52 mode */
2570 PrivMode (0, PrivMode_vt52); 2618 priv_modes &= ~PrivMode_vt52;
2571 break; 2619 break;
2572 case 'F': /* use special graphics character set */ 2620 case 'F': /* use special graphics character set */
2573 case 'G': /* use regular character set */ 2621 case 'G': /* use regular character set */
2574 /* unimplemented */ 2622 /* unimplemented */
2575 break; 2623 break;
… …
2581} 2629}
2582/*}}} */ 2630/*}}} */
2583 2631
2584 2632
2585/*{{{ process escape sequences */ 2633/*{{{ process escape sequences */
2586void 2634void ecb_hot
2587rxvt_term::process_escape_seq () 2635rxvt_term::process_escape_seq ()
2588{ 2636{
2589 unicode_t ch = cmd_getc (); 2637 unicode_t ch = cmd_getc ();
2590 2638
2591 if (priv_modes & PrivMode_vt52) 2639 if (priv_modes & PrivMode_vt52)
… …
2594 return; 2642 return;
2595 } 2643 }
2596 2644
2597 switch (ch) 2645 switch (ch)
2598 { 2646 {
2599 /* case 1: do_tek_mode (); break; */
2600 case '#': 2647 case '#':
2601 if (cmd_getc () == '8') 2648 if (cmd_getc () == '8')
2602 scr_E (); 2649 scr_E ();
2603 break; 2650 break;
2604 case '(': 2651 case '(':
… …
2627#if !ENABLE_MINIMAL 2674#if !ENABLE_MINIMAL
2628 case '9': 2675 case '9':
2629 scr_forwardindex (); 2676 scr_forwardindex ();
2630 break; 2677 break;
2631#endif 2678#endif
2679 // DECPAM/DECPNM
2632 case '=': 2680 case '=':
2681 priv_modes |= PrivMode_aplKP;
2682 break;
2633 case '>': 2683 case '>':
2634 PrivMode ((ch == '='), PrivMode_aplKP); 2684 priv_modes &= ~PrivMode_aplKP;
2635 break; 2685 break;
2636 2686
2637 case C1_40: 2687 case C1_40:
2638 cmd_getc (); 2688 cmd_getc ();
2639 break; 2689 break;
… …
2643 2693
2644 /* 8.3.87: NEXT LINE */ 2694 /* 8.3.87: NEXT LINE */
2645 case C1_NEL: /* ESC E */ 2695 case C1_NEL: /* ESC E */
2646 { 2696 {
2647 wchar_t nlcr[] = { C0_LF, C0_CR }; 2697 wchar_t nlcr[] = { C0_LF, C0_CR };
2648 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2698 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2649 } 2699 }
2650 break; 2700 break;
2651 2701
2652 /* kidnapped escape sequence: Should be 8.3.48 */ 2702 /* kidnapped escape sequence: Should be 8.3.48 */
2653 case C1_ESA: /* ESC G */ 2703 case C1_ESA: /* ESC G */
2654 process_graphics (); 2704 // used by original rxvt for rob nations own graphics mode
2705 if (cmd_getc () == 'Q')
2706 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2655 break; 2707 break;
2656 2708
2657 /* 8.3.63: CHARACTER TABULATION SET */ 2709 /* 8.3.63: CHARACTER TABULATION SET */
2658 case C1_HTS: /* ESC H */ 2710 case C1_HTS: /* ESC H */
2659 scr_set_tab (1); 2711 scr_set_tab (1);
… …
2663 case C1_RI: /* ESC M */ 2715 case C1_RI: /* ESC M */
2664 scr_index (DN); 2716 scr_index (DN);
2665 break; 2717 break;
2666 2718
2667 /* 8.3.142: SINGLE-SHIFT TWO */ 2719 /* 8.3.142: SINGLE-SHIFT TWO */
2668 /*case C1_SS2: scr_single_shift (2); break; */ 2720 /* case C1_SS2: break; */
2669 2721
2670 /* 8.3.143: SINGLE-SHIFT THREE */ 2722 /* 8.3.143: SINGLE-SHIFT THREE */
2671 /*case C1_SS3: scr_single_shift (3); break; */ 2723 /* case C1_SS3: break; */
2672 2724
2673 /* 8.3.27: DEVICE CONTROL STRING */ 2725 /* 8.3.27: DEVICE CONTROL STRING */
2674 case C1_DCS: /* ESC P */ 2726 case C1_DCS: /* ESC P */
2675 process_dcs_seq (); 2727 process_dcs_seq ();
2676 break; 2728 break;
… …
2678 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2730 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2679 case C1_SCI: /* ESC Z */ 2731 case C1_SCI: /* ESC Z */
2680 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2732 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2681 break; /* steal obsolete ESC [ c */ 2733 break; /* steal obsolete ESC [ c */
2682 2734
2683 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2735 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2684 case C1_CSI: /* ESC [ */ 2736 case C1_CSI: /* ESC [ */
2685 process_csi_seq (); 2737 process_csi_seq ();
2686 break; 2738 break;
2687 2739
2688 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2740 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2689 case C1_OSC: /* ESC ] */ 2741 case C1_OSC: /* ESC ] */
2690 process_osc_seq (); 2742 process_osc_seq ();
2691 break; 2743 break;
2692 2744
2693 /* 8.3.106: RESET TO INITIAL STATE */ 2745 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2694 case 'c': 2746 case 'c':
2695 mbstate.reset (); 2747 mbstate.reset ();
2696 scr_poweron (); 2748 scr_poweron ();
2697 scrollbar_show (1); 2749 scrollBar.show (1);
2698 break; 2750 break;
2699 2751
2700 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2752 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2701 case 'n': 2753 case 'n':
2702 scr_charset_choose (2); 2754 scr_charset_choose (2);
… …
2709 } 2761 }
2710} 2762}
2711/*}}} */ 2763/*}}} */
2712 2764
2713/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2765/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2714/* *INDENT-OFF* */
2715enum { 2766enum {
2716 CSI_ICH = 0x40, 2767 CSI_ICH = 0x40,
2717 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2768 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2718 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2769 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2719 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2770 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2722 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2773 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2723 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2774 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2724 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2775 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2725}; 2776};
2726 2777
2727#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2778#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2728 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2779 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2729 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2780 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2730#define get_byte_array_bit(array, bit) \ 2781#define get_byte_array_bit(array, bit) \
2731 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2782 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2732 2783
2733const unsigned char csi_defaults[] = 2784static const unsigned char csi_defaults[] =
2734 { 2785 {
2735 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2786 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2736 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2787 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2737 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2788 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2738 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2789 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2739 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2790 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2740 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2791 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2741 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2792 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2742 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2793 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2743 }; 2794 };
2744/* *INDENT-ON* */
2745 2795
2746void 2796void ecb_hot
2747rxvt_term::process_csi_seq () 2797rxvt_term::process_csi_seq ()
2748{ 2798{
2749 unicode_t ch, priv, i; 2799 unicode_t ch, priv, i;
2750 unsigned int nargs, p; 2800 unsigned int nargs, p;
2751 int n, ndef; 2801 int n, ndef;
… …
2753 2803
2754 nargs = 0; 2804 nargs = 0;
2755 2805
2756 priv = 0; 2806 priv = 0;
2757 ch = cmd_getc (); 2807 ch = cmd_getc ();
2758 if (ch >= '<' && ch <= '?') 2808 if ((ch >= '<' && ch <= '?') || ch == '!')
2759 { 2809 {
2760 /* '<' '=' '>' '?' */ 2810 /* '<' '=' '>' '?' '!' */
2761 priv = ch; 2811 priv = ch;
2762 ch = cmd_getc (); 2812 ch = cmd_getc ();
2763 } 2813 }
2764 2814
2765 /* read any numerical arguments */ 2815 /* read any numerical arguments */
… …
2819 2869
2820 case '?': 2870 case '?':
2821 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2871 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2822 process_terminal_mode (ch, priv, nargs, arg); 2872 process_terminal_mode (ch, priv, nargs, arg);
2823 break; 2873 break;
2874
2875 case '!':
2876 if (ch == CSI_70)
2877 {
2878 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2879 scr_soft_reset ();
2880
2881 static const int pm_h[] = { 7, 25 };
2882 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2883
2884 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2885 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2824 } 2886 }
2887 break;
2888 }
2889
2825 return; 2890 return;
2826 } 2891 }
2827 2892
2828 switch (ch) 2893 switch (ch)
2829 { 2894 {
… …
2843 } 2908 }
2844 break; 2909 break;
2845#endif 2910#endif
2846 2911
2847 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2912 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2848 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2913 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2849 arg[0] = -arg[0]; 2914 arg[0] = -arg[0];
2850 /* FALLTHROUGH */ 2915 /* FALLTHROUGH */
2851 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2916 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2852 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2917 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2853 scr_gotorc (arg[0], 0, RELATIVE); 2918 scr_gotorc (arg[0], 0, RELATIVE);
2854 break; 2919 break;
2855 2920
2856 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2921 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2857 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2922 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3044 } 3109 }
3045} 3110}
3046/*}}} */ 3111/*}}} */
3047 3112
3048#if !ENABLE_MINIMAL 3113#if !ENABLE_MINIMAL
3049/* ARGSUSED */
3050void 3114void
3051rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3115rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3052{ 3116{
3053 int x, y; 3117 int x, y;
3054 XWindowAttributes wattr; 3118 XWindowAttributes wattr;
… …
3063 { 3127 {
3064 /* 3128 /*
3065 * commands 3129 * commands
3066 */ 3130 */
3067 case 1: /* deiconify window */ 3131 case 1: /* deiconify window */
3068 XMapWindow (dpy, parent[0]); 3132 XMapWindow (dpy, parent);
3069 break; 3133 break;
3070 case 2: /* iconify window */ 3134 case 2: /* iconify window */
3071 XIconifyWindow (dpy, parent[0], display->screen); 3135 XIconifyWindow (dpy, parent, display->screen);
3072 break; 3136 break;
3073 case 3: /* set position (pixels) */ 3137 case 3: /* set position (pixels) */
3074 XMoveWindow (dpy, parent[0], args[1], args[2]); 3138 XMoveWindow (dpy, parent, args[1], args[2]);
3075 break; 3139 break;
3076 case 4: /* set size (pixels) */ 3140 case 4: /* set size (pixels) */
3077 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3141 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3078 break; 3142 break;
3079 case 5: /* raise window */ 3143 case 5: /* raise window */
3080 XRaiseWindow (dpy, parent[0]); 3144 XRaiseWindow (dpy, parent);
3081 break; 3145 break;
3082 case 6: /* lower window */ 3146 case 6: /* lower window */
3083 XLowerWindow (dpy, parent[0]); 3147 XLowerWindow (dpy, parent);
3084 break; 3148 break;
3085 case 7: /* refresh window */ 3149 case 7: /* refresh window */
3086 scr_touch (true); 3150 scr_touch (true);
3087 break; 3151 break;
3088 case 8: /* set size (chars) */ 3152 case 8: /* set size (chars) */
… …
3091 break; 3155 break;
3092 3156
3093 //case 9: NYI, TODO, restore maximized window or maximize window 3157 //case 9: NYI, TODO, restore maximized window or maximize window
3094 default: 3158 default:
3095 if (args[0] >= 24) /* set height (chars) */ 3159 if (args[0] >= 24) /* set height (chars) */
3096 set_widthheight ((unsigned int)width, 3160 set_widthheight ((unsigned int)vt_width,
3097 (unsigned int) (args[1] * fheight)); 3161 (unsigned int) (args[1] * fheight));
3098 break; 3162 break;
3099 3163
3100 /* 3164 /*
3101 * reports - some output format copied from XTerm 3165 * reports - some output format copied from XTerm
3102 */ 3166 */
3103 case 11: /* report window state */ 3167 case 11: /* report window state */
3104 XGetWindowAttributes (dpy, parent[0], &wattr); 3168 XGetWindowAttributes (dpy, parent, &wattr);
3105 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3169 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3106 break; 3170 break;
3107 case 13: /* report window position */ 3171 case 13: /* report window position */
3108 XGetWindowAttributes (dpy, parent[0], &wattr); 3172 XGetWindowAttributes (dpy, parent, &wattr);
3109 XTranslateCoordinates (dpy, parent[0], wattr.root, 3173 XTranslateCoordinates (dpy, parent, wattr.root,
3110 -wattr.border_width, -wattr.border_width, 3174 -wattr.border_width, -wattr.border_width,
3111 &x, &y, &wdummy); 3175 &x, &y, &wdummy);
3112 tt_printf ("\033[3;%d;%dt", x, y); 3176 tt_printf ("\033[3;%d;%dt", x, y);
3113 break; 3177 break;
3114 case 14: /* report window size (pixels) */ 3178 case 14: /* report window size (pixels) */
3115 XGetWindowAttributes (dpy, parent[0], &wattr); 3179 XGetWindowAttributes (dpy, parent, &wattr);
3116 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3180 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3117 break; 3181 break;
3118 case 18: /* report text area size (chars) */ 3182 case 18: /* report text area size (chars) */
3119 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3183 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3120 break; 3184 break;
… …
3122 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3186 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3123 break; 3187 break;
3124 case 20: /* report icon label */ 3188 case 20: /* report icon label */
3125 { 3189 {
3126 char *s; 3190 char *s;
3127 XGetIconName (dpy, parent[0], &s); 3191 XGetIconName (dpy, parent, &s);
3128 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3192 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3129 XFree (s); 3193 XFree (s);
3130 } 3194 }
3131 break; 3195 break;
3132 case 21: /* report window title */ 3196 case 21: /* report window title */
3133 { 3197 {
3134 char *s; 3198 char *s;
3135 XFetchName (dpy, parent[0], &s); 3199 XFetchName (dpy, parent, &s);
3136 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3200 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3137 XFree (s); 3201 XFree (s);
3138 } 3202 }
3139 break; 3203 break;
3140 } 3204 }
… …
3196 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3260 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3197 */ 3261 */
3198void 3262void
3199rxvt_term::process_dcs_seq () 3263rxvt_term::process_dcs_seq ()
3200{ 3264{
3201 char *s;
3202 unicode_t eh;
3203
3204 /* 3265 /*
3205 * Not handled yet 3266 * Not handled yet
3206 */ 3267 */
3268
3269 unicode_t eh;
3207 s = get_to_st (eh); 3270 char *s = get_to_st (eh);
3208 if (s) 3271 if (s)
3209 free (s); 3272 free (s);
3210 3273
3211 return; 3274 return;
3212} 3275}
… …
3216 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3279 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3217 */ 3280 */
3218void 3281void
3219rxvt_term::process_osc_seq () 3282rxvt_term::process_osc_seq ()
3220{ 3283{
3221 unicode_t ch, eh;
3222 int arg; 3284 int arg;
3223 3285
3224 ch = cmd_getc (); 3286 unicode_t ch = cmd_getc ();
3225 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3287 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3226 arg = arg * 10 + (ch - '0'); 3288 arg = arg * 10 + (ch - '0');
3227 3289
3228 if (ch == ';') 3290 if (ch == ';')
3229 { 3291 {
3292 unicode_t eh;
3230 char *s = get_to_st (eh); 3293 char *s = get_to_st (eh);
3231 3294
3232 if (s) 3295 if (s)
3233 { 3296 {
3234 process_xterm_seq (arg, s, eh); 3297 process_xterm_seq (arg, s, eh);
… …
3258 3321
3259/* 3322/*
3260 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3323 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3261 */ 3324 */
3262void 3325void
3263rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3326rxvt_term::process_xterm_seq (int op, char *str, char resp)
3264{ 3327{
3265 int color; 3328 int color;
3266 char *buf, *name; 3329 char *buf, *name;
3267 bool query = str[0] == '?' && !str[1]; 3330 bool query = str[0] == '?' && !str[1];
3268 int saveop = op; 3331 int saveop = op;
… …
3295 unsigned long bytes_after; 3358 unsigned long bytes_after;
3296 unsigned char *value = 0; 3359 unsigned char *value = 0;
3297 const char *str = ""; 3360 const char *str = "";
3298 3361
3299 if (prop 3362 if (prop
3300 && XGetWindowProperty (dpy, parent[0], 3363 && XGetWindowProperty (dpy, parent,
3301 prop, 0, 1<<16, 0, AnyPropertyType, 3364 prop, 0, 1<<16, 0, AnyPropertyType,
3302 &actual_type, &actual_format, 3365 &actual_type, &actual_format,
3303 &nitems, &bytes_after, &value) == Success 3366 &nitems, &bytes_after, &value) == Success
3304 && actual_type != None 3367 && actual_type != None
3305 && actual_format == 8) 3368 && actual_format == 8)
… …
3309 3372
3310 XFree (value); 3373 XFree (value);
3311 } 3374 }
3312 else 3375 else
3313 { 3376 {
3314 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3377 char *eq = strchr (str, '=');
3315 3378
3316 if (eq) 3379 if (eq)
3317 { 3380 {
3318 *eq = 0; 3381 *eq = 0;
3319 set_utf8_property (display->atom (str), eq + 1); 3382 set_utf8_property (display->atom (str), eq + 1);
3320 } 3383 }
3321 else 3384 else
3322 XDeleteProperty (dpy, parent[0], 3385 XDeleteProperty (dpy, parent,
3323 display->atom (str)); 3386 display->atom (str));
3324 } 3387 }
3325 break; 3388 break;
3326 3389
3327 case XTerm_Color: 3390 case XTerm_Color:
… …
3359 process_color_seq (op, Color_pointer_fg, str, resp); 3422 process_color_seq (op, Color_pointer_fg, str, resp);
3360 break; 3423 break;
3361 case XTerm_Color_pointer_bg: 3424 case XTerm_Color_pointer_bg:
3362 process_color_seq (op, Color_pointer_bg, str, resp); 3425 process_color_seq (op, Color_pointer_bg, str, resp);
3363 break; 3426 break;
3427#ifdef OPTION_HC
3428 case XTerm_Color_HC:
3429 process_color_seq (op, Color_HC, str, resp);
3430 break;
3431 case XTerm_Color_HTC:
3432 process_color_seq (op, Color_HTC, str, resp);
3433 break;
3434#endif
3364#ifndef NO_BOLD_UNDERLINE_REVERSE 3435#ifndef NO_BOLD_UNDERLINE_REVERSE
3365 case XTerm_Color_RV:
3366 process_color_seq (op, Color_RV, str, resp);
3367 break;
3368 case Rxvt_Color_BD:
3369 case URxvt_Color_BD: 3436 case URxvt_Color_BD:
3370 process_color_seq (op, Color_BD, str, resp); 3437 process_color_seq (op, Color_BD, str, resp);
3371 break; 3438 break;
3372 case Rxvt_Color_UL:
3373 case URxvt_Color_UL: 3439 case URxvt_Color_UL:
3374 process_color_seq (op, Color_UL, str, resp); 3440 process_color_seq (op, Color_UL, str, resp);
3375 break; 3441 break;
3376 case URxvt_Color_IT: 3442 case URxvt_Color_IT:
3377 process_color_seq (op, Color_IT, str, resp); 3443 process_color_seq (op, Color_IT, str, resp);
3378 break; 3444 break;
3379#endif 3445#endif
3446 case URxvt_Color_border:
3447 process_color_seq (op, Color_border, str, resp);
3448 break;
3380#if ENABLE_TRANSPARENCY 3449#if ENABLE_TRANSPARENCY
3381 case URxvt_Color_tint: 3450 case URxvt_Color_tint:
3382 process_color_seq (op, Color_tint, str, resp); 3451 process_color_seq (op, Color_tint, str, resp);
3383 { 3452 {
3384 bool changed = false; 3453 bool changed = false;
3385 3454
3386 if (ISSET_PIXCOLOR (Color_tint)) 3455 if (ISSET_PIXCOLOR (Color_tint))
3387 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3456 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3388 else
3389 changed = bgPixmap.unset_tint ();
3390 3457
3391 if (changed) 3458 if (changed)
3392 update_background (); 3459 update_background ();
3393 } 3460 }
3394 3461
… …
3398#if BG_IMAGE_FROM_FILE 3465#if BG_IMAGE_FROM_FILE
3399 case Rxvt_Pixmap: 3466 case Rxvt_Pixmap:
3400 if (!strcmp (str, "?")) 3467 if (!strcmp (str, "?"))
3401 { 3468 {
3402 char str[256]; 3469 char str[256];
3470 int h_scale = 0, v_scale = 0;
3471 int h_align = 0, v_align = 0;
3472 if (image_vec.size () > 0)
3473 {
3474 h_scale = image_vec[0].h_scale;
3475 v_scale = image_vec[0].v_scale;
3476 h_align = image_vec[0].h_align;
3477 v_align = image_vec[0].v_align;
3478 }
3403 3479
3404 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3480 sprintf (str, "[%dx%d+%d+%d]",
3405 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3481 h_scale, v_scale,
3406 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3482 h_align, v_align);
3407 process_xterm_seq (XTerm_title, str, CHAR_ST); 3483 process_xterm_seq (XTerm_title, str, CHAR_ST);
3408 } 3484 }
3409 else 3485 else
3410 { 3486 {
3411 int changed = 0; 3487 bool changed = false;
3412 3488
3413 if (*str != ';') 3489 if (*str != ';')
3414 { 3490 {
3415 /* reset to default scaling :*/ 3491 if (image_vec.size () > 0)
3416 bgPixmap.unset_geometry (); 3492 changed = image_vec[0].set_file_geometry (str);
3417 if (bgPixmap.set_file (str)) /* change pixmap */ 3493 else
3494 {
3495 rxvt_image *image = new_image ();
3496 if (!image->set_file_geometry (str))
3497 image_vec.pop_back ();
3498 else
3418 changed++; 3499 changed = true;
3419 str = strchr (str, ';'); 3500 }
3420 if (str == NULL)
3421 bgPixmap.set_defaultGeometry ();
3422 } 3501 }
3423 3502 else
3424 while (str)
3425 { 3503 {
3426 str++; 3504 str++;
3427 if (bgPixmap.set_geometry (str)) 3505 if (image_vec.size () > 0)
3428 changed++; 3506 changed = image_vec[0].set_geometry (str, true);
3429 str = strchr (str, ';');
3430 } 3507 }
3431 3508
3432 if (changed) 3509 if (changed)
3510 {
3511 if (bg_window_position_sensitive ())
3512 {
3513 int x, y;
3514 get_window_origin (x, y);
3515 bg_set_position (x, y);
3516 }
3433 update_background (); 3517 update_background ();
3518 }
3434 } 3519 }
3435 break; 3520 break;
3436#endif 3521#endif
3437 3522
3438 case XTerm_logfile: 3523 case XTerm_logfile:
… …
3508 break; 3593 break;
3509#endif 3594#endif
3510 3595
3511#if ENABLE_PERL 3596#if ENABLE_PERL
3512 case URxvt_perl: 3597 case URxvt_perl:
3513 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3598 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3514 ; // no responses yet
3515 break; 3599 break;
3516#endif 3600#endif
3517 } 3601 }
3518} 3602}
3519/*----------------------------------------------------------------------*/ 3603/*----------------------------------------------------------------------*/
… …
3526 * 's' = save 3610 * 's' = save
3527 * 'r' = restore 3611 * 'r' = restore
3528 * 't' = toggle 3612 * 't' = toggle
3529 * so no need for fancy checking 3613 * so no need for fancy checking
3530 */ 3614 */
3531int 3615int ecb_cold
3532rxvt_term::privcases (int mode, unsigned long bit) 3616rxvt_term::privcases (int mode, unsigned long bit)
3533{ 3617{
3534 int state; 3618 int state;
3535 3619
3536 if (mode == 's') 3620 if (mode == 's')
3537 { 3621 {
3538 SavedModes |= (priv_modes & bit); 3622 if (priv_modes & bit)
3623 SavedModes |= bit;
3624 else
3625 SavedModes &= ~bit;
3539 return -1; 3626 return -1;
3540 } 3627 }
3541 else 3628 else
3542 { 3629 {
3543 if (mode == 'r') 3630 if (mode == 'r')
3544 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3631 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3545 else 3632 else
3546 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3633 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3547 PrivMode (state, bit); 3634
3635 if (state)
3636 priv_modes |= bit;
3637 else
3638 priv_modes &= ~bit;
3548 } 3639 }
3549 3640
3550 return state; 3641 return state;
3551} 3642}
3552 3643
3553/* we're not using priv _yet_ */ 3644/* we're not using priv _yet_ */
3554void 3645void
3555rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3646rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3556{ 3647{
3557 unsigned int i, j; 3648 unsigned int i, j;
3558 int state; 3649 int state;
3559 3650
3560 static const struct 3651 static const struct
3561 { 3652 {
3562 const int argval; 3653 const int argval;
3563 const unsigned long bit; 3654 const unsigned long bit;
3564 } argtopriv[] = { 3655 } argtopriv[] = {
3565 { 1, PrivMode_aplCUR }, 3656 { 1, PrivMode_aplCUR }, // DECCKM
3566 { 2, PrivMode_vt52 }, 3657 { 2, PrivMode_vt52 }, // DECANM
3567 { 3, PrivMode_132 }, 3658 { 3, PrivMode_132 }, // DECCOLM
3568 { 4, PrivMode_smoothScroll }, 3659 { 4, PrivMode_smoothScroll }, // DECSCLM
3569 { 5, PrivMode_rVideo }, 3660 { 5, PrivMode_rVideo }, // DECSCNM
3570 { 6, PrivMode_relOrigin }, 3661 { 6, PrivMode_relOrigin }, // DECOM
3571 { 7, PrivMode_Autowrap }, 3662 { 7, PrivMode_Autowrap }, // DECAWM
3572 // 8, bi-directional support mode 3663 // 8, auto-repeat keys // DECARM
3573 { 9, PrivMode_MouseX10 }, 3664 { 9, PrivMode_MouseX10 },
3574 // 18, 19 printing-related 3665 // 18 end FF to printer after print screen
3666 // 19 Print screen prints full screen/scroll region
3575 { 25, PrivMode_VisibleCursor }, 3667 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3576#ifdef scrollBar_esc 3668#ifdef scrollBar_esc
3577 { scrollBar_esc, PrivMode_scrollBar }, 3669 { scrollBar_esc, PrivMode_scrollBar },
3578#endif 3670#endif
3579 { 35, PrivMode_ShiftKeys }, // rxvt extension 3671 { 35, PrivMode_ShiftKeys }, // rxvt extension
3672 // 38, tektronix mode // DECTEK
3580 { 40, PrivMode_132OK }, 3673 { 40, PrivMode_132OK },
3581 // 41 xterm more fixes NYI 3674 // 41 xterm more fixes NYI
3582 // 45 margin bell NYI 3675 // 45 margin bell NYI
3583 // 46 start logging 3676 // 46 start logging
3584 { 47, PrivMode_Screen }, 3677 { 47, PrivMode_Screen },
3585 { 66, PrivMode_aplKP }, 3678 { 66, PrivMode_aplKP }, // DECNKM
3586#ifndef NO_BACKSPACE_KEY 3679#ifndef NO_BACKSPACE_KEY
3587 { 67, PrivMode_BackSpace }, 3680 { 67, PrivMode_BackSpace }, // DECBKM
3588#endif 3681#endif
3589 { 1000, PrivMode_MouseX11 }, 3682 { 1000, PrivMode_MouseX11 },
3590 { 1002, PrivMode_MouseBtnEvent }, 3683 { 1002, PrivMode_MouseBtnEvent },
3591 { 1003, PrivMode_MouseAnyEvent }, 3684 { 1003, PrivMode_MouseAnyEvent },
3685#if ENABLE_FRILLS
3686 { 1005, PrivMode_ExtModeMouse },
3687#endif
3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3688 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3593 { 1011, PrivMode_Keypress }, // rxvt extension 3689 { 1011, PrivMode_Keypress }, // rxvt extension
3690#if ENABLE_FRILLS
3691 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3692#endif
3594 // 1035 enable modifiers for alt, numlock NYI 3693 // 1035 enable modifiers for alt, numlock NYI
3595 // 1036 send ESC for meta keys NYI 3694 // 1036 send ESC for meta keys NYI
3596 // 1037 send DEL for keypad delete NYI 3695 // 1037 send DEL for keypad delete NYI
3597 { 1047, PrivMode_Screen }, 3696 { 1047, PrivMode_Screen },
3598 // 1048 save and restore cursor 3697 // 1048 save and restore cursor, implemented in code
3599 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3698 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3699 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3601 { 2004, PrivMode_BracketPaste }, 3700 { 2004, PrivMode_BracketPaste },
3602 }; 3701 };
3603 3702
… …
3613 for (i = 0; i < nargs; i++) 3712 for (i = 0; i < nargs; i++)
3614 { 3713 {
3615 state = -1; 3714 state = -1;
3616 3715
3617 /* basic handling */ 3716 /* basic handling */
3618 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3717 for (j = 0; j < ecb_array_length (argtopriv); j++)
3619 if (argtopriv[j].argval == arg[i]) 3718 if (argtopriv[j].argval == arg[i])
3620 { 3719 {
3621 state = privcases (mode, argtopriv[j].bit); 3720 state = privcases (mode, argtopriv[j].bit);
3622 break; 3721 break;
3623 } 3722 }
… …
3631 3730
3632 scr_touch (true); 3731 scr_touch (true);
3633 break; 3732 break;
3634#endif 3733#endif
3635 case 1048: /* alternative cursor save */ 3734 case 1048: /* alternative cursor save */
3636 case 1049:
3637 if (option (Opt_secondaryScreen)) 3735 if (option (Opt_secondaryScreen))
3638 if (mode == 0) 3736 if (mode == 0)
3639 scr_cursor (RESTORE); 3737 scr_cursor (RESTORE);
3640 else if (mode == 1) 3738 else if (mode == 1)
3641 scr_cursor (SAVE); 3739 scr_cursor (SAVE);
… …
3650 case 2: /* VT52 mode */ 3748 case 2: /* VT52 mode */
3651 /* oddball mode. should be set regardless of set/reset 3749 /* oddball mode. should be set regardless of set/reset
3652 * parameter. Return from VT52 mode with an ESC < from 3750 * parameter. Return from VT52 mode with an ESC < from
3653 * within VT52 mode 3751 * within VT52 mode
3654 */ 3752 */
3655 PrivMode (1, PrivMode_vt52); 3753 priv_modes |= PrivMode_vt52;
3656 break; 3754 break;
3657 case 3: /* 80/132 */ 3755 case 3: /* 80/132 */
3658 if (priv_modes & PrivMode_132OK) 3756 if (priv_modes & PrivMode_132OK)
3659 {
3660 scr_poweron ();
3661 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3757 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3662 }
3663 break; 3758 break;
3664 case 4: /* smooth scrolling */ 3759 case 4: /* smooth scrolling */
3665 set_option (Opt_jumpScroll, !state); 3760 set_option (Opt_jumpScroll, !state);
3666 break; 3761 break;
3667 case 5: /* reverse video */ 3762 case 5: /* reverse video */
… …
3678 if (state) /* orthogonal */ 3773 if (state) /* orthogonal */
3679 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3774 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3680 break; 3775 break;
3681#ifdef scrollBar_esc 3776#ifdef scrollBar_esc
3682 case scrollBar_esc: 3777 case scrollBar_esc:
3683 if (scrollbar_mapping (state)) 3778 scrollBar.map (state);
3684 {
3685 resize_all_windows (0, 0, 0); 3779 resize_all_windows (0, 0, 0);
3686 scr_touch (true); 3780 scr_touch (true);
3687 }
3688 break; 3781 break;
3689#endif 3782#endif
3690 case 25: /* visible/invisible cursor */ 3783 case 25: /* visible/invisible cursor */
3691 scr_cursor_visible (state); 3784 scr_cursor_visible (state);
3692 break; 3785 break;
… …
3705 case 1003: 3798 case 1003:
3706 if (state) 3799 if (state)
3707 { 3800 {
3708 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3801 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3709 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3802 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3803 mouse_row = mouse_col = 0;
3710 vt_emask_mouse = PointerMotionMask; 3804 vt_emask_mouse = PointerMotionMask;
3711 } 3805 }
3712 else 3806 else
3713 vt_emask_mouse = NoEventMask; 3807 vt_emask_mouse = NoEventMask;
3808
3714 vt_select_input (); 3809 vt_select_input ();
3715 break; 3810 break;
3716 case 1010: /* scroll to bottom on TTY output inhibit */ 3811 case 1010: /* scroll to bottom on TTY output inhibit */
3717 set_option (Opt_scrollTtyOutput, !state); 3812 set_option (Opt_scrollTtyOutput, !state);
3718 break; 3813 break;
3719 case 1011: /* scroll to bottom on key press */ 3814 case 1011: /* scroll to bottom on key press */
3720 set_option (Opt_scrollTtyKeypress, state); 3815 set_option (Opt_scrollTtyKeypress, state);
3721 break; 3816 break;
3722 case 1047: /* secondary screen w/ clearing last */ 3817 case 1047: /* secondary screen w/ clearing last */
3723 if (option (Opt_secondaryScreen)) 3818 if (option (Opt_secondaryScreen))
3724 if (current_screen != PRIMARY) 3819 if (!state)
3725 scr_erase_screen (2); 3820 scr_erase_screen (2);
3821
3726 scr_change_screen (state); 3822 scr_change_screen (state);
3727 break; 3823 break;
3728 case 1049: /* secondary screen w/ clearing first */ 3824 case 1049: /* secondary screen w/ clearing first */
3825 if (option (Opt_secondaryScreen))
3826 if (state)
3827 scr_cursor (SAVE);
3828
3729 scr_change_screen (state); 3829 scr_change_screen (state);
3830
3730 if (option (Opt_secondaryScreen)) 3831 if (option (Opt_secondaryScreen))
3731 if (current_screen != PRIMARY) 3832 if (state)
3732 scr_erase_screen (2); 3833 scr_erase_screen (2);
3834 else
3835 scr_cursor (RESTORE);
3733 break; 3836 break;
3734 default: 3837 default:
3735 break; 3838 break;
3736 } 3839 }
3737 } 3840 }
3738} 3841}
3739/*}}} */ 3842/*}}} */
3740 3843
3741/*{{{ process sgr sequences */ 3844/*{{{ process sgr sequences */
3742void 3845void ecb_hot
3743rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3846rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3744{ 3847{
3745 unsigned int i; 3848 unsigned int i;
3746 short rendset; 3849 short rendset;
3747 int rendstyle; 3850 int rendstyle;
… …
3890 } 3993 }
3891 } 3994 }
3892} 3995}
3893/*}}} */ 3996/*}}} */
3894 3997
3895/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3896void
3897rxvt_term::process_graphics ()
3898{
3899 unicode_t ch, cmd = cmd_getc ();
3900
3901 if (cmd == 'Q')
3902 {
3903 /* query graphics */
3904 tt_printf ("\033G0\012"); /* no graphics */
3905 return;
3906 }
3907 /* swallow other graphics sequences until terminating ':' */
3908 do
3909 ch = cmd_getc ();
3910 while (ch != ':');
3911}
3912/*}}} */
3913
3914/* ------------------------------------------------------------------------- */ 3998/* ------------------------------------------------------------------------- */
3915 3999
3916/* 4000/*
3917 * Send printf () formatted output to the command. 4001 * Send printf () formatted output to the command.
3918 * Only use for small amounts of data. 4002 * Only use for small amounts of data.
… …
3931 4015
3932/* ---------------------------------------------------------------------- */ 4016/* ---------------------------------------------------------------------- */
3933/* Write data to the pty as typed by the user, pasted with the mouse, 4017/* Write data to the pty as typed by the user, pasted with the mouse,
3934 * or generated by us in response to a query ESC sequence. 4018 * or generated by us in response to a query ESC sequence.
3935 */ 4019 */
3936const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4020static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3937 4021
3938void 4022void
3939rxvt_term::tt_write (const char *data, unsigned int len) 4023rxvt_term::tt_write (const char *data, unsigned int len)
3940{ 4024{
3941 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4025 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3946 4030
3947 if (v_buflen == 0) 4031 if (v_buflen == 0)
3948 { 4032 {
3949 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4033 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3950 4034
4035 max_it (written, 0);
4036
3951 if ((unsigned int)written == len) 4037 if (written == len)
3952 return; 4038 return;
3953 4039
3954 data += written; 4040 data += written;
3955 len -= written; 4041 len -= written;
3956 } 4042 }
3957 4043
3958 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4044 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3959 4045
3960 memcpy (v_buffer + v_buflen, data, len); 4046 memcpy (v_buffer + v_buflen, data, len);
3961 v_buflen += len; 4047 v_buflen += len;
3962 4048
3963 pty_ev.set (ev::READ | ev::WRITE); 4049 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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