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.381 by root, Fri Dec 14 05:25:23 2007 UTC vs.
Revision 1.508 by sf-exg, Fri Apr 13 09:23:58 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 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
53 54
54#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <signal.h>
59 60
60#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
61# include <ctime> 62# include <time.h>
62#endif 63#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
161 162
162void 163void
163rxvt_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)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
196 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
200 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);
201 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
202 207
203 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
205 210
206 if (y >= 0) 211 if (y >= 0)
207 { 212 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 214 x = 0;
210 } 215 }
211 216
212 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
213 218
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 220
216 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
217 { 222 {
… …
220 ch = *chr++; 225 ch = *chr++;
221 226
222 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
225# if !UNICODE3 230# if !UNICODE_3
226 if (ch >= 0x10000) 231 if (ch >= 0x10000)
227 ch = 0xfffd; 232 ch = 0xfffd;
228# endif 233# endif
229 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
230 235
… …
236// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
239// } 244// }
240 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
241 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
242
243 free (fname); 249 free (fname[i]);
250 }
244 251
245# if ENABLE_COMBINING 252# if ENABLE_COMBINING
246 if (alloc) 253 if (alloc)
247 delete [] alloc; 254 delete [] alloc;
248# endif 255# endif
… …
250#endif 257#endif
251 258
252void 259void
253rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
254{ 261{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259 263
260 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
261 { 265 {
262 char mb[16]; 266 char mb[MB_LEN_MAX];
263 int len; 267 int len;
264 268
265 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
267 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
268 else 272 else
269 { 273 {
270 mb[0] = ch[0]; 274 mb[0] = ch;
271 len = 1; 275 len = 1;
272 } 276 }
273 277
274 if (len > 0) 278 if (len > 0)
275 tt_write (mb, len); 279 tt_write (mb, len);
… …
278 } 282 }
279 283
280 iso14755buf = 0; 284 iso14755buf = 0;
281} 285}
282 286
283int 287static int
284rxvt_term::hex_keyval (XKeyEvent &ev) 288hex_keyval (XKeyEvent &ev)
285{ 289{
286 // check wether this event corresponds to a hex digit 290 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 291 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 292 for (int index = 0; index < 8; index++)
289 { 293 {
290 KeySym k = XLookupKeysym (&ev, index); 294 KeySym k = XLookupKeysym (&ev, index);
291 295
… …
297 301
298 return -1; 302 return -1;
299} 303}
300#endif 304#endif
301 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
302void 401void
303rxvt_term::key_press (XKeyEvent &ev) 402rxvt_term::key_press (XKeyEvent &ev)
304{ 403{
305 int ctrl, meta, shft, len; 404 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 405 KeySym keysym;
308 int valid_keysym; 406 int valid_keysym;
309 char kbuf[KBUFSZ]; 407 char kbuf[KBUFSZ];
310 408
311#if ISO_14755 409#if ISO_14755
… …
320 * Always permit `shift' to override the current setting 418 * Always permit `shift' to override the current setting
321 */ 419 */
322 shft = ev.state & ShiftMask; 420 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
325
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331 423
332 kbuf[0] = 0; 424 kbuf[0] = 0;
333 425
334#ifdef USE_XIM 426#ifdef USE_XIM
335 if (Input_Context) 427 if (Input_Context)
… …
410#ifdef PAGING_CONTEXT_LINES 502#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 503 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 504#else
413 lnsppg = nrow * 4 / 5; 505 lnsppg = nrow * 4 / 5;
414#endif 506#endif
507 max_it (lnsppg, 1);
508
415 if (keysym == XK_Prior) 509 if (keysym == XK_Prior)
416 { 510 {
417 scr_page (UP, lnsppg); 511 scr_page (UP, lnsppg);
418 return; 512 return;
419 } 513 }
… …
472 selection_request (ev.time); 566 selection_request (ev.time);
473 return; 567 return;
474#if TODO 568#if TODO
475 /* rxvt extras */ 569 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 571 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 573 return;
482#endif 574#endif
483 } 575 }
484 } 576 }
485 } 577 }
486 578
487#if ENABLE_FRILLS || ISO_14755 579#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 580 // ISO 14755 support
489 if (shft && ctrl) 581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 582 {
491 int hv; 583 int hv;
492 584
493 if (iso14755buf & ISO_14755_51 585 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 586 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 616 scr_overlay_off ();
525# endif 617# endif
526 iso14755buf = 0; 618 iso14755buf = 0;
527 } 619 }
528 } 620 }
621 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 622 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 623 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 624 if (!(iso14755buf & ISO_14755_STARTED))
532 { 625 {
533 iso14755buf |= ISO_14755_STARTED; 626 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 627# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 628 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 639 }
547#endif 640#endif
548 641
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 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)
551 { 653 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 654#ifndef NO_BACKSPACE_KEY
553 newlen = 1; 655 case XK_BackSpace:
554#ifdef XK_KP_Home 656 if (priv_modes & PrivMode_HaveBackSpace)
555 static const KeySym keypadtrans[] = { 657 {
556 XK_KP_7, // XK_KP_Home 658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557 XK_KP_4, // XK_KP_Left 659 ^ !!ctrl) ? '\b' : '\177';
558 XK_KP_8, // XK_KP_Up 660 kbuf[1] = '\0';
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 }; 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;
571 687
572 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:
573 { 768 {
574 unsigned int index = keysym - XK_KP_Home; 769 int param = map_function_key (keysym);
575 keysym = kp ? keypadtrans[index] : XK_Home + index; 770 if (param > 0)
771 sprintf (kbuf,"\033[%d~", param);
772 else
773 newlen = 0;
576 } 774 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
584 switch (keysym)
585 {
586#ifndef NO_BACKSPACE_KEY
587 case XK_BackSpace:
588 if (priv_modes & PrivMode_HaveBackSpace)
589 {
590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
591 ^ !!ctrl) ? '\b' : '\177';
592 kbuf[1] = '\0';
593 }
594 else
595 strcpy (kbuf, rs[Rs_backspace_key]);
596 break; 775 break;
597#endif
598#ifndef NO_DELETE_KEY
599 case XK_Delete:
600 strcpy (kbuf, rs[Rs_delete_key]);
601 break;
602#endif
603 case XK_Tab:
604 if (shft)
605 strcpy (kbuf, "\033[Z");
606 else
607 {
608#ifdef CTRL_TAB_MAKES_META
609 if (ctrl)
610 meta = 1;
611#endif
612#ifdef MOD4_TAB_MAKES_META
613 if (ev.state & Mod4Mask)
614 meta = 1;
615#endif
616 newlen = 0;
617 }
618 break;
619
620 case XK_Up: /* "\033[A" */
621 case XK_Down: /* "\033[B" */
622 case XK_Right: /* "\033[C" */
623 case XK_Left: /* "\033[D" */
624 strcpy (kbuf, "\033[Z");
625 kbuf[2] = "DACB"[keysym - XK_Left];
626 /* do Shift first */
627 if (shft)
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 else if (ctrl)
630 {
631 kbuf[1] = 'O';
632 kbuf[2] = "dacb"[keysym - XK_Left];
633 }
634 else if (priv_modes & PrivMode_aplCUR)
635 kbuf[1] = 'O';
636 break;
637
638#ifndef UNSHIFTED_SCROLLKEYS
639 case XK_Prior:
640 strcpy (kbuf, "\033[5~");
641 break;
642 case XK_Next:
643 strcpy (kbuf, "\033[6~");
644 break;
645#endif
646 case XK_KP_Enter:
647 /* allow shift to override */
648 if (kp)
649 {
650 strcpy (kbuf, "\033OM");
651 break;
652 }
653
654 /* FALLTHROUGH */
655
656 case XK_Return:
657 if (priv_modes & PrivMode_LFNL)
658 {
659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
661 kbuf[2] = '\0';
662 }
663 else
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\0';
667 }
668 break;
669
670 case XK_KP_F1: /* "\033OP" */
671 case XK_KP_F2: /* "\033OQ" */
672 case XK_KP_F3: /* "\033OR" */
673 case XK_KP_F4: /* "\033OS" */
674 strcpy (kbuf, "\033OP");
675 kbuf[2] += (keysym - XK_KP_F1);
676 break;
677
678 case XK_KP_Multiply: /* "\033Oj" : "*" */
679 case XK_KP_Add: /* "\033Ok" : "+" */
680 case XK_KP_Separator: /* "\033Ol" : "," */
681 case XK_KP_Subtract: /* "\033Om" : "-" */
682 case XK_KP_Decimal: /* "\033On" : "." */
683 case XK_KP_Divide: /* "\033Oo" : "/" */
684 case XK_KP_0: /* "\033Op" : "0" */
685 case XK_KP_1: /* "\033Oq" : "1" */
686 case XK_KP_2: /* "\033Or" : "2" */
687 case XK_KP_3: /* "\033Os" : "3" */
688 case XK_KP_4: /* "\033Ot" : "4" */
689 case XK_KP_5: /* "\033Ou" : "5" */
690 case XK_KP_6: /* "\033Ov" : "6" */
691 case XK_KP_7: /* "\033Ow" : "7" */
692 case XK_KP_8: /* "\033Ox" : "8" */
693 case XK_KP_9: /* "\033Oy" : "9" */
694 /* allow shift to override */
695 if (kp)
696 {
697 strcpy (kbuf, "\033Oj");
698 kbuf[2] += (keysym - XK_KP_Multiply);
699 }
700 else
701 {
702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703 kbuf[1] = '\0';
704 }
705 break;
706
707 case XK_Find:
708 strcpy (kbuf, "\033[1~");
709 break;
710
711 case XK_Insert:
712 strcpy (kbuf, "\033[2~");
713 break;
714#ifdef DXK_Remove /* support for DEC remove like key */
715 case DXK_Remove:
716 /* FALLTHROUGH */
717#endif
718 case XK_Execute:
719 strcpy (kbuf, "\033[3~");
720 break;
721 case XK_Select:
722 strcpy (kbuf, "\033[4~");
723 break;
724 case XK_End:
725 strcpy (kbuf, KS_END);
726 break;
727 case XK_Home:
728 strcpy (kbuf, KS_HOME);
729 break;
730
731#define FKEY(n, fkey) \
732 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
733
734 case XK_F1: /* "\033[11~" */
735 case XK_F2: /* "\033[12~" */
736 case XK_F3: /* "\033[13~" */
737 case XK_F4: /* "\033[14~" */
738 case XK_F5: /* "\033[15~" */
739 FKEY (11, XK_F1);
740 break;
741 case XK_F6: /* "\033[17~" */
742 case XK_F7: /* "\033[18~" */
743 case XK_F8: /* "\033[19~" */
744 case XK_F9: /* "\033[20~" */
745 case XK_F10: /* "\033[21~" */
746 FKEY (17, XK_F6);
747 break;
748 case XK_F11: /* "\033[23~" */
749 case XK_F12: /* "\033[24~" */
750 case XK_F13: /* "\033[25~" */
751 case XK_F14: /* "\033[26~" */
752 FKEY (23, XK_F11);
753 break;
754 case XK_F15: /* "\033[28~" */
755 case XK_F16: /* "\033[29~" */
756 FKEY (28, XK_F15);
757 break;
758 case XK_Help: /* "\033[28~" */
759 FKEY (28, XK_Help);
760 break;
761 case XK_Menu: /* "\033[29~" */
762 FKEY (29, XK_Menu);
763 break;
764 case XK_F17: /* "\033[31~" */
765 case XK_F18: /* "\033[32~" */
766 case XK_F19: /* "\033[33~" */
767 case XK_F20: /* "\033[34~" */
768 case XK_F21: /* "\033[35~" */
769 case XK_F22: /* "\033[36~" */
770 case XK_F23: /* "\033[37~" */
771 case XK_F24: /* "\033[38~" */
772 case XK_F25: /* "\033[39~" */
773 case XK_F26: /* "\033[40~" */
774 case XK_F27: /* "\033[41~" */
775 case XK_F28: /* "\033[42~" */
776 case XK_F29: /* "\033[43~" */
777 case XK_F30: /* "\033[44~" */
778 case XK_F31: /* "\033[45~" */
779 case XK_F32: /* "\033[46~" */
780 case XK_F33: /* "\033[47~" */
781 case XK_F34: /* "\033[48~" */
782 case XK_F35: /* "\033[49~" */
783 FKEY (31, XK_F17);
784 break;
785#undef FKEY
786 default:
787 newlen = 0;
788 break;
789 }
790
791 if (newlen)
792 len = strlen (kbuf);
793 } 776 }
794 777
778 if (newlen)
779 len = strlen (kbuf);
780
781 if (len > 0)
782 {
795 /* 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 /*
796 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
797 */ 797 */
798#ifdef META8_OPTION 798#ifdef META8_OPTION
799 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
800 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
801#endif 801#endif
802 }
802 803
803 } 804 }
804 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
805 { 806 {
806 len = 1; 807 len = 1;
… …
839 if (view_start) 840 if (view_start)
840 { 841 {
841 view_start = 0; 842 view_start = 0;
842 want_refresh = 1; 843 want_refresh = 1;
843 } 844 }
844
845 /*
846 * these modifications only affect the static keybuffer
847 * pass Shift/Control indicators for function keys ending with `~'
848 *
849 * eg,
850 * Prior = "ESC[5~"
851 * Shift+Prior = "ESC[5$"
852 * Ctrl+Prior = "ESC[5^"
853 * Ctrl+Shift+Prior = "ESC[5@"
854 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
855 */
856 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
857 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
858 845
859 /* escape prefix */ 846 /* escape prefix */
860 if (meta 847 if (meta
861#ifdef META8_OPTION 848#ifdef META8_OPTION
862 && meta_char == C0_ESC 849 && meta_char == C0_ESC
… …
898 commit_iso14755 (); 885 commit_iso14755 ();
899 886
900 return; 887 return;
901 } 888 }
902 889
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 890 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
904 if (i[0] == keysym) 891 if (i[0] == keysym)
905 { 892 {
906 iso14755buf = ISO_14755_51 | i[1]; 893 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 (); 894 commit_iso14755 ();
908 895
… …
945 else if (keysym == XK_Control_L || keysym == XK_Control_R) 932 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0; 933 mouse_slip_wheel_speed = 0;
947#endif 934#endif
948} 935}
949 936
950#if defined (KEYSYM_RESOURCE)
951unsigned int
952rxvt_term::cmd_write (const char *str, unsigned int count)
953{
954 unsigned int n, s;
955
956 n = cmdbuf_ptr - cmdbuf_base;
957 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
958
959 if (n > 0 && s < count)
960 {
961 memmove (cmdbuf_base, cmdbuf_ptr,
962 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
963 cmdbuf_ptr = cmdbuf_base;
964 cmdbuf_endp -= n;
965 s += n;
966 }
967
968 if (count > s)
969 {
970 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
971 count = s;
972 }
973
974 for (; count--;)
975 *cmdbuf_endp++ = *str++;
976
977 cmd_parse ();
978
979 return 0;
980}
981#endif
982
983void 937void
984rxvt_term::flush () 938rxvt_term::flush ()
985{ 939{
986 flush_ev.stop (); 940 flush_ev.stop ();
987 941
988#ifdef HAVE_BG_PIXMAP 942#ifdef HAVE_BG_PIXMAP
989 if (bgPixmap.check_clearChanged ()) 943 if (bg_flags & BG_NEEDS_REFRESH)
990 { 944 {
991// scr_clear (true); This needs to be researched further! 945 bg_flags &= ~BG_NEEDS_REFRESH;
992 scr_touch (false); 946 scr_touch (false);
993 } 947 }
994#endif 948#endif
995 949
996 if (want_refresh) 950 if (want_refresh)
… …
1032 } 986 }
1033 while (row < end_row); 987 while (row < end_row);
1034 } 988 }
1035 989
1036 scr_refresh (); 990 scr_refresh ();
1037 scrollbar_show (1); 991 scrollBar.show (1);
1038#ifdef USE_XIM 992#ifdef USE_XIM
1039 IMSendSpot (); 993 im_send_spot ();
1040#endif 994#endif
1041 } 995 }
1042 996
1043 display->flush (); 997 display->flush ();
1044} 998}
1045 999
1046/* checks wether a refresh is requested and starts the refresh timer */ 1000/* checks whether a refresh is requested and starts the refresh timer */
1047void 1001void
1048rxvt_term::refresh_check () 1002rxvt_term::refresh_check ()
1049{ 1003{
1050 if (want_refresh && !flush_ev.is_active ()) 1004 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1005 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1006
1007 display->flush ();
1052} 1008}
1053 1009
1054void 1010void
1055rxvt_term::flush_cb (ev::timer &w, int revents) 1011rxvt_term::flush_cb (ev::timer &w, int revents)
1056{ 1012{
… …
1059 refresh_count = 0; 1015 refresh_count = 0;
1060 flush (); 1016 flush ();
1061} 1017}
1062 1018
1063#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
1064void 1035void
1065rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1066{ 1037{
1067 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1068 want_refresh = 1; 1039 want_refresh = 1;
… …
1076{ 1047{
1077 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1048 if (scr_refresh_rend (RS_Blink, RS_Blink))
1078 { 1049 {
1079 hidden_text = !hidden_text; 1050 hidden_text = !hidden_text;
1080 want_refresh = 1; 1051 want_refresh = 1;
1081 refresh_check (); 1052 refresh_check ();
1082 } 1053 }
1083 else 1054 else
1084 w.stop (); 1055 w.stop ();
1085} 1056}
1086#endif 1057#endif
1087 1058
1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1089void 1060void
1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1091{ 1062{
1092 if ((scrollbar_isUp () || scrollbar_isDn ()) 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1093 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1094 { 1065 {
1095 want_refresh = 1; 1066 want_refresh = 1;
1096 refresh_check (); 1067 refresh_check ();
1097 } 1068 }
1098 else 1069 else
… …
1142 { 1113 {
1143 // this should really be sched_yield(), but the linux guys thought 1114 // this should really be sched_yield(), but the linux guys thought
1144 // that giving a process calling sched_yield () less cpu time than 1115 // that giving a process calling sched_yield () less cpu time than
1145 // 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
1146 // 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.
1147 1121
1148 struct timespec ts = { 0, 0 }; 1122 struct timespec ts = { 0, 1000 };
1149 nanosleep (&ts, 0); 1123 nanosleep (&ts, 0);
1150 1124
1151 w.stop (); 1125 w.stop ();
1152 } 1126 }
1153 1127
… …
1156 { 1130 {
1157 } 1131 }
1158} event_handler; 1132} event_handler;
1159#endif 1133#endif
1160 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
1161bool 1168bool
1162rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1163{ 1170{
1164 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 cmdbuf_reify ();
1165 1172
1166 if (CBUFSIZ == n) 1173 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1167 { 1174
1168 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1175 if (!avail)
1169 n = 0;
1170 } 1176 {
1171 1177 // normally this indicates a "too long" command sequence - just drop the data we have
1172 memmove (cmdbuf_base, cmdbuf_ptr, n);
1173 cmdbuf_ptr = cmdbuf_base; 1178 cmdbuf_ptr = cmdbuf_base;
1174 cmdbuf_endp = cmdbuf_ptr + n; 1179 cmdbuf_endp = cmdbuf_ptr;
1180 avail = CBUFSIZ;
1181 }
1175 1182
1176 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1177 1184
1178 if (r > 0) 1185 if (r > 0)
1179 { 1186 {
1180 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1181 return true; 1188 return true;
… …
1203{ 1210{
1204 make_current (); 1211 make_current ();
1205 1212
1206 if (revents & ev::READ) 1213 if (revents & ev::READ)
1207 // loop, but don't allow a single term to monopolize us 1214 // loop, but don't allow a single term to monopolize us
1208 while (pty_fill ()) 1215 for (int i = CBUFCNT; i-- && pty_fill (); )
1209 if (cmd_parse ()) 1216 cmd_parse ();
1210 break;
1211 1217
1212 if (revents & ev::WRITE) 1218 if (revents & ev::WRITE)
1213 pty_write (); 1219 pty_write ();
1220
1221 refresh_check ();
1214} 1222}
1215 1223
1216void 1224void
1217rxvt_term::pointer_unblank () 1225rxvt_term::pointer_unblank ()
1218{ 1226{
… …
1254{ 1262{
1255 int button_number, key_state = 0; 1263 int button_number, key_state = 0;
1256 int x, y; 1264 int x, y;
1257 int code = 32; 1265 int code = 32;
1258 1266
1259 x = Pixel2Col (ev.x); 1267 x = Pixel2Col (ev.x) + 1;
1260 y = Pixel2Row (ev.y); 1268 y = Pixel2Row (ev.y) + 1;
1269
1261 if (ev.type == MotionNotify) 1270 if (ev.type == MotionNotify)
1262 { 1271 {
1263 if (x == mouse_row && y == mouse_col) 1272 if (x == mouse_row && y == mouse_col)
1264 return; 1273 return;
1274
1265 mouse_row = x; 1275 mouse_row = x;
1266 mouse_col = y; 1276 mouse_col = y;
1267 code += 32; 1277 code += 32;
1268 } 1278 }
1269 1279
… …
1272 else 1282 else
1273 { 1283 {
1274 button_number = MEvent.button - Button1; 1284 button_number = MEvent.button - Button1;
1275 /* add 0x3D for wheel events, like xterm does */ 1285 /* add 0x3D for wheel events, like xterm does */
1276 if (button_number >= 3) 1286 if (button_number >= 3)
1277 button_number += (64 - 3); 1287 button_number += 64 - 3;
1278 } 1288 }
1279 1289
1280 if (priv_modes & PrivMode_MouseX10) 1290 if (priv_modes & PrivMode_MouseX10)
1281 { 1291 {
1282 /* 1292 /*
… …
1314 fputc ('A', stderr); 1324 fputc ('A', stderr);
1315 if (key_state & 32) 1325 if (key_state & 32)
1316 fputc ('2', stderr); 1326 fputc ('2', stderr);
1317 fprintf (stderr, "]: <%d>, %d/%d\n", 1327 fprintf (stderr, "]: <%d>, %d/%d\n",
1318 button_number, 1328 button_number,
1319 x + 1, 1329 x,
1320 y + 1); 1330 y);
1321#endif 1331#endif
1322 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
1323 tt_printf ("\033[M%c%c%c", 1346 tt_printf ("\033[M%c%c%c",
1324 (code + button_number + key_state), 1347 code + button_number + key_state,
1325 (32 + x + 1), 1348 32 + x,
1326 (32 + y + 1)); 1349 32 + y);
1327} 1350}
1328 1351
1329/*{{{ process an X event */ 1352/*{{{ process an X event */
1330void 1353void
1331rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
… …
1433 && ev.xfocus.mode != NotifyGrab) 1456 && ev.xfocus.mode != NotifyGrab)
1434 focus_out (); 1457 focus_out ();
1435 break; 1458 break;
1436 1459
1437 case ConfigureNotify: 1460 case ConfigureNotify:
1438 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1439 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1440 szHint.width, szHint.height); */
1441 if (ev.xconfigure.window == parent[0]) 1461 if (ev.xconfigure.window == parent)
1442 { 1462 {
1443 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1444 ; 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
1445 1484
1446 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1447 { 1486 {
1448 seen_resize = 1; 1487 seen_resize = 1;
1449 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1450 } 1489 }
1451 else 1490 else
1452 { 1491 {
1453#ifdef HAVE_BG_PIXMAP 1492#ifdef HAVE_BG_PIXMAP
1454 if (bgPixmap.window_position_sensitive ()) 1493 if (moved)
1455 update_background (); 1494 update_background ();
1456#endif 1495#endif
1457 } 1496 }
1497
1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 } 1499 }
1460 break; 1500 break;
1461 1501
1462 case PropertyNotify: 1502 case PropertyNotify:
1463 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1503 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1465 && ev.xproperty.state == PropertyNewValue)
1466 selection_property (ev.xproperty.window, ev.xproperty.atom);
1467
1468 break; 1504 break;
1469 1505
1470 case SelectionClear: 1506 case SelectionClear:
1471 selection_clear (); 1507 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1472 break;
1473
1474 case SelectionNotify:
1475 if (selection_wait == Sel_normal)
1476 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1477 break; 1508 break;
1478 1509
1479 case SelectionRequest: 1510 case SelectionRequest:
1480 selection_send (ev.xselectionrequest); 1511 selection_send (ev.xselectionrequest);
1481 break; 1512 break;
1482 1513
1483 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
1484 mapped = 1; 1531 mapped = 1;
1485#ifdef TEXT_BLINK 1532#ifdef TEXT_BLINK
1486 text_blink_ev.start (); 1533 text_blink_ev.start ();
1487#endif 1534#endif
1488 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1535 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1501 if (ev.xany.window == vt) 1548 if (ev.xany.window == vt)
1502 { 1549 {
1503 do 1550 do
1504 { 1551 {
1505 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1506 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1507 } 1554 }
1508 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1509 1556
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511 1558
1512 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1513 { 1560 {
1514 scr_expose (ev.xexpose.x, ev.xexpose.y, 1561 scr_expose (ev.xexpose.x, ev.xexpose.y,
1515 ev.xexpose.width, ev.xexpose.height, False); 1562 ev.xexpose.width, ev.xexpose.height, false);
1516 } 1563 }
1517 1564
1518 want_refresh = 1; 1565 want_refresh = 1;
1519 } 1566 }
1520 else 1567 else
… …
1524 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1525 ; 1572 ;
1526 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1527 ; 1574 ;
1528 1575
1529 if (isScrollbarWindow (ev.xany.window)) 1576 if (scrollBar.state && ev.xany.window == scrollBar.win)
1530 { 1577 {
1531 scrollBar.setIdle (); 1578 scrollBar.state = SB_STATE_IDLE;
1532 scrollbar_show (0); 1579 scrollBar.show (0);
1533 } 1580 }
1534 } 1581 }
1535 break; 1582 break;
1536 1583
1537 case MotionNotify: 1584 case MotionNotify:
… …
1602 dist = int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1603 } 1650 }
1604 else 1651 else
1605 { 1652 {
1606 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1607 dist = ev.xbutton.y - (int_bwidth + height); 1654 dist = ev.xbutton.y - (int_bwidth + vt_height);
1608 } 1655 }
1609 1656
1610 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1611 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1612 + 1; 1659 + 1;
… …
1624#ifdef MOUSE_THRESHOLD 1671#ifdef MOUSE_THRESHOLD
1625 } 1672 }
1626#endif 1673#endif
1627 } 1674 }
1628 } 1675 }
1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1630 { 1677 {
1631 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1632 MotionNotify, &ev)) 1679 MotionNotify, &ev))
1633 ; 1680 ;
1634 1681
1635 XQueryPointer (dpy, scrollBar.win, 1682 XQueryPointer (dpy, scrollBar.win,
1636 &unused_root, &unused_child, 1683 &unused_root, &unused_child,
1637 &unused_root_x, &unused_root_y, 1684 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1685 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1686 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1687 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1641 scrollbar_size ()); 1688 scrollBar.size ());
1642 want_refresh = 1; 1689 want_refresh = 1;
1643 scrollbar_show (1); 1690 scrollBar.show (1);
1644 } 1691 }
1645 break; 1692 break;
1646 } 1693 }
1647 1694
1648#if defined(CURSOR_BLINK) 1695#if defined(CURSOR_BLINK)
1649 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1696 if (ev.type == KeyPress)
1650 {
1651 if (hidden_cursor)
1652 {
1653 hidden_cursor = 0;
1654 want_refresh = 1;
1655 }
1656
1657 cursor_blink_ev.again (); 1697 cursor_blink_reset ();
1658 }
1659#endif 1698#endif
1660 1699
1661#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1662 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1663 { 1702 {
… …
1673#endif 1712#endif
1674 1713
1675 refresh_check (); 1714 refresh_check ();
1676} 1715}
1677 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
1678void 1734void
1679rxvt_term::focus_in () 1735rxvt_term::focus_in ()
1680{ 1736{
1681 if (!focus) 1737 if (!focus)
1682 { 1738 {
1683 focus = 1; 1739 focus = 1;
1684 want_refresh = 1; 1740 want_refresh = 1;
1685 1741
1686 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1687
1688#if USE_XIM 1742#if USE_XIM
1689 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1690 { 1744 {
1691 IMSetPosition (); 1745 im_set_position ();
1692 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1693 } 1747 }
1694#endif 1748#endif
1695#if CURSOR_BLINK 1749#if CURSOR_BLINK
1696 if (option (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
… …
1703 scr_recolour (); 1757 scr_recolour ();
1704 } 1758 }
1705#endif 1759#endif
1706#if ENABLE_FRILLS 1760#if ENABLE_FRILLS
1707 if (option (Opt_urgentOnBell)) 1761 if (option (Opt_urgentOnBell))
1708 { 1762 set_urgency (0);
1709 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1710 {
1711 h->flags &= ~XUrgencyHint;
1712 XSetWMHints (dpy, parent[0], h);
1713 }
1714 }
1715#endif 1763#endif
1764
1765 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1716 } 1766 }
1717} 1767}
1718 1768
1719void 1769void
1720rxvt_term::focus_out () 1770rxvt_term::focus_out ()
… …
1722 if (focus) 1772 if (focus)
1723 { 1773 {
1724 focus = 0; 1774 focus = 0;
1725 want_refresh = 1; 1775 want_refresh = 1;
1726 1776
1727 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1777#if ENABLE_FRILLS
1728 1778 if (option (Opt_urgentOnBell))
1779 set_urgency (0);
1780#endif
1729#if ENABLE_FRILLS || ISO_14755 1781#if ENABLE_FRILLS || ISO_14755
1730 if (iso14755buf) 1782 if (iso14755buf)
1731 { 1783 {
1732 iso14755buf = 0; 1784 iso14755buf = 0;
1733# if ISO_14755 1785# if ISO_14755
… …
1750 { 1802 {
1751 pix_colors = pix_colors_unfocused; 1803 pix_colors = pix_colors_unfocused;
1752 scr_recolour (); 1804 scr_recolour ();
1753 } 1805 }
1754#endif 1806#endif
1807
1808 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1755 } 1809 }
1756} 1810}
1757 1811
1758void 1812void
1759rxvt_term::update_fade_color (unsigned int idx) 1813rxvt_term::update_fade_color (unsigned int idx)
… …
1787 * 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.
1788 */ 1842 */
1789 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1843 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1790 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1844 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1791 { 1845 {
1792 bgPixmap.set_root_pixmap (); 1846 bg_set_root_pixmap ();
1793 update_background (); 1847 update_background ();
1794 } 1848 }
1849
1795 break; 1850 break;
1796 } 1851 }
1797# endif 1852# endif
1798 1853
1799 refresh_check (); 1854 refresh_check ();
… …
1835 /* save the xbutton state (for ButtonRelease) */ 1890 /* save the xbutton state (for ButtonRelease) */
1836 MEvent.state = ev.state; 1891 MEvent.state = ev.state;
1837#ifdef MOUSE_REPORT_DOUBLECLICK 1892#ifdef MOUSE_REPORT_DOUBLECLICK
1838 if (ev.button == MEvent.button && clickintime) 1893 if (ev.button == MEvent.button && clickintime)
1839 { 1894 {
1840 /* same button, within alloted time */ 1895 /* same button, within allowed time */
1841 MEvent.clicks++; 1896 MEvent.clicks++;
1842 1897
1843 if (MEvent.clicks > 1) 1898 if (MEvent.clicks > 1)
1844 { 1899 {
1845 /* only report double clicks */ 1900 /* only report double clicks */
… …
1917 } 1972 }
1918 1973
1919 /* 1974 /*
1920 * Scrollbar window processing of button press 1975 * Scrollbar window processing of button press
1921 */ 1976 */
1922 if (isScrollbarWindow (ev.window)) 1977 if (scrollBar.state && ev.window == scrollBar.win)
1923 { 1978 {
1924 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;
1925 /* 1987 /*
1926 * Rxvt-style scrollbar: 1988 * Rxvt-style scrollbar:
1927 * move up if mouse is above slider 1989 * move up if mouse is above slider
1928 * move dn if mouse is below slider 1990 * move dn if mouse is below slider
1929 * 1991 *
… …
1938 /* 2000 /*
1939 * Mouse report disabled scrollbar: 2001 * Mouse report disabled scrollbar:
1940 * arrow buttons - send up/down 2002 * arrow buttons - send up/down
1941 * click on scrollbar - send pageup/down 2003 * click on scrollbar - send pageup/down
1942 */ 2004 */
1943 if ((scrollBar.style == R_SB_NEXT 2005 if (direction == UP)
1944 && scrollbarnext_upButton (ev.y))
1945 || (scrollBar.style == R_SB_RXVT
1946 && scrollbarrxvt_upButton (ev.y)))
1947 tt_printf ("\033[A"); 2006 tt_printf ("\033[A");
1948 else if ((scrollBar.style == R_SB_NEXT 2007 else if (direction == DN)
1949 && scrollbarnext_dnButton (ev.y))
1950 || (scrollBar.style == R_SB_RXVT
1951 && scrollbarrxvt_dnButton (ev.y)))
1952 tt_printf ("\033[B"); 2008 tt_printf ("\033[B");
1953 else 2009 else
1954 switch (ev.button) 2010 switch (ev.button)
1955 { 2011 {
1956 case Button2: 2012 case Button2:
… …
1964 break; 2020 break;
1965 } 2021 }
1966 } 2022 }
1967 else 2023 else
1968#endif /* NO_SCROLLBAR_REPORT */ 2024#endif /* NO_SCROLLBAR_REPORT */
1969
1970 {
1971 char upordown = 0;
1972
1973 if (scrollBar.style == R_SB_NEXT)
1974 { 2025 {
1975 if (scrollbarnext_upButton (ev.y)) 2026 if (direction != NO_DIR)
1976 upordown = -1; /* up */
1977 else if (scrollbarnext_dnButton (ev.y))
1978 upordown = 1; /* down */
1979 }
1980 else if (scrollBar.style == R_SB_RXVT)
1981 {
1982 if (scrollbarrxvt_upButton (ev.y))
1983 upordown = -1; /* up */
1984 else if (scrollbarrxvt_dnButton (ev.y))
1985 upordown = 1; /* down */
1986 }
1987
1988 if (upordown)
1989 { 2027 {
1990#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2028#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1991 if (!cont_scroll_ev.is_active ()) 2029 if (!cont_scroll_ev.is_active ())
1992 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2030 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1993#endif 2031#endif
1994 if (scr_page (upordown < 0 ? UP : DN, 1)) 2032 if (scr_page (direction, 1))
1995 { 2033 {
1996 if (upordown < 0) 2034 if (direction == UP)
1997 scrollBar.setUp (); 2035 scrollBar.state = SB_STATE_UP;
1998 else 2036 else
1999 scrollBar.setDn (); 2037 scrollBar.state = SB_STATE_DOWN;
2000 } 2038 }
2001 } 2039 }
2002 else 2040 else
2003 switch (ev.button) 2041 switch (ev.button)
2004 { 2042 {
2005 case Button2: 2043 case Button2:
2006 switch (scrollbar_align) 2044 switch (scrollBar.align)
2007 { 2045 {
2008 case R_SB_ALIGN_TOP: 2046 case SB_ALIGN_TOP:
2009 csrO = 0; 2047 csrO = 0;
2010 break; 2048 break;
2011 case R_SB_ALIGN_CENTRE: 2049 case SB_ALIGN_CENTRE:
2012 csrO = (scrollBar.bot - scrollBar.top) / 2; 2050 csrO = (scrollBar.bot - scrollBar.top) / 2;
2013 break; 2051 break;
2014 case R_SB_ALIGN_BOTTOM: 2052 case SB_ALIGN_BOTTOM:
2015 csrO = scrollBar.bot - scrollBar.top; 2053 csrO = scrollBar.bot - scrollBar.top;
2016 break; 2054 break;
2017 } 2055 }
2018 2056
2019 if (scrollBar.style == R_SB_XTERM 2057 if (scrollBar.style == SB_STYLE_XTERM
2020 || scrollbar_above_slider (ev.y) 2058 || scrollBar.above_slider (ev.y)
2021 || scrollbar_below_slider (ev.y)) 2059 || scrollBar.below_slider (ev.y))
2022 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2060 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2023 2061
2024 scrollBar.setMotion (); 2062 scrollBar.state = SB_STATE_MOTION;
2025 break; 2063 break;
2026 2064
2027 case Button1: 2065 case Button1:
2028 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2066 if (scrollBar.align == SB_ALIGN_CENTRE)
2029 csrO = ev.y - scrollBar.top; 2067 csrO = ev.y - scrollBar.top;
2030 /* FALLTHROUGH */ 2068 /* FALLTHROUGH */
2031 2069
2032 case Button3: 2070 case Button3:
2033 if (scrollBar.style != R_SB_XTERM) 2071 if (scrollBar.style != SB_STYLE_XTERM)
2034 { 2072 {
2035 if (scrollbar_above_slider (ev.y)) 2073 if (scrollBar.above_slider (ev.y))
2036# ifdef RXVT_SCROLL_FULL 2074# ifdef RXVT_SCROLL_FULL
2037 scr_page (UP, nrow - 1); 2075 scr_page (UP, nrow - 1);
2038# else 2076# else
2039 scr_page (UP, nrow / 4); 2077 scr_page (UP, nrow / 4);
2040# endif 2078# endif
2041 else if (scrollbar_below_slider (ev.y)) 2079 else if (scrollBar.below_slider (ev.y))
2042# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
2043 scr_page (DN, nrow - 1); 2081 scr_page (DN, nrow - 1);
2044# else 2082# else
2045 scr_page (DN, nrow / 4); 2083 scr_page (DN, nrow / 4);
2046# endif 2084# endif
2047 else 2085 else
2048 scrollBar.setMotion (); 2086 scrollBar.state = SB_STATE_MOTION;
2049 } 2087 }
2050 else 2088 else
2051 { 2089 {
2052 scr_page ((ev.button == Button1 ? DN : UP), 2090 scr_page ((ev.button == Button1 ? DN : UP),
2053 (nrow 2091 (nrow
2054 * scrollbar_position (ev.y) 2092 * scrollBar.position (ev.y)
2055 / scrollbar_size ())); 2093 / scrollBar.size ()));
2056 } 2094 }
2057 2095
2058 break; 2096 break;
2059 } 2097 }
2060 } 2098 }
… …
2070 2108
2071 csrO = 0; /* reset csr Offset */ 2109 csrO = 0; /* reset csr Offset */
2072 if (!bypass_keystate) 2110 if (!bypass_keystate)
2073 reportmode = !! (priv_modes & PrivMode_mouse_report); 2111 reportmode = !! (priv_modes & PrivMode_mouse_report);
2074 2112
2075 if (scrollbar_isUpDn ()) 2113 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2076 { 2114 {
2077 scrollBar.setIdle (); 2115 scrollBar.state = SB_STATE_IDLE;
2078 scrollbar_show (0); 2116 scrollBar.show (0);
2079 } 2117 }
2080 2118
2081#ifdef SELECTION_SCROLLING 2119#ifdef SELECTION_SCROLLING
2082 sel_scroll_ev.stop(); 2120 sel_scroll_ev.stop();
2083#endif 2121#endif
… …
2132 case Button3: 2170 case Button3:
2133 selection_make (ev.time); 2171 selection_make (ev.time);
2134 break; 2172 break;
2135 2173
2136 case Button2: 2174 case Button2:
2137 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?
2138 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2139 break; 2177 break;
2140 2178
2141#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2142 case Button4: 2180 case Button4:
2143 case Button5: 2181 case Button5:
… …
2163 2201
2164 if (!slip_wheel_ev.is_active ()) 2202 if (!slip_wheel_ev.is_active ())
2165 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2203 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2166 } 2204 }
2167 else 2205 else
2206# endif
2168 { 2207 {
2169# endif
2170 scr_page (v, i); 2208 scr_page (v, i);
2171 scrollbar_show (1); 2209 scrollBar.show (1);
2172# ifdef MOUSE_SLIP_WHEELING
2173 } 2210 }
2174# endif
2175 } 2211 }
2176 break; 2212 break;
2177#endif 2213#endif
2178 } 2214 }
2179 } 2215 }
2180} 2216}
2181 2217
2182/*}}} */ 2218/*}}} */
2183 2219
2184bool 2220void
2185rxvt_term::cmd_parse () 2221rxvt_term::cmd_parse ()
2186{ 2222{
2187 bool flag = false;
2188 wchar_t ch = NOCHAR; 2223 wchar_t ch = NOCHAR;
2189 char *seq_begin; // remember start of esc-sequence here 2224 char *seq_begin; // remember start of esc-sequence here
2190 2225
2191 for (;;) 2226 for (;;)
2192 { 2227 {
2193 if (ch == NOCHAR) 2228 if (ecb_unlikely (ch == NOCHAR))
2194 { 2229 {
2195 seq_begin = cmdbuf_ptr; 2230 seq_begin = cmdbuf_ptr;
2196 ch = next_char (); 2231 ch = next_char ();
2197 2232
2198 if (ch == NOCHAR) 2233 if (ch == NOCHAR)
2199 break; 2234 break;
2200 } 2235 }
2201 2236
2202 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))
2203 { 2238 {
2204 if (!seen_input) 2239 if (ecb_unlikely (!seen_input))
2205 { 2240 {
2206 seen_input = 1; 2241 seen_input = 1;
2207 // many badly-written programs (e.g. jed) contain a race condition: 2242 // many badly-written programs (e.g. jed) contain a race condition:
2208 // they first read the screensize and then install a SIGWINCH handler. 2243 // they first read the screensize and then install a SIGWINCH handler.
2209 // some window managers resize the window early, and these programs 2244 // some window managers resize the window early, and these programs
… …
2222 wchar_t *str = buf; 2257 wchar_t *str = buf;
2223 wchar_t *eol = str + min (ncol, UBUFSIZ); 2258 wchar_t *eol = str + min (ncol, UBUFSIZ);
2224 2259
2225 for (;;) 2260 for (;;)
2226 { 2261 {
2227 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)))
2228 break; 2263 break;
2229 2264
2230 *str++ = ch; 2265 *str++ = ch;
2231 2266
2232 if (ch == C0_LF || str >= eol) 2267 if (ecb_unlikely (ch == C0_LF || str >= eol))
2233 { 2268 {
2234 if (ch == C0_LF) 2269 if (ch == C0_LF)
2235 nlines++; 2270 nlines++;
2236 2271
2237 refresh_count++; 2272 refresh_count++;
… …
2286 * 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.
2287 * if skipScroll is enabled. 2322 * if skipScroll is enabled.
2288 */ 2323 */
2289 if (refreshnow) 2324 if (refreshnow)
2290 { 2325 {
2291 flag = true;
2292 scr_refresh (); 2326 scr_refresh ();
2293 want_refresh = 1; 2327 want_refresh = 1;
2294 } 2328 }
2295
2296 } 2329 }
2297 else 2330 else
2298 { 2331 {
2299 try 2332 try
2300 { 2333 {
… …
2308 } 2341 }
2309 2342
2310 ch = NOCHAR; 2343 ch = NOCHAR;
2311 } 2344 }
2312 } 2345 }
2313
2314 refresh_check ();
2315
2316 return flag;
2317} 2346}
2318 2347
2319// read the next character 2348// read the next character
2320wchar_t 2349wchar_t
2321rxvt_term::next_char () NOTHROW 2350rxvt_term::next_char () NOTHROW
2322{ 2351{
2323 while (cmdbuf_ptr < cmdbuf_endp) 2352 while (cmdbuf_ptr < cmdbuf_endp)
2324 { 2353 {
2325 // assume 7-bit to be ascii ALWAYS 2354 // assume 7-bit to be ascii ALWAYS
2326 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2355 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2327 return *cmdbuf_ptr++; 2356 return *cmdbuf_ptr++;
2328 2357
2329 wchar_t wc; 2358 wchar_t wc;
2330 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);
2331 2360
… …
2335 cmdbuf_ptr = cmdbuf_endp; 2364 cmdbuf_ptr = cmdbuf_endp;
2336 break; 2365 break;
2337 } 2366 }
2338 2367
2339 if (len == (size_t)-1) 2368 if (len == (size_t)-1)
2369 {
2370 mbstate.reset (); // reset now undefined conversion state
2340 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 }
2341 2373
2342 // assume wchar == unicode 2374 // assume wchar == unicode
2343 cmdbuf_ptr += len; 2375 cmdbuf_ptr += len;
2344 return wc & UNICODE_MASK; 2376 return wc & UNICODE_MASK;
2345 } 2377 }
… …
2356 : NOCHAR; 2388 : NOCHAR;
2357} 2389}
2358 2390
2359static class out_of_input out_of_input; 2391static class out_of_input out_of_input;
2360 2392
2361/* rxvt_cmd_getc () - Return next input character */
2362/*
2363 * Return the next input character after first passing any keyboard input
2364 * to the command.
2365 */
2366wchar_t 2393wchar_t
2367rxvt_term::cmd_getc () THROW ((class out_of_input)) 2394rxvt_term::cmd_getc () THROW ((class out_of_input))
2368{ 2395{
2369 wchar_t c = next_char (); 2396 wchar_t c = next_char ();
2370 2397
… …
2389/*----------------------------------------------------------------------*/ 2416/*----------------------------------------------------------------------*/
2390#ifdef PRINTPIPE 2417#ifdef PRINTPIPE
2391FILE * 2418FILE *
2392rxvt_term::popen_printer () 2419rxvt_term::popen_printer ()
2393{ 2420{
2394 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2421 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2395 2422
2396 if (stream == NULL) 2423 if (stream == NULL)
2397 rxvt_warn ("can't open printer pipe, not printing.\n"); 2424 rxvt_warn ("can't open printer pipe, not printing.\n");
2398 2425
2399 return stream; 2426 return stream;
… …
2410 * simulate attached vt100 printer 2437 * simulate attached vt100 printer
2411 */ 2438 */
2412void 2439void
2413rxvt_term::process_print_pipe () 2440rxvt_term::process_print_pipe ()
2414{ 2441{
2415 int done; 2442 FILE *fd = popen_printer ();
2416 FILE *fd;
2417 2443
2418 if ((fd = popen_printer ()) == NULL) 2444 if (!fd)
2419 return; 2445 return;
2420 2446
2421 /* 2447 /*
2422 * 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
2423 * is received. 2449 * is received.
2424 */ 2450 */
2425 for (done = 0; !done;) 2451 for (int done = 0; !done; )
2426 { 2452 {
2427 unsigned char buf[8]; 2453 unsigned char buf[8];
2428 unicode_t ch; 2454 unicode_t ch;
2429 unsigned int i, len; 2455 unsigned int i, len;
2430 2456
… …
2464 pclose_printer (fd); 2490 pclose_printer (fd);
2465} 2491}
2466#endif /* PRINTPIPE */ 2492#endif /* PRINTPIPE */
2467/*}}} */ 2493/*}}} */
2468 2494
2469/* *INDENT-OFF* */
2470enum { 2495enum {
2471 C1_40 = 0x40, 2496 C1_40 = 0x40,
2472 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,
2473 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,
2474 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,
2475 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,
2476}; 2501};
2477/* *INDENT-ON* */
2478 2502
2479/*{{{ process non-printing single characters */ 2503/*{{{ process non-printing single characters */
2480void 2504void
2481rxvt_term::process_nonprinting (unicode_t ch) 2505rxvt_term::process_nonprinting (unicode_t ch)
2482{ 2506{
… …
2575 break; 2599 break;
2576 case 'Z': /* identify the terminal type */ 2600 case 'Z': /* identify the terminal type */
2577 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2578 break; 2602 break;
2579 case '<': /* turn off VT52 mode */ 2603 case '<': /* turn off VT52 mode */
2580 PrivMode (0, PrivMode_vt52); 2604 priv_modes &= ~PrivMode_vt52;
2581 break; 2605 break;
2582 case 'F': /* use special graphics character set */ 2606 case 'F': /* use special graphics character set */
2583 case 'G': /* use regular character set */ 2607 case 'G': /* use regular character set */
2584 /* unimplemented */ 2608 /* unimplemented */
2585 break; 2609 break;
… …
2604 return; 2628 return;
2605 } 2629 }
2606 2630
2607 switch (ch) 2631 switch (ch)
2608 { 2632 {
2609 /* case 1: do_tek_mode (); break; */
2610 case '#': 2633 case '#':
2611 if (cmd_getc () == '8') 2634 if (cmd_getc () == '8')
2612 scr_E (); 2635 scr_E ();
2613 break; 2636 break;
2614 case '(': 2637 case '(':
… …
2637#if !ENABLE_MINIMAL 2660#if !ENABLE_MINIMAL
2638 case '9': 2661 case '9':
2639 scr_forwardindex (); 2662 scr_forwardindex ();
2640 break; 2663 break;
2641#endif 2664#endif
2665 // DECPAM/DECPNM
2642 case '=': 2666 case '=':
2667 priv_modes |= PrivMode_aplKP;
2668 break;
2643 case '>': 2669 case '>':
2644 PrivMode ((ch == '='), PrivMode_aplKP); 2670 priv_modes &= ~PrivMode_aplKP;
2645 break; 2671 break;
2646 2672
2647 case C1_40: 2673 case C1_40:
2648 cmd_getc (); 2674 cmd_getc ();
2649 break; 2675 break;
… …
2653 2679
2654 /* 8.3.87: NEXT LINE */ 2680 /* 8.3.87: NEXT LINE */
2655 case C1_NEL: /* ESC E */ 2681 case C1_NEL: /* ESC E */
2656 { 2682 {
2657 wchar_t nlcr[] = { C0_LF, C0_CR }; 2683 wchar_t nlcr[] = { C0_LF, C0_CR };
2658 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2684 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2659 } 2685 }
2660 break; 2686 break;
2661 2687
2662 /* kidnapped escape sequence: Should be 8.3.48 */ 2688 /* kidnapped escape sequence: Should be 8.3.48 */
2663 case C1_ESA: /* ESC G */ 2689 case C1_ESA: /* ESC G */
2664 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 */
2665 break; 2693 break;
2666 2694
2667 /* 8.3.63: CHARACTER TABULATION SET */ 2695 /* 8.3.63: CHARACTER TABULATION SET */
2668 case C1_HTS: /* ESC H */ 2696 case C1_HTS: /* ESC H */
2669 scr_set_tab (1); 2697 scr_set_tab (1);
… …
2673 case C1_RI: /* ESC M */ 2701 case C1_RI: /* ESC M */
2674 scr_index (DN); 2702 scr_index (DN);
2675 break; 2703 break;
2676 2704
2677 /* 8.3.142: SINGLE-SHIFT TWO */ 2705 /* 8.3.142: SINGLE-SHIFT TWO */
2678 /*case C1_SS2: scr_single_shift (2); break; */ 2706 /* case C1_SS2: break; */
2679 2707
2680 /* 8.3.143: SINGLE-SHIFT THREE */ 2708 /* 8.3.143: SINGLE-SHIFT THREE */
2681 /*case C1_SS3: scr_single_shift (3); break; */ 2709 /* case C1_SS3: break; */
2682 2710
2683 /* 8.3.27: DEVICE CONTROL STRING */ 2711 /* 8.3.27: DEVICE CONTROL STRING */
2684 case C1_DCS: /* ESC P */ 2712 case C1_DCS: /* ESC P */
2685 process_dcs_seq (); 2713 process_dcs_seq ();
2686 break; 2714 break;
… …
2688 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2716 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2689 case C1_SCI: /* ESC Z */ 2717 case C1_SCI: /* ESC Z */
2690 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2718 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2691 break; /* steal obsolete ESC [ c */ 2719 break; /* steal obsolete ESC [ c */
2692 2720
2693 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2721 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2694 case C1_CSI: /* ESC [ */ 2722 case C1_CSI: /* ESC [ */
2695 process_csi_seq (); 2723 process_csi_seq ();
2696 break; 2724 break;
2697 2725
2698 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2726 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2699 case C1_OSC: /* ESC ] */ 2727 case C1_OSC: /* ESC ] */
2700 process_osc_seq (); 2728 process_osc_seq ();
2701 break; 2729 break;
2702 2730
2703 /* 8.3.106: RESET TO INITIAL STATE */ 2731 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2704 case 'c': 2732 case 'c':
2705 mbstate.reset (); 2733 mbstate.reset ();
2706 scr_poweron (); 2734 scr_poweron ();
2707 scrollbar_show (1); 2735 scrollBar.show (1);
2708 break; 2736 break;
2709 2737
2710 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2738 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2711 case 'n': 2739 case 'n':
2712 scr_charset_choose (2); 2740 scr_charset_choose (2);
… …
2719 } 2747 }
2720} 2748}
2721/*}}} */ 2749/*}}} */
2722 2750
2723/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2751/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2724/* *INDENT-OFF* */
2725enum { 2752enum {
2726 CSI_ICH = 0x40, 2753 CSI_ICH = 0x40,
2727 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,
2728 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 ,
2729 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,
… …
2732 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,
2733 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 ,
2734 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
2735}; 2762};
2736 2763
2737#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2764#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2738 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2739 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2740#define get_byte_array_bit(array, bit) \ 2767#define get_byte_array_bit(array, bit) \
2741 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2768 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2742 2769
2743const unsigned char csi_defaults[] = 2770static const unsigned char csi_defaults[] =
2744 { 2771 {
2745 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, */
2746 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, */
2747 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, */
2748 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, [, \, ], ^, _, */
2749 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, */
2750 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, */
2751 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, */
2752 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, {, |, }, ~, */
2753 }; 2780 };
2754/* *INDENT-ON* */
2755 2781
2756void 2782void
2757rxvt_term::process_csi_seq () 2783rxvt_term::process_csi_seq ()
2758{ 2784{
2759 unicode_t ch, priv, i; 2785 unicode_t ch, priv, i;
… …
2763 2789
2764 nargs = 0; 2790 nargs = 0;
2765 2791
2766 priv = 0; 2792 priv = 0;
2767 ch = cmd_getc (); 2793 ch = cmd_getc ();
2768 if (ch >= '<' && ch <= '?') 2794 if ((ch >= '<' && ch <= '?') || ch == '!')
2769 { 2795 {
2770 /* '<' '=' '>' '?' */ 2796 /* '<' '=' '>' '?' '!' */
2771 priv = ch; 2797 priv = ch;
2772 ch = cmd_getc (); 2798 ch = cmd_getc ();
2773 } 2799 }
2774 2800
2775 /* read any numerical arguments */ 2801 /* read any numerical arguments */
… …
2824 // versions. 2850 // versions.
2825 // 2851 //
2826 tt_printf ("\033[>%d;95;0c", 'U'); 2852 tt_printf ("\033[>%d;95;0c", 'U');
2827 } 2853 }
2828 break; 2854 break;
2855
2829 case '?': 2856 case '?':
2830 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2857 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2831 process_terminal_mode (ch, priv, nargs, arg); 2858 process_terminal_mode (ch, priv, nargs, arg);
2832 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);
2833 } 2872 }
2873 break;
2874 }
2875
2834 return; 2876 return;
2835 } 2877 }
2836 2878
2837 switch (ch) 2879 switch (ch)
2838 { 2880 {
… …
2852 } 2894 }
2853 break; 2895 break;
2854#endif 2896#endif
2855 2897
2856 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2898 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2857 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2899 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2858 arg[0] = -arg[0]; 2900 arg[0] = -arg[0];
2859 /* FALLTHROUGH */ 2901 /* FALLTHROUGH */
2860 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2902 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2861 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2903 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2862 scr_gotorc (arg[0], 0, RELATIVE); 2904 scr_gotorc (arg[0], 0, RELATIVE);
2863 break; 2905 break;
2864 2906
2865 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2907 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2866 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2908 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3053 } 3095 }
3054} 3096}
3055/*}}} */ 3097/*}}} */
3056 3098
3057#if !ENABLE_MINIMAL 3099#if !ENABLE_MINIMAL
3058/* ARGSUSED */
3059void 3100void
3060rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3101rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3061{ 3102{
3062 int x, y; 3103 int x, y;
3063 XWindowAttributes wattr; 3104 XWindowAttributes wattr;
… …
3072 { 3113 {
3073 /* 3114 /*
3074 * commands 3115 * commands
3075 */ 3116 */
3076 case 1: /* deiconify window */ 3117 case 1: /* deiconify window */
3077 XMapWindow (dpy, parent[0]); 3118 XMapWindow (dpy, parent);
3078 break; 3119 break;
3079 case 2: /* iconify window */ 3120 case 2: /* iconify window */
3080 XIconifyWindow (dpy, parent[0], display->screen); 3121 XIconifyWindow (dpy, parent, display->screen);
3081 break; 3122 break;
3082 case 3: /* set position (pixels) */ 3123 case 3: /* set position (pixels) */
3083 XMoveWindow (dpy, parent[0], args[1], args[2]); 3124 XMoveWindow (dpy, parent, args[1], args[2]);
3084 break; 3125 break;
3085 case 4: /* set size (pixels) */ 3126 case 4: /* set size (pixels) */
3086 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3127 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3087 break; 3128 break;
3088 case 5: /* raise window */ 3129 case 5: /* raise window */
3089 XRaiseWindow (dpy, parent[0]); 3130 XRaiseWindow (dpy, parent);
3090 break; 3131 break;
3091 case 6: /* lower window */ 3132 case 6: /* lower window */
3092 XLowerWindow (dpy, parent[0]); 3133 XLowerWindow (dpy, parent);
3093 break; 3134 break;
3094 case 7: /* refresh window */ 3135 case 7: /* refresh window */
3095 scr_touch (true); 3136 scr_touch (true);
3096 break; 3137 break;
3097 case 8: /* set size (chars) */ 3138 case 8: /* set size (chars) */
… …
3100 break; 3141 break;
3101 3142
3102 //case 9: NYI, TODO, restore maximized window or maximize window 3143 //case 9: NYI, TODO, restore maximized window or maximize window
3103 default: 3144 default:
3104 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3105 set_widthheight ((unsigned int)width, 3146 set_widthheight ((unsigned int)vt_width,
3106 (unsigned int) (args[1] * fheight)); 3147 (unsigned int) (args[1] * fheight));
3107 break; 3148 break;
3108 3149
3109 /* 3150 /*
3110 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
3111 */ 3152 */
3112 case 11: /* report window state */ 3153 case 11: /* report window state */
3113 XGetWindowAttributes (dpy, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent, &wattr);
3114 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3155 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3115 break; 3156 break;
3116 case 13: /* report window position */ 3157 case 13: /* report window position */
3117 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3118 XTranslateCoordinates (dpy, parent[0], wattr.root, 3159 XTranslateCoordinates (dpy, parent, wattr.root,
3119 -wattr.border_width, -wattr.border_width, 3160 -wattr.border_width, -wattr.border_width,
3120 &x, &y, &wdummy); 3161 &x, &y, &wdummy);
3121 tt_printf ("\033[3;%d;%dt", x, y); 3162 tt_printf ("\033[3;%d;%dt", x, y);
3122 break; 3163 break;
3123 case 14: /* report window size (pixels) */ 3164 case 14: /* report window size (pixels) */
3124 XGetWindowAttributes (dpy, parent[0], &wattr); 3165 XGetWindowAttributes (dpy, parent, &wattr);
3125 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3166 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3126 break; 3167 break;
3127 case 18: /* report text area size (chars) */ 3168 case 18: /* report text area size (chars) */
3128 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3129 break; 3170 break;
… …
3131 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3172 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3132 break; 3173 break;
3133 case 20: /* report icon label */ 3174 case 20: /* report icon label */
3134 { 3175 {
3135 char *s; 3176 char *s;
3136 XGetIconName (dpy, parent[0], &s); 3177 XGetIconName (dpy, parent, &s);
3137 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 */
3138 XFree (s); 3179 XFree (s);
3139 } 3180 }
3140 break; 3181 break;
3141 case 21: /* report window title */ 3182 case 21: /* report window title */
3142 { 3183 {
3143 char *s; 3184 char *s;
3144 XFetchName (dpy, parent[0], &s); 3185 XFetchName (dpy, parent, &s);
3145 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 */
3146 XFree (s); 3187 XFree (s);
3147 } 3188 }
3148 break; 3189 break;
3149 } 3190 }
… …
3205 * 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)'
3206 */ 3247 */
3207void 3248void
3208rxvt_term::process_dcs_seq () 3249rxvt_term::process_dcs_seq ()
3209{ 3250{
3210 char *s;
3211 unicode_t eh;
3212
3213 /* 3251 /*
3214 * Not handled yet 3252 * Not handled yet
3215 */ 3253 */
3254
3255 unicode_t eh;
3216 s = get_to_st (eh); 3256 char *s = get_to_st (eh);
3217 if (s) 3257 if (s)
3218 free (s); 3258 free (s);
3219 3259
3220 return; 3260 return;
3221} 3261}
… …
3225 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3265 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3226 */ 3266 */
3227void 3267void
3228rxvt_term::process_osc_seq () 3268rxvt_term::process_osc_seq ()
3229{ 3269{
3230 unicode_t ch, eh;
3231 int arg; 3270 int arg;
3232 3271
3233 ch = cmd_getc (); 3272 unicode_t ch = cmd_getc ();
3234 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3273 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3235 arg = arg * 10 + (ch - '0'); 3274 arg = arg * 10 + (ch - '0');
3236 3275
3237 if (ch == ';') 3276 if (ch == ';')
3238 { 3277 {
3278 unicode_t eh;
3239 char *s = get_to_st (eh); 3279 char *s = get_to_st (eh);
3240 3280
3241 if (s) 3281 if (s)
3242 { 3282 {
3243 process_xterm_seq (arg, s, eh); 3283 process_xterm_seq (arg, s, eh);
… …
3267 3307
3268/* 3308/*
3269 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3309 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3270 */ 3310 */
3271void 3311void
3272rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3312rxvt_term::process_xterm_seq (int op, char *str, char resp)
3273{ 3313{
3274 int color; 3314 int color;
3275 char *buf, *name; 3315 char *buf, *name;
3276 bool query = str[0] == '?' && !str[1]; 3316 bool query = str[0] == '?' && !str[1];
3277 int saveop = op; 3317 int saveop = op;
… …
3304 unsigned long bytes_after; 3344 unsigned long bytes_after;
3305 unsigned char *value = 0; 3345 unsigned char *value = 0;
3306 const char *str = ""; 3346 const char *str = "";
3307 3347
3308 if (prop 3348 if (prop
3309 && XGetWindowProperty (dpy, parent[0], 3349 && XGetWindowProperty (dpy, parent,
3310 prop, 0, 1<<16, 0, AnyPropertyType, 3350 prop, 0, 1<<16, 0, AnyPropertyType,
3311 &actual_type, &actual_format, 3351 &actual_type, &actual_format,
3312 &nitems, &bytes_after, &value) == Success 3352 &nitems, &bytes_after, &value) == Success
3313 && actual_type != None 3353 && actual_type != None
3314 && actual_format == 8) 3354 && actual_format == 8)
… …
3318 3358
3319 XFree (value); 3359 XFree (value);
3320 } 3360 }
3321 else 3361 else
3322 { 3362 {
3323 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3363 char *eq = strchr (str, '=');
3324 3364
3325 if (eq) 3365 if (eq)
3326 { 3366 {
3327 *eq = 0; 3367 *eq = 0;
3328 set_utf8_property (display->atom (str), eq + 1); 3368 set_utf8_property (display->atom (str), eq + 1);
3329 } 3369 }
3330 else 3370 else
3331 XDeleteProperty (dpy, parent[0], 3371 XDeleteProperty (dpy, parent,
3332 display->atom (str)); 3372 display->atom (str));
3333 } 3373 }
3334 break; 3374 break;
3335 3375
3336 case XTerm_Color: 3376 case XTerm_Color:
… …
3349 *buf++ = '\0'; 3389 *buf++ = '\0';
3350 3390
3351 process_color_seq (op, color, name, resp); 3391 process_color_seq (op, color, name, resp);
3352 } 3392 }
3353 break; 3393 break;
3394 case Rxvt_restoreFG:
3354 case XTerm_Color00: 3395 case XTerm_Color00:
3355 process_color_seq (op, Color_fg, str, resp); 3396 process_color_seq (op, Color_fg, str, resp);
3356 break; 3397 break;
3398 case Rxvt_restoreBG:
3357 case XTerm_Color01: 3399 case XTerm_Color01:
3358 process_color_seq (op, Color_bg, str, resp); 3400 process_color_seq (op, Color_bg, str, resp);
3359 break; 3401 break;
3360#ifndef NO_CURSORCOLOR 3402#ifndef NO_CURSORCOLOR
3361 case XTerm_Color_cursor: 3403 case XTerm_Color_cursor:
… …
3366 process_color_seq (op, Color_pointer_fg, str, resp); 3408 process_color_seq (op, Color_pointer_fg, str, resp);
3367 break; 3409 break;
3368 case XTerm_Color_pointer_bg: 3410 case XTerm_Color_pointer_bg:
3369 process_color_seq (op, Color_pointer_bg, str, resp); 3411 process_color_seq (op, Color_pointer_bg, str, resp);
3370 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
3371#ifndef NO_BOLD_UNDERLINE_REVERSE 3421#ifndef NO_BOLD_UNDERLINE_REVERSE
3372 case XTerm_Color_RV:
3373 process_color_seq (op, Color_RV, str, resp);
3374 break;
3375 case Rxvt_Color_BD:
3376 case URxvt_Color_BD: 3422 case URxvt_Color_BD:
3377 process_color_seq (op, Color_BD, str, resp); 3423 process_color_seq (op, Color_BD, str, resp);
3378 break; 3424 break;
3379 case Rxvt_Color_UL:
3380 case URxvt_Color_UL: 3425 case URxvt_Color_UL:
3381 process_color_seq (op, Color_UL, str, resp); 3426 process_color_seq (op, Color_UL, str, resp);
3382 break; 3427 break;
3383 case URxvt_Color_IT: 3428 case URxvt_Color_IT:
3384 process_color_seq (op, Color_IT, str, resp); 3429 process_color_seq (op, Color_IT, str, resp);
3385 break; 3430 break;
3386#endif 3431#endif
3432 case URxvt_Color_border:
3433 process_color_seq (op, Color_border, str, resp);
3434 break;
3387#if ENABLE_TRANSPARENCY 3435#if ENABLE_TRANSPARENCY
3388 case URxvt_Color_tint: 3436 case URxvt_Color_tint:
3389 process_color_seq (op, Color_tint, str, resp); 3437 process_color_seq (op, Color_tint, str, resp);
3390 { 3438 {
3391 bool changed = false; 3439 bool changed = false;
3440
3392 if (ISSET_PIXCOLOR (Color_tint)) 3441 if (ISSET_PIXCOLOR (Color_tint))
3393 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3442 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3394 else 3443
3395 changed = bgPixmap.unset_tint ();
3396 if (changed) 3444 if (changed)
3397 update_background (); 3445 update_background ();
3398 } 3446 }
3399 3447
3400 break; 3448 break;
… …
3404 case Rxvt_Pixmap: 3452 case Rxvt_Pixmap:
3405 if (!strcmp (str, "?")) 3453 if (!strcmp (str, "?"))
3406 { 3454 {
3407 char str[256]; 3455 char str[256];
3408 3456
3409 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3457 sprintf (str, "[%dx%d+%d+%d]",
3410 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3458 min (h_scale, 32767), min (v_scale, 32767),
3411 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3459 min (h_align, 32767), min (v_align, 32767));
3412 process_xterm_seq (XTerm_title, str, CHAR_ST); 3460 process_xterm_seq (XTerm_title, str, CHAR_ST);
3413 } 3461 }
3414 else 3462 else
3415 { 3463 {
3416 int changed = 0; 3464 bool changed = false;
3417 3465
3418 if (*str != ';') 3466 if (*str != ';')
3419 { 3467 {
3420 /* reset to default scaling :*/
3421 bgPixmap.unset_geometry ();
3422 if (bgPixmap.set_file (str)) /* change pixmap */ 3468 if (bg_set_file (str)) /* change pixmap */
3423 changed++; 3469 changed = true;
3424 str = strchr (str, ';');
3425 if (str == NULL)
3426 bgPixmap.set_defaultGeometry ();
3427 } 3470 }
3428 while (str) 3471 else
3429 { 3472 {
3430 str++; 3473 str++;
3431 if (bgPixmap.set_geometry (str)) 3474 if (bg_set_geometry (str, true))
3432 changed++; 3475 changed = true;
3433 str = strchr (str, ';');
3434 } 3476 }
3477
3435 if (changed) 3478 if (changed)
3479 {
3480 if (bg_window_position_sensitive ())
3481 {
3482 int x, y;
3483 get_window_origin (x, y);
3484 bg_set_position (x, y);
3485 }
3436 update_background (); 3486 update_background ();
3487 }
3437 } 3488 }
3438 break; 3489 break;
3439#endif 3490#endif
3440
3441 case Rxvt_restoreFG:
3442 set_window_color (Color_fg, str);
3443 break;
3444 case Rxvt_restoreBG:
3445 set_window_color (Color_bg, str);
3446 break;
3447 3491
3448 case XTerm_logfile: 3492 case XTerm_logfile:
3449 // TODO, when secure mode? 3493 // TODO, when secure mode?
3450 break; 3494 break;
3451 3495
… …
3518 break; 3562 break;
3519#endif 3563#endif
3520 3564
3521#if ENABLE_PERL 3565#if ENABLE_PERL
3522 case URxvt_perl: 3566 case URxvt_perl:
3523 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3567 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3524 ; // no responses yet
3525 break; 3568 break;
3526#endif 3569#endif
3527 } 3570 }
3528} 3571}
3529/*----------------------------------------------------------------------*/ 3572/*----------------------------------------------------------------------*/
… …
3543{ 3586{
3544 int state; 3587 int state;
3545 3588
3546 if (mode == 's') 3589 if (mode == 's')
3547 { 3590 {
3548 SavedModes |= (priv_modes & bit); 3591 if (priv_modes & bit)
3592 SavedModes |= bit;
3593 else
3594 SavedModes &= ~bit;
3549 return -1; 3595 return -1;
3550 } 3596 }
3551 else 3597 else
3552 { 3598 {
3553 if (mode == 'r') 3599 if (mode == 'r')
3554 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3600 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3555 else 3601 else
3556 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3602 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3557 PrivMode (state, bit); 3603
3604 if (state)
3605 priv_modes |= bit;
3606 else
3607 priv_modes &= ~bit;
3558 } 3608 }
3559 3609
3560 return state; 3610 return state;
3561} 3611}
3562 3612
3563/* we're not using priv _yet_ */ 3613/* we're not using priv _yet_ */
3564void 3614void
3565rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3615rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3566{ 3616{
3567 unsigned int i, j; 3617 unsigned int i, j;
3568 int state; 3618 int state;
3569 3619
3570 static const struct 3620 static const struct
3571 { 3621 {
3572 const int argval; 3622 const int argval;
3573 const unsigned long bit; 3623 const unsigned long bit;
3574 } argtopriv[] = { 3624 } argtopriv[] = {
3575 { 1, PrivMode_aplCUR }, 3625 { 1, PrivMode_aplCUR }, // DECCKM
3576 { 2, PrivMode_vt52 }, 3626 { 2, PrivMode_vt52 }, // DECANM
3577 { 3, PrivMode_132 }, 3627 { 3, PrivMode_132 }, // DECCOLM
3578 { 4, PrivMode_smoothScroll }, 3628 { 4, PrivMode_smoothScroll }, // DECSCLM
3579 { 5, PrivMode_rVideo }, 3629 { 5, PrivMode_rVideo }, // DECSCNM
3580 { 6, PrivMode_relOrigin }, 3630 { 6, PrivMode_relOrigin }, // DECOM
3581 { 7, PrivMode_Autowrap }, 3631 { 7, PrivMode_Autowrap }, // DECAWM
3582 // 8, bi-directional support mode 3632 // 8, auto-repeat keys // DECARM
3583 { 9, PrivMode_MouseX10 }, 3633 { 9, PrivMode_MouseX10 },
3584 // 18, 19 printing-related 3634 // 18 end FF to printer after print screen
3635 // 19 Print screen prints full screen/scroll region
3585 { 25, PrivMode_VisibleCursor }, 3636 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3586#ifdef scrollBar_esc 3637#ifdef scrollBar_esc
3587 { scrollBar_esc, PrivMode_scrollBar }, 3638 { scrollBar_esc, PrivMode_scrollBar },
3588#endif 3639#endif
3589 { 35, PrivMode_ShiftKeys }, // rxvt extension 3640 { 35, PrivMode_ShiftKeys }, // rxvt extension
3641 // 38, tektronix mode // DECTEK
3590 { 40, PrivMode_132OK }, 3642 { 40, PrivMode_132OK },
3591 // 41 xterm more fixes NYI 3643 // 41 xterm more fixes NYI
3592 // 45 margin bell NYI 3644 // 45 margin bell NYI
3593 // 46 start logging 3645 // 46 start logging
3594 { 47, PrivMode_Screen }, 3646 { 47, PrivMode_Screen },
3595 { 66, PrivMode_aplKP }, 3647 { 66, PrivMode_aplKP }, // DECNKM
3596#ifndef NO_BACKSPACE_KEY 3648#ifndef NO_BACKSPACE_KEY
3597 { 67, PrivMode_BackSpace }, 3649 { 67, PrivMode_BackSpace }, // DECBKM
3598#endif 3650#endif
3599 { 1000, PrivMode_MouseX11 }, 3651 { 1000, PrivMode_MouseX11 },
3600 { 1002, PrivMode_MouseBtnEvent }, 3652 { 1002, PrivMode_MouseBtnEvent },
3601 { 1003, PrivMode_MouseAnyEvent }, 3653 { 1003, PrivMode_MouseAnyEvent },
3654#if ENABLE_FRILLS
3655 { 1005, PrivMode_ExtModeMouse },
3656#endif
3602 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3657 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3603 { 1011, PrivMode_Keypress }, // rxvt extension 3658 { 1011, PrivMode_Keypress }, // rxvt extension
3659#if ENABLE_FRILLS
3660 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3661#endif
3604 // 1035 enable modifiers for alt, numlock NYI 3662 // 1035 enable modifiers for alt, numlock NYI
3605 // 1036 send ESC for meta keys NYI 3663 // 1036 send ESC for meta keys NYI
3606 // 1037 send DEL for keypad delete NYI 3664 // 1037 send DEL for keypad delete NYI
3607 { 1047, PrivMode_Screen }, 3665 { 1047, PrivMode_Screen },
3608 // 1048 save and restore cursor 3666 // 1048 save and restore cursor, implemented in code
3609 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3667 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3610 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3668 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3669 { 2004, PrivMode_BracketPaste },
3611 }; 3670 };
3612 3671
3613 if (nargs == 0) 3672 if (nargs == 0)
3614 return; 3673 return;
3615 3674
… …
3622 for (i = 0; i < nargs; i++) 3681 for (i = 0; i < nargs; i++)
3623 { 3682 {
3624 state = -1; 3683 state = -1;
3625 3684
3626 /* basic handling */ 3685 /* basic handling */
3627 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3686 for (j = 0; j < ecb_array_length (argtopriv); j++)
3628 if (argtopriv[j].argval == arg[i]) 3687 if (argtopriv[j].argval == arg[i])
3629 { 3688 {
3630 state = privcases (mode, argtopriv[j].bit); 3689 state = privcases (mode, argtopriv[j].bit);
3631 break; 3690 break;
3632 } 3691 }
… …
3640 3699
3641 scr_touch (true); 3700 scr_touch (true);
3642 break; 3701 break;
3643#endif 3702#endif
3644 case 1048: /* alternative cursor save */ 3703 case 1048: /* alternative cursor save */
3645 case 1049:
3646 if (option (Opt_secondaryScreen)) 3704 if (option (Opt_secondaryScreen))
3647 if (mode == 0) 3705 if (mode == 0)
3648 scr_cursor (RESTORE); 3706 scr_cursor (RESTORE);
3649 else if (mode == 1) 3707 else if (mode == 1)
3650 scr_cursor (SAVE); 3708 scr_cursor (SAVE);
… …
3659 case 2: /* VT52 mode */ 3717 case 2: /* VT52 mode */
3660 /* oddball mode. should be set regardless of set/reset 3718 /* oddball mode. should be set regardless of set/reset
3661 * parameter. Return from VT52 mode with an ESC < from 3719 * parameter. Return from VT52 mode with an ESC < from
3662 * within VT52 mode 3720 * within VT52 mode
3663 */ 3721 */
3664 PrivMode (1, PrivMode_vt52); 3722 priv_modes |= PrivMode_vt52;
3665 break; 3723 break;
3666 case 3: /* 80/132 */ 3724 case 3: /* 80/132 */
3667 if (priv_modes & PrivMode_132OK) 3725 if (priv_modes & PrivMode_132OK)
3668 set_widthheight (((state ? 132 : 80) * fwidth), height); 3726 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3669 break; 3727 break;
3670 case 4: /* smooth scrolling */ 3728 case 4: /* smooth scrolling */
3671 set_option (Opt_jumpScroll, !state); 3729 set_option (Opt_jumpScroll, !state);
3672 break; 3730 break;
3673 case 5: /* reverse video */ 3731 case 5: /* reverse video */
… …
3684 if (state) /* orthogonal */ 3742 if (state) /* orthogonal */
3685 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3743 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3686 break; 3744 break;
3687#ifdef scrollBar_esc 3745#ifdef scrollBar_esc
3688 case scrollBar_esc: 3746 case scrollBar_esc:
3689 if (scrollbar_mapping (state)) 3747 scrollBar.map (state);
3690 {
3691 resize_all_windows (0, 0, 0); 3748 resize_all_windows (0, 0, 0);
3692 scr_touch (true); 3749 scr_touch (true);
3693 }
3694 break; 3750 break;
3695#endif 3751#endif
3696 case 25: /* visible/invisible cursor */ 3752 case 25: /* visible/invisible cursor */
3697 scr_cursor_visible (state); 3753 scr_cursor_visible (state);
3698 break; 3754 break;
… …
3711 case 1003: 3767 case 1003:
3712 if (state) 3768 if (state)
3713 { 3769 {
3714 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3770 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3715 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3771 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3772 mouse_row = mouse_col = 0;
3716 vt_emask_mouse = PointerMotionMask; 3773 vt_emask_mouse = PointerMotionMask;
3717 } 3774 }
3718 else 3775 else
3719 vt_emask_mouse = NoEventMask; 3776 vt_emask_mouse = NoEventMask;
3777
3720 vt_select_input (); 3778 vt_select_input ();
3721 break; 3779 break;
3722 case 1010: /* scroll to bottom on TTY output inhibit */ 3780 case 1010: /* scroll to bottom on TTY output inhibit */
3723 set_option (Opt_scrollTtyOutput, !state); 3781 set_option (Opt_scrollTtyOutput, !state);
3724 break; 3782 break;
3725 case 1011: /* scroll to bottom on key press */ 3783 case 1011: /* scroll to bottom on key press */
3726 set_option (Opt_scrollTtyKeypress, state); 3784 set_option (Opt_scrollTtyKeypress, state);
3727 break; 3785 break;
3728 case 1047: /* secondary screen w/ clearing last */ 3786 case 1047: /* secondary screen w/ clearing last */
3729 if (option (Opt_secondaryScreen)) 3787 if (option (Opt_secondaryScreen))
3730 if (current_screen != PRIMARY) 3788 if (!state)
3731 scr_erase_screen (2); 3789 scr_erase_screen (2);
3790
3732 scr_change_screen (state); 3791 scr_change_screen (state);
3733 break; 3792 break;
3734 case 1049: /* secondary screen w/ clearing first */ 3793 case 1049: /* secondary screen w/ clearing first */
3794 if (option (Opt_secondaryScreen))
3795 if (state)
3796 scr_cursor (SAVE);
3797
3735 scr_change_screen (state); 3798 scr_change_screen (state);
3799
3736 if (option (Opt_secondaryScreen)) 3800 if (option (Opt_secondaryScreen))
3737 if (current_screen != PRIMARY) 3801 if (state)
3738 scr_erase_screen (2); 3802 scr_erase_screen (2);
3803 else
3804 scr_cursor (RESTORE);
3739 break; 3805 break;
3740 default: 3806 default:
3741 break; 3807 break;
3742 } 3808 }
3743 } 3809 }
… …
3896 } 3962 }
3897 } 3963 }
3898} 3964}
3899/*}}} */ 3965/*}}} */
3900 3966
3901/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3902void
3903rxvt_term::process_graphics ()
3904{
3905 unicode_t ch, cmd = cmd_getc ();
3906
3907 if (cmd == 'Q')
3908 {
3909 /* query graphics */
3910 tt_printf ("\033G0\012"); /* no graphics */
3911 return;
3912 }
3913 /* swallow other graphics sequences until terminating ':' */
3914 do
3915 ch = cmd_getc ();
3916 while (ch != ':');
3917}
3918/*}}} */
3919
3920/* ------------------------------------------------------------------------- */ 3967/* ------------------------------------------------------------------------- */
3921 3968
3922/* 3969/*
3923 * Send printf () formatted output to the command. 3970 * Send printf () formatted output to the command.
3924 * Only use for small amounts of data. 3971 * Only use for small amounts of data.
… …
3937 3984
3938/* ---------------------------------------------------------------------- */ 3985/* ---------------------------------------------------------------------- */
3939/* Write data to the pty as typed by the user, pasted with the mouse, 3986/* Write data to the pty as typed by the user, pasted with the mouse,
3940 * or generated by us in response to a query ESC sequence. 3987 * or generated by us in response to a query ESC sequence.
3941 */ 3988 */
3942const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3989static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3943 3990
3944void 3991void
3945rxvt_term::tt_write (const char *data, unsigned int len) 3992rxvt_term::tt_write (const char *data, unsigned int len)
3946{ 3993{
3947 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3994 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3952 3999
3953 if (v_buflen == 0) 4000 if (v_buflen == 0)
3954 { 4001 {
3955 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4002 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3956 4003
4004 max_it (written, 0);
4005
3957 if ((unsigned int)written == len) 4006 if (written == len)
3958 return; 4007 return;
3959 4008
3960 data += written; 4009 data += written;
3961 len -= written; 4010 len -= written;
3962 } 4011 }
3963 4012
3964 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4013 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3965 4014
3966 memcpy (v_buffer + v_buflen, data, len); 4015 memcpy (v_buffer + v_buflen, data, len);
3967 v_buflen += len; 4016 v_buflen += len;
3968 4017
3969 pty_ev.set (ev::READ | ev::WRITE); 4018 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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