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.408 by ayin, Sat Feb 16 13:36:10 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
339void 342static inline int ecb_cold
343map_function_key (KeySym keysym)
344{
345 int param = 0;
346
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
348 {
349 param = 11 + keysym - XK_F1;
350 if (keysym >= XK_F17)
351 param += 4;
352 else if (keysym >= XK_F15)
353 param += 3;
354 else if (keysym >= XK_F11)
355 param += 2;
356 else if (keysym >= XK_F6)
357 param += 1;
358 }
359 else
360 switch (keysym)
361 {
362 case XK_Find:
363 param = 1;
364 break;
365 case XK_Insert:
366 param = 2;
367 break;
368#ifdef DXK_Remove
369 case DXK_Remove:
370#endif
371 case XK_Execute:
372 param = 3;
373 break;
374 case XK_Select:
375 param = 4;
376 break;
377#ifndef UNSHIFTED_SCROLLKEYS
378 case XK_Prior:
379 param = 5;
380 break;
381 case XK_Next:
382 param = 6;
383 break;
384 case XK_Home:
385 param = 7;
386 break;
387 case XK_End:
388 param = 8;
389 break;
390#endif
391 case XK_Help:
392 param = 28;
393 break;
394 case XK_Menu:
395 param = 29;
396 break;
397 }
398 return param;
399}
400
401void ecb_cold
340rxvt_term::key_press (XKeyEvent &ev) 402rxvt_term::key_press (XKeyEvent &ev)
341{ 403{
342 int ctrl, meta, shft, len; 404 int ctrl, meta, shft, len;
343 KeySym keysym; 405 KeySym keysym;
344 int valid_keysym; 406 int valid_keysym;
… …
357 */ 419 */
358 shft = ev.state & ShiftMask; 420 shft = ev.state & ShiftMask;
359 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
360 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
361 423
362 if (numlock_state || (ev.state & ModNumLockMask))
363 {
364 numlock_state = (ev.state & ModNumLockMask);
365 PrivMode ((!numlock_state), PrivMode_aplKP);
366 }
367
368 kbuf[0] = 0; 424 kbuf[0] = 0;
369 425
370#ifdef USE_XIM 426#if USE_XIM
371 if (Input_Context) 427 if (Input_Context)
372 { 428 {
373 Status status_return; 429 Status status_return;
374 430
375#if 0 431#if 0
… …
446#ifdef PAGING_CONTEXT_LINES 502#ifdef PAGING_CONTEXT_LINES
447 lnsppg = nrow - PAGING_CONTEXT_LINES; 503 lnsppg = nrow - PAGING_CONTEXT_LINES;
448#else 504#else
449 lnsppg = nrow * 4 / 5; 505 lnsppg = nrow * 4 / 5;
450#endif 506#endif
507 max_it (lnsppg, 1);
508
451 if (keysym == XK_Prior) 509 if (keysym == XK_Prior)
452 { 510 {
453 scr_page (UP, lnsppg); 511 scr_page (UP, lnsppg);
454 return; 512 return;
455 } 513 }
… …
508 selection_request (ev.time); 566 selection_request (ev.time);
509 return; 567 return;
510#if TODO 568#if TODO
511 /* rxvt extras */ 569 /* rxvt extras */
512 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
513 change_font (FONT_UP);
514 return; 571 return;
515 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
516 change_font (FONT_DN);
517 return; 573 return;
518#endif 574#endif
519 } 575 }
520 } 576 }
521 } 577 }
522 578
523#if ENABLE_FRILLS || ISO_14755 579#if ENABLE_FRILLS || ISO_14755
524 // ISO 14755 support 580 // ISO 14755 support
525 if (shft && ctrl) 581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
526 { 582 {
527 int hv; 583 int hv;
528 584
529 if (iso14755buf & ISO_14755_51 585 if (iso14755buf & ISO_14755_51
530 && (keysym == XK_space || keysym == XK_KP_Space 586 && (keysym == XK_space || keysym == XK_KP_Space
… …
560 scr_overlay_off (); 616 scr_overlay_off ();
561# endif 617# endif
562 iso14755buf = 0; 618 iso14755buf = 0;
563 } 619 }
564 } 620 }
621 else if (option (Opt_iso14755) &&
565 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 622 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
566 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 623 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
567 if (!(iso14755buf & ISO_14755_STARTED)) 624 if (!(iso14755buf & ISO_14755_STARTED))
568 { 625 {
569 iso14755buf |= ISO_14755_STARTED; 626 iso14755buf |= ISO_14755_STARTED;
570# if ISO_14755 627# if ISO_14755
571 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 628 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
582 } 639 }
583#endif 640#endif
584 641
585 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
586 { 643 {
587 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
588 unsigned int newlen = 1; 645 unsigned int newlen = 1;
589 646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
590 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:
591 { 768 {
592#ifndef NO_BACKSPACE_KEY 769 int param = map_function_key (keysym);
593 case XK_BackSpace: 770 if (param > 0)
594 if (priv_modes & PrivMode_HaveBackSpace) 771 sprintf (kbuf,"\033[%d~", param);
595 {
596 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
597 ^ !!ctrl) ? '\b' : '\177';
598 kbuf[1] = '\0';
599 }
600 else 772 else
601 strcpy (kbuf, rs[Rs_backspace_key]);
602 break;
603#endif
604#ifndef NO_DELETE_KEY
605 case XK_Delete:
606 strcpy (kbuf, rs[Rs_delete_key]);
607 break;
608#endif
609 case XK_Tab:
610 if (shft)
611 strcpy (kbuf, "\033[Z");
612 else
613 {
614#ifdef CTRL_TAB_MAKES_META
615 if (ctrl)
616 meta = 1;
617#endif
618#ifdef MOD4_TAB_MAKES_META
619 if (ev.state & Mod4Mask)
620 meta = 1;
621#endif
622 newlen = 0;
623 }
624 break;
625
626 case XK_Up: /* "\033[A" */
627 case XK_Down: /* "\033[B" */
628 case XK_Right: /* "\033[C" */
629 case XK_Left: /* "\033[D" */
630 strcpy (kbuf, "\033[Z");
631 kbuf[2] = "DACB"[keysym - XK_Left];
632 /* do Shift first */
633 if (shft)
634 kbuf[2] = "dacb"[keysym - XK_Left];
635 else if (ctrl)
636 {
637 kbuf[1] = 'O';
638 kbuf[2] = "dacb"[keysym - XK_Left];
639 }
640 else if (priv_modes & PrivMode_aplCUR)
641 kbuf[1] = 'O';
642 break;
643
644#ifndef UNSHIFTED_SCROLLKEYS
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648 case XK_Next:
649 strcpy (kbuf, "\033[6~");
650 break;
651#endif
652 case XK_KP_Enter:
653 /* allow shift to override */
654 if (kp)
655 {
656 strcpy (kbuf, "\033OM");
657 break;
658 }
659
660 /* FALLTHROUGH */
661
662 case XK_Return:
663 if (priv_modes & PrivMode_LFNL)
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\012';
667 kbuf[2] = '\0';
668 }
669 else
670 {
671 kbuf[0] = '\015';
672 kbuf[1] = '\0';
673 }
674 break;
675
676 case XK_KP_F1: /* "\033OP" */
677 case XK_KP_F2: /* "\033OQ" */
678 case XK_KP_F3: /* "\033OR" */
679 case XK_KP_F4: /* "\033OS" */
680 strcpy (kbuf, "\033OP");
681 kbuf[2] += (keysym - XK_KP_F1);
682 break;
683
684 case XK_KP_Multiply: /* "\033Oj" : "*" */
685 case XK_KP_Add: /* "\033Ok" : "+" */
686 case XK_KP_Separator: /* "\033Ol" : "," */
687 case XK_KP_Subtract: /* "\033Om" : "-" */
688 case XK_KP_Decimal: /* "\033On" : "." */
689 case XK_KP_Divide: /* "\033Oo" : "/" */
690 case XK_KP_0: /* "\033Op" : "0" */
691 case XK_KP_1: /* "\033Oq" : "1" */
692 case XK_KP_2: /* "\033Or" : "2" */
693 case XK_KP_3: /* "\033Os" : "3" */
694 case XK_KP_4: /* "\033Ot" : "4" */
695 case XK_KP_5: /* "\033Ou" : "5" */
696 case XK_KP_6: /* "\033Ov" : "6" */
697 case XK_KP_7: /* "\033Ow" : "7" */
698 case XK_KP_8: /* "\033Ox" : "8" */
699 case XK_KP_9: /* "\033Oy" : "9" */
700 /* allow shift to override */
701 if (kp)
702 {
703 strcpy (kbuf, "\033Oj");
704 kbuf[2] += (keysym - XK_KP_Multiply);
705 }
706 else
707 {
708 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
709 kbuf[1] = '\0';
710 }
711 break;
712
713 case XK_Find:
714 strcpy (kbuf, "\033[1~");
715 break;
716
717 case XK_Insert:
718 strcpy (kbuf, "\033[2~");
719 break;
720#ifdef DXK_Remove /* support for DEC remove like key */
721 case DXK_Remove:
722 /* FALLTHROUGH */
723#endif
724 case XK_Execute:
725 strcpy (kbuf, "\033[3~");
726 break;
727 case XK_Select:
728 strcpy (kbuf, "\033[4~");
729 break;
730 case XK_End:
731 strcpy (kbuf, KS_END);
732 break;
733 case XK_Home:
734 strcpy (kbuf, KS_HOME);
735 break;
736
737#define FKEY(n, fkey) \
738 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
739
740 case XK_F1: /* "\033[11~" */
741 case XK_F2: /* "\033[12~" */
742 case XK_F3: /* "\033[13~" */
743 case XK_F4: /* "\033[14~" */
744 case XK_F5: /* "\033[15~" */
745 FKEY (11, XK_F1);
746 break;
747 case XK_F6: /* "\033[17~" */
748 case XK_F7: /* "\033[18~" */
749 case XK_F8: /* "\033[19~" */
750 case XK_F9: /* "\033[20~" */
751 case XK_F10: /* "\033[21~" */
752 FKEY (17, XK_F6);
753 break;
754 case XK_F11: /* "\033[23~" */
755 case XK_F12: /* "\033[24~" */
756 case XK_F13: /* "\033[25~" */
757 case XK_F14: /* "\033[26~" */
758 FKEY (23, XK_F11);
759 break;
760 case XK_F15: /* "\033[28~" */
761 case XK_F16: /* "\033[29~" */
762 FKEY (28, XK_F15);
763 break;
764 case XK_Help: /* "\033[28~" */
765 FKEY (28, XK_Help);
766 break;
767 case XK_Menu: /* "\033[29~" */
768 FKEY (29, XK_Menu);
769 break;
770 case XK_F17: /* "\033[31~" */
771 case XK_F18: /* "\033[32~" */
772 case XK_F19: /* "\033[33~" */
773 case XK_F20: /* "\033[34~" */
774 case XK_F21: /* "\033[35~" */
775 case XK_F22: /* "\033[36~" */
776 case XK_F23: /* "\033[37~" */
777 case XK_F24: /* "\033[38~" */
778 case XK_F25: /* "\033[39~" */
779 case XK_F26: /* "\033[40~" */
780 case XK_F27: /* "\033[41~" */
781 case XK_F28: /* "\033[42~" */
782 case XK_F29: /* "\033[43~" */
783 case XK_F30: /* "\033[44~" */
784 case XK_F31: /* "\033[45~" */
785 case XK_F32: /* "\033[46~" */
786 case XK_F33: /* "\033[47~" */
787 case XK_F34: /* "\033[48~" */
788 case XK_F35: /* "\033[49~" */
789 FKEY (31, XK_F17);
790 break;
791#undef FKEY
792 default:
793 newlen = 0; 773 newlen = 0;
794 break;
795 } 774 }
775 break;
776 }
796 777
797 if (newlen) 778 if (newlen)
798 len = strlen (kbuf); 779 len = strlen (kbuf);
799 780
781 if (len > 0)
782 {
800 /* 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 /*
801 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
802 */ 797 */
803#ifdef META8_OPTION 798#ifdef META8_OPTION
804 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
805 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
806#endif 801#endif
802 }
807 803
808 } 804 }
809 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
810 { 806 {
811 len = 1; 807 len = 1;
… …
845 { 841 {
846 view_start = 0; 842 view_start = 0;
847 want_refresh = 1; 843 want_refresh = 1;
848 } 844 }
849 845
850 /*
851 * these modifications only affect the static keybuffer
852 * pass Shift/Control indicators for function keys ending with `~'
853 *
854 * eg,
855 * Prior = "ESC[5~"
856 * Shift+Prior = "ESC[5$"
857 * Ctrl+Prior = "ESC[5^"
858 * Ctrl+Shift+Prior = "ESC[5@"
859 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
860 */
861 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
862 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
863
864 /* escape prefix */ 846 /* escape prefix */
865 if (meta 847 if (meta
866#ifdef META8_OPTION 848#ifdef META8_OPTION
867 && meta_char == C0_ESC 849 && meta_char == C0_ESC
868#endif 850#endif
… …
873 } 855 }
874 856
875 tt_write (kbuf, (unsigned int)len); 857 tt_write (kbuf, (unsigned int)len);
876} 858}
877 859
878void 860void ecb_cold
879rxvt_term::key_release (XKeyEvent &ev) 861rxvt_term::key_release (XKeyEvent &ev)
880{ 862{
881#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 863#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
882 KeySym keysym; 864 KeySym keysym;
883 865
… …
903 commit_iso14755 (); 885 commit_iso14755 ();
904 886
905 return; 887 return;
906 } 888 }
907 889
908 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 890 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
909 if (i[0] == keysym) 891 if (i[0] == keysym)
910 { 892 {
911 iso14755buf = ISO_14755_51 | i[1]; 893 iso14755buf = ISO_14755_51 | i[1];
912 commit_iso14755 (); 894 commit_iso14755 ();
913 895
… …
950 else if (keysym == XK_Control_L || keysym == XK_Control_R) 932 else if (keysym == XK_Control_L || keysym == XK_Control_R)
951 mouse_slip_wheel_speed = 0; 933 mouse_slip_wheel_speed = 0;
952#endif 934#endif
953} 935}
954 936
955#if defined (KEYSYM_RESOURCE)
956unsigned int
957rxvt_term::cmd_write (const char *str, unsigned int count)
958{
959 unsigned int n, s;
960
961 n = cmdbuf_ptr - cmdbuf_base;
962 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
963
964 if (n > 0 && s < count)
965 {
966 memmove (cmdbuf_base, cmdbuf_ptr,
967 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
968 cmdbuf_ptr = cmdbuf_base;
969 cmdbuf_endp -= n;
970 s += n;
971 }
972
973 if (count > s)
974 {
975 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
976 count = s;
977 }
978
979 for (; count--;)
980 *cmdbuf_endp++ = *str++;
981
982 cmd_parse ();
983
984 return 0;
985}
986#endif
987
988void 937void
989rxvt_term::flush () 938rxvt_term::flush ()
990{ 939{
991 flush_ev.stop (); 940 flush_ev.stop ();
992 941
993#ifdef HAVE_BG_PIXMAP 942#ifdef HAVE_BG_PIXMAP
994 if (bgPixmap.check_clearChanged ()) 943 if (bg_flags & BG_NEEDS_REFRESH)
995 { 944 {
996// scr_clear (true); This needs to be researched further! 945 bg_flags &= ~BG_NEEDS_REFRESH;
997 scr_touch (false); 946 scr_touch (false);
998 } 947 }
999#endif 948#endif
1000 949
1001 if (want_refresh) 950 if (want_refresh)
… …
1037 } 986 }
1038 while (row < end_row); 987 while (row < end_row);
1039 } 988 }
1040 989
1041 scr_refresh (); 990 scr_refresh ();
1042 scrollbar_show (1); 991 scrollBar.show (1);
1043#ifdef USE_XIM 992#if USE_XIM
1044 IMSendSpot (); 993 im_send_spot ();
1045#endif 994#endif
1046 } 995 }
1047 996
1048 display->flush (); 997 display->flush ();
1049} 998}
1050 999
1051/* checks wether a refresh is requested and starts the refresh timer */ 1000/* checks whether a refresh is requested and starts the refresh timer */
1052void 1001void
1053rxvt_term::refresh_check () 1002rxvt_term::refresh_check ()
1054{ 1003{
1055 if (want_refresh && !flush_ev.is_active ()) 1004 if (want_refresh && !flush_ev.is_active ())
1056 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1005 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1066 refresh_count = 0; 1015 refresh_count = 0;
1067 flush (); 1016 flush ();
1068} 1017}
1069 1018
1070#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
1071void 1035void
1072rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1073{ 1037{
1074 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1075 want_refresh = 1; 1039 want_refresh = 1;
… …
1094 1058
1095#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1096void 1060void
1097rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1098{ 1062{
1099 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1100 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1101 { 1065 {
1102 want_refresh = 1; 1066 want_refresh = 1;
1103 refresh_check (); 1067 refresh_check ();
1104 } 1068 }
1105 else 1069 else
… …
1149 { 1113 {
1150 // this should really be sched_yield(), but the linux guys thought 1114 // this should really be sched_yield(), but the linux guys thought
1151 // that giving a process calling sched_yield () less cpu time than 1115 // that giving a process calling sched_yield () less cpu time than
1152 // 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
1153 // 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.
1154 1121
1155 struct timespec ts = { 0, 0 }; 1122 struct timespec ts = { 0, 1000 };
1156 nanosleep (&ts, 0); 1123 nanosleep (&ts, 0);
1157 1124
1158 w.stop (); 1125 w.stop ();
1159 } 1126 }
1160 1127
… …
1163 { 1130 {
1164 } 1131 }
1165} event_handler; 1132} event_handler;
1166#endif 1133#endif
1167 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
1168bool 1168bool
1169rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1170{ 1170{
1171 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 cmdbuf_reify ();
1172 1172
1173 if (CBUFSIZ == n) 1173 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1174 { 1174
1175 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1175 if (!avail)
1176 n = 0;
1177 } 1176 {
1178 1177 // normally this indicates a "too long" command sequence - just drop the data we have
1179 memmove (cmdbuf_base, cmdbuf_ptr, n);
1180 cmdbuf_ptr = cmdbuf_base; 1178 cmdbuf_ptr = cmdbuf_base;
1181 cmdbuf_endp = cmdbuf_ptr + n; 1179 cmdbuf_endp = cmdbuf_ptr;
1180 avail = CBUFSIZ;
1181 }
1182 1182
1183 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1184 1184
1185 if (r > 0) 1185 if (r > 0)
1186 { 1186 {
1187 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1188 return true; 1188 return true;
… …
1210{ 1210{
1211 make_current (); 1211 make_current ();
1212 1212
1213 if (revents & ev::READ) 1213 if (revents & ev::READ)
1214 // loop, but don't allow a single term to monopolize us 1214 // loop, but don't allow a single term to monopolize us
1215 while (pty_fill ()) 1215 for (int i = CBUFCNT; i-- && pty_fill (); )
1216 if (cmd_parse ()) 1216 cmd_parse ();
1217 break;
1218 1217
1219 if (revents & ev::WRITE) 1218 if (revents & ev::WRITE)
1220 pty_write (); 1219 pty_write ();
1221 1220
1222 refresh_check (); 1221 refresh_check ();
1223} 1222}
1224 1223
1225void 1224void ecb_cold
1226rxvt_term::pointer_unblank () 1225rxvt_term::pointer_unblank ()
1227{ 1226{
1228 XDefineCursor (dpy, vt, TermWin_cursor); 1227 XDefineCursor (dpy, vt, TermWin_cursor);
1229 recolour_cursor (); 1228 recolour_cursor ();
1230 1229
… …
1235 pointer_ev.start (pointerBlankDelay); 1234 pointer_ev.start (pointerBlankDelay);
1236#endif 1235#endif
1237} 1236}
1238 1237
1239#ifdef POINTER_BLANK 1238#ifdef POINTER_BLANK
1240void 1239void ecb_cold
1241rxvt_term::pointer_blank () 1240rxvt_term::pointer_blank ()
1242{ 1241{
1243 if (!option (Opt_pointerBlank)) 1242 if (!option (Opt_pointerBlank))
1244 return; 1243 return;
1245 1244
… …
1247 XFlush (dpy); 1246 XFlush (dpy);
1248 1247
1249 hidden_pointer = 1; 1248 hidden_pointer = 1;
1250} 1249}
1251 1250
1252void 1251void ecb_cold
1253rxvt_term::pointer_cb (ev::timer &w, int revents) 1252rxvt_term::pointer_cb (ev::timer &w, int revents)
1254{ 1253{
1255 make_current (); 1254 make_current ();
1256 1255
1257 pointer_blank (); 1256 pointer_blank ();
… …
1263{ 1262{
1264 int button_number, key_state = 0; 1263 int button_number, key_state = 0;
1265 int x, y; 1264 int x, y;
1266 int code = 32; 1265 int code = 32;
1267 1266
1268 x = Pixel2Col (ev.x); 1267 x = Pixel2Col (ev.x) + 1;
1269 y = Pixel2Row (ev.y); 1268 y = Pixel2Row (ev.y) + 1;
1269
1270 if (ev.type == MotionNotify) 1270 if (ev.type == MotionNotify)
1271 { 1271 {
1272 if (x == mouse_row && y == mouse_col) 1272 if (x == mouse_row && y == mouse_col)
1273 return; 1273 return;
1274
1274 mouse_row = x; 1275 mouse_row = x;
1275 mouse_col = y; 1276 mouse_col = y;
1276 code += 32; 1277 code += 32;
1277 } 1278 }
1278 1279
… …
1281 else 1282 else
1282 { 1283 {
1283 button_number = MEvent.button - Button1; 1284 button_number = MEvent.button - Button1;
1284 /* add 0x3D for wheel events, like xterm does */ 1285 /* add 0x3D for wheel events, like xterm does */
1285 if (button_number >= 3) 1286 if (button_number >= 3)
1286 button_number += (64 - 3); 1287 button_number += 64 - 3;
1287 } 1288 }
1288 1289
1289 if (priv_modes & PrivMode_MouseX10) 1290 if (priv_modes & PrivMode_MouseX10)
1290 { 1291 {
1291 /* 1292 /*
… …
1323 fputc ('A', stderr); 1324 fputc ('A', stderr);
1324 if (key_state & 32) 1325 if (key_state & 32)
1325 fputc ('2', stderr); 1326 fputc ('2', stderr);
1326 fprintf (stderr, "]: <%d>, %d/%d\n", 1327 fprintf (stderr, "]: <%d>, %d/%d\n",
1327 button_number, 1328 button_number,
1328 x + 1, 1329 x,
1329 y + 1); 1330 y);
1330#endif 1331#endif
1331 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
1332 tt_printf ("\033[M%c%c%c", 1346 tt_printf ("\033[M%c%c%c",
1333 (code + button_number + key_state), 1347 code + button_number + key_state,
1334 (32 + x + 1), 1348 32 + x,
1335 (32 + y + 1)); 1349 32 + y);
1336} 1350}
1337 1351
1338/*{{{ process an X event */ 1352/*{{{ process an X event */
1339void 1353void ecb_hot
1340rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
1341{ 1355{
1342 make_current (); 1356 make_current ();
1343 1357
1344 dLocal (Display *, dpy); 1358 dLocal (Display *, dpy);
… …
1442 && ev.xfocus.mode != NotifyGrab) 1456 && ev.xfocus.mode != NotifyGrab)
1443 focus_out (); 1457 focus_out ();
1444 break; 1458 break;
1445 1459
1446 case ConfigureNotify: 1460 case ConfigureNotify:
1447 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1448 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1449 szHint.width, szHint.height);*/
1450 if (ev.xconfigure.window == parent[0]) 1461 if (ev.xconfigure.window == parent)
1451 { 1462 {
1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453 ; 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 }
1454 1498
1455 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1499 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1456 { 1500 {
1457 seen_resize = 1; 1501 seen_resize = 1;
1458 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1502 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1459 } 1503 }
1460 else 1504 else
1461 { 1505 {
1462#ifdef HAVE_BG_PIXMAP 1506#ifdef HAVE_BG_PIXMAP
1463 if (bgPixmap.window_position_sensitive ())
1464 {
1465 if (mapped) 1507 if (moved)
1466 update_background (); 1508 update_background ();
1467 else
1468 bgPixmap.invalidate ();
1469 }
1470#endif 1509#endif
1471 } 1510 }
1472 1511
1473 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1474 } 1513 }
1475 break; 1514 break;
1476 1515
1477 case PropertyNotify: 1516 case PropertyNotify:
1478 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1517 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1479 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1480 && ev.xproperty.state == PropertyNewValue)
1481 selection_property (ev.xproperty.window, ev.xproperty.atom);
1482
1483 break; 1518 break;
1484 1519
1485 case SelectionClear: 1520 case SelectionClear:
1486 selection_clear (); 1521 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1487 break;
1488
1489 case SelectionNotify:
1490 if (selection_wait == Sel_normal)
1491 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1492 break; 1522 break;
1493 1523
1494 case SelectionRequest: 1524 case SelectionRequest:
1495 selection_send (ev.xselectionrequest); 1525 selection_send (ev.xselectionrequest);
1496 break; 1526 break;
1497 1527
1498 case MapNotify: 1528 case MapNotify:
1499#ifdef HAVE_BG_PIXMAP 1529#ifdef HAVE_BG_PIXMAP
1500 /* 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
1501 * non-reparenting window manager. In those cases we never get first 1531 * non-reparenting window manager. In those cases we never get first
1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1532 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1503 * care of multiplicity of ConfigureNotify events arriwing while WM does 1533 * care of multiplicity of ConfigureNotify events arriving while WM does
1504 * reparenting. 1534 * reparenting.
1505 * We should not render background immidiately, as there could be several 1535 * We should not render background immediately, as there could be several
1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1536 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1507 * by scheduling background redraw as soon as we can, but giving a short 1537 * by scheduling background redraw as soon as we can, but giving a short
1508 * bit of time for ConfigureNotifies to arrive. 1538 * bit of time for ConfigureNotifies to arrive.
1509 * 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
1510 * of ConfigureNotifys for the best results. 1540 * of ConfigureNotifys for the best results.
1511 */ 1541 */
1512 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1542 if (!(bg_flags & BG_IS_VALID))
1513 update_background_ev.start (0.025); 1543 update_background_ev.start (0.025);
1514#endif 1544#endif
1515 mapped = 1; 1545 mapped = 1;
1516#ifdef TEXT_BLINK 1546#ifdef TEXT_BLINK
1517 text_blink_ev.start (); 1547 text_blink_ev.start ();
… …
1532 if (ev.xany.window == vt) 1562 if (ev.xany.window == vt)
1533 { 1563 {
1534 do 1564 do
1535 { 1565 {
1536 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1537 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, false);
1538 } 1568 }
1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1569 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1540 1570
1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1571 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542 1572
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1544 { 1574 {
1545 scr_expose (ev.xexpose.x, ev.xexpose.y, 1575 scr_expose (ev.xexpose.x, ev.xexpose.y,
1546 ev.xexpose.width, ev.xexpose.height, False); 1576 ev.xexpose.width, ev.xexpose.height, false);
1547 } 1577 }
1548 1578
1549 want_refresh = 1; 1579 want_refresh = 1;
1550 } 1580 }
1551 else 1581 else
… …
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1587 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1588 ;
1559 1589
1560 if (scrollBar.state && ev.xany.window == scrollBar.win) 1590 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1591 {
1562 scrollBar.state = STATE_IDLE; 1592 scrollBar.state = SB_STATE_IDLE;
1563 scrollbar_show (0); 1593 scrollBar.show (0);
1564 } 1594 }
1565 } 1595 }
1566 break; 1596 break;
1567 1597
1568 case MotionNotify: 1598 case MotionNotify:
… …
1633 dist = int_bwidth - ev.xbutton.y; 1663 dist = int_bwidth - ev.xbutton.y;
1634 } 1664 }
1635 else 1665 else
1636 { 1666 {
1637 scroll_selection_dir = DN; 1667 scroll_selection_dir = DN;
1638 dist = ev.xbutton.y - (int_bwidth + height); 1668 dist = ev.xbutton.y - (int_bwidth + vt_height);
1639 } 1669 }
1640 1670
1641 scroll_selection_lines = Pixel2Height (dist) 1671 scroll_selection_lines = Pixel2Height (dist)
1642 / SELECTION_SCROLL_LINE_SPEEDUP 1672 / SELECTION_SCROLL_LINE_SPEEDUP
1643 + 1; 1673 + 1;
… …
1655#ifdef MOUSE_THRESHOLD 1685#ifdef MOUSE_THRESHOLD
1656 } 1686 }
1657#endif 1687#endif
1658 } 1688 }
1659 } 1689 }
1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1661 { 1691 {
1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1663 MotionNotify, &ev)) 1693 MotionNotify, &ev))
1664 ; 1694 ;
1665 1695
1666 XQueryPointer (dpy, scrollBar.win, 1696 XQueryPointer (dpy, scrollBar.win,
1667 &unused_root, &unused_child, 1697 &unused_root, &unused_child,
1668 &unused_root_x, &unused_root_y, 1698 &unused_root_x, &unused_root_y,
1669 &ev.xbutton.x, &ev.xbutton.y, 1699 &ev.xbutton.x, &ev.xbutton.y,
1670 &unused_mask); 1700 &unused_mask);
1671 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1701 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1672 scrollbar_size ()); 1702 scrollBar.size ());
1673 want_refresh = 1; 1703 want_refresh = 1;
1674 scrollbar_show (1); 1704 scrollBar.show (1);
1675 } 1705 }
1676 break; 1706 break;
1677 } 1707 }
1678 1708
1679#if defined(CURSOR_BLINK) 1709#if defined(CURSOR_BLINK)
1680 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1710 if (ev.type == KeyPress)
1681 {
1682 if (hidden_cursor)
1683 {
1684 hidden_cursor = 0;
1685 want_refresh = 1;
1686 }
1687
1688 cursor_blink_ev.again (); 1711 cursor_blink_reset ();
1689 }
1690#endif 1712#endif
1691 1713
1692#if defined(POINTER_BLANK) 1714#if defined(POINTER_BLANK)
1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1715 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 { 1716 {
… …
1704#endif 1726#endif
1705 1727
1706 refresh_check (); 1728 refresh_check ();
1707} 1729}
1708 1730
1709void 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
1710rxvt_term::focus_in () 1749rxvt_term::focus_in ()
1711{ 1750{
1712 if (!focus) 1751 if (!focus)
1713 { 1752 {
1714 focus = 1; 1753 focus = 1;
1715 want_refresh = 1; 1754 want_refresh = 1;
1716 1755
1717 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1718
1719#if USE_XIM 1756#if USE_XIM
1720 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1721 { 1758 {
1722 IMSetPosition (); 1759 im_set_position ();
1723 XSetICFocus (Input_Context); 1760 XSetICFocus (Input_Context);
1724 } 1761 }
1725#endif 1762#endif
1726#if CURSOR_BLINK 1763#if CURSOR_BLINK
1727 if (option (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
… …
1734 scr_recolour (); 1771 scr_recolour ();
1735 } 1772 }
1736#endif 1773#endif
1737#if ENABLE_FRILLS 1774#if ENABLE_FRILLS
1738 if (option (Opt_urgentOnBell)) 1775 if (option (Opt_urgentOnBell))
1739 { 1776 set_urgency (0);
1740 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1741 {
1742 h->flags &= ~XUrgencyHint;
1743 XSetWMHints (dpy, parent[0], h);
1744 }
1745 }
1746#endif 1777#endif
1747 }
1748}
1749 1778
1750void 1779 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1780 }
1781}
1782
1783void ecb_cold
1751rxvt_term::focus_out () 1784rxvt_term::focus_out ()
1752{ 1785{
1753 if (focus) 1786 if (focus)
1754 { 1787 {
1755 focus = 0; 1788 focus = 0;
1756 want_refresh = 1; 1789 want_refresh = 1;
1757 1790
1758 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1791#if ENABLE_FRILLS
1759 1792 if (option (Opt_urgentOnBell))
1793 set_urgency (0);
1794#endif
1760#if ENABLE_FRILLS || ISO_14755 1795#if ENABLE_FRILLS || ISO_14755
1761 if (iso14755buf) 1796 if (iso14755buf)
1762 { 1797 {
1763 iso14755buf = 0; 1798 iso14755buf = 0;
1764# if ISO_14755 1799# if ISO_14755
… …
1781 { 1816 {
1782 pix_colors = pix_colors_unfocused; 1817 pix_colors = pix_colors_unfocused;
1783 scr_recolour (); 1818 scr_recolour ();
1784 } 1819 }
1785#endif 1820#endif
1786 }
1787}
1788 1821
1789void 1822 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1823 }
1824}
1825
1826void ecb_cold
1790rxvt_term::update_fade_color (unsigned int idx) 1827rxvt_term::update_fade_color (unsigned int idx)
1791{ 1828{
1792#if OFF_FOCUS_FADING 1829#if OFF_FOCUS_FADING
1793 if (rs[Rs_fade]) 1830 if (rs[Rs_fade])
1794 { 1831 {
… …
1798 } 1835 }
1799#endif 1836#endif
1800} 1837}
1801 1838
1802#if ENABLE_TRANSPARENCY || ENABLE_PERL 1839#if ENABLE_TRANSPARENCY || ENABLE_PERL
1803void 1840void ecb_hot
1804rxvt_term::rootwin_cb (XEvent &ev) 1841rxvt_term::rootwin_cb (XEvent &ev)
1805{ 1842{
1806 make_current (); 1843 make_current ();
1807 1844
1808 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1845 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
… …
1818 * 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.
1819 */ 1856 */
1820 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1857 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1821 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1858 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1822 { 1859 {
1823 bgPixmap.set_root_pixmap (); 1860 bg_set_root_pixmap ();
1824 update_background (); 1861 update_background ();
1825 } 1862 }
1826 1863
1827 break; 1864 break;
1828 } 1865 }
… …
1867 /* save the xbutton state (for ButtonRelease) */ 1904 /* save the xbutton state (for ButtonRelease) */
1868 MEvent.state = ev.state; 1905 MEvent.state = ev.state;
1869#ifdef MOUSE_REPORT_DOUBLECLICK 1906#ifdef MOUSE_REPORT_DOUBLECLICK
1870 if (ev.button == MEvent.button && clickintime) 1907 if (ev.button == MEvent.button && clickintime)
1871 { 1908 {
1872 /* same button, within alloted time */ 1909 /* same button, within allowed time */
1873 MEvent.clicks++; 1910 MEvent.clicks++;
1874 1911
1875 if (MEvent.clicks > 1) 1912 if (MEvent.clicks > 1)
1876 { 1913 {
1877 /* only report double clicks */ 1914 /* only report double clicks */
… …
1958 if (scrollBar.upButton (ev.y)) 1995 if (scrollBar.upButton (ev.y))
1959 direction = UP; /* up */ 1996 direction = UP; /* up */
1960 else if (scrollBar.dnButton (ev.y)) 1997 else if (scrollBar.dnButton (ev.y))
1961 direction = DN; /* down */ 1998 direction = DN; /* down */
1962 1999
1963 scrollBar.state = STATE_IDLE; 2000 scrollBar.state = SB_STATE_IDLE;
1964 /* 2001 /*
1965 * Rxvt-style scrollbar: 2002 * Rxvt-style scrollbar:
1966 * move up if mouse is above slider 2003 * move up if mouse is above slider
1967 * move dn if mouse is below slider 2004 * move dn if mouse is below slider
1968 * 2005 *
… …
2007 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2044 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2008#endif 2045#endif
2009 if (scr_page (direction, 1)) 2046 if (scr_page (direction, 1))
2010 { 2047 {
2011 if (direction == UP) 2048 if (direction == UP)
2012 scrollBar.state = STATE_UP; 2049 scrollBar.state = SB_STATE_UP;
2013 else 2050 else
2014 scrollBar.state = STATE_DOWN; 2051 scrollBar.state = SB_STATE_DOWN;
2015 } 2052 }
2016 } 2053 }
2017 else 2054 else
2018 switch (ev.button) 2055 switch (ev.button)
2019 { 2056 {
2020 case Button2: 2057 case Button2:
2021 switch (scrollBar.align) 2058 switch (scrollBar.align)
2022 { 2059 {
2023 case R_SB_ALIGN_TOP: 2060 case SB_ALIGN_TOP:
2024 csrO = 0; 2061 csrO = 0;
2025 break; 2062 break;
2026 case R_SB_ALIGN_CENTRE: 2063 case SB_ALIGN_CENTRE:
2027 csrO = (scrollBar.bot - scrollBar.top) / 2; 2064 csrO = (scrollBar.bot - scrollBar.top) / 2;
2028 break; 2065 break;
2029 case R_SB_ALIGN_BOTTOM: 2066 case SB_ALIGN_BOTTOM:
2030 csrO = scrollBar.bot - scrollBar.top; 2067 csrO = scrollBar.bot - scrollBar.top;
2031 break; 2068 break;
2032 } 2069 }
2033 2070
2034 if (scrollBar.style == R_SB_XTERM 2071 if (scrollBar.style == SB_STYLE_XTERM
2035 || scrollbar_above_slider (ev.y) 2072 || scrollBar.above_slider (ev.y)
2036 || scrollbar_below_slider (ev.y)) 2073 || scrollBar.below_slider (ev.y))
2037 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2074 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2038 2075
2039 scrollBar.state = STATE_MOTION; 2076 scrollBar.state = SB_STATE_MOTION;
2040 break; 2077 break;
2041 2078
2042 case Button1: 2079 case Button1:
2043 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2080 if (scrollBar.align == SB_ALIGN_CENTRE)
2044 csrO = ev.y - scrollBar.top; 2081 csrO = ev.y - scrollBar.top;
2045 /* FALLTHROUGH */ 2082 /* FALLTHROUGH */
2046 2083
2047 case Button3: 2084 case Button3:
2048 if (scrollBar.style != R_SB_XTERM) 2085 if (scrollBar.style != SB_STYLE_XTERM)
2049 { 2086 {
2050 if (scrollbar_above_slider (ev.y)) 2087 if (scrollBar.above_slider (ev.y))
2051# ifdef RXVT_SCROLL_FULL 2088# ifdef RXVT_SCROLL_FULL
2052 scr_page (UP, nrow - 1); 2089 scr_page (UP, nrow - 1);
2053# else 2090# else
2054 scr_page (UP, nrow / 4); 2091 scr_page (UP, nrow / 4);
2055# endif 2092# endif
2056 else if (scrollbar_below_slider (ev.y)) 2093 else if (scrollBar.below_slider (ev.y))
2057# ifdef RXVT_SCROLL_FULL 2094# ifdef RXVT_SCROLL_FULL
2058 scr_page (DN, nrow - 1); 2095 scr_page (DN, nrow - 1);
2059# else 2096# else
2060 scr_page (DN, nrow / 4); 2097 scr_page (DN, nrow / 4);
2061# endif 2098# endif
2062 else 2099 else
2063 scrollBar.state = STATE_MOTION; 2100 scrollBar.state = SB_STATE_MOTION;
2064 } 2101 }
2065 else 2102 else
2066 { 2103 {
2067 scr_page ((ev.button == Button1 ? DN : UP), 2104 scr_page ((ev.button == Button1 ? DN : UP),
2068 (nrow 2105 (nrow
2069 * scrollbar_position (ev.y) 2106 * scrollBar.position (ev.y)
2070 / scrollbar_size ())); 2107 / scrollBar.size ()));
2071 } 2108 }
2072 2109
2073 break; 2110 break;
2074 } 2111 }
2075 } 2112 }
… …
2085 2122
2086 csrO = 0; /* reset csr Offset */ 2123 csrO = 0; /* reset csr Offset */
2087 if (!bypass_keystate) 2124 if (!bypass_keystate)
2088 reportmode = !! (priv_modes & PrivMode_mouse_report); 2125 reportmode = !! (priv_modes & PrivMode_mouse_report);
2089 2126
2090 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2127 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2091 { 2128 {
2092 scrollBar.state = STATE_IDLE; 2129 scrollBar.state = SB_STATE_IDLE;
2093 scrollbar_show (0); 2130 scrollBar.show (0);
2094 } 2131 }
2095 2132
2096#ifdef SELECTION_SCROLLING 2133#ifdef SELECTION_SCROLLING
2097 sel_scroll_ev.stop(); 2134 sel_scroll_ev.stop();
2098#endif 2135#endif
… …
2147 case Button3: 2184 case Button3:
2148 selection_make (ev.time); 2185 selection_make (ev.time);
2149 break; 2186 break;
2150 2187
2151 case Button2: 2188 case Button2:
2152 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?
2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2190 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2154 break; 2191 break;
2155 2192
2156#ifdef MOUSE_WHEEL 2193#ifdef MOUSE_WHEEL
2157 case Button4: 2194 case Button4:
2158 case Button5: 2195 case Button5:
… …
2181 } 2218 }
2182 else 2219 else
2183# endif 2220# endif
2184 { 2221 {
2185 scr_page (v, i); 2222 scr_page (v, i);
2186 scrollbar_show (1); 2223 scrollBar.show (1);
2187 } 2224 }
2188 } 2225 }
2189 break; 2226 break;
2190#endif 2227#endif
2191 } 2228 }
2192 } 2229 }
2193} 2230}
2194 2231
2195/*}}} */ 2232/*}}} */
2196 2233
2197bool 2234void ecb_hot
2198rxvt_term::cmd_parse () 2235rxvt_term::cmd_parse ()
2199{ 2236{
2200 bool flag = false;
2201 wchar_t ch = NOCHAR; 2237 wchar_t ch = NOCHAR;
2202 char *seq_begin; // remember start of esc-sequence here 2238 char *seq_begin; // remember start of esc-sequence here
2203 2239
2204 for (;;) 2240 for (;;)
2205 { 2241 {
2206 if (ch == NOCHAR) 2242 if (ecb_unlikely (ch == NOCHAR))
2207 { 2243 {
2208 seq_begin = cmdbuf_ptr; 2244 seq_begin = cmdbuf_ptr;
2209 ch = next_char (); 2245 ch = next_char ();
2210 2246
2211 if (ch == NOCHAR) 2247 if (ch == NOCHAR)
2212 break; 2248 break;
2213 } 2249 }
2214 2250
2215 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))
2216 { 2252 {
2217 if (!seen_input) 2253 if (ecb_unlikely (!seen_input))
2218 { 2254 {
2219 seen_input = 1; 2255 seen_input = 1;
2220 // many badly-written programs (e.g. jed) contain a race condition: 2256 // many badly-written programs (e.g. jed) contain a race condition:
2221 // they first read the screensize and then install a SIGWINCH handler. 2257 // they first read the screensize and then install a SIGWINCH handler.
2222 // some window managers resize the window early, and these programs 2258 // some window managers resize the window early, and these programs
… …
2235 wchar_t *str = buf; 2271 wchar_t *str = buf;
2236 wchar_t *eol = str + min (ncol, UBUFSIZ); 2272 wchar_t *eol = str + min (ncol, UBUFSIZ);
2237 2273
2238 for (;;) 2274 for (;;)
2239 { 2275 {
2240 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)))
2241 break; 2277 break;
2242 2278
2243 *str++ = ch; 2279 *str++ = ch;
2244 2280
2245 if (ch == C0_LF || str >= eol) 2281 if (ecb_unlikely (ch == C0_LF || str >= eol))
2246 { 2282 {
2247 if (ch == C0_LF) 2283 if (ch == C0_LF)
2248 nlines++; 2284 nlines++;
2249 2285
2250 refresh_count++; 2286 refresh_count++;
… …
2299 * 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.
2300 * if skipScroll is enabled. 2336 * if skipScroll is enabled.
2301 */ 2337 */
2302 if (refreshnow) 2338 if (refreshnow)
2303 { 2339 {
2304 flag = true;
2305 scr_refresh (); 2340 scr_refresh ();
2306 want_refresh = 1; 2341 want_refresh = 1;
2307 } 2342 }
2308
2309 } 2343 }
2310 else 2344 else
2311 { 2345 {
2312 try 2346 try
2313 { 2347 {
… …
2321 } 2355 }
2322 2356
2323 ch = NOCHAR; 2357 ch = NOCHAR;
2324 } 2358 }
2325 } 2359 }
2326
2327 return flag;
2328} 2360}
2329 2361
2330// read the next character 2362// read the next character
2331wchar_t 2363wchar_t ecb_hot
2332rxvt_term::next_char () NOTHROW 2364rxvt_term::next_char () NOTHROW
2333{ 2365{
2334 while (cmdbuf_ptr < cmdbuf_endp) 2366 while (cmdbuf_ptr < cmdbuf_endp)
2335 { 2367 {
2336 // assume 7-bit to be ascii ALWAYS 2368 // assume 7-bit to be ascii ALWAYS
2337 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2369 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2338 return *cmdbuf_ptr++; 2370 return *cmdbuf_ptr++;
2339 2371
2340 wchar_t wc; 2372 wchar_t wc;
2341 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);
2342 2374
… …
2346 cmdbuf_ptr = cmdbuf_endp; 2378 cmdbuf_ptr = cmdbuf_endp;
2347 break; 2379 break;
2348 } 2380 }
2349 2381
2350 if (len == (size_t)-1) 2382 if (len == (size_t)-1)
2383 {
2384 mbstate.reset (); // reset now undefined conversion state
2351 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 }
2352 2387
2353 // assume wchar == unicode 2388 // assume wchar == unicode
2354 cmdbuf_ptr += len; 2389 cmdbuf_ptr += len;
2355 return wc & UNICODE_MASK; 2390 return wc & UNICODE_MASK;
2356 } 2391 }
2357 2392
2358 return NOCHAR; 2393 return NOCHAR;
2359} 2394}
2360 2395
2361// read the next octet 2396// read the next octet
2362uint32_t 2397uint32_t ecb_hot
2363rxvt_term::next_octet () NOTHROW 2398rxvt_term::next_octet () NOTHROW
2364{ 2399{
2365 return cmdbuf_ptr < cmdbuf_endp 2400 return cmdbuf_ptr < cmdbuf_endp
2366 ? (unsigned char)*cmdbuf_ptr++ 2401 ? (unsigned char)*cmdbuf_ptr++
2367 : NOCHAR; 2402 : NOCHAR;
2368} 2403}
2369 2404
2370static class out_of_input out_of_input; 2405static class out_of_input out_of_input;
2371 2406
2372/* rxvt_cmd_getc () - Return next input character */ 2407wchar_t ecb_hot
2373/*
2374 * Return the next input character after first passing any keyboard input
2375 * to the command.
2376 */
2377wchar_t
2378rxvt_term::cmd_getc () THROW ((class out_of_input)) 2408rxvt_term::cmd_getc () THROW ((class out_of_input))
2379{ 2409{
2380 wchar_t c = next_char (); 2410 wchar_t c = next_char ();
2381 2411
2382 if (c == NOCHAR) 2412 if (c == NOCHAR)
2383 throw out_of_input; 2413 throw out_of_input;
2384 2414
2385 return c; 2415 return c;
2386} 2416}
2387 2417
2388uint32_t 2418uint32_t ecb_hot
2389rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2419rxvt_term::cmd_get8 () THROW ((class out_of_input))
2390{ 2420{
2391 uint32_t c = next_octet (); 2421 uint32_t c = next_octet ();
2392 2422
2393 if (c == NOCHAR) 2423 if (c == NOCHAR)
… …
2397} 2427}
2398 2428
2399/*{{{ print pipe */ 2429/*{{{ print pipe */
2400/*----------------------------------------------------------------------*/ 2430/*----------------------------------------------------------------------*/
2401#ifdef PRINTPIPE 2431#ifdef PRINTPIPE
2402FILE * 2432FILE * ecb_cold
2403rxvt_term::popen_printer () 2433rxvt_term::popen_printer ()
2404{ 2434{
2405 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2435 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2406 2436
2407 if (stream == NULL) 2437 if (stream == NULL)
2408 rxvt_warn ("can't open printer pipe, not printing.\n"); 2438 rxvt_warn ("can't open printer pipe, not printing.\n");
2409 2439
2410 return stream; 2440 return stream;
2411} 2441}
2412 2442
2413int 2443int ecb_cold
2414rxvt_term::pclose_printer (FILE *stream) 2444rxvt_term::pclose_printer (FILE *stream)
2415{ 2445{
2416 fflush (stream); 2446 fflush (stream);
2417 return pclose (stream); 2447 return pclose (stream);
2418} 2448}
2419 2449
2420/* 2450/*
2421 * simulate attached vt100 printer 2451 * simulate attached vt100 printer
2422 */ 2452 */
2423void 2453void ecb_cold
2424rxvt_term::process_print_pipe () 2454rxvt_term::process_print_pipe ()
2425{ 2455{
2426 int done; 2456 FILE *fd = popen_printer ();
2427 FILE *fd;
2428 2457
2429 if ((fd = popen_printer ()) == NULL) 2458 if (!fd)
2430 return; 2459 return;
2431 2460
2432 /* 2461 /*
2433 * 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
2434 * is received. 2463 * is received.
2435 */ 2464 */
2436 for (done = 0; !done;) 2465 for (int done = 0; !done; )
2437 { 2466 {
2438 unsigned char buf[8]; 2467 unsigned char buf[8];
2439 unicode_t ch; 2468 unicode_t ch;
2440 unsigned int i, len; 2469 unsigned int i, len;
2441 2470
… …
2475 pclose_printer (fd); 2504 pclose_printer (fd);
2476} 2505}
2477#endif /* PRINTPIPE */ 2506#endif /* PRINTPIPE */
2478/*}}} */ 2507/*}}} */
2479 2508
2480/* *INDENT-OFF* */
2481enum { 2509enum {
2482 C1_40 = 0x40, 2510 C1_40 = 0x40,
2483 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,
2484 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,
2485 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,
2486 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,
2487}; 2515};
2488/* *INDENT-ON* */
2489 2516
2490/*{{{ process non-printing single characters */ 2517/*{{{ process non-printing single characters */
2491void 2518void ecb_hot
2492rxvt_term::process_nonprinting (unicode_t ch) 2519rxvt_term::process_nonprinting (unicode_t ch)
2493{ 2520{
2494 switch (ch) 2521 switch (ch)
2495 { 2522 {
2496 case C0_ESC: 2523 case C0_ESC:
… …
2542} 2569}
2543/*}}} */ 2570/*}}} */
2544 2571
2545 2572
2546/*{{{ process VT52 escape sequences */ 2573/*{{{ process VT52 escape sequences */
2547void 2574void ecb_cold
2548rxvt_term::process_escape_vt52 (unicode_t ch) 2575rxvt_term::process_escape_vt52 (unicode_t ch)
2549{ 2576{
2550 int row, col; 2577 int row, col;
2551 2578
2552 switch (ch) 2579 switch (ch)
… …
2586 break; 2613 break;
2587 case 'Z': /* identify the terminal type */ 2614 case 'Z': /* identify the terminal type */
2588 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2615 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2589 break; 2616 break;
2590 case '<': /* turn off VT52 mode */ 2617 case '<': /* turn off VT52 mode */
2591 PrivMode (0, PrivMode_vt52); 2618 priv_modes &= ~PrivMode_vt52;
2592 break; 2619 break;
2593 case 'F': /* use special graphics character set */ 2620 case 'F': /* use special graphics character set */
2594 case 'G': /* use regular character set */ 2621 case 'G': /* use regular character set */
2595 /* unimplemented */ 2622 /* unimplemented */
2596 break; 2623 break;
… …
2602} 2629}
2603/*}}} */ 2630/*}}} */
2604 2631
2605 2632
2606/*{{{ process escape sequences */ 2633/*{{{ process escape sequences */
2607void 2634void ecb_hot
2608rxvt_term::process_escape_seq () 2635rxvt_term::process_escape_seq ()
2609{ 2636{
2610 unicode_t ch = cmd_getc (); 2637 unicode_t ch = cmd_getc ();
2611 2638
2612 if (priv_modes & PrivMode_vt52) 2639 if (priv_modes & PrivMode_vt52)
… …
2615 return; 2642 return;
2616 } 2643 }
2617 2644
2618 switch (ch) 2645 switch (ch)
2619 { 2646 {
2620 /* case 1: do_tek_mode (); break; */
2621 case '#': 2647 case '#':
2622 if (cmd_getc () == '8') 2648 if (cmd_getc () == '8')
2623 scr_E (); 2649 scr_E ();
2624 break; 2650 break;
2625 case '(': 2651 case '(':
… …
2648#if !ENABLE_MINIMAL 2674#if !ENABLE_MINIMAL
2649 case '9': 2675 case '9':
2650 scr_forwardindex (); 2676 scr_forwardindex ();
2651 break; 2677 break;
2652#endif 2678#endif
2679 // DECPAM/DECPNM
2653 case '=': 2680 case '=':
2681 priv_modes |= PrivMode_aplKP;
2682 break;
2654 case '>': 2683 case '>':
2655 PrivMode ((ch == '='), PrivMode_aplKP); 2684 priv_modes &= ~PrivMode_aplKP;
2656 break; 2685 break;
2657 2686
2658 case C1_40: 2687 case C1_40:
2659 cmd_getc (); 2688 cmd_getc ();
2660 break; 2689 break;
… …
2664 2693
2665 /* 8.3.87: NEXT LINE */ 2694 /* 8.3.87: NEXT LINE */
2666 case C1_NEL: /* ESC E */ 2695 case C1_NEL: /* ESC E */
2667 { 2696 {
2668 wchar_t nlcr[] = { C0_LF, C0_CR }; 2697 wchar_t nlcr[] = { C0_LF, C0_CR };
2669 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2698 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2670 } 2699 }
2671 break; 2700 break;
2672 2701
2673 /* kidnapped escape sequence: Should be 8.3.48 */ 2702 /* kidnapped escape sequence: Should be 8.3.48 */
2674 case C1_ESA: /* ESC G */ 2703 case C1_ESA: /* ESC G */
2675 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 */
2676 break; 2707 break;
2677 2708
2678 /* 8.3.63: CHARACTER TABULATION SET */ 2709 /* 8.3.63: CHARACTER TABULATION SET */
2679 case C1_HTS: /* ESC H */ 2710 case C1_HTS: /* ESC H */
2680 scr_set_tab (1); 2711 scr_set_tab (1);
… …
2684 case C1_RI: /* ESC M */ 2715 case C1_RI: /* ESC M */
2685 scr_index (DN); 2716 scr_index (DN);
2686 break; 2717 break;
2687 2718
2688 /* 8.3.142: SINGLE-SHIFT TWO */ 2719 /* 8.3.142: SINGLE-SHIFT TWO */
2689 /*case C1_SS2: scr_single_shift (2); break; */ 2720 /* case C1_SS2: break; */
2690 2721
2691 /* 8.3.143: SINGLE-SHIFT THREE */ 2722 /* 8.3.143: SINGLE-SHIFT THREE */
2692 /*case C1_SS3: scr_single_shift (3); break; */ 2723 /* case C1_SS3: break; */
2693 2724
2694 /* 8.3.27: DEVICE CONTROL STRING */ 2725 /* 8.3.27: DEVICE CONTROL STRING */
2695 case C1_DCS: /* ESC P */ 2726 case C1_DCS: /* ESC P */
2696 process_dcs_seq (); 2727 process_dcs_seq ();
2697 break; 2728 break;
… …
2699 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2730 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2700 case C1_SCI: /* ESC Z */ 2731 case C1_SCI: /* ESC Z */
2701 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2732 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2702 break; /* steal obsolete ESC [ c */ 2733 break; /* steal obsolete ESC [ c */
2703 2734
2704 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2735 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2705 case C1_CSI: /* ESC [ */ 2736 case C1_CSI: /* ESC [ */
2706 process_csi_seq (); 2737 process_csi_seq ();
2707 break; 2738 break;
2708 2739
2709 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2740 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2710 case C1_OSC: /* ESC ] */ 2741 case C1_OSC: /* ESC ] */
2711 process_osc_seq (); 2742 process_osc_seq ();
2712 break; 2743 break;
2713 2744
2714 /* 8.3.106: RESET TO INITIAL STATE */ 2745 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2715 case 'c': 2746 case 'c':
2716 mbstate.reset (); 2747 mbstate.reset ();
2717 scr_poweron (); 2748 scr_poweron ();
2718 scrollbar_show (1); 2749 scrollBar.show (1);
2719 break; 2750 break;
2720 2751
2721 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2752 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2722 case 'n': 2753 case 'n':
2723 scr_charset_choose (2); 2754 scr_charset_choose (2);
… …
2730 } 2761 }
2731} 2762}
2732/*}}} */ 2763/*}}} */
2733 2764
2734/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2765/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2735/* *INDENT-OFF* */
2736enum { 2766enum {
2737 CSI_ICH = 0x40, 2767 CSI_ICH = 0x40,
2738 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,
2739 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 ,
2740 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,
… …
2743 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,
2744 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 ,
2745 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
2746}; 2776};
2747 2777
2748#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2778#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2749 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2779 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2750 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2780 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2751#define get_byte_array_bit(array, bit) \ 2781#define get_byte_array_bit(array, bit) \
2752 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2782 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2753 2783
2754const unsigned char csi_defaults[] = 2784static const unsigned char csi_defaults[] =
2755 { 2785 {
2756 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, */
2757 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, */
2758 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, */
2759 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, [, \, ], ^, _, */
2760 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, */
2761 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, */
2762 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, */
2763 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, {, |, }, ~, */
2764 }; 2794 };
2765/* *INDENT-ON* */
2766 2795
2767void 2796void ecb_hot
2768rxvt_term::process_csi_seq () 2797rxvt_term::process_csi_seq ()
2769{ 2798{
2770 unicode_t ch, priv, i; 2799 unicode_t ch, priv, i;
2771 unsigned int nargs, p; 2800 unsigned int nargs, p;
2772 int n, ndef; 2801 int n, ndef;
… …
2774 2803
2775 nargs = 0; 2804 nargs = 0;
2776 2805
2777 priv = 0; 2806 priv = 0;
2778 ch = cmd_getc (); 2807 ch = cmd_getc ();
2779 if (ch >= '<' && ch <= '?') 2808 if ((ch >= '<' && ch <= '?') || ch == '!')
2780 { 2809 {
2781 /* '<' '=' '>' '?' */ 2810 /* '<' '=' '>' '?' '!' */
2782 priv = ch; 2811 priv = ch;
2783 ch = cmd_getc (); 2812 ch = cmd_getc ();
2784 } 2813 }
2785 2814
2786 /* read any numerical arguments */ 2815 /* read any numerical arguments */
… …
2840 2869
2841 case '?': 2870 case '?':
2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2871 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2843 process_terminal_mode (ch, priv, nargs, arg); 2872 process_terminal_mode (ch, priv, nargs, arg);
2844 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);
2845 } 2886 }
2887 break;
2888 }
2889
2846 return; 2890 return;
2847 } 2891 }
2848 2892
2849 switch (ch) 2893 switch (ch)
2850 { 2894 {
… …
2864 } 2908 }
2865 break; 2909 break;
2866#endif 2910#endif
2867 2911
2868 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2912 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2869 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2913 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2870 arg[0] = -arg[0]; 2914 arg[0] = -arg[0];
2871 /* FALLTHROUGH */ 2915 /* FALLTHROUGH */
2872 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2916 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2873 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2917 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2874 scr_gotorc (arg[0], 0, RELATIVE); 2918 scr_gotorc (arg[0], 0, RELATIVE);
2875 break; 2919 break;
2876 2920
2877 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2921 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2878 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2922 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3065 } 3109 }
3066} 3110}
3067/*}}} */ 3111/*}}} */
3068 3112
3069#if !ENABLE_MINIMAL 3113#if !ENABLE_MINIMAL
3070/* ARGSUSED */
3071void 3114void
3072rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3115rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3073{ 3116{
3074 int x, y; 3117 int x, y;
3075 XWindowAttributes wattr; 3118 XWindowAttributes wattr;
… …
3084 { 3127 {
3085 /* 3128 /*
3086 * commands 3129 * commands
3087 */ 3130 */
3088 case 1: /* deiconify window */ 3131 case 1: /* deiconify window */
3089 XMapWindow (dpy, parent[0]); 3132 XMapWindow (dpy, parent);
3090 break; 3133 break;
3091 case 2: /* iconify window */ 3134 case 2: /* iconify window */
3092 XIconifyWindow (dpy, parent[0], display->screen); 3135 XIconifyWindow (dpy, parent, display->screen);
3093 break; 3136 break;
3094 case 3: /* set position (pixels) */ 3137 case 3: /* set position (pixels) */
3095 XMoveWindow (dpy, parent[0], args[1], args[2]); 3138 XMoveWindow (dpy, parent, args[1], args[2]);
3096 break; 3139 break;
3097 case 4: /* set size (pixels) */ 3140 case 4: /* set size (pixels) */
3098 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3141 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3099 break; 3142 break;
3100 case 5: /* raise window */ 3143 case 5: /* raise window */
3101 XRaiseWindow (dpy, parent[0]); 3144 XRaiseWindow (dpy, parent);
3102 break; 3145 break;
3103 case 6: /* lower window */ 3146 case 6: /* lower window */
3104 XLowerWindow (dpy, parent[0]); 3147 XLowerWindow (dpy, parent);
3105 break; 3148 break;
3106 case 7: /* refresh window */ 3149 case 7: /* refresh window */
3107 scr_touch (true); 3150 scr_touch (true);
3108 break; 3151 break;
3109 case 8: /* set size (chars) */ 3152 case 8: /* set size (chars) */
… …
3112 break; 3155 break;
3113 3156
3114 //case 9: NYI, TODO, restore maximized window or maximize window 3157 //case 9: NYI, TODO, restore maximized window or maximize window
3115 default: 3158 default:
3116 if (args[0] >= 24) /* set height (chars) */ 3159 if (args[0] >= 24) /* set height (chars) */
3117 set_widthheight ((unsigned int)width, 3160 set_widthheight ((unsigned int)vt_width,
3118 (unsigned int) (args[1] * fheight)); 3161 (unsigned int) (args[1] * fheight));
3119 break; 3162 break;
3120 3163
3121 /* 3164 /*
3122 * reports - some output format copied from XTerm 3165 * reports - some output format copied from XTerm
3123 */ 3166 */
3124 case 11: /* report window state */ 3167 case 11: /* report window state */
3125 XGetWindowAttributes (dpy, parent[0], &wattr); 3168 XGetWindowAttributes (dpy, parent, &wattr);
3126 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3169 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3127 break; 3170 break;
3128 case 13: /* report window position */ 3171 case 13: /* report window position */
3129 XGetWindowAttributes (dpy, parent[0], &wattr); 3172 XGetWindowAttributes (dpy, parent, &wattr);
3130 XTranslateCoordinates (dpy, parent[0], wattr.root, 3173 XTranslateCoordinates (dpy, parent, wattr.root,
3131 -wattr.border_width, -wattr.border_width, 3174 -wattr.border_width, -wattr.border_width,
3132 &x, &y, &wdummy); 3175 &x, &y, &wdummy);
3133 tt_printf ("\033[3;%d;%dt", x, y); 3176 tt_printf ("\033[3;%d;%dt", x, y);
3134 break; 3177 break;
3135 case 14: /* report window size (pixels) */ 3178 case 14: /* report window size (pixels) */
3136 XGetWindowAttributes (dpy, parent[0], &wattr); 3179 XGetWindowAttributes (dpy, parent, &wattr);
3137 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3180 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3138 break; 3181 break;
3139 case 18: /* report text area size (chars) */ 3182 case 18: /* report text area size (chars) */
3140 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3183 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3141 break; 3184 break;
… …
3143 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3186 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3144 break; 3187 break;
3145 case 20: /* report icon label */ 3188 case 20: /* report icon label */
3146 { 3189 {
3147 char *s; 3190 char *s;
3148 XGetIconName (dpy, parent[0], &s); 3191 XGetIconName (dpy, parent, &s);
3149 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 */
3150 XFree (s); 3193 XFree (s);
3151 } 3194 }
3152 break; 3195 break;
3153 case 21: /* report window title */ 3196 case 21: /* report window title */
3154 { 3197 {
3155 char *s; 3198 char *s;
3156 XFetchName (dpy, parent[0], &s); 3199 XFetchName (dpy, parent, &s);
3157 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 */
3158 XFree (s); 3201 XFree (s);
3159 } 3202 }
3160 break; 3203 break;
3161 } 3204 }
… …
3217 * 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)'
3218 */ 3261 */
3219void 3262void
3220rxvt_term::process_dcs_seq () 3263rxvt_term::process_dcs_seq ()
3221{ 3264{
3222 char *s;
3223 unicode_t eh;
3224
3225 /* 3265 /*
3226 * Not handled yet 3266 * Not handled yet
3227 */ 3267 */
3268
3269 unicode_t eh;
3228 s = get_to_st (eh); 3270 char *s = get_to_st (eh);
3229 if (s) 3271 if (s)
3230 free (s); 3272 free (s);
3231 3273
3232 return; 3274 return;
3233} 3275}
… …
3237 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3279 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3238 */ 3280 */
3239void 3281void
3240rxvt_term::process_osc_seq () 3282rxvt_term::process_osc_seq ()
3241{ 3283{
3242 unicode_t ch, eh;
3243 int arg; 3284 int arg;
3244 3285
3245 ch = cmd_getc (); 3286 unicode_t ch = cmd_getc ();
3246 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3287 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3247 arg = arg * 10 + (ch - '0'); 3288 arg = arg * 10 + (ch - '0');
3248 3289
3249 if (ch == ';') 3290 if (ch == ';')
3250 { 3291 {
3292 unicode_t eh;
3251 char *s = get_to_st (eh); 3293 char *s = get_to_st (eh);
3252 3294
3253 if (s) 3295 if (s)
3254 { 3296 {
3255 process_xterm_seq (arg, s, eh); 3297 process_xterm_seq (arg, s, eh);
… …
3279 3321
3280/* 3322/*
3281 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3323 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3282 */ 3324 */
3283void 3325void
3284rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3326rxvt_term::process_xterm_seq (int op, char *str, char resp)
3285{ 3327{
3286 int color; 3328 int color;
3287 char *buf, *name; 3329 char *buf, *name;
3288 bool query = str[0] == '?' && !str[1]; 3330 bool query = str[0] == '?' && !str[1];
3289 int saveop = op; 3331 int saveop = op;
… …
3316 unsigned long bytes_after; 3358 unsigned long bytes_after;
3317 unsigned char *value = 0; 3359 unsigned char *value = 0;
3318 const char *str = ""; 3360 const char *str = "";
3319 3361
3320 if (prop 3362 if (prop
3321 && XGetWindowProperty (dpy, parent[0], 3363 && XGetWindowProperty (dpy, parent,
3322 prop, 0, 1<<16, 0, AnyPropertyType, 3364 prop, 0, 1<<16, 0, AnyPropertyType,
3323 &actual_type, &actual_format, 3365 &actual_type, &actual_format,
3324 &nitems, &bytes_after, &value) == Success 3366 &nitems, &bytes_after, &value) == Success
3325 && actual_type != None 3367 && actual_type != None
3326 && actual_format == 8) 3368 && actual_format == 8)
… …
3330 3372
3331 XFree (value); 3373 XFree (value);
3332 } 3374 }
3333 else 3375 else
3334 { 3376 {
3335 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3377 char *eq = strchr (str, '=');
3336 3378
3337 if (eq) 3379 if (eq)
3338 { 3380 {
3339 *eq = 0; 3381 *eq = 0;
3340 set_utf8_property (display->atom (str), eq + 1); 3382 set_utf8_property (display->atom (str), eq + 1);
3341 } 3383 }
3342 else 3384 else
3343 XDeleteProperty (dpy, parent[0], 3385 XDeleteProperty (dpy, parent,
3344 display->atom (str)); 3386 display->atom (str));
3345 } 3387 }
3346 break; 3388 break;
3347 3389
3348 case XTerm_Color: 3390 case XTerm_Color:
… …
3380 process_color_seq (op, Color_pointer_fg, str, resp); 3422 process_color_seq (op, Color_pointer_fg, str, resp);
3381 break; 3423 break;
3382 case XTerm_Color_pointer_bg: 3424 case XTerm_Color_pointer_bg:
3383 process_color_seq (op, Color_pointer_bg, str, resp); 3425 process_color_seq (op, Color_pointer_bg, str, resp);
3384 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
3385#ifndef NO_BOLD_UNDERLINE_REVERSE 3435#ifndef NO_BOLD_UNDERLINE_REVERSE
3386 case XTerm_Color_RV:
3387 process_color_seq (op, Color_RV, str, resp);
3388 break;
3389 case Rxvt_Color_BD:
3390 case URxvt_Color_BD: 3436 case URxvt_Color_BD:
3391 process_color_seq (op, Color_BD, str, resp); 3437 process_color_seq (op, Color_BD, str, resp);
3392 break; 3438 break;
3393 case Rxvt_Color_UL:
3394 case URxvt_Color_UL: 3439 case URxvt_Color_UL:
3395 process_color_seq (op, Color_UL, str, resp); 3440 process_color_seq (op, Color_UL, str, resp);
3396 break; 3441 break;
3397 case URxvt_Color_IT: 3442 case URxvt_Color_IT:
3398 process_color_seq (op, Color_IT, str, resp); 3443 process_color_seq (op, Color_IT, str, resp);
3399 break; 3444 break;
3400#endif 3445#endif
3446 case URxvt_Color_border:
3447 process_color_seq (op, Color_border, str, resp);
3448 break;
3401#if ENABLE_TRANSPARENCY 3449#if ENABLE_TRANSPARENCY
3402 case URxvt_Color_tint: 3450 case URxvt_Color_tint:
3403 process_color_seq (op, Color_tint, str, resp); 3451 process_color_seq (op, Color_tint, str, resp);
3404 { 3452 {
3405 bool changed = false; 3453 bool changed = false;
3406 3454
3407 if (ISSET_PIXCOLOR (Color_tint)) 3455 if (ISSET_PIXCOLOR (Color_tint))
3408 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3456 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3409 else
3410 changed = bgPixmap.unset_tint ();
3411 3457
3412 if (changed) 3458 if (changed)
3413 update_background (); 3459 update_background ();
3414 } 3460 }
3415 3461
… …
3419#if BG_IMAGE_FROM_FILE 3465#if BG_IMAGE_FROM_FILE
3420 case Rxvt_Pixmap: 3466 case Rxvt_Pixmap:
3421 if (!strcmp (str, "?")) 3467 if (!strcmp (str, "?"))
3422 { 3468 {
3423 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 }
3424 3479
3425 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3480 sprintf (str, "[%dx%d+%d+%d]",
3426 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3481 h_scale, v_scale,
3427 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3482 h_align, v_align);
3428 process_xterm_seq (XTerm_title, str, CHAR_ST); 3483 process_xterm_seq (XTerm_title, str, CHAR_ST);
3429 } 3484 }
3430 else 3485 else
3431 { 3486 {
3432 int changed = 0; 3487 bool changed = false;
3433 3488
3434 if (*str != ';') 3489 if (*str != ';')
3435 { 3490 {
3436 /* reset to default scaling :*/ 3491 if (image_vec.size () > 0)
3437 bgPixmap.unset_geometry (); 3492 changed = image_vec[0].set_file_geometry (str);
3438 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
3439 changed++; 3499 changed = true;
3440 str = strchr (str, ';'); 3500 }
3441 if (str == NULL)
3442 bgPixmap.set_defaultGeometry ();
3443 } 3501 }
3444 3502 else
3445 while (str)
3446 { 3503 {
3447 str++; 3504 str++;
3448 if (bgPixmap.set_geometry (str)) 3505 if (image_vec.size () > 0)
3449 changed++; 3506 changed = image_vec[0].set_geometry (str, true);
3450 str = strchr (str, ';');
3451 } 3507 }
3452 3508
3453 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 }
3454 update_background (); 3517 update_background ();
3518 }
3455 } 3519 }
3456 break; 3520 break;
3457#endif 3521#endif
3458 3522
3459 case XTerm_logfile: 3523 case XTerm_logfile:
… …
3529 break; 3593 break;
3530#endif 3594#endif
3531 3595
3532#if ENABLE_PERL 3596#if ENABLE_PERL
3533 case URxvt_perl: 3597 case URxvt_perl:
3534 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));
3535 ; // no responses yet
3536 break; 3599 break;
3537#endif 3600#endif
3538 } 3601 }
3539} 3602}
3540/*----------------------------------------------------------------------*/ 3603/*----------------------------------------------------------------------*/
… …
3547 * 's' = save 3610 * 's' = save
3548 * 'r' = restore 3611 * 'r' = restore
3549 * 't' = toggle 3612 * 't' = toggle
3550 * so no need for fancy checking 3613 * so no need for fancy checking
3551 */ 3614 */
3552int 3615int ecb_cold
3553rxvt_term::privcases (int mode, unsigned long bit) 3616rxvt_term::privcases (int mode, unsigned long bit)
3554{ 3617{
3555 int state; 3618 int state;
3556 3619
3557 if (mode == 's') 3620 if (mode == 's')
3558 { 3621 {
3559 SavedModes |= (priv_modes & bit); 3622 if (priv_modes & bit)
3623 SavedModes |= bit;
3624 else
3625 SavedModes &= ~bit;
3560 return -1; 3626 return -1;
3561 } 3627 }
3562 else 3628 else
3563 { 3629 {
3564 if (mode == 'r') 3630 if (mode == 'r')
3565 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3631 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3566 else 3632 else
3567 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3633 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3568 PrivMode (state, bit); 3634
3635 if (state)
3636 priv_modes |= bit;
3637 else
3638 priv_modes &= ~bit;
3569 } 3639 }
3570 3640
3571 return state; 3641 return state;
3572} 3642}
3573 3643
3574/* we're not using priv _yet_ */ 3644/* we're not using priv _yet_ */
3575void 3645void
3576rxvt_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)
3577{ 3647{
3578 unsigned int i, j; 3648 unsigned int i, j;
3579 int state; 3649 int state;
3580 3650
3581 static const struct 3651 static const struct
3582 { 3652 {
3583 const int argval; 3653 const int argval;
3584 const unsigned long bit; 3654 const unsigned long bit;
3585 } argtopriv[] = { 3655 } argtopriv[] = {
3586 { 1, PrivMode_aplCUR }, 3656 { 1, PrivMode_aplCUR }, // DECCKM
3587 { 2, PrivMode_vt52 }, 3657 { 2, PrivMode_vt52 }, // DECANM
3588 { 3, PrivMode_132 }, 3658 { 3, PrivMode_132 }, // DECCOLM
3589 { 4, PrivMode_smoothScroll }, 3659 { 4, PrivMode_smoothScroll }, // DECSCLM
3590 { 5, PrivMode_rVideo }, 3660 { 5, PrivMode_rVideo }, // DECSCNM
3591 { 6, PrivMode_relOrigin }, 3661 { 6, PrivMode_relOrigin }, // DECOM
3592 { 7, PrivMode_Autowrap }, 3662 { 7, PrivMode_Autowrap }, // DECAWM
3593 // 8, bi-directional support mode 3663 // 8, auto-repeat keys // DECARM
3594 { 9, PrivMode_MouseX10 }, 3664 { 9, PrivMode_MouseX10 },
3595 // 18, 19 printing-related 3665 // 18 end FF to printer after print screen
3666 // 19 Print screen prints full screen/scroll region
3596 { 25, PrivMode_VisibleCursor }, 3667 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3597#ifdef scrollBar_esc 3668#ifdef scrollBar_esc
3598 { scrollBar_esc, PrivMode_scrollBar }, 3669 { scrollBar_esc, PrivMode_scrollBar },
3599#endif 3670#endif
3600 { 35, PrivMode_ShiftKeys }, // rxvt extension 3671 { 35, PrivMode_ShiftKeys }, // rxvt extension
3672 // 38, tektronix mode // DECTEK
3601 { 40, PrivMode_132OK }, 3673 { 40, PrivMode_132OK },
3602 // 41 xterm more fixes NYI 3674 // 41 xterm more fixes NYI
3603 // 45 margin bell NYI 3675 // 45 margin bell NYI
3604 // 46 start logging 3676 // 46 start logging
3605 { 47, PrivMode_Screen }, 3677 { 47, PrivMode_Screen },
3606 { 66, PrivMode_aplKP }, 3678 { 66, PrivMode_aplKP }, // DECNKM
3607#ifndef NO_BACKSPACE_KEY 3679#ifndef NO_BACKSPACE_KEY
3608 { 67, PrivMode_BackSpace }, 3680 { 67, PrivMode_BackSpace }, // DECBKM
3609#endif 3681#endif
3610 { 1000, PrivMode_MouseX11 }, 3682 { 1000, PrivMode_MouseX11 },
3611 { 1002, PrivMode_MouseBtnEvent }, 3683 { 1002, PrivMode_MouseBtnEvent },
3612 { 1003, PrivMode_MouseAnyEvent }, 3684 { 1003, PrivMode_MouseAnyEvent },
3685#if ENABLE_FRILLS
3686 { 1005, PrivMode_ExtModeMouse },
3687#endif
3613 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3688 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3614 { 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
3615 // 1035 enable modifiers for alt, numlock NYI 3693 // 1035 enable modifiers for alt, numlock NYI
3616 // 1036 send ESC for meta keys NYI 3694 // 1036 send ESC for meta keys NYI
3617 // 1037 send DEL for keypad delete NYI 3695 // 1037 send DEL for keypad delete NYI
3618 { 1047, PrivMode_Screen }, 3696 { 1047, PrivMode_Screen },
3619 // 1048 save and restore cursor 3697 // 1048 save and restore cursor, implemented in code
3620 { 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 */
3621 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3699 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3622 { 2004, PrivMode_BracketPaste }, 3700 { 2004, PrivMode_BracketPaste },
3623 }; 3701 };
3624 3702
… …
3634 for (i = 0; i < nargs; i++) 3712 for (i = 0; i < nargs; i++)
3635 { 3713 {
3636 state = -1; 3714 state = -1;
3637 3715
3638 /* basic handling */ 3716 /* basic handling */
3639 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3717 for (j = 0; j < ecb_array_length (argtopriv); j++)
3640 if (argtopriv[j].argval == arg[i]) 3718 if (argtopriv[j].argval == arg[i])
3641 { 3719 {
3642 state = privcases (mode, argtopriv[j].bit); 3720 state = privcases (mode, argtopriv[j].bit);
3643 break; 3721 break;
3644 } 3722 }
… …
3652 3730
3653 scr_touch (true); 3731 scr_touch (true);
3654 break; 3732 break;
3655#endif 3733#endif
3656 case 1048: /* alternative cursor save */ 3734 case 1048: /* alternative cursor save */
3657 case 1049:
3658 if (option (Opt_secondaryScreen)) 3735 if (option (Opt_secondaryScreen))
3659 if (mode == 0) 3736 if (mode == 0)
3660 scr_cursor (RESTORE); 3737 scr_cursor (RESTORE);
3661 else if (mode == 1) 3738 else if (mode == 1)
3662 scr_cursor (SAVE); 3739 scr_cursor (SAVE);
… …
3671 case 2: /* VT52 mode */ 3748 case 2: /* VT52 mode */
3672 /* oddball mode. should be set regardless of set/reset 3749 /* oddball mode. should be set regardless of set/reset
3673 * parameter. Return from VT52 mode with an ESC < from 3750 * parameter. Return from VT52 mode with an ESC < from
3674 * within VT52 mode 3751 * within VT52 mode
3675 */ 3752 */
3676 PrivMode (1, PrivMode_vt52); 3753 priv_modes |= PrivMode_vt52;
3677 break; 3754 break;
3678 case 3: /* 80/132 */ 3755 case 3: /* 80/132 */
3679 if (priv_modes & PrivMode_132OK) 3756 if (priv_modes & PrivMode_132OK)
3680 {
3681 scr_poweron ();
3682 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3757 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3683 }
3684 break; 3758 break;
3685 case 4: /* smooth scrolling */ 3759 case 4: /* smooth scrolling */
3686 set_option (Opt_jumpScroll, !state); 3760 set_option (Opt_jumpScroll, !state);
3687 break; 3761 break;
3688 case 5: /* reverse video */ 3762 case 5: /* reverse video */
… …
3699 if (state) /* orthogonal */ 3773 if (state) /* orthogonal */
3700 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3774 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3701 break; 3775 break;
3702#ifdef scrollBar_esc 3776#ifdef scrollBar_esc
3703 case scrollBar_esc: 3777 case scrollBar_esc:
3704 if (scrollbar_mapping (state)) 3778 scrollBar.map (state);
3705 {
3706 resize_all_windows (0, 0, 0); 3779 resize_all_windows (0, 0, 0);
3707 scr_touch (true); 3780 scr_touch (true);
3708 }
3709 break; 3781 break;
3710#endif 3782#endif
3711 case 25: /* visible/invisible cursor */ 3783 case 25: /* visible/invisible cursor */
3712 scr_cursor_visible (state); 3784 scr_cursor_visible (state);
3713 break; 3785 break;
… …
3726 case 1003: 3798 case 1003:
3727 if (state) 3799 if (state)
3728 { 3800 {
3729 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3801 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3730 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;
3731 vt_emask_mouse = PointerMotionMask; 3804 vt_emask_mouse = PointerMotionMask;
3732 } 3805 }
3733 else 3806 else
3734 vt_emask_mouse = NoEventMask; 3807 vt_emask_mouse = NoEventMask;
3808
3735 vt_select_input (); 3809 vt_select_input ();
3736 break; 3810 break;
3737 case 1010: /* scroll to bottom on TTY output inhibit */ 3811 case 1010: /* scroll to bottom on TTY output inhibit */
3738 set_option (Opt_scrollTtyOutput, !state); 3812 set_option (Opt_scrollTtyOutput, !state);
3739 break; 3813 break;
3740 case 1011: /* scroll to bottom on key press */ 3814 case 1011: /* scroll to bottom on key press */
3741 set_option (Opt_scrollTtyKeypress, state); 3815 set_option (Opt_scrollTtyKeypress, state);
3742 break; 3816 break;
3743 case 1047: /* secondary screen w/ clearing last */ 3817 case 1047: /* secondary screen w/ clearing last */
3744 if (option (Opt_secondaryScreen)) 3818 if (option (Opt_secondaryScreen))
3745 if (current_screen != PRIMARY) 3819 if (!state)
3746 scr_erase_screen (2); 3820 scr_erase_screen (2);
3821
3747 scr_change_screen (state); 3822 scr_change_screen (state);
3748 break; 3823 break;
3749 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
3750 scr_change_screen (state); 3829 scr_change_screen (state);
3830
3751 if (option (Opt_secondaryScreen)) 3831 if (option (Opt_secondaryScreen))
3752 if (current_screen != PRIMARY) 3832 if (state)
3753 scr_erase_screen (2); 3833 scr_erase_screen (2);
3834 else
3835 scr_cursor (RESTORE);
3754 break; 3836 break;
3755 default: 3837 default:
3756 break; 3838 break;
3757 } 3839 }
3758 } 3840 }
3759} 3841}
3760/*}}} */ 3842/*}}} */
3761 3843
3762/*{{{ process sgr sequences */ 3844/*{{{ process sgr sequences */
3763void 3845void ecb_hot
3764rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3846rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3765{ 3847{
3766 unsigned int i; 3848 unsigned int i;
3767 short rendset; 3849 short rendset;
3768 int rendstyle; 3850 int rendstyle;
… …
3911 } 3993 }
3912 } 3994 }
3913} 3995}
3914/*}}} */ 3996/*}}} */
3915 3997
3916/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3917void
3918rxvt_term::process_graphics ()
3919{
3920 unicode_t ch, cmd = cmd_getc ();
3921
3922 if (cmd == 'Q')
3923 {
3924 /* query graphics */
3925 tt_printf ("\033G0\012"); /* no graphics */
3926 return;
3927 }
3928 /* swallow other graphics sequences until terminating ':' */
3929 do
3930 ch = cmd_getc ();
3931 while (ch != ':');
3932}
3933/*}}} */
3934
3935/* ------------------------------------------------------------------------- */ 3998/* ------------------------------------------------------------------------- */
3936 3999
3937/* 4000/*
3938 * Send printf () formatted output to the command. 4001 * Send printf () formatted output to the command.
3939 * Only use for small amounts of data. 4002 * Only use for small amounts of data.
… …
3952 4015
3953/* ---------------------------------------------------------------------- */ 4016/* ---------------------------------------------------------------------- */
3954/* 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,
3955 * or generated by us in response to a query ESC sequence. 4018 * or generated by us in response to a query ESC sequence.
3956 */ 4019 */
3957const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4020static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3958 4021
3959void 4022void
3960rxvt_term::tt_write (const char *data, unsigned int len) 4023rxvt_term::tt_write (const char *data, unsigned int len)
3961{ 4024{
3962 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)))
… …
3967 4030
3968 if (v_buflen == 0) 4031 if (v_buflen == 0)
3969 { 4032 {
3970 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));
3971 4034
4035 max_it (written, 0);
4036
3972 if ((unsigned int)written == len) 4037 if (written == len)
3973 return; 4038 return;
3974 4039
3975 data += written; 4040 data += written;
3976 len -= written; 4041 len -= written;
3977 } 4042 }
3978 4043
3979 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4044 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3980 4045
3981 memcpy (v_buffer + v_buflen, data, len); 4046 memcpy (v_buffer + v_buflen, data, len);
3982 v_buflen += len; 4047 v_buflen += len;
3983 4048
3984 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