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.391 by root, Wed Jan 9 01:14:29 2008 UTC vs.
Revision 1.510 by sf-exg, Fri May 25 08:27:47 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)
… …
162 162
163void 163void
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
… …
251#endif 257#endif
252 258
253void 259void
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
284int 287static int
285rxvt_term::hex_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
306static inline KeySym
307translate_keypad (KeySym keysym, bool kp)
308{
309#ifdef XK_KP_Home
310 static const KeySym keypadtrans[] = {
311 XK_KP_7, // XK_KP_Home
312 XK_KP_4, // XK_KP_Left
313 XK_KP_8, // XK_KP_Up
314 XK_KP_6, // XK_KP_Right
315 XK_KP_2, // XK_KP_Down
316# ifndef UNSHIFTED_SCROLLKEYS
317 XK_KP_9, // XK_KP_Prior
318 XK_KP_3, // XK_KP_Next
319# else
320 XK_Prior,
321 XK_Next,
322# endif
323 XK_KP_1, // XK_KP_End
324 XK_KP_5, // XK_KP_Begin
325 };
326
327 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
328 {
329 unsigned int index = keysym - XK_KP_Home;
330 keysym = kp ? keypadtrans[index] : XK_Home + index;
331 }
332 else if (keysym == XK_KP_Insert)
333 keysym = kp ? XK_KP_0 : XK_Insert;
334# ifndef NO_DELETE_KEY
335 else if (keysym == XK_KP_Delete)
336 keysym = kp ? XK_KP_Decimal : XK_Delete;
337# endif
338#endif
339 return keysym;
340}
341
342static inline int
343map_function_key (KeySym keysym)
344{
345 int param = 0;
346
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
348 {
349 param = 11 + keysym - XK_F1;
350 if (keysym >= XK_F17)
351 param += 4;
352 else if (keysym >= XK_F15)
353 param += 3;
354 else if (keysym >= XK_F11)
355 param += 2;
356 else if (keysym >= XK_F6)
357 param += 1;
358 }
359 else
360 switch (keysym)
361 {
362 case XK_Find:
363 param = 1;
364 break;
365 case XK_Insert:
366 param = 2;
367 break;
368#ifdef DXK_Remove
369 case DXK_Remove:
370#endif
371 case XK_Execute:
372 param = 3;
373 break;
374 case XK_Select:
375 param = 4;
376 break;
377#ifndef UNSHIFTED_SCROLLKEYS
378 case XK_Prior:
379 param = 5;
380 break;
381 case XK_Next:
382 param = 6;
383 break;
384 case XK_Home:
385 param = 7;
386 break;
387 case XK_End:
388 param = 8;
389 break;
390#endif
391 case XK_Help:
392 param = 28;
393 break;
394 case XK_Menu:
395 param = 29;
396 break;
397 }
398 return param;
399}
400
303void 401void
304rxvt_term::key_press (XKeyEvent &ev) 402rxvt_term::key_press (XKeyEvent &ev)
305{ 403{
306 int ctrl, meta, shft, len; 404 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 405 KeySym keysym;
309 int valid_keysym; 406 int valid_keysym;
310 char kbuf[KBUFSZ]; 407 char kbuf[KBUFSZ];
311 408
312#if ISO_14755 409#if ISO_14755
… …
321 * Always permit `shift' to override the current setting 418 * Always permit `shift' to override the current setting
322 */ 419 */
323 shft = ev.state & ShiftMask; 420 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
326
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332 423
333 kbuf[0] = 0; 424 kbuf[0] = 0;
334 425
335#ifdef USE_XIM 426#ifdef USE_XIM
336 if (Input_Context) 427 if (Input_Context)
… …
411#ifdef PAGING_CONTEXT_LINES 502#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 503 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 504#else
414 lnsppg = nrow * 4 / 5; 505 lnsppg = nrow * 4 / 5;
415#endif 506#endif
507 max_it (lnsppg, 1);
508
416 if (keysym == XK_Prior) 509 if (keysym == XK_Prior)
417 { 510 {
418 scr_page (UP, lnsppg); 511 scr_page (UP, lnsppg);
419 return; 512 return;
420 } 513 }
… …
473 selection_request (ev.time); 566 selection_request (ev.time);
474 return; 567 return;
475#if TODO 568#if TODO
476 /* rxvt extras */ 569 /* rxvt extras */
477 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
478 change_font (FONT_UP);
479 return; 571 return;
480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
481 change_font (FONT_DN);
482 return; 573 return;
483#endif 574#endif
484 } 575 }
485 } 576 }
486 } 577 }
487 578
488#if ENABLE_FRILLS || ISO_14755 579#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 580 // ISO 14755 support
490 if (shft && ctrl) 581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 582 {
492 int hv; 583 int hv;
493 584
494 if (iso14755buf & ISO_14755_51 585 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 586 && (keysym == XK_space || keysym == XK_KP_Space
… …
525 scr_overlay_off (); 616 scr_overlay_off ();
526# endif 617# endif
527 iso14755buf = 0; 618 iso14755buf = 0;
528 } 619 }
529 } 620 }
621 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 622 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 623 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 624 if (!(iso14755buf & ISO_14755_STARTED))
533 { 625 {
534 iso14755buf |= ISO_14755_STARTED; 626 iso14755buf |= ISO_14755_STARTED;
535# if ISO_14755 627# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 628 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
547 } 639 }
548#endif 640#endif
549 641
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 643 {
644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
645 unsigned int newlen = 1;
646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
552 { 653 {
553 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 654#ifndef NO_BACKSPACE_KEY
554 newlen = 1; 655 case XK_BackSpace:
555#ifdef XK_KP_Home 656 if (priv_modes & PrivMode_HaveBackSpace)
556 static const KeySym keypadtrans[] = { 657 {
557 XK_KP_7, // XK_KP_Home 658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
558 XK_KP_4, // XK_KP_Left 659 ^ !!ctrl) ? '\b' : '\177';
559 XK_KP_8, // XK_KP_Up 660 kbuf[1] = '\0';
560 XK_KP_6, // XK_KP_Right
561 XK_KP_2, // XK_KP_Down
562#ifndef UNSHIFTED_SCROLLKEYS
563 XK_KP_9, // XK_KP_Prior
564 XK_KP_3, // XK_KP_Next
565#else
566 XK_Prior,
567 XK_Next,
568#endif
569 XK_KP_1, // XK_KP_End
570 XK_KP_5, // XK_KP_Begin
571 }; 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;
572 687
573 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 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:
574 { 768 {
575 unsigned int index = keysym - XK_KP_Home; 769 int param = map_function_key (keysym);
576 keysym = kp ? keypadtrans[index] : XK_Home + index; 770 if (param > 0)
771 sprintf (kbuf,"\033[%d~", param);
772 else
773 newlen = 0;
577 } 774 }
578 else if (keysym == XK_KP_Insert)
579 keysym = kp ? XK_KP_0 : XK_Insert;
580#ifndef NO_DELETE_KEY
581 else if (keysym == XK_KP_Delete)
582 keysym = kp ? XK_KP_Decimal : XK_Delete;
583#endif
584#endif
585 switch (keysym)
586 {
587#ifndef NO_BACKSPACE_KEY
588 case XK_BackSpace:
589 if (priv_modes & PrivMode_HaveBackSpace)
590 {
591 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
592 ^ !!ctrl) ? '\b' : '\177';
593 kbuf[1] = '\0';
594 }
595 else
596 strcpy (kbuf, rs[Rs_backspace_key]);
597 break; 775 break;
598#endif
599#ifndef NO_DELETE_KEY
600 case XK_Delete:
601 strcpy (kbuf, rs[Rs_delete_key]);
602 break;
603#endif
604 case XK_Tab:
605 if (shft)
606 strcpy (kbuf, "\033[Z");
607 else
608 {
609#ifdef CTRL_TAB_MAKES_META
610 if (ctrl)
611 meta = 1;
612#endif
613#ifdef MOD4_TAB_MAKES_META
614 if (ev.state & Mod4Mask)
615 meta = 1;
616#endif
617 newlen = 0;
618 }
619 break;
620
621 case XK_Up: /* "\033[A" */
622 case XK_Down: /* "\033[B" */
623 case XK_Right: /* "\033[C" */
624 case XK_Left: /* "\033[D" */
625 strcpy (kbuf, "\033[Z");
626 kbuf[2] = "DACB"[keysym - XK_Left];
627 /* do Shift first */
628 if (shft)
629 kbuf[2] = "dacb"[keysym - XK_Left];
630 else if (ctrl)
631 {
632 kbuf[1] = 'O';
633 kbuf[2] = "dacb"[keysym - XK_Left];
634 }
635 else if (priv_modes & PrivMode_aplCUR)
636 kbuf[1] = 'O';
637 break;
638
639#ifndef UNSHIFTED_SCROLLKEYS
640 case XK_Prior:
641 strcpy (kbuf, "\033[5~");
642 break;
643 case XK_Next:
644 strcpy (kbuf, "\033[6~");
645 break;
646#endif
647 case XK_KP_Enter:
648 /* allow shift to override */
649 if (kp)
650 {
651 strcpy (kbuf, "\033OM");
652 break;
653 }
654
655 /* FALLTHROUGH */
656
657 case XK_Return:
658 if (priv_modes & PrivMode_LFNL)
659 {
660 kbuf[0] = '\015';
661 kbuf[1] = '\012';
662 kbuf[2] = '\0';
663 }
664 else
665 {
666 kbuf[0] = '\015';
667 kbuf[1] = '\0';
668 }
669 break;
670
671 case XK_KP_F1: /* "\033OP" */
672 case XK_KP_F2: /* "\033OQ" */
673 case XK_KP_F3: /* "\033OR" */
674 case XK_KP_F4: /* "\033OS" */
675 strcpy (kbuf, "\033OP");
676 kbuf[2] += (keysym - XK_KP_F1);
677 break;
678
679 case XK_KP_Multiply: /* "\033Oj" : "*" */
680 case XK_KP_Add: /* "\033Ok" : "+" */
681 case XK_KP_Separator: /* "\033Ol" : "," */
682 case XK_KP_Subtract: /* "\033Om" : "-" */
683 case XK_KP_Decimal: /* "\033On" : "." */
684 case XK_KP_Divide: /* "\033Oo" : "/" */
685 case XK_KP_0: /* "\033Op" : "0" */
686 case XK_KP_1: /* "\033Oq" : "1" */
687 case XK_KP_2: /* "\033Or" : "2" */
688 case XK_KP_3: /* "\033Os" : "3" */
689 case XK_KP_4: /* "\033Ot" : "4" */
690 case XK_KP_5: /* "\033Ou" : "5" */
691 case XK_KP_6: /* "\033Ov" : "6" */
692 case XK_KP_7: /* "\033Ow" : "7" */
693 case XK_KP_8: /* "\033Ox" : "8" */
694 case XK_KP_9: /* "\033Oy" : "9" */
695 /* allow shift to override */
696 if (kp)
697 {
698 strcpy (kbuf, "\033Oj");
699 kbuf[2] += (keysym - XK_KP_Multiply);
700 }
701 else
702 {
703 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
704 kbuf[1] = '\0';
705 }
706 break;
707
708 case XK_Find:
709 strcpy (kbuf, "\033[1~");
710 break;
711
712 case XK_Insert:
713 strcpy (kbuf, "\033[2~");
714 break;
715#ifdef DXK_Remove /* support for DEC remove like key */
716 case DXK_Remove:
717 /* FALLTHROUGH */
718#endif
719 case XK_Execute:
720 strcpy (kbuf, "\033[3~");
721 break;
722 case XK_Select:
723 strcpy (kbuf, "\033[4~");
724 break;
725 case XK_End:
726 strcpy (kbuf, KS_END);
727 break;
728 case XK_Home:
729 strcpy (kbuf, KS_HOME);
730 break;
731
732#define FKEY(n, fkey) \
733 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
734
735 case XK_F1: /* "\033[11~" */
736 case XK_F2: /* "\033[12~" */
737 case XK_F3: /* "\033[13~" */
738 case XK_F4: /* "\033[14~" */
739 case XK_F5: /* "\033[15~" */
740 FKEY (11, XK_F1);
741 break;
742 case XK_F6: /* "\033[17~" */
743 case XK_F7: /* "\033[18~" */
744 case XK_F8: /* "\033[19~" */
745 case XK_F9: /* "\033[20~" */
746 case XK_F10: /* "\033[21~" */
747 FKEY (17, XK_F6);
748 break;
749 case XK_F11: /* "\033[23~" */
750 case XK_F12: /* "\033[24~" */
751 case XK_F13: /* "\033[25~" */
752 case XK_F14: /* "\033[26~" */
753 FKEY (23, XK_F11);
754 break;
755 case XK_F15: /* "\033[28~" */
756 case XK_F16: /* "\033[29~" */
757 FKEY (28, XK_F15);
758 break;
759 case XK_Help: /* "\033[28~" */
760 FKEY (28, XK_Help);
761 break;
762 case XK_Menu: /* "\033[29~" */
763 FKEY (29, XK_Menu);
764 break;
765 case XK_F17: /* "\033[31~" */
766 case XK_F18: /* "\033[32~" */
767 case XK_F19: /* "\033[33~" */
768 case XK_F20: /* "\033[34~" */
769 case XK_F21: /* "\033[35~" */
770 case XK_F22: /* "\033[36~" */
771 case XK_F23: /* "\033[37~" */
772 case XK_F24: /* "\033[38~" */
773 case XK_F25: /* "\033[39~" */
774 case XK_F26: /* "\033[40~" */
775 case XK_F27: /* "\033[41~" */
776 case XK_F28: /* "\033[42~" */
777 case XK_F29: /* "\033[43~" */
778 case XK_F30: /* "\033[44~" */
779 case XK_F31: /* "\033[45~" */
780 case XK_F32: /* "\033[46~" */
781 case XK_F33: /* "\033[47~" */
782 case XK_F34: /* "\033[48~" */
783 case XK_F35: /* "\033[49~" */
784 FKEY (31, XK_F17);
785 break;
786#undef FKEY
787 default:
788 newlen = 0;
789 break;
790 }
791
792 if (newlen)
793 len = strlen (kbuf);
794 } 776 }
795 777
778 if (newlen)
779 len = strlen (kbuf);
780
781 if (len > 0)
782 {
796 /* 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 /*
797 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
798 */ 797 */
799#ifdef META8_OPTION 798#ifdef META8_OPTION
800 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
801 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
802#endif 801#endif
802 }
803 803
804 } 804 }
805 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
806 { 806 {
807 len = 1; 807 len = 1;
… …
840 if (view_start) 840 if (view_start)
841 { 841 {
842 view_start = 0; 842 view_start = 0;
843 want_refresh = 1; 843 want_refresh = 1;
844 } 844 }
845
846 /*
847 * these modifications only affect the static keybuffer
848 * pass Shift/Control indicators for function keys ending with `~'
849 *
850 * eg,
851 * Prior = "ESC[5~"
852 * Shift+Prior = "ESC[5$"
853 * Ctrl+Prior = "ESC[5^"
854 * Ctrl+Shift+Prior = "ESC[5@"
855 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
856 */
857 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
858 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
859 845
860 /* escape prefix */ 846 /* escape prefix */
861 if (meta 847 if (meta
862#ifdef META8_OPTION 848#ifdef META8_OPTION
863 && meta_char == C0_ESC 849 && meta_char == C0_ESC
… …
899 commit_iso14755 (); 885 commit_iso14755 ();
900 886
901 return; 887 return;
902 } 888 }
903 889
904 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 890 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
905 if (i[0] == keysym) 891 if (i[0] == keysym)
906 { 892 {
907 iso14755buf = ISO_14755_51 | i[1]; 893 iso14755buf = ISO_14755_51 | i[1];
908 commit_iso14755 (); 894 commit_iso14755 ();
909 895
… …
946 else if (keysym == XK_Control_L || keysym == XK_Control_R) 932 else if (keysym == XK_Control_L || keysym == XK_Control_R)
947 mouse_slip_wheel_speed = 0; 933 mouse_slip_wheel_speed = 0;
948#endif 934#endif
949} 935}
950 936
951#if defined (KEYSYM_RESOURCE)
952unsigned int
953rxvt_term::cmd_write (const char *str, unsigned int count)
954{
955 unsigned int n, s;
956
957 n = cmdbuf_ptr - cmdbuf_base;
958 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
959
960 if (n > 0 && s < count)
961 {
962 memmove (cmdbuf_base, cmdbuf_ptr,
963 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
964 cmdbuf_ptr = cmdbuf_base;
965 cmdbuf_endp -= n;
966 s += n;
967 }
968
969 if (count > s)
970 {
971 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
972 count = s;
973 }
974
975 for (; count--;)
976 *cmdbuf_endp++ = *str++;
977
978 cmd_parse ();
979
980 return 0;
981}
982#endif
983
984void 937void
985rxvt_term::flush () 938rxvt_term::flush ()
986{ 939{
987 flush_ev.stop (); 940 flush_ev.stop ();
988 941
989#ifdef HAVE_BG_PIXMAP 942#ifdef HAVE_BG_PIXMAP
990 if (bgPixmap.check_clearChanged ()) 943 if (bg_flags & BG_NEEDS_REFRESH)
991 { 944 {
992// scr_clear (true); This needs to be researched further! 945 bg_flags &= ~BG_NEEDS_REFRESH;
993 scr_touch (false); 946 scr_touch (false);
994 } 947 }
995#endif 948#endif
996 949
997 if (want_refresh) 950 if (want_refresh)
… …
1033 } 986 }
1034 while (row < end_row); 987 while (row < end_row);
1035 } 988 }
1036 989
1037 scr_refresh (); 990 scr_refresh ();
1038 scrollbar_show (1); 991 scrollBar.show (1);
1039#ifdef USE_XIM 992#ifdef USE_XIM
1040 IMSendSpot (); 993 im_send_spot ();
1041#endif 994#endif
1042 } 995 }
1043 996
1044 display->flush (); 997 display->flush ();
1045} 998}
1046 999
1047/* checks wether a refresh is requested and starts the refresh timer */ 1000/* checks whether a refresh is requested and starts the refresh timer */
1048void 1001void
1049rxvt_term::refresh_check () 1002rxvt_term::refresh_check ()
1050{ 1003{
1051 if (want_refresh && !flush_ev.is_active ()) 1004 if (want_refresh && !flush_ev.is_active ())
1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1005 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1062 refresh_count = 0; 1015 refresh_count = 0;
1063 flush (); 1016 flush ();
1064} 1017}
1065 1018
1066#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
1067void 1035void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1037{
1070 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1039 want_refresh = 1;
… …
1079{ 1047{
1080 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1048 if (scr_refresh_rend (RS_Blink, RS_Blink))
1081 { 1049 {
1082 hidden_text = !hidden_text; 1050 hidden_text = !hidden_text;
1083 want_refresh = 1; 1051 want_refresh = 1;
1084 refresh_check (); 1052 refresh_check ();
1085 } 1053 }
1086 else 1054 else
1087 w.stop (); 1055 w.stop ();
1088} 1056}
1089#endif 1057#endif
1090 1058
1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1092void 1060void
1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1094{ 1062{
1095 if ((scrollbar_isUp () || scrollbar_isDn ()) 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1096 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1097 { 1065 {
1098 want_refresh = 1; 1066 want_refresh = 1;
1099 refresh_check (); 1067 refresh_check ();
1100 } 1068 }
1101 else 1069 else
… …
1145 { 1113 {
1146 // this should really be sched_yield(), but the linux guys thought 1114 // this should really be sched_yield(), but the linux guys thought
1147 // that giving a process calling sched_yield () less cpu time than 1115 // that giving a process calling sched_yield () less cpu time than
1148 // 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
1149 // 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.
1150 1121
1151 struct timespec ts = { 0, 0 }; 1122 struct timespec ts = { 0, 1000 };
1152 nanosleep (&ts, 0); 1123 nanosleep (&ts, 0);
1153 1124
1154 w.stop (); 1125 w.stop ();
1155 } 1126 }
1156 1127
… …
1159 { 1130 {
1160 } 1131 }
1161} event_handler; 1132} event_handler;
1162#endif 1133#endif
1163 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
1164bool 1168bool
1165rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1166{ 1170{
1167 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 cmdbuf_reify ();
1168 1172
1169 if (CBUFSIZ == n) 1173 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1170 { 1174
1171 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1175 if (!avail)
1172 n = 0;
1173 } 1176 {
1174 1177 // normally this indicates a "too long" command sequence - just drop the data we have
1175 memmove (cmdbuf_base, cmdbuf_ptr, n);
1176 cmdbuf_ptr = cmdbuf_base; 1178 cmdbuf_ptr = cmdbuf_base;
1177 cmdbuf_endp = cmdbuf_ptr + n; 1179 cmdbuf_endp = cmdbuf_ptr;
1180 avail = CBUFSIZ;
1181 }
1178 1182
1179 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1180 1184
1181 if (r > 0) 1185 if (r > 0)
1182 { 1186 {
1183 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1184 return true; 1188 return true;
… …
1206{ 1210{
1207 make_current (); 1211 make_current ();
1208 1212
1209 if (revents & ev::READ) 1213 if (revents & ev::READ)
1210 // loop, but don't allow a single term to monopolize us 1214 // loop, but don't allow a single term to monopolize us
1211 while (pty_fill ()) 1215 for (int i = CBUFCNT; i-- && pty_fill (); )
1212 if (cmd_parse ()) 1216 cmd_parse ();
1213 break;
1214 1217
1215 if (revents & ev::WRITE) 1218 if (revents & ev::WRITE)
1216 pty_write (); 1219 pty_write ();
1217 1220
1218 refresh_check (); 1221 refresh_check ();
… …
1259{ 1262{
1260 int button_number, key_state = 0; 1263 int button_number, key_state = 0;
1261 int x, y; 1264 int x, y;
1262 int code = 32; 1265 int code = 32;
1263 1266
1264 x = Pixel2Col (ev.x); 1267 x = Pixel2Col (ev.x) + 1;
1265 y = Pixel2Row (ev.y); 1268 y = Pixel2Row (ev.y) + 1;
1269
1266 if (ev.type == MotionNotify) 1270 if (ev.type == MotionNotify)
1267 { 1271 {
1268 if (x == mouse_row && y == mouse_col) 1272 if (x == mouse_row && y == mouse_col)
1269 return; 1273 return;
1274
1270 mouse_row = x; 1275 mouse_row = x;
1271 mouse_col = y; 1276 mouse_col = y;
1272 code += 32; 1277 code += 32;
1273 } 1278 }
1274 1279
… …
1277 else 1282 else
1278 { 1283 {
1279 button_number = MEvent.button - Button1; 1284 button_number = MEvent.button - Button1;
1280 /* add 0x3D for wheel events, like xterm does */ 1285 /* add 0x3D for wheel events, like xterm does */
1281 if (button_number >= 3) 1286 if (button_number >= 3)
1282 button_number += (64 - 3); 1287 button_number += 64 - 3;
1283 } 1288 }
1284 1289
1285 if (priv_modes & PrivMode_MouseX10) 1290 if (priv_modes & PrivMode_MouseX10)
1286 { 1291 {
1287 /* 1292 /*
… …
1319 fputc ('A', stderr); 1324 fputc ('A', stderr);
1320 if (key_state & 32) 1325 if (key_state & 32)
1321 fputc ('2', stderr); 1326 fputc ('2', stderr);
1322 fprintf (stderr, "]: <%d>, %d/%d\n", 1327 fprintf (stderr, "]: <%d>, %d/%d\n",
1323 button_number, 1328 button_number,
1324 x + 1, 1329 x,
1325 y + 1); 1330 y);
1326#endif 1331#endif
1327 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
1328 tt_printf ("\033[M%c%c%c", 1346 tt_printf ("\033[M%c%c%c",
1329 (code + button_number + key_state), 1347 code + button_number + key_state,
1330 (32 + x + 1), 1348 32 + x,
1331 (32 + y + 1)); 1349 32 + y);
1332} 1350}
1333 1351
1334/*{{{ process an X event */ 1352/*{{{ process an X event */
1335void 1353void
1336rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
… …
1438 && ev.xfocus.mode != NotifyGrab) 1456 && ev.xfocus.mode != NotifyGrab)
1439 focus_out (); 1457 focus_out ();
1440 break; 1458 break;
1441 1459
1442 case ConfigureNotify: 1460 case ConfigureNotify:
1443 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445 szHint.width, szHint.height); */
1446 if (ev.xconfigure.window == parent[0]) 1461 if (ev.xconfigure.window == parent)
1447 { 1462 {
1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449 ; 1464 ;
1465
1466#ifdef HAVE_BG_PIXMAP
1467 bool moved = false;
1468 if (bg_window_position_sensitive ())
1469 {
1470 int x, y;
1471 if (ev.xconfigure.send_event)
1472 {
1473 x = ev.xconfigure.x;
1474 y = ev.xconfigure.y;
1475 }
1476 else
1477 get_window_origin (x, y);
1478
1479 if (bg_set_position (x, y)
1480 || !(bg_flags & BG_IS_VALID))
1481 moved = true;
1482 }
1483#endif
1450 1484
1451 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1452 { 1486 {
1453 seen_resize = 1; 1487 seen_resize = 1;
1454 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1455 } 1489 }
1456 else 1490 else
1457 { 1491 {
1458#ifdef HAVE_BG_PIXMAP 1492#ifdef HAVE_BG_PIXMAP
1459 if (bgPixmap.window_position_sensitive ()) 1493 if (moved)
1460 update_background (); 1494 update_background ();
1461#endif 1495#endif
1462 } 1496 }
1463 1497
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465 } 1499 }
1466 break; 1500 break;
1467 1501
1468 case PropertyNotify: 1502 case PropertyNotify:
1469 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1503 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1470 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1471 && ev.xproperty.state == PropertyNewValue)
1472 selection_property (ev.xproperty.window, ev.xproperty.atom);
1473
1474 break; 1504 break;
1475 1505
1476 case SelectionClear: 1506 case SelectionClear:
1477 selection_clear (); 1507 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1478 break;
1479
1480 case SelectionNotify:
1481 if (selection_wait == Sel_normal)
1482 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1483 break; 1508 break;
1484 1509
1485 case SelectionRequest: 1510 case SelectionRequest:
1486 selection_send (ev.xselectionrequest); 1511 selection_send (ev.xselectionrequest);
1487 break; 1512 break;
1488 1513
1489 case MapNotify: 1514 case MapNotify:
1515#ifdef HAVE_BG_PIXMAP
1516 /* This is needed specifically to fix the case of no window manager or a
1517 * non-reparenting window manager. In those cases we never get first
1518 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1519 * care of multiplicity of ConfigureNotify events arriving while WM does
1520 * reparenting.
1521 * We should not render background immediately, as there could be several
1522 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1523 * by scheduling background redraw as soon as we can, but giving a short
1524 * bit of time for ConfigureNotifies to arrive.
1525 * We should render background PRIOR to drawing any text, but AFTER all
1526 * of ConfigureNotifys for the best results.
1527 */
1528 if (!(bg_flags & BG_IS_VALID))
1529 update_background_ev.start (0.025);
1530#endif
1490 mapped = 1; 1531 mapped = 1;
1491#ifdef TEXT_BLINK 1532#ifdef TEXT_BLINK
1492 text_blink_ev.start (); 1533 text_blink_ev.start ();
1493#endif 1534#endif
1494 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1535 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1507 if (ev.xany.window == vt) 1548 if (ev.xany.window == vt)
1508 { 1549 {
1509 do 1550 do
1510 { 1551 {
1511 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1512 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1513 } 1554 }
1514 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1515 1556
1516 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1517 1558
1518 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1519 { 1560 {
1520 scr_expose (ev.xexpose.x, ev.xexpose.y, 1561 scr_expose (ev.xexpose.x, ev.xexpose.y,
1521 ev.xexpose.width, ev.xexpose.height, False); 1562 ev.xexpose.width, ev.xexpose.height, false);
1522 } 1563 }
1523 1564
1524 want_refresh = 1; 1565 want_refresh = 1;
1525 } 1566 }
1526 else 1567 else
… …
1532 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1533 ; 1574 ;
1534 1575
1535 if (scrollBar.state && ev.xany.window == scrollBar.win) 1576 if (scrollBar.state && ev.xany.window == scrollBar.win)
1536 { 1577 {
1537 scrollBar.setIdle (); 1578 scrollBar.state = SB_STATE_IDLE;
1538 scrollbar_show (0); 1579 scrollBar.show (0);
1539 } 1580 }
1540 } 1581 }
1541 break; 1582 break;
1542 1583
1543 case MotionNotify: 1584 case MotionNotify:
… …
1608 dist = int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1609 } 1650 }
1610 else 1651 else
1611 { 1652 {
1612 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1613 dist = ev.xbutton.y - (int_bwidth + height); 1654 dist = ev.xbutton.y - (int_bwidth + vt_height);
1614 } 1655 }
1615 1656
1616 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1617 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1618 + 1; 1659 + 1;
… …
1630#ifdef MOUSE_THRESHOLD 1671#ifdef MOUSE_THRESHOLD
1631 } 1672 }
1632#endif 1673#endif
1633 } 1674 }
1634 } 1675 }
1635 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1636 { 1677 {
1637 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1638 MotionNotify, &ev)) 1679 MotionNotify, &ev))
1639 ; 1680 ;
1640 1681
1641 XQueryPointer (dpy, scrollBar.win, 1682 XQueryPointer (dpy, scrollBar.win,
1642 &unused_root, &unused_child, 1683 &unused_root, &unused_child,
1643 &unused_root_x, &unused_root_y, 1684 &unused_root_x, &unused_root_y,
1644 &ev.xbutton.x, &ev.xbutton.y, 1685 &ev.xbutton.x, &ev.xbutton.y,
1645 &unused_mask); 1686 &unused_mask);
1646 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1687 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1647 scrollbar_size ()); 1688 scrollBar.size ());
1648 want_refresh = 1; 1689 want_refresh = 1;
1649 scrollbar_show (1); 1690 scrollBar.show (1);
1650 } 1691 }
1651 break; 1692 break;
1652 } 1693 }
1653 1694
1654#if defined(CURSOR_BLINK) 1695#if defined(CURSOR_BLINK)
1655 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1696 if (ev.type == KeyPress)
1656 {
1657 if (hidden_cursor)
1658 {
1659 hidden_cursor = 0;
1660 want_refresh = 1;
1661 }
1662
1663 cursor_blink_ev.again (); 1697 cursor_blink_reset ();
1664 }
1665#endif 1698#endif
1666 1699
1667#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1668 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1669 { 1702 {
… …
1679#endif 1712#endif
1680 1713
1681 refresh_check (); 1714 refresh_check ();
1682} 1715}
1683 1716
1717#if ENABLE_FRILLS
1718void
1719rxvt_term::set_urgency (bool enable)
1720{
1721 if (enable == urgency_hint)
1722 return;
1723
1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1725 {
1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1727 XSetWMHints (dpy, parent, h);
1728 urgency_hint = enable;
1729 XFree (h);
1730 }
1731}
1732#endif
1733
1684void 1734void
1685rxvt_term::focus_in () 1735rxvt_term::focus_in ()
1686{ 1736{
1687 if (!focus) 1737 if (!focus)
1688 { 1738 {
1689 focus = 1; 1739 focus = 1;
1690 want_refresh = 1; 1740 want_refresh = 1;
1691 1741
1692 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1693
1694#if USE_XIM 1742#if USE_XIM
1695 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1696 { 1744 {
1697 IMSetPosition (); 1745 im_set_position ();
1698 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1699 } 1747 }
1700#endif 1748#endif
1701#if CURSOR_BLINK 1749#if CURSOR_BLINK
1702 if (option (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
… …
1709 scr_recolour (); 1757 scr_recolour ();
1710 } 1758 }
1711#endif 1759#endif
1712#if ENABLE_FRILLS 1760#if ENABLE_FRILLS
1713 if (option (Opt_urgentOnBell)) 1761 if (option (Opt_urgentOnBell))
1714 { 1762 set_urgency (0);
1715 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1716 {
1717 h->flags &= ~XUrgencyHint;
1718 XSetWMHints (dpy, parent[0], h);
1719 }
1720 }
1721#endif 1763#endif
1764
1765 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1722 } 1766 }
1723} 1767}
1724 1768
1725void 1769void
1726rxvt_term::focus_out () 1770rxvt_term::focus_out ()
… …
1728 if (focus) 1772 if (focus)
1729 { 1773 {
1730 focus = 0; 1774 focus = 0;
1731 want_refresh = 1; 1775 want_refresh = 1;
1732 1776
1733 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1777#if ENABLE_FRILLS
1734 1778 if (option (Opt_urgentOnBell))
1779 set_urgency (0);
1780#endif
1735#if ENABLE_FRILLS || ISO_14755 1781#if ENABLE_FRILLS || ISO_14755
1736 if (iso14755buf) 1782 if (iso14755buf)
1737 { 1783 {
1738 iso14755buf = 0; 1784 iso14755buf = 0;
1739# if ISO_14755 1785# if ISO_14755
… …
1756 { 1802 {
1757 pix_colors = pix_colors_unfocused; 1803 pix_colors = pix_colors_unfocused;
1758 scr_recolour (); 1804 scr_recolour ();
1759 } 1805 }
1760#endif 1806#endif
1807
1808 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1761 } 1809 }
1762} 1810}
1763 1811
1764void 1812void
1765rxvt_term::update_fade_color (unsigned int idx) 1813rxvt_term::update_fade_color (unsigned int idx)
… …
1793 * use the property to determine the pixmap. We use it later on. 1841 * use the property to determine the pixmap. We use it later on.
1794 */ 1842 */
1795 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1843 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1796 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1844 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1797 { 1845 {
1798 bgPixmap.set_root_pixmap (); 1846 bg_set_root_pixmap ();
1799 update_background (); 1847 update_background ();
1800 } 1848 }
1801 1849
1802 break; 1850 break;
1803 } 1851 }
… …
1842 /* save the xbutton state (for ButtonRelease) */ 1890 /* save the xbutton state (for ButtonRelease) */
1843 MEvent.state = ev.state; 1891 MEvent.state = ev.state;
1844#ifdef MOUSE_REPORT_DOUBLECLICK 1892#ifdef MOUSE_REPORT_DOUBLECLICK
1845 if (ev.button == MEvent.button && clickintime) 1893 if (ev.button == MEvent.button && clickintime)
1846 { 1894 {
1847 /* same button, within alloted time */ 1895 /* same button, within allowed time */
1848 MEvent.clicks++; 1896 MEvent.clicks++;
1849 1897
1850 if (MEvent.clicks > 1) 1898 if (MEvent.clicks > 1)
1851 { 1899 {
1852 /* only report double clicks */ 1900 /* only report double clicks */
… …
1926 /* 1974 /*
1927 * Scrollbar window processing of button press 1975 * Scrollbar window processing of button press
1928 */ 1976 */
1929 if (scrollBar.state && ev.window == scrollBar.win) 1977 if (scrollBar.state && ev.window == scrollBar.win)
1930 { 1978 {
1931 scrollBar.setIdle (); 1979 page_dirn direction = NO_DIR;
1980
1981 if (scrollBar.upButton (ev.y))
1982 direction = UP; /* up */
1983 else if (scrollBar.dnButton (ev.y))
1984 direction = DN; /* down */
1985
1986 scrollBar.state = SB_STATE_IDLE;
1932 /* 1987 /*
1933 * Rxvt-style scrollbar: 1988 * Rxvt-style scrollbar:
1934 * move up if mouse is above slider 1989 * move up if mouse is above slider
1935 * move dn if mouse is below slider 1990 * move dn if mouse is below slider
1936 * 1991 *
… …
1945 /* 2000 /*
1946 * Mouse report disabled scrollbar: 2001 * Mouse report disabled scrollbar:
1947 * arrow buttons - send up/down 2002 * arrow buttons - send up/down
1948 * click on scrollbar - send pageup/down 2003 * click on scrollbar - send pageup/down
1949 */ 2004 */
1950 if ((scrollBar.style == R_SB_NEXT 2005 if (direction == UP)
1951 && scrollbarnext_upButton (ev.y))
1952 || (scrollBar.style == R_SB_RXVT
1953 && scrollbarrxvt_upButton (ev.y)))
1954 tt_printf ("\033[A"); 2006 tt_printf ("\033[A");
1955 else if ((scrollBar.style == R_SB_NEXT 2007 else if (direction == DN)
1956 && scrollbarnext_dnButton (ev.y))
1957 || (scrollBar.style == R_SB_RXVT
1958 && scrollbarrxvt_dnButton (ev.y)))
1959 tt_printf ("\033[B"); 2008 tt_printf ("\033[B");
1960 else 2009 else
1961 switch (ev.button) 2010 switch (ev.button)
1962 { 2011 {
1963 case Button2: 2012 case Button2:
… …
1971 break; 2020 break;
1972 } 2021 }
1973 } 2022 }
1974 else 2023 else
1975#endif /* NO_SCROLLBAR_REPORT */ 2024#endif /* NO_SCROLLBAR_REPORT */
1976
1977 {
1978 char upordown = 0;
1979
1980 if (scrollBar.style == R_SB_NEXT)
1981 { 2025 {
1982 if (scrollbarnext_upButton (ev.y)) 2026 if (direction != NO_DIR)
1983 upordown = -1; /* up */
1984 else if (scrollbarnext_dnButton (ev.y))
1985 upordown = 1; /* down */
1986 }
1987 else if (scrollBar.style == R_SB_RXVT)
1988 {
1989 if (scrollbarrxvt_upButton (ev.y))
1990 upordown = -1; /* up */
1991 else if (scrollbarrxvt_dnButton (ev.y))
1992 upordown = 1; /* down */
1993 }
1994
1995 if (upordown)
1996 { 2027 {
1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2028#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1998 if (!cont_scroll_ev.is_active ()) 2029 if (!cont_scroll_ev.is_active ())
1999 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2030 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2000#endif 2031#endif
2001 if (scr_page (upordown < 0 ? UP : DN, 1)) 2032 if (scr_page (direction, 1))
2002 { 2033 {
2003 if (upordown < 0) 2034 if (direction == UP)
2004 scrollBar.setUp (); 2035 scrollBar.state = SB_STATE_UP;
2005 else 2036 else
2006 scrollBar.setDn (); 2037 scrollBar.state = SB_STATE_DOWN;
2007 } 2038 }
2008 } 2039 }
2009 else 2040 else
2010 switch (ev.button) 2041 switch (ev.button)
2011 { 2042 {
2012 case Button2: 2043 case Button2:
2013 switch (scrollBar.align) 2044 switch (scrollBar.align)
2014 { 2045 {
2015 case R_SB_ALIGN_TOP: 2046 case SB_ALIGN_TOP:
2016 csrO = 0; 2047 csrO = 0;
2017 break; 2048 break;
2018 case R_SB_ALIGN_CENTRE: 2049 case SB_ALIGN_CENTRE:
2019 csrO = (scrollBar.bot - scrollBar.top) / 2; 2050 csrO = (scrollBar.bot - scrollBar.top) / 2;
2020 break; 2051 break;
2021 case R_SB_ALIGN_BOTTOM: 2052 case SB_ALIGN_BOTTOM:
2022 csrO = scrollBar.bot - scrollBar.top; 2053 csrO = scrollBar.bot - scrollBar.top;
2023 break; 2054 break;
2024 } 2055 }
2025 2056
2026 if (scrollBar.style == R_SB_XTERM 2057 if (scrollBar.style == SB_STYLE_XTERM
2027 || scrollbar_above_slider (ev.y) 2058 || scrollBar.above_slider (ev.y)
2028 || scrollbar_below_slider (ev.y)) 2059 || scrollBar.below_slider (ev.y))
2029 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2060 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2030 2061
2031 scrollBar.setMotion (); 2062 scrollBar.state = SB_STATE_MOTION;
2032 break; 2063 break;
2033 2064
2034 case Button1: 2065 case Button1:
2035 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2066 if (scrollBar.align == SB_ALIGN_CENTRE)
2036 csrO = ev.y - scrollBar.top; 2067 csrO = ev.y - scrollBar.top;
2037 /* FALLTHROUGH */ 2068 /* FALLTHROUGH */
2038 2069
2039 case Button3: 2070 case Button3:
2040 if (scrollBar.style != R_SB_XTERM) 2071 if (scrollBar.style != SB_STYLE_XTERM)
2041 { 2072 {
2042 if (scrollbar_above_slider (ev.y)) 2073 if (scrollBar.above_slider (ev.y))
2043# ifdef RXVT_SCROLL_FULL 2074# ifdef RXVT_SCROLL_FULL
2044 scr_page (UP, nrow - 1); 2075 scr_page (UP, nrow - 1);
2045# else 2076# else
2046 scr_page (UP, nrow / 4); 2077 scr_page (UP, nrow / 4);
2047# endif 2078# endif
2048 else if (scrollbar_below_slider (ev.y)) 2079 else if (scrollBar.below_slider (ev.y))
2049# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
2050 scr_page (DN, nrow - 1); 2081 scr_page (DN, nrow - 1);
2051# else 2082# else
2052 scr_page (DN, nrow / 4); 2083 scr_page (DN, nrow / 4);
2053# endif 2084# endif
2054 else 2085 else
2055 scrollBar.setMotion (); 2086 scrollBar.state = SB_STATE_MOTION;
2056 } 2087 }
2057 else 2088 else
2058 { 2089 {
2059 scr_page ((ev.button == Button1 ? DN : UP), 2090 scr_page ((ev.button == Button1 ? DN : UP),
2060 (nrow 2091 (nrow
2061 * scrollbar_position (ev.y) 2092 * scrollBar.position (ev.y)
2062 / scrollbar_size ())); 2093 / scrollBar.size ()));
2063 } 2094 }
2064 2095
2065 break; 2096 break;
2066 } 2097 }
2067 } 2098 }
… …
2077 2108
2078 csrO = 0; /* reset csr Offset */ 2109 csrO = 0; /* reset csr Offset */
2079 if (!bypass_keystate) 2110 if (!bypass_keystate)
2080 reportmode = !! (priv_modes & PrivMode_mouse_report); 2111 reportmode = !! (priv_modes & PrivMode_mouse_report);
2081 2112
2082 if (scrollbar_isUpDn ()) 2113 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2083 { 2114 {
2084 scrollBar.setIdle (); 2115 scrollBar.state = SB_STATE_IDLE;
2085 scrollbar_show (0); 2116 scrollBar.show (0);
2086 } 2117 }
2087 2118
2088#ifdef SELECTION_SCROLLING 2119#ifdef SELECTION_SCROLLING
2089 sel_scroll_ev.stop(); 2120 sel_scroll_ev.stop();
2090#endif 2121#endif
… …
2139 case Button3: 2170 case Button3:
2140 selection_make (ev.time); 2171 selection_make (ev.time);
2141 break; 2172 break;
2142 2173
2143 case Button2: 2174 case Button2:
2144 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2175 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2145 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2146 break; 2177 break;
2147 2178
2148#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2149 case Button4: 2180 case Button4:
2150 case Button5: 2181 case Button5:
… …
2173 } 2204 }
2174 else 2205 else
2175# endif 2206# endif
2176 { 2207 {
2177 scr_page (v, i); 2208 scr_page (v, i);
2178 scrollbar_show (1); 2209 scrollBar.show (1);
2179 } 2210 }
2180 } 2211 }
2181 break; 2212 break;
2182#endif 2213#endif
2183 } 2214 }
2184 } 2215 }
2185} 2216}
2186 2217
2187/*}}} */ 2218/*}}} */
2188 2219
2189bool 2220void
2190rxvt_term::cmd_parse () 2221rxvt_term::cmd_parse ()
2191{ 2222{
2192 bool flag = false;
2193 wchar_t ch = NOCHAR; 2223 wchar_t ch = NOCHAR;
2194 char *seq_begin; // remember start of esc-sequence here 2224 char *seq_begin; // remember start of esc-sequence here
2195 2225
2196 for (;;) 2226 for (;;)
2197 { 2227 {
2198 if (ch == NOCHAR) 2228 if (ecb_unlikely (ch == NOCHAR))
2199 { 2229 {
2200 seq_begin = cmdbuf_ptr; 2230 seq_begin = cmdbuf_ptr;
2201 ch = next_char (); 2231 ch = next_char ();
2202 2232
2203 if (ch == NOCHAR) 2233 if (ch == NOCHAR)
2204 break; 2234 break;
2205 } 2235 }
2206 2236
2207 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2237 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2208 { 2238 {
2209 if (!seen_input) 2239 if (ecb_unlikely (!seen_input))
2210 { 2240 {
2211 seen_input = 1; 2241 seen_input = 1;
2212 // many badly-written programs (e.g. jed) contain a race condition: 2242 // many badly-written programs (e.g. jed) contain a race condition:
2213 // they first read the screensize and then install a SIGWINCH handler. 2243 // they first read the screensize and then install a SIGWINCH handler.
2214 // some window managers resize the window early, and these programs 2244 // some window managers resize the window early, and these programs
… …
2227 wchar_t *str = buf; 2257 wchar_t *str = buf;
2228 wchar_t *eol = str + min (ncol, UBUFSIZ); 2258 wchar_t *eol = str + min (ncol, UBUFSIZ);
2229 2259
2230 for (;;) 2260 for (;;)
2231 { 2261 {
2232 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2262 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2233 break; 2263 break;
2234 2264
2235 *str++ = ch; 2265 *str++ = ch;
2236 2266
2237 if (ch == C0_LF || str >= eol) 2267 if (ecb_unlikely (ch == C0_LF || str >= eol))
2238 { 2268 {
2239 if (ch == C0_LF) 2269 if (ch == C0_LF)
2240 nlines++; 2270 nlines++;
2241 2271
2242 refresh_count++; 2272 refresh_count++;
… …
2291 * What the heck we'll cheat and only refresh less than every page-full. 2321 * What the heck we'll cheat and only refresh less than every page-full.
2292 * if skipScroll is enabled. 2322 * if skipScroll is enabled.
2293 */ 2323 */
2294 if (refreshnow) 2324 if (refreshnow)
2295 { 2325 {
2296 flag = true;
2297 scr_refresh (); 2326 scr_refresh ();
2298 want_refresh = 1; 2327 want_refresh = 1;
2299 } 2328 }
2300
2301 } 2329 }
2302 else 2330 else
2303 { 2331 {
2304 try 2332 try
2305 { 2333 {
… …
2313 } 2341 }
2314 2342
2315 ch = NOCHAR; 2343 ch = NOCHAR;
2316 } 2344 }
2317 } 2345 }
2318
2319 return flag;
2320} 2346}
2321 2347
2322// read the next character 2348// read the next character
2323wchar_t 2349wchar_t
2324rxvt_term::next_char () NOTHROW 2350rxvt_term::next_char () NOTHROW
2325{ 2351{
2326 while (cmdbuf_ptr < cmdbuf_endp) 2352 while (cmdbuf_ptr < cmdbuf_endp)
2327 { 2353 {
2328 // assume 7-bit to be ascii ALWAYS 2354 // assume 7-bit to be ascii ALWAYS
2329 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2355 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2330 return *cmdbuf_ptr++; 2356 return *cmdbuf_ptr++;
2331 2357
2332 wchar_t wc; 2358 wchar_t wc;
2333 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2359 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2334 2360
… …
2338 cmdbuf_ptr = cmdbuf_endp; 2364 cmdbuf_ptr = cmdbuf_endp;
2339 break; 2365 break;
2340 } 2366 }
2341 2367
2342 if (len == (size_t)-1) 2368 if (len == (size_t)-1)
2369 {
2370 mbstate.reset (); // reset now undefined conversion state
2343 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2371 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2372 }
2344 2373
2345 // assume wchar == unicode 2374 // assume wchar == unicode
2346 cmdbuf_ptr += len; 2375 cmdbuf_ptr += len;
2347 return wc & UNICODE_MASK; 2376 return wc & UNICODE_MASK;
2348 } 2377 }
… …
2359 : NOCHAR; 2388 : NOCHAR;
2360} 2389}
2361 2390
2362static class out_of_input out_of_input; 2391static class out_of_input out_of_input;
2363 2392
2364/* rxvt_cmd_getc () - Return next input character */
2365/*
2366 * Return the next input character after first passing any keyboard input
2367 * to the command.
2368 */
2369wchar_t 2393wchar_t
2370rxvt_term::cmd_getc () THROW ((class out_of_input)) 2394rxvt_term::cmd_getc () THROW ((class out_of_input))
2371{ 2395{
2372 wchar_t c = next_char (); 2396 wchar_t c = next_char ();
2373 2397
… …
2392/*----------------------------------------------------------------------*/ 2416/*----------------------------------------------------------------------*/
2393#ifdef PRINTPIPE 2417#ifdef PRINTPIPE
2394FILE * 2418FILE *
2395rxvt_term::popen_printer () 2419rxvt_term::popen_printer ()
2396{ 2420{
2397 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2421 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2398 2422
2399 if (stream == NULL) 2423 if (stream == NULL)
2400 rxvt_warn ("can't open printer pipe, not printing.\n"); 2424 rxvt_warn ("can't open printer pipe, not printing.\n");
2401 2425
2402 return stream; 2426 return stream;
… …
2413 * simulate attached vt100 printer 2437 * simulate attached vt100 printer
2414 */ 2438 */
2415void 2439void
2416rxvt_term::process_print_pipe () 2440rxvt_term::process_print_pipe ()
2417{ 2441{
2418 int done; 2442 FILE *fd = popen_printer ();
2419 FILE *fd;
2420 2443
2421 if ((fd = popen_printer ()) == NULL) 2444 if (!fd)
2422 return; 2445 return;
2423 2446
2424 /* 2447 /*
2425 * Send all input to the printer until either ESC[4i or ESC[?4i 2448 * Send all input to the printer until either ESC[4i or ESC[?4i
2426 * is received. 2449 * is received.
2427 */ 2450 */
2428 for (done = 0; !done;) 2451 for (int done = 0; !done; )
2429 { 2452 {
2430 unsigned char buf[8]; 2453 unsigned char buf[8];
2431 unicode_t ch; 2454 unicode_t ch;
2432 unsigned int i, len; 2455 unsigned int i, len;
2433 2456
… …
2467 pclose_printer (fd); 2490 pclose_printer (fd);
2468} 2491}
2469#endif /* PRINTPIPE */ 2492#endif /* PRINTPIPE */
2470/*}}} */ 2493/*}}} */
2471 2494
2472/* *INDENT-OFF* */
2473enum { 2495enum {
2474 C1_40 = 0x40, 2496 C1_40 = 0x40,
2475 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2497 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2476 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2498 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2477 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2499 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2478 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2500 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2479}; 2501};
2480/* *INDENT-ON* */
2481 2502
2482/*{{{ process non-printing single characters */ 2503/*{{{ process non-printing single characters */
2483void 2504void
2484rxvt_term::process_nonprinting (unicode_t ch) 2505rxvt_term::process_nonprinting (unicode_t ch)
2485{ 2506{
… …
2578 break; 2599 break;
2579 case 'Z': /* identify the terminal type */ 2600 case 'Z': /* identify the terminal type */
2580 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2581 break; 2602 break;
2582 case '<': /* turn off VT52 mode */ 2603 case '<': /* turn off VT52 mode */
2583 PrivMode (0, PrivMode_vt52); 2604 priv_modes &= ~PrivMode_vt52;
2584 break; 2605 break;
2585 case 'F': /* use special graphics character set */ 2606 case 'F': /* use special graphics character set */
2586 case 'G': /* use regular character set */ 2607 case 'G': /* use regular character set */
2587 /* unimplemented */ 2608 /* unimplemented */
2588 break; 2609 break;
… …
2607 return; 2628 return;
2608 } 2629 }
2609 2630
2610 switch (ch) 2631 switch (ch)
2611 { 2632 {
2612 /* case 1: do_tek_mode (); break; */
2613 case '#': 2633 case '#':
2614 if (cmd_getc () == '8') 2634 if (cmd_getc () == '8')
2615 scr_E (); 2635 scr_E ();
2616 break; 2636 break;
2617 case '(': 2637 case '(':
… …
2640#if !ENABLE_MINIMAL 2660#if !ENABLE_MINIMAL
2641 case '9': 2661 case '9':
2642 scr_forwardindex (); 2662 scr_forwardindex ();
2643 break; 2663 break;
2644#endif 2664#endif
2665 // DECPAM/DECPNM
2645 case '=': 2666 case '=':
2667 priv_modes |= PrivMode_aplKP;
2668 break;
2646 case '>': 2669 case '>':
2647 PrivMode ((ch == '='), PrivMode_aplKP); 2670 priv_modes &= ~PrivMode_aplKP;
2648 break; 2671 break;
2649 2672
2650 case C1_40: 2673 case C1_40:
2651 cmd_getc (); 2674 cmd_getc ();
2652 break; 2675 break;
… …
2656 2679
2657 /* 8.3.87: NEXT LINE */ 2680 /* 8.3.87: NEXT LINE */
2658 case C1_NEL: /* ESC E */ 2681 case C1_NEL: /* ESC E */
2659 { 2682 {
2660 wchar_t nlcr[] = { C0_LF, C0_CR }; 2683 wchar_t nlcr[] = { C0_LF, C0_CR };
2661 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2684 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2662 } 2685 }
2663 break; 2686 break;
2664 2687
2665 /* kidnapped escape sequence: Should be 8.3.48 */ 2688 /* kidnapped escape sequence: Should be 8.3.48 */
2666 case C1_ESA: /* ESC G */ 2689 case C1_ESA: /* ESC G */
2667 process_graphics (); 2690 // used by original rxvt for rob nations own graphics mode
2691 if (cmd_getc () == 'Q')
2692 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2668 break; 2693 break;
2669 2694
2670 /* 8.3.63: CHARACTER TABULATION SET */ 2695 /* 8.3.63: CHARACTER TABULATION SET */
2671 case C1_HTS: /* ESC H */ 2696 case C1_HTS: /* ESC H */
2672 scr_set_tab (1); 2697 scr_set_tab (1);
… …
2676 case C1_RI: /* ESC M */ 2701 case C1_RI: /* ESC M */
2677 scr_index (DN); 2702 scr_index (DN);
2678 break; 2703 break;
2679 2704
2680 /* 8.3.142: SINGLE-SHIFT TWO */ 2705 /* 8.3.142: SINGLE-SHIFT TWO */
2681 /*case C1_SS2: scr_single_shift (2); break; */ 2706 /* case C1_SS2: break; */
2682 2707
2683 /* 8.3.143: SINGLE-SHIFT THREE */ 2708 /* 8.3.143: SINGLE-SHIFT THREE */
2684 /*case C1_SS3: scr_single_shift (3); break; */ 2709 /* case C1_SS3: break; */
2685 2710
2686 /* 8.3.27: DEVICE CONTROL STRING */ 2711 /* 8.3.27: DEVICE CONTROL STRING */
2687 case C1_DCS: /* ESC P */ 2712 case C1_DCS: /* ESC P */
2688 process_dcs_seq (); 2713 process_dcs_seq ();
2689 break; 2714 break;
… …
2691 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2716 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2692 case C1_SCI: /* ESC Z */ 2717 case C1_SCI: /* ESC Z */
2693 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2718 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2694 break; /* steal obsolete ESC [ c */ 2719 break; /* steal obsolete ESC [ c */
2695 2720
2696 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2721 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2697 case C1_CSI: /* ESC [ */ 2722 case C1_CSI: /* ESC [ */
2698 process_csi_seq (); 2723 process_csi_seq ();
2699 break; 2724 break;
2700 2725
2701 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2726 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2702 case C1_OSC: /* ESC ] */ 2727 case C1_OSC: /* ESC ] */
2703 process_osc_seq (); 2728 process_osc_seq ();
2704 break; 2729 break;
2705 2730
2706 /* 8.3.106: RESET TO INITIAL STATE */ 2731 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2707 case 'c': 2732 case 'c':
2708 mbstate.reset (); 2733 mbstate.reset ();
2709 scr_poweron (); 2734 scr_poweron ();
2710 scrollbar_show (1); 2735 scrollBar.show (1);
2711 break; 2736 break;
2712 2737
2713 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2738 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2714 case 'n': 2739 case 'n':
2715 scr_charset_choose (2); 2740 scr_charset_choose (2);
… …
2722 } 2747 }
2723} 2748}
2724/*}}} */ 2749/*}}} */
2725 2750
2726/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2751/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2727/* *INDENT-OFF* */
2728enum { 2752enum {
2729 CSI_ICH = 0x40, 2753 CSI_ICH = 0x40,
2730 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2754 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2731 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2755 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2732 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2756 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2735 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2759 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2736 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2760 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2737 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2761 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2738}; 2762};
2739 2763
2740#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2764#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2741 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2742 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2743#define get_byte_array_bit(array, bit) \ 2767#define get_byte_array_bit(array, bit) \
2744 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2768 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2745 2769
2746const unsigned char csi_defaults[] = 2770static const unsigned char csi_defaults[] =
2747 { 2771 {
2748 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2772 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2749 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2773 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2750 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2774 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2751 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2775 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2752 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2776 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2753 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2777 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2754 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2778 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2755 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2779 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2756 }; 2780 };
2757/* *INDENT-ON* */
2758 2781
2759void 2782void
2760rxvt_term::process_csi_seq () 2783rxvt_term::process_csi_seq ()
2761{ 2784{
2762 unicode_t ch, priv, i; 2785 unicode_t ch, priv, i;
… …
2766 2789
2767 nargs = 0; 2790 nargs = 0;
2768 2791
2769 priv = 0; 2792 priv = 0;
2770 ch = cmd_getc (); 2793 ch = cmd_getc ();
2771 if (ch >= '<' && ch <= '?') 2794 if ((ch >= '<' && ch <= '?') || ch == '!')
2772 { 2795 {
2773 /* '<' '=' '>' '?' */ 2796 /* '<' '=' '>' '?' '!' */
2774 priv = ch; 2797 priv = ch;
2775 ch = cmd_getc (); 2798 ch = cmd_getc ();
2776 } 2799 }
2777 2800
2778 /* read any numerical arguments */ 2801 /* read any numerical arguments */
… …
2827 // versions. 2850 // versions.
2828 // 2851 //
2829 tt_printf ("\033[>%d;95;0c", 'U'); 2852 tt_printf ("\033[>%d;95;0c", 'U');
2830 } 2853 }
2831 break; 2854 break;
2855
2832 case '?': 2856 case '?':
2833 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2857 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2834 process_terminal_mode (ch, priv, nargs, arg); 2858 process_terminal_mode (ch, priv, nargs, arg);
2835 break; 2859 break;
2860
2861 case '!':
2862 if (ch == CSI_70)
2863 {
2864 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2865 scr_soft_reset ();
2866
2867 static const int pm_h[] = { 7, 25 };
2868 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2869
2870 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2871 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2836 } 2872 }
2873 break;
2874 }
2875
2837 return; 2876 return;
2838 } 2877 }
2839 2878
2840 switch (ch) 2879 switch (ch)
2841 { 2880 {
… …
2855 } 2894 }
2856 break; 2895 break;
2857#endif 2896#endif
2858 2897
2859 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2898 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2860 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2899 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2861 arg[0] = -arg[0]; 2900 arg[0] = -arg[0];
2862 /* FALLTHROUGH */ 2901 /* FALLTHROUGH */
2863 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2902 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2864 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2903 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2865 scr_gotorc (arg[0], 0, RELATIVE); 2904 scr_gotorc (arg[0], 0, RELATIVE);
2866 break; 2905 break;
2867 2906
2868 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2907 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2869 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2908 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3056 } 3095 }
3057} 3096}
3058/*}}} */ 3097/*}}} */
3059 3098
3060#if !ENABLE_MINIMAL 3099#if !ENABLE_MINIMAL
3061/* ARGSUSED */
3062void 3100void
3063rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3101rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3064{ 3102{
3065 int x, y; 3103 int x, y;
3066 XWindowAttributes wattr; 3104 XWindowAttributes wattr;
… …
3075 { 3113 {
3076 /* 3114 /*
3077 * commands 3115 * commands
3078 */ 3116 */
3079 case 1: /* deiconify window */ 3117 case 1: /* deiconify window */
3080 XMapWindow (dpy, parent[0]); 3118 XMapWindow (dpy, parent);
3081 break; 3119 break;
3082 case 2: /* iconify window */ 3120 case 2: /* iconify window */
3083 XIconifyWindow (dpy, parent[0], display->screen); 3121 XIconifyWindow (dpy, parent, display->screen);
3084 break; 3122 break;
3085 case 3: /* set position (pixels) */ 3123 case 3: /* set position (pixels) */
3086 XMoveWindow (dpy, parent[0], args[1], args[2]); 3124 XMoveWindow (dpy, parent, args[1], args[2]);
3087 break; 3125 break;
3088 case 4: /* set size (pixels) */ 3126 case 4: /* set size (pixels) */
3089 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3127 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3090 break; 3128 break;
3091 case 5: /* raise window */ 3129 case 5: /* raise window */
3092 XRaiseWindow (dpy, parent[0]); 3130 XRaiseWindow (dpy, parent);
3093 break; 3131 break;
3094 case 6: /* lower window */ 3132 case 6: /* lower window */
3095 XLowerWindow (dpy, parent[0]); 3133 XLowerWindow (dpy, parent);
3096 break; 3134 break;
3097 case 7: /* refresh window */ 3135 case 7: /* refresh window */
3098 scr_touch (true); 3136 scr_touch (true);
3099 break; 3137 break;
3100 case 8: /* set size (chars) */ 3138 case 8: /* set size (chars) */
… …
3103 break; 3141 break;
3104 3142
3105 //case 9: NYI, TODO, restore maximized window or maximize window 3143 //case 9: NYI, TODO, restore maximized window or maximize window
3106 default: 3144 default:
3107 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3108 set_widthheight ((unsigned int)width, 3146 set_widthheight ((unsigned int)vt_width,
3109 (unsigned int) (args[1] * fheight)); 3147 (unsigned int) (args[1] * fheight));
3110 break; 3148 break;
3111 3149
3112 /* 3150 /*
3113 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
3114 */ 3152 */
3115 case 11: /* report window state */ 3153 case 11: /* report window state */
3116 XGetWindowAttributes (dpy, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent, &wattr);
3117 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3155 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3118 break; 3156 break;
3119 case 13: /* report window position */ 3157 case 13: /* report window position */
3120 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3121 XTranslateCoordinates (dpy, parent[0], wattr.root, 3159 XTranslateCoordinates (dpy, parent, wattr.root,
3122 -wattr.border_width, -wattr.border_width, 3160 -wattr.border_width, -wattr.border_width,
3123 &x, &y, &wdummy); 3161 &x, &y, &wdummy);
3124 tt_printf ("\033[3;%d;%dt", x, y); 3162 tt_printf ("\033[3;%d;%dt", x, y);
3125 break; 3163 break;
3126 case 14: /* report window size (pixels) */ 3164 case 14: /* report window size (pixels) */
3127 XGetWindowAttributes (dpy, parent[0], &wattr); 3165 XGetWindowAttributes (dpy, parent, &wattr);
3128 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3166 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3129 break; 3167 break;
3130 case 18: /* report text area size (chars) */ 3168 case 18: /* report text area size (chars) */
3131 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3132 break; 3170 break;
… …
3134 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3172 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3135 break; 3173 break;
3136 case 20: /* report icon label */ 3174 case 20: /* report icon label */
3137 { 3175 {
3138 char *s; 3176 char *s;
3139 XGetIconName (dpy, parent[0], &s); 3177 XGetIconName (dpy, parent, &s);
3140 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3178 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3141 XFree (s); 3179 XFree (s);
3142 } 3180 }
3143 break; 3181 break;
3144 case 21: /* report window title */ 3182 case 21: /* report window title */
3145 { 3183 {
3146 char *s; 3184 char *s;
3147 XFetchName (dpy, parent[0], &s); 3185 XFetchName (dpy, parent, &s);
3148 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3186 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3149 XFree (s); 3187 XFree (s);
3150 } 3188 }
3151 break; 3189 break;
3152 } 3190 }
… …
3208 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3246 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3209 */ 3247 */
3210void 3248void
3211rxvt_term::process_dcs_seq () 3249rxvt_term::process_dcs_seq ()
3212{ 3250{
3213 char *s;
3214 unicode_t eh;
3215
3216 /* 3251 /*
3217 * Not handled yet 3252 * Not handled yet
3218 */ 3253 */
3254
3255 unicode_t eh;
3219 s = get_to_st (eh); 3256 char *s = get_to_st (eh);
3220 if (s) 3257 if (s)
3221 free (s); 3258 free (s);
3222 3259
3223 return; 3260 return;
3224} 3261}
… …
3228 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3265 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3229 */ 3266 */
3230void 3267void
3231rxvt_term::process_osc_seq () 3268rxvt_term::process_osc_seq ()
3232{ 3269{
3233 unicode_t ch, eh;
3234 int arg; 3270 int arg;
3235 3271
3236 ch = cmd_getc (); 3272 unicode_t ch = cmd_getc ();
3237 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3273 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3238 arg = arg * 10 + (ch - '0'); 3274 arg = arg * 10 + (ch - '0');
3239 3275
3240 if (ch == ';') 3276 if (ch == ';')
3241 { 3277 {
3278 unicode_t eh;
3242 char *s = get_to_st (eh); 3279 char *s = get_to_st (eh);
3243 3280
3244 if (s) 3281 if (s)
3245 { 3282 {
3246 process_xterm_seq (arg, s, eh); 3283 process_xterm_seq (arg, s, eh);
… …
3270 3307
3271/* 3308/*
3272 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3309 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3273 */ 3310 */
3274void 3311void
3275rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3312rxvt_term::process_xterm_seq (int op, char *str, char resp)
3276{ 3313{
3277 int color; 3314 int color;
3278 char *buf, *name; 3315 char *buf, *name;
3279 bool query = str[0] == '?' && !str[1]; 3316 bool query = str[0] == '?' && !str[1];
3280 int saveop = op; 3317 int saveop = op;
… …
3307 unsigned long bytes_after; 3344 unsigned long bytes_after;
3308 unsigned char *value = 0; 3345 unsigned char *value = 0;
3309 const char *str = ""; 3346 const char *str = "";
3310 3347
3311 if (prop 3348 if (prop
3312 && XGetWindowProperty (dpy, parent[0], 3349 && XGetWindowProperty (dpy, parent,
3313 prop, 0, 1<<16, 0, AnyPropertyType, 3350 prop, 0, 1<<16, 0, AnyPropertyType,
3314 &actual_type, &actual_format, 3351 &actual_type, &actual_format,
3315 &nitems, &bytes_after, &value) == Success 3352 &nitems, &bytes_after, &value) == Success
3316 && actual_type != None 3353 && actual_type != None
3317 && actual_format == 8) 3354 && actual_format == 8)
… …
3321 3358
3322 XFree (value); 3359 XFree (value);
3323 } 3360 }
3324 else 3361 else
3325 { 3362 {
3326 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3363 char *eq = strchr (str, '=');
3327 3364
3328 if (eq) 3365 if (eq)
3329 { 3366 {
3330 *eq = 0; 3367 *eq = 0;
3331 set_utf8_property (display->atom (str), eq + 1); 3368 set_utf8_property (display->atom (str), eq + 1);
3332 } 3369 }
3333 else 3370 else
3334 XDeleteProperty (dpy, parent[0], 3371 XDeleteProperty (dpy, parent,
3335 display->atom (str)); 3372 display->atom (str));
3336 } 3373 }
3337 break; 3374 break;
3338 3375
3339 case XTerm_Color: 3376 case XTerm_Color:
… …
3352 *buf++ = '\0'; 3389 *buf++ = '\0';
3353 3390
3354 process_color_seq (op, color, name, resp); 3391 process_color_seq (op, color, name, resp);
3355 } 3392 }
3356 break; 3393 break;
3394 case Rxvt_restoreFG:
3357 case XTerm_Color00: 3395 case XTerm_Color00:
3358 process_color_seq (op, Color_fg, str, resp); 3396 process_color_seq (op, Color_fg, str, resp);
3359 break; 3397 break;
3398 case Rxvt_restoreBG:
3360 case XTerm_Color01: 3399 case XTerm_Color01:
3361 process_color_seq (op, Color_bg, str, resp); 3400 process_color_seq (op, Color_bg, str, resp);
3362 break; 3401 break;
3363#ifndef NO_CURSORCOLOR 3402#ifndef NO_CURSORCOLOR
3364 case XTerm_Color_cursor: 3403 case XTerm_Color_cursor:
… …
3369 process_color_seq (op, Color_pointer_fg, str, resp); 3408 process_color_seq (op, Color_pointer_fg, str, resp);
3370 break; 3409 break;
3371 case XTerm_Color_pointer_bg: 3410 case XTerm_Color_pointer_bg:
3372 process_color_seq (op, Color_pointer_bg, str, resp); 3411 process_color_seq (op, Color_pointer_bg, str, resp);
3373 break; 3412 break;
3413#ifdef OPTION_HC
3414 case XTerm_Color_HC:
3415 process_color_seq (op, Color_HC, str, resp);
3416 break;
3417 case XTerm_Color_HTC:
3418 process_color_seq (op, Color_HTC, str, resp);
3419 break;
3420#endif
3374#ifndef NO_BOLD_UNDERLINE_REVERSE 3421#ifndef NO_BOLD_UNDERLINE_REVERSE
3375 case XTerm_Color_RV:
3376 process_color_seq (op, Color_RV, str, resp);
3377 break;
3378 case Rxvt_Color_BD:
3379 case URxvt_Color_BD: 3422 case URxvt_Color_BD:
3380 process_color_seq (op, Color_BD, str, resp); 3423 process_color_seq (op, Color_BD, str, resp);
3381 break; 3424 break;
3382 case Rxvt_Color_UL:
3383 case URxvt_Color_UL: 3425 case URxvt_Color_UL:
3384 process_color_seq (op, Color_UL, str, resp); 3426 process_color_seq (op, Color_UL, str, resp);
3385 break; 3427 break;
3386 case URxvt_Color_IT: 3428 case URxvt_Color_IT:
3387 process_color_seq (op, Color_IT, str, resp); 3429 process_color_seq (op, Color_IT, str, resp);
3388 break; 3430 break;
3389#endif 3431#endif
3432 case URxvt_Color_border:
3433 process_color_seq (op, Color_border, str, resp);
3434 break;
3390#if ENABLE_TRANSPARENCY 3435#if ENABLE_TRANSPARENCY
3391 case URxvt_Color_tint: 3436 case URxvt_Color_tint:
3392 process_color_seq (op, Color_tint, str, resp); 3437 process_color_seq (op, Color_tint, str, resp);
3393 { 3438 {
3394 bool changed = false; 3439 bool changed = false;
3395 3440
3396 if (ISSET_PIXCOLOR (Color_tint)) 3441 if (ISSET_PIXCOLOR (Color_tint))
3397 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3442 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3398 else
3399 changed = bgPixmap.unset_tint ();
3400 3443
3401 if (changed) 3444 if (changed)
3402 update_background (); 3445 update_background ();
3403 } 3446 }
3404 3447
… …
3408#if BG_IMAGE_FROM_FILE 3451#if BG_IMAGE_FROM_FILE
3409 case Rxvt_Pixmap: 3452 case Rxvt_Pixmap:
3410 if (!strcmp (str, "?")) 3453 if (!strcmp (str, "?"))
3411 { 3454 {
3412 char str[256]; 3455 char str[256];
3456 int h_scale = 0, v_scale = 0;
3457 int h_align = 0, v_align = 0;
3458 if (image_vec.size () > 0)
3459 {
3460 h_scale = image_vec[0].h_scale;
3461 v_scale = image_vec[0].v_scale;
3462 h_align = image_vec[0].h_align;
3463 v_align = image_vec[0].v_align;
3464 }
3413 3465
3414 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3466 sprintf (str, "[%dx%d+%d+%d]",
3415 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3467 h_scale, v_scale,
3416 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3468 h_align, v_align);
3417 process_xterm_seq (XTerm_title, str, CHAR_ST); 3469 process_xterm_seq (XTerm_title, str, CHAR_ST);
3418 } 3470 }
3419 else 3471 else
3420 { 3472 {
3421 int changed = 0; 3473 bool changed = false;
3422 3474
3423 if (*str != ';') 3475 if (*str != ';')
3424 { 3476 {
3425 /* reset to default scaling :*/ 3477 if (image_vec.size () > 0
3426 bgPixmap.unset_geometry (); 3478 && image_vec[0].set_file_geometry (str))
3427 if (bgPixmap.set_file (str)) /* change pixmap */
3428 changed++; 3479 changed = true;
3429 str = strchr (str, ';'); 3480 else
3430 if (str == NULL) 3481 {
3431 bgPixmap.set_defaultGeometry (); 3482 rxvt_image *image = new_image ();
3483 if (!image->set_file_geometry (str))
3484 image_vec.pop_back ();
3485 else
3486 changed = true;
3487 }
3432 } 3488 }
3433 3489 else
3434 while (str)
3435 { 3490 {
3436 str++; 3491 str++;
3437 if (bgPixmap.set_geometry (str)) 3492 if (image_vec.size () > 0
3493 && image_vec[0].set_geometry (str, true))
3438 changed++; 3494 changed = true;
3439 str = strchr (str, ';');
3440 } 3495 }
3441 3496
3442 if (changed) 3497 if (changed)
3498 {
3499 if (bg_window_position_sensitive ())
3500 {
3501 int x, y;
3502 get_window_origin (x, y);
3503 bg_set_position (x, y);
3504 }
3443 update_background (); 3505 update_background ();
3506 }
3444 } 3507 }
3445 break; 3508 break;
3446#endif 3509#endif
3447
3448 case Rxvt_restoreFG:
3449 set_window_color (Color_fg, str);
3450 break;
3451 case Rxvt_restoreBG:
3452 set_window_color (Color_bg, str);
3453 break;
3454 3510
3455 case XTerm_logfile: 3511 case XTerm_logfile:
3456 // TODO, when secure mode? 3512 // TODO, when secure mode?
3457 break; 3513 break;
3458 3514
… …
3525 break; 3581 break;
3526#endif 3582#endif
3527 3583
3528#if ENABLE_PERL 3584#if ENABLE_PERL
3529 case URxvt_perl: 3585 case URxvt_perl:
3530 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3586 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3531 ; // no responses yet
3532 break; 3587 break;
3533#endif 3588#endif
3534 } 3589 }
3535} 3590}
3536/*----------------------------------------------------------------------*/ 3591/*----------------------------------------------------------------------*/
… …
3550{ 3605{
3551 int state; 3606 int state;
3552 3607
3553 if (mode == 's') 3608 if (mode == 's')
3554 { 3609 {
3555 SavedModes |= (priv_modes & bit); 3610 if (priv_modes & bit)
3611 SavedModes |= bit;
3612 else
3613 SavedModes &= ~bit;
3556 return -1; 3614 return -1;
3557 } 3615 }
3558 else 3616 else
3559 { 3617 {
3560 if (mode == 'r') 3618 if (mode == 'r')
3561 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3619 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3562 else 3620 else
3563 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3621 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3564 PrivMode (state, bit); 3622
3623 if (state)
3624 priv_modes |= bit;
3625 else
3626 priv_modes &= ~bit;
3565 } 3627 }
3566 3628
3567 return state; 3629 return state;
3568} 3630}
3569 3631
3570/* we're not using priv _yet_ */ 3632/* we're not using priv _yet_ */
3571void 3633void
3572rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3634rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3573{ 3635{
3574 unsigned int i, j; 3636 unsigned int i, j;
3575 int state; 3637 int state;
3576 3638
3577 static const struct 3639 static const struct
3578 { 3640 {
3579 const int argval; 3641 const int argval;
3580 const unsigned long bit; 3642 const unsigned long bit;
3581 } argtopriv[] = { 3643 } argtopriv[] = {
3582 { 1, PrivMode_aplCUR }, 3644 { 1, PrivMode_aplCUR }, // DECCKM
3583 { 2, PrivMode_vt52 }, 3645 { 2, PrivMode_vt52 }, // DECANM
3584 { 3, PrivMode_132 }, 3646 { 3, PrivMode_132 }, // DECCOLM
3585 { 4, PrivMode_smoothScroll }, 3647 { 4, PrivMode_smoothScroll }, // DECSCLM
3586 { 5, PrivMode_rVideo }, 3648 { 5, PrivMode_rVideo }, // DECSCNM
3587 { 6, PrivMode_relOrigin }, 3649 { 6, PrivMode_relOrigin }, // DECOM
3588 { 7, PrivMode_Autowrap }, 3650 { 7, PrivMode_Autowrap }, // DECAWM
3589 // 8, bi-directional support mode 3651 // 8, auto-repeat keys // DECARM
3590 { 9, PrivMode_MouseX10 }, 3652 { 9, PrivMode_MouseX10 },
3591 // 18, 19 printing-related 3653 // 18 end FF to printer after print screen
3654 // 19 Print screen prints full screen/scroll region
3592 { 25, PrivMode_VisibleCursor }, 3655 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3593#ifdef scrollBar_esc 3656#ifdef scrollBar_esc
3594 { scrollBar_esc, PrivMode_scrollBar }, 3657 { scrollBar_esc, PrivMode_scrollBar },
3595#endif 3658#endif
3596 { 35, PrivMode_ShiftKeys }, // rxvt extension 3659 { 35, PrivMode_ShiftKeys }, // rxvt extension
3660 // 38, tektronix mode // DECTEK
3597 { 40, PrivMode_132OK }, 3661 { 40, PrivMode_132OK },
3598 // 41 xterm more fixes NYI 3662 // 41 xterm more fixes NYI
3599 // 45 margin bell NYI 3663 // 45 margin bell NYI
3600 // 46 start logging 3664 // 46 start logging
3601 { 47, PrivMode_Screen }, 3665 { 47, PrivMode_Screen },
3602 { 66, PrivMode_aplKP }, 3666 { 66, PrivMode_aplKP }, // DECNKM
3603#ifndef NO_BACKSPACE_KEY 3667#ifndef NO_BACKSPACE_KEY
3604 { 67, PrivMode_BackSpace }, 3668 { 67, PrivMode_BackSpace }, // DECBKM
3605#endif 3669#endif
3606 { 1000, PrivMode_MouseX11 }, 3670 { 1000, PrivMode_MouseX11 },
3607 { 1002, PrivMode_MouseBtnEvent }, 3671 { 1002, PrivMode_MouseBtnEvent },
3608 { 1003, PrivMode_MouseAnyEvent }, 3672 { 1003, PrivMode_MouseAnyEvent },
3673#if ENABLE_FRILLS
3674 { 1005, PrivMode_ExtModeMouse },
3675#endif
3609 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3676 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3610 { 1011, PrivMode_Keypress }, // rxvt extension 3677 { 1011, PrivMode_Keypress }, // rxvt extension
3678#if ENABLE_FRILLS
3679 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3680#endif
3611 // 1035 enable modifiers for alt, numlock NYI 3681 // 1035 enable modifiers for alt, numlock NYI
3612 // 1036 send ESC for meta keys NYI 3682 // 1036 send ESC for meta keys NYI
3613 // 1037 send DEL for keypad delete NYI 3683 // 1037 send DEL for keypad delete NYI
3614 { 1047, PrivMode_Screen }, 3684 { 1047, PrivMode_Screen },
3615 // 1048 save and restore cursor 3685 // 1048 save and restore cursor, implemented in code
3616 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3686 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3617 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3687 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3688 { 2004, PrivMode_BracketPaste },
3618 }; 3689 };
3619 3690
3620 if (nargs == 0) 3691 if (nargs == 0)
3621 return; 3692 return;
3622 3693
… …
3629 for (i = 0; i < nargs; i++) 3700 for (i = 0; i < nargs; i++)
3630 { 3701 {
3631 state = -1; 3702 state = -1;
3632 3703
3633 /* basic handling */ 3704 /* basic handling */
3634 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3705 for (j = 0; j < ecb_array_length (argtopriv); j++)
3635 if (argtopriv[j].argval == arg[i]) 3706 if (argtopriv[j].argval == arg[i])
3636 { 3707 {
3637 state = privcases (mode, argtopriv[j].bit); 3708 state = privcases (mode, argtopriv[j].bit);
3638 break; 3709 break;
3639 } 3710 }
… …
3647 3718
3648 scr_touch (true); 3719 scr_touch (true);
3649 break; 3720 break;
3650#endif 3721#endif
3651 case 1048: /* alternative cursor save */ 3722 case 1048: /* alternative cursor save */
3652 case 1049:
3653 if (option (Opt_secondaryScreen)) 3723 if (option (Opt_secondaryScreen))
3654 if (mode == 0) 3724 if (mode == 0)
3655 scr_cursor (RESTORE); 3725 scr_cursor (RESTORE);
3656 else if (mode == 1) 3726 else if (mode == 1)
3657 scr_cursor (SAVE); 3727 scr_cursor (SAVE);
… …
3666 case 2: /* VT52 mode */ 3736 case 2: /* VT52 mode */
3667 /* oddball mode. should be set regardless of set/reset 3737 /* oddball mode. should be set regardless of set/reset
3668 * parameter. Return from VT52 mode with an ESC < from 3738 * parameter. Return from VT52 mode with an ESC < from
3669 * within VT52 mode 3739 * within VT52 mode
3670 */ 3740 */
3671 PrivMode (1, PrivMode_vt52); 3741 priv_modes |= PrivMode_vt52;
3672 break; 3742 break;
3673 case 3: /* 80/132 */ 3743 case 3: /* 80/132 */
3674 if (priv_modes & PrivMode_132OK) 3744 if (priv_modes & PrivMode_132OK)
3675 {
3676 scr_poweron ();
3677 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3745 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3678 }
3679 break; 3746 break;
3680 case 4: /* smooth scrolling */ 3747 case 4: /* smooth scrolling */
3681 set_option (Opt_jumpScroll, !state); 3748 set_option (Opt_jumpScroll, !state);
3682 break; 3749 break;
3683 case 5: /* reverse video */ 3750 case 5: /* reverse video */
… …
3694 if (state) /* orthogonal */ 3761 if (state) /* orthogonal */
3695 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3762 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3696 break; 3763 break;
3697#ifdef scrollBar_esc 3764#ifdef scrollBar_esc
3698 case scrollBar_esc: 3765 case scrollBar_esc:
3699 if (scrollbar_mapping (state)) 3766 scrollBar.map (state);
3700 {
3701 resize_all_windows (0, 0, 0); 3767 resize_all_windows (0, 0, 0);
3702 scr_touch (true); 3768 scr_touch (true);
3703 }
3704 break; 3769 break;
3705#endif 3770#endif
3706 case 25: /* visible/invisible cursor */ 3771 case 25: /* visible/invisible cursor */
3707 scr_cursor_visible (state); 3772 scr_cursor_visible (state);
3708 break; 3773 break;
… …
3721 case 1003: 3786 case 1003:
3722 if (state) 3787 if (state)
3723 { 3788 {
3724 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3789 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3725 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3790 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3791 mouse_row = mouse_col = 0;
3726 vt_emask_mouse = PointerMotionMask; 3792 vt_emask_mouse = PointerMotionMask;
3727 } 3793 }
3728 else 3794 else
3729 vt_emask_mouse = NoEventMask; 3795 vt_emask_mouse = NoEventMask;
3796
3730 vt_select_input (); 3797 vt_select_input ();
3731 break; 3798 break;
3732 case 1010: /* scroll to bottom on TTY output inhibit */ 3799 case 1010: /* scroll to bottom on TTY output inhibit */
3733 set_option (Opt_scrollTtyOutput, !state); 3800 set_option (Opt_scrollTtyOutput, !state);
3734 break; 3801 break;
3735 case 1011: /* scroll to bottom on key press */ 3802 case 1011: /* scroll to bottom on key press */
3736 set_option (Opt_scrollTtyKeypress, state); 3803 set_option (Opt_scrollTtyKeypress, state);
3737 break; 3804 break;
3738 case 1047: /* secondary screen w/ clearing last */ 3805 case 1047: /* secondary screen w/ clearing last */
3739 if (option (Opt_secondaryScreen)) 3806 if (option (Opt_secondaryScreen))
3740 if (current_screen != PRIMARY) 3807 if (!state)
3741 scr_erase_screen (2); 3808 scr_erase_screen (2);
3809
3742 scr_change_screen (state); 3810 scr_change_screen (state);
3743 break; 3811 break;
3744 case 1049: /* secondary screen w/ clearing first */ 3812 case 1049: /* secondary screen w/ clearing first */
3813 if (option (Opt_secondaryScreen))
3814 if (state)
3815 scr_cursor (SAVE);
3816
3745 scr_change_screen (state); 3817 scr_change_screen (state);
3818
3746 if (option (Opt_secondaryScreen)) 3819 if (option (Opt_secondaryScreen))
3747 if (current_screen != PRIMARY) 3820 if (state)
3748 scr_erase_screen (2); 3821 scr_erase_screen (2);
3822 else
3823 scr_cursor (RESTORE);
3749 break; 3824 break;
3750 default: 3825 default:
3751 break; 3826 break;
3752 } 3827 }
3753 } 3828 }
… …
3906 } 3981 }
3907 } 3982 }
3908} 3983}
3909/*}}} */ 3984/*}}} */
3910 3985
3911/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3912void
3913rxvt_term::process_graphics ()
3914{
3915 unicode_t ch, cmd = cmd_getc ();
3916
3917 if (cmd == 'Q')
3918 {
3919 /* query graphics */
3920 tt_printf ("\033G0\012"); /* no graphics */
3921 return;
3922 }
3923 /* swallow other graphics sequences until terminating ':' */
3924 do
3925 ch = cmd_getc ();
3926 while (ch != ':');
3927}
3928/*}}} */
3929
3930/* ------------------------------------------------------------------------- */ 3986/* ------------------------------------------------------------------------- */
3931 3987
3932/* 3988/*
3933 * Send printf () formatted output to the command. 3989 * Send printf () formatted output to the command.
3934 * Only use for small amounts of data. 3990 * Only use for small amounts of data.
… …
3947 4003
3948/* ---------------------------------------------------------------------- */ 4004/* ---------------------------------------------------------------------- */
3949/* Write data to the pty as typed by the user, pasted with the mouse, 4005/* Write data to the pty as typed by the user, pasted with the mouse,
3950 * or generated by us in response to a query ESC sequence. 4006 * or generated by us in response to a query ESC sequence.
3951 */ 4007 */
3952const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4008static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3953 4009
3954void 4010void
3955rxvt_term::tt_write (const char *data, unsigned int len) 4011rxvt_term::tt_write (const char *data, unsigned int len)
3956{ 4012{
3957 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4013 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3962 4018
3963 if (v_buflen == 0) 4019 if (v_buflen == 0)
3964 { 4020 {
3965 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4021 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3966 4022
4023 max_it (written, 0);
4024
3967 if ((unsigned int)written == len) 4025 if (written == len)
3968 return; 4026 return;
3969 4027
3970 data += written; 4028 data += written;
3971 len -= written; 4029 len -= written;
3972 } 4030 }
3973 4031
3974 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4032 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3975 4033
3976 memcpy (v_buffer + v_buflen, data, len); 4034 memcpy (v_buffer + v_buflen, data, len);
3977 v_buflen += len; 4035 v_buflen += len;
3978 4036
3979 pty_ev.set (ev::READ | ev::WRITE); 4037 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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