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.376 by root, Fri Dec 14 02:08:18 2007 UTC vs.
Revision 1.505 by sf-exg, Thu Jan 19 13:33:43 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-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
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
1000/* checks whether a refresh is requested and starts the refresh timer */
1046void 1001void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1002rxvt_term::refresh_check ()
1048{ 1003{
1049 make_current ();
1050
1051 display->flush ();
1052
1053 if (want_refresh && !flush_ev.is_active ()) 1004 if (want_refresh && !flush_ev.is_active ())
1054 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 ();
1055} 1008}
1056 1009
1057void 1010void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1011rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1012{
… …
1067void 1020void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1021rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1022{
1070 hidden_cursor = !hidden_cursor; 1023 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1024 want_refresh = 1;
1025 refresh_check ();
1072} 1026}
1073#endif 1027#endif
1074 1028
1075#ifdef TEXT_BLINK 1029#ifdef TEXT_BLINK
1076void 1030void
… …
1078{ 1032{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1033 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1034 {
1081 hidden_text = !hidden_text; 1035 hidden_text = !hidden_text;
1082 want_refresh = 1; 1036 want_refresh = 1;
1037 refresh_check ();
1083 } 1038 }
1084 else 1039 else
1085 w.stop (); 1040 w.stop ();
1086} 1041}
1087#endif 1042#endif
1088 1043
1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1044#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1090void 1045void
1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1046rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1092{ 1047{
1093 if ((scrollbar_isUp() || scrollbar_isDn()) && 1048 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1094 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1049 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1050 {
1095 want_refresh = 1; 1051 want_refresh = 1;
1052 refresh_check ();
1053 }
1096 else 1054 else
1097 w.stop (); 1055 w.stop ();
1098} 1056}
1099#endif 1057#endif
1100 1058
… …
1104{ 1062{
1105 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1063 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1106 { 1064 {
1107 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1065 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1108 want_refresh = 1; 1066 want_refresh = 1;
1067 refresh_check ();
1109 } 1068 }
1110 else 1069 else
1111 w.stop (); 1070 w.stop ();
1112} 1071}
1113#endif 1072#endif
1114 1073
1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1074#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1116void 1075void
1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1076rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1118{ 1077{
1119 if (mouse_slip_wheel_speed == 0 1078 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1120 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1121 : scr_page (UP, mouse_slip_wheel_speed))
1122 { 1079 {
1123 if (view_start == top_row || view_start == 0)
1124 mouse_slip_wheel_speed = 0;
1125
1126 want_refresh = 1; 1080 want_refresh = 1;
1081 refresh_check ();
1082 }
1083
1084 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1127 } 1085 {
1128 else 1086 mouse_slip_wheel_speed = 0;
1129 w.stop (); 1087 w.stop ();
1088 }
1130} 1089}
1131#endif 1090#endif
1132 1091
1133#if LINUX_YIELD_HACK 1092#if LINUX_YIELD_HACK
1134static struct event_handler 1093static struct event_handler
… …
1139 { 1098 {
1140 // this should really be sched_yield(), but the linux guys thought 1099 // this should really be sched_yield(), but the linux guys thought
1141 // that giving a process calling sched_yield () less cpu time than 1100 // that giving a process calling sched_yield () less cpu time than
1142 // ones with high nice levels is a useful thing to do. It surely is is 1101 // ones with high nice levels is a useful thing to do. It surely is is
1143 // allowed by the sus... as is returning ENOSYS. 1102 // allowed by the sus... as is returning ENOSYS.
1103 // since the linux guys additionally thought that breaking the only
1104 // known workaround against their unusable sched_yield hack is cool,
1105 // we just nanosleep a bit and hope for the best.
1144 1106
1145 struct timespec ts = { 0, 0 }; 1107 struct timespec ts = { 0, 1000 };
1146 nanosleep (&ts, 0); 1108 nanosleep (&ts, 0);
1147 1109
1148 w.stop (); 1110 w.stop ();
1149 } 1111 }
1150 1112
… …
1153 { 1115 {
1154 } 1116 }
1155} event_handler; 1117} event_handler;
1156#endif 1118#endif
1157 1119
1120/* make sure all the cmd data is at beginning of cmdbuf */
1121void
1122rxvt_term::cmdbuf_reify ()
1123{
1124 if (cmdbuf_ptr == cmdbuf_base)
1125 return;
1126
1127 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1128
1129 memmove (cmdbuf_base, cmdbuf_ptr, used);
1130 cmdbuf_ptr = cmdbuf_base;
1131 cmdbuf_endp = cmdbuf_ptr + used;
1132
1133}
1134
1135#if defined (KEYSYM_RESOURCE)
1136void
1137rxvt_term::cmdbuf_append (const char *str, size_t count)
1138{
1139 cmdbuf_reify ();
1140
1141 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1142
1143 if (count > avail)
1144 return;
1145
1146 memcpy (cmdbuf_endp, str, count);
1147 cmdbuf_endp += count;
1148
1149 cmd_parse ();
1150}
1151#endif
1152
1158bool 1153bool
1159rxvt_term::pty_fill () 1154rxvt_term::pty_fill ()
1160{ 1155{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1156 cmdbuf_reify ();
1162 1157
1163 if (CBUFSIZ == n) 1158 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1159
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1160 if (!avail)
1166 n = 0;
1167 } 1161 {
1168 1162 // normally this indicates a "too long" command sequence - just drop the data we have
1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1163 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1164 cmdbuf_endp = cmdbuf_ptr;
1165 avail = CBUFSIZ;
1166 }
1172 1167
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1168 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1169
1175 if (r > 0) 1170 if (r > 0)
1176 { 1171 {
1177 cmdbuf_endp += r; 1172 cmdbuf_endp += r;
1178 return true; 1173 return true;
… …
1200{ 1195{
1201 make_current (); 1196 make_current ();
1202 1197
1203 if (revents & ev::READ) 1198 if (revents & ev::READ)
1204 // loop, but don't allow a single term to monopolize us 1199 // loop, but don't allow a single term to monopolize us
1205 while (pty_fill ()) 1200 for (int i = CBUFCNT; i-- && pty_fill (); )
1206 if (cmd_parse ()) 1201 cmd_parse ();
1207 break;
1208 1202
1209 if (revents & ev::WRITE) 1203 if (revents & ev::WRITE)
1210 pty_write (); 1204 pty_write ();
1205
1206 refresh_check ();
1211} 1207}
1212 1208
1213void 1209void
1214rxvt_term::pointer_unblank () 1210rxvt_term::pointer_unblank ()
1215{ 1211{
… …
1251{ 1247{
1252 int button_number, key_state = 0; 1248 int button_number, key_state = 0;
1253 int x, y; 1249 int x, y;
1254 int code = 32; 1250 int code = 32;
1255 1251
1256 x = Pixel2Col (ev.x); 1252 x = Pixel2Col (ev.x) + 1;
1257 y = Pixel2Row (ev.y); 1253 y = Pixel2Row (ev.y) + 1;
1254
1258 if (ev.type == MotionNotify) 1255 if (ev.type == MotionNotify)
1259 { 1256 {
1260 if (x == mouse_row && y == mouse_col) 1257 if (x == mouse_row && y == mouse_col)
1261 return; 1258 return;
1259
1262 mouse_row = x; 1260 mouse_row = x;
1263 mouse_col = y; 1261 mouse_col = y;
1264 code += 32; 1262 code += 32;
1265 } 1263 }
1266 1264
… …
1269 else 1267 else
1270 { 1268 {
1271 button_number = MEvent.button - Button1; 1269 button_number = MEvent.button - Button1;
1272 /* add 0x3D for wheel events, like xterm does */ 1270 /* add 0x3D for wheel events, like xterm does */
1273 if (button_number >= 3) 1271 if (button_number >= 3)
1274 button_number += (64 - 3); 1272 button_number += 64 - 3;
1275 } 1273 }
1276 1274
1277 if (priv_modes & PrivMode_MouseX10) 1275 if (priv_modes & PrivMode_MouseX10)
1278 { 1276 {
1279 /* 1277 /*
… …
1311 fputc ('A', stderr); 1309 fputc ('A', stderr);
1312 if (key_state & 32) 1310 if (key_state & 32)
1313 fputc ('2', stderr); 1311 fputc ('2', stderr);
1314 fprintf (stderr, "]: <%d>, %d/%d\n", 1312 fprintf (stderr, "]: <%d>, %d/%d\n",
1315 button_number, 1313 button_number,
1316 x + 1, 1314 x,
1317 y + 1); 1315 y);
1318#endif 1316#endif
1319 1317
1318#if ENABLE_FRILLS
1319 if (priv_modes & PrivMode_ExtMouseRight)
1320 tt_printf ("\033[%d;%d;%dM",
1321 code + button_number + key_state,
1322 x,
1323 y);
1324 else if (priv_modes & PrivMode_ExtModeMouse)
1325 tt_printf ("\033[M%c%lc%lc",
1326 code + button_number + key_state,
1327 wint_t (32 + x),
1328 wint_t (32 + y));
1329 else
1330#endif
1320 tt_printf ("\033[M%c%c%c", 1331 tt_printf ("\033[M%c%c%c",
1321 (code + button_number + key_state), 1332 code + button_number + key_state,
1322 (32 + x + 1), 1333 32 + x,
1323 (32 + y + 1)); 1334 32 + y);
1324} 1335}
1325 1336
1326/*{{{ process an X event */ 1337/*{{{ process an X event */
1327void 1338void
1328rxvt_term::x_cb (XEvent &ev) 1339rxvt_term::x_cb (XEvent &ev)
… …
1430 && ev.xfocus.mode != NotifyGrab) 1441 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1442 focus_out ();
1432 break; 1443 break;
1433 1444
1434 case ConfigureNotify: 1445 case ConfigureNotify:
1435 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height); */
1438 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent)
1439 { 1447 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 1449 ;
1450
1451#ifdef HAVE_BG_PIXMAP
1452 bool moved = false;
1453 if (bg_window_position_sensitive ())
1454 {
1455 int x, y;
1456 if (ev.xconfigure.send_event)
1457 {
1458 x = ev.xconfigure.x;
1459 y = ev.xconfigure.y;
1460 }
1461 else
1462 get_window_origin (x, y);
1463
1464 if (bg_set_position (x, y)
1465 || !(bg_flags & BG_IS_VALID))
1466 moved = true;
1467 }
1468#endif
1442 1469
1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1470 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1471 {
1445 seen_resize = 1; 1472 seen_resize = 1;
1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1473 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1474 }
1448 else 1475 else
1449 { 1476 {
1450#ifdef HAVE_BG_PIXMAP 1477#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ()) 1478 if (moved)
1452 update_background (); 1479 update_background ();
1453#endif 1480#endif
1454 } 1481 }
1482
1455 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1483 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1456 } 1484 }
1457 break; 1485 break;
1458 1486
1459 case PropertyNotify: 1487 case PropertyNotify:
1460 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1488 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1461 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1462 && ev.xproperty.state == PropertyNewValue)
1463 selection_property (ev.xproperty.window, ev.xproperty.atom);
1464
1465 break; 1489 break;
1466 1490
1467 case SelectionClear: 1491 case SelectionClear:
1468 selection_clear (); 1492 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1469 break;
1470
1471 case SelectionNotify:
1472 if (selection_wait == Sel_normal)
1473 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1474 break; 1493 break;
1475 1494
1476 case SelectionRequest: 1495 case SelectionRequest:
1477 selection_send (ev.xselectionrequest); 1496 selection_send (ev.xselectionrequest);
1478 break; 1497 break;
1479 1498
1480 case MapNotify: 1499 case MapNotify:
1500#ifdef HAVE_BG_PIXMAP
1501 /* This is needed specifically to fix the case of no window manager or a
1502 * non-reparenting window manager. In those cases we never get first
1503 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1504 * care of multiplicity of ConfigureNotify events arriving while WM does
1505 * reparenting.
1506 * We should not render background immediately, as there could be several
1507 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1508 * by scheduling background redraw as soon as we can, but giving a short
1509 * bit of time for ConfigureNotifies to arrive.
1510 * We should render background PRIOR to drawing any text, but AFTER all
1511 * of ConfigureNotifys for the best results.
1512 */
1513 if (!(bg_flags & BG_IS_VALID))
1514 update_background_ev.start (0.025);
1515#endif
1481 mapped = 1; 1516 mapped = 1;
1482#ifdef TEXT_BLINK 1517#ifdef TEXT_BLINK
1483 text_blink_ev.start (); 1518 text_blink_ev.start ();
1484#endif 1519#endif
1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1520 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1498 if (ev.xany.window == vt) 1533 if (ev.xany.window == vt)
1499 { 1534 {
1500 do 1535 do
1501 { 1536 {
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1537 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1538 ev.xexpose.width, ev.xexpose.height, false);
1504 } 1539 }
1505 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1540 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1506 1541
1507 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1542 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1508 1543
1509 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510 { 1545 {
1511 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1512 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1513 } 1548 }
1549
1514 want_refresh = 1; 1550 want_refresh = 1;
1515 } 1551 }
1516 else 1552 else
1517 { 1553 {
1518 XEvent unused_event; 1554 XEvent unused_event;
… …
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1556 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1521 ; 1557 ;
1522 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1558 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1523 ; 1559 ;
1524 1560
1525 if (isScrollbarWindow (ev.xany.window)) 1561 if (scrollBar.state && ev.xany.window == scrollBar.win)
1526 { 1562 {
1527 scrollBar.setIdle (); 1563 scrollBar.state = SB_STATE_IDLE;
1528 scrollbar_show (0); 1564 scrollBar.show (0);
1529 } 1565 }
1530 } 1566 }
1531 break; 1567 break;
1532 1568
1533 case MotionNotify: 1569 case MotionNotify:
… …
1598 dist = int_bwidth - ev.xbutton.y; 1634 dist = int_bwidth - ev.xbutton.y;
1599 } 1635 }
1600 else 1636 else
1601 { 1637 {
1602 scroll_selection_dir = DN; 1638 scroll_selection_dir = DN;
1603 dist = ev.xbutton.y - (int_bwidth + height); 1639 dist = ev.xbutton.y - (int_bwidth + vt_height);
1604 } 1640 }
1605 1641
1606 scroll_selection_lines = Pixel2Height (dist) 1642 scroll_selection_lines = Pixel2Height (dist)
1607 / SELECTION_SCROLL_LINE_SPEEDUP 1643 / SELECTION_SCROLL_LINE_SPEEDUP
1608 + 1; 1644 + 1;
… …
1620#ifdef MOUSE_THRESHOLD 1656#ifdef MOUSE_THRESHOLD
1621 } 1657 }
1622#endif 1658#endif
1623 } 1659 }
1624 } 1660 }
1625 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1661 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1626 { 1662 {
1627 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1663 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1628 MotionNotify, &ev)) 1664 MotionNotify, &ev))
1629 ; 1665 ;
1630 1666
1631 XQueryPointer (dpy, scrollBar.win, 1667 XQueryPointer (dpy, scrollBar.win,
1632 &unused_root, &unused_child, 1668 &unused_root, &unused_child,
1633 &unused_root_x, &unused_root_y, 1669 &unused_root_x, &unused_root_y,
1634 &ev.xbutton.x, &ev.xbutton.y, 1670 &ev.xbutton.x, &ev.xbutton.y,
1635 &unused_mask); 1671 &unused_mask);
1636 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1672 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1637 scrollbar_size ()); 1673 scrollBar.size ());
1638 want_refresh = 1; 1674 want_refresh = 1;
1639 scrollbar_show (1); 1675 scrollBar.show (1);
1640 } 1676 }
1641 break; 1677 break;
1642 } 1678 }
1643 1679
1644#if defined(CURSOR_BLINK) 1680#if defined(CURSOR_BLINK)
… …
1665 1701
1666 if (ev.type == KeyPress && hidden_pointer == 0) 1702 if (ev.type == KeyPress && hidden_pointer == 0)
1667 pointer_blank (); 1703 pointer_blank ();
1668 } 1704 }
1669#endif 1705#endif
1706
1707 refresh_check ();
1670} 1708}
1709
1710#if ENABLE_FRILLS
1711void
1712rxvt_term::set_urgency (bool enable)
1713{
1714 if (enable == urgency_hint)
1715 return;
1716
1717 if (XWMHints *h = XGetWMHints (dpy, parent))
1718 {
1719 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1720 XSetWMHints (dpy, parent, h);
1721 urgency_hint = enable;
1722 XFree (h);
1723 }
1724}
1725#endif
1671 1726
1672void 1727void
1673rxvt_term::focus_in () 1728rxvt_term::focus_in ()
1674{ 1729{
1675 if (!focus) 1730 if (!focus)
1676 { 1731 {
1677 focus = 1; 1732 focus = 1;
1678 want_refresh = 1; 1733 want_refresh = 1;
1679 1734
1680 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1681
1682#if USE_XIM 1735#if USE_XIM
1683 if (Input_Context != NULL) 1736 if (Input_Context != NULL)
1684 { 1737 {
1685 IMSetPosition (); 1738 im_set_position ();
1686 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1687 } 1740 }
1688#endif 1741#endif
1689#if CURSOR_BLINK 1742#if CURSOR_BLINK
1690 if (option (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
… …
1697 scr_recolour (); 1750 scr_recolour ();
1698 } 1751 }
1699#endif 1752#endif
1700#if ENABLE_FRILLS 1753#if ENABLE_FRILLS
1701 if (option (Opt_urgentOnBell)) 1754 if (option (Opt_urgentOnBell))
1702 { 1755 set_urgency (0);
1703 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1704 {
1705 h->flags &= ~XUrgencyHint;
1706 XSetWMHints (dpy, parent[0], h);
1707 }
1708 }
1709#endif 1756#endif
1757
1758 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1710 } 1759 }
1711} 1760}
1712 1761
1713void 1762void
1714rxvt_term::focus_out () 1763rxvt_term::focus_out ()
… …
1716 if (focus) 1765 if (focus)
1717 { 1766 {
1718 focus = 0; 1767 focus = 0;
1719 want_refresh = 1; 1768 want_refresh = 1;
1720 1769
1721 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1770#if ENABLE_FRILLS
1722 1771 if (option (Opt_urgentOnBell))
1772 set_urgency (0);
1773#endif
1723#if ENABLE_FRILLS || ISO_14755 1774#if ENABLE_FRILLS || ISO_14755
1724 if (iso14755buf) 1775 if (iso14755buf)
1725 { 1776 {
1726 iso14755buf = 0; 1777 iso14755buf = 0;
1727# if ISO_14755 1778# if ISO_14755
… …
1744 { 1795 {
1745 pix_colors = pix_colors_unfocused; 1796 pix_colors = pix_colors_unfocused;
1746 scr_recolour (); 1797 scr_recolour ();
1747 } 1798 }
1748#endif 1799#endif
1800
1801 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1749 } 1802 }
1750} 1803}
1751 1804
1752void 1805void
1753rxvt_term::update_fade_color (unsigned int idx) 1806rxvt_term::update_fade_color (unsigned int idx)
… …
1781 * use the property to determine the pixmap. We use it later on. 1834 * use the property to determine the pixmap. We use it later on.
1782 */ 1835 */
1783 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1836 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1784 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1837 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1785 { 1838 {
1786 bgPixmap.set_root_pixmap (); 1839 bg_set_root_pixmap ();
1787 update_background (); 1840 update_background ();
1788 } 1841 }
1842
1789 break; 1843 break;
1790 } 1844 }
1791# endif 1845# endif
1846
1847 refresh_check ();
1792} 1848}
1793#endif 1849#endif
1794 1850
1795void 1851void
1796rxvt_term::button_press (XButtonEvent &ev) 1852rxvt_term::button_press (XButtonEvent &ev)
… …
1827 /* save the xbutton state (for ButtonRelease) */ 1883 /* save the xbutton state (for ButtonRelease) */
1828 MEvent.state = ev.state; 1884 MEvent.state = ev.state;
1829#ifdef MOUSE_REPORT_DOUBLECLICK 1885#ifdef MOUSE_REPORT_DOUBLECLICK
1830 if (ev.button == MEvent.button && clickintime) 1886 if (ev.button == MEvent.button && clickintime)
1831 { 1887 {
1832 /* same button, within alloted time */ 1888 /* same button, within allowed time */
1833 MEvent.clicks++; 1889 MEvent.clicks++;
1834 1890
1835 if (MEvent.clicks > 1) 1891 if (MEvent.clicks > 1)
1836 { 1892 {
1837 /* only report double clicks */ 1893 /* only report double clicks */
… …
1909 } 1965 }
1910 1966
1911 /* 1967 /*
1912 * Scrollbar window processing of button press 1968 * Scrollbar window processing of button press
1913 */ 1969 */
1914 if (isScrollbarWindow (ev.window)) 1970 if (scrollBar.state && ev.window == scrollBar.win)
1915 { 1971 {
1916 scrollBar.setIdle (); 1972 page_dirn direction = NO_DIR;
1973
1974 if (scrollBar.upButton (ev.y))
1975 direction = UP; /* up */
1976 else if (scrollBar.dnButton (ev.y))
1977 direction = DN; /* down */
1978
1979 scrollBar.state = SB_STATE_IDLE;
1917 /* 1980 /*
1918 * Rxvt-style scrollbar: 1981 * Rxvt-style scrollbar:
1919 * move up if mouse is above slider 1982 * move up if mouse is above slider
1920 * move dn if mouse is below slider 1983 * move dn if mouse is below slider
1921 * 1984 *
… …
1930 /* 1993 /*
1931 * Mouse report disabled scrollbar: 1994 * Mouse report disabled scrollbar:
1932 * arrow buttons - send up/down 1995 * arrow buttons - send up/down
1933 * click on scrollbar - send pageup/down 1996 * click on scrollbar - send pageup/down
1934 */ 1997 */
1935 if ((scrollBar.style == R_SB_NEXT 1998 if (direction == UP)
1936 && scrollbarnext_upButton (ev.y))
1937 || (scrollBar.style == R_SB_RXVT
1938 && scrollbarrxvt_upButton (ev.y)))
1939 tt_printf ("\033[A"); 1999 tt_printf ("\033[A");
1940 else if ((scrollBar.style == R_SB_NEXT 2000 else if (direction == DN)
1941 && scrollbarnext_dnButton (ev.y))
1942 || (scrollBar.style == R_SB_RXVT
1943 && scrollbarrxvt_dnButton (ev.y)))
1944 tt_printf ("\033[B"); 2001 tt_printf ("\033[B");
1945 else 2002 else
1946 switch (ev.button) 2003 switch (ev.button)
1947 { 2004 {
1948 case Button2: 2005 case Button2:
… …
1956 break; 2013 break;
1957 } 2014 }
1958 } 2015 }
1959 else 2016 else
1960#endif /* NO_SCROLLBAR_REPORT */ 2017#endif /* NO_SCROLLBAR_REPORT */
1961
1962 {
1963 char upordown = 0;
1964
1965 if (scrollBar.style == R_SB_NEXT)
1966 { 2018 {
1967 if (scrollbarnext_upButton (ev.y)) 2019 if (direction != NO_DIR)
1968 upordown = -1; /* up */
1969 else if (scrollbarnext_dnButton (ev.y))
1970 upordown = 1; /* down */
1971 }
1972 else if (scrollBar.style == R_SB_RXVT)
1973 {
1974 if (scrollbarrxvt_upButton (ev.y))
1975 upordown = -1; /* up */
1976 else if (scrollbarrxvt_dnButton (ev.y))
1977 upordown = 1; /* down */
1978 }
1979
1980 if (upordown)
1981 { 2020 {
1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2021#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1983 if (!cont_scroll_ev.is_active ()) 2022 if (!cont_scroll_ev.is_active ())
1984 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2023 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1985#endif 2024#endif
1986 if (scr_page (upordown < 0 ? UP : DN, 1)) 2025 if (scr_page (direction, 1))
1987 { 2026 {
1988 if (upordown < 0) 2027 if (direction == UP)
1989 scrollBar.setUp (); 2028 scrollBar.state = SB_STATE_UP;
1990 else 2029 else
1991 scrollBar.setDn (); 2030 scrollBar.state = SB_STATE_DOWN;
1992 } 2031 }
1993 } 2032 }
1994 else 2033 else
1995 switch (ev.button) 2034 switch (ev.button)
1996 { 2035 {
1997 case Button2: 2036 case Button2:
1998 switch (scrollbar_align) 2037 switch (scrollBar.align)
1999 { 2038 {
2000 case R_SB_ALIGN_TOP: 2039 case SB_ALIGN_TOP:
2001 csrO = 0; 2040 csrO = 0;
2002 break; 2041 break;
2003 case R_SB_ALIGN_CENTRE: 2042 case SB_ALIGN_CENTRE:
2004 csrO = (scrollBar.bot - scrollBar.top) / 2; 2043 csrO = (scrollBar.bot - scrollBar.top) / 2;
2005 break; 2044 break;
2006 case R_SB_ALIGN_BOTTOM: 2045 case SB_ALIGN_BOTTOM:
2007 csrO = scrollBar.bot - scrollBar.top; 2046 csrO = scrollBar.bot - scrollBar.top;
2008 break; 2047 break;
2009 } 2048 }
2010 2049
2011 if (scrollBar.style == R_SB_XTERM 2050 if (scrollBar.style == SB_STYLE_XTERM
2012 || scrollbar_above_slider (ev.y) 2051 || scrollBar.above_slider (ev.y)
2013 || scrollbar_below_slider (ev.y)) 2052 || scrollBar.below_slider (ev.y))
2014 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2053 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2015 2054
2016 scrollBar.setMotion (); 2055 scrollBar.state = SB_STATE_MOTION;
2017 break; 2056 break;
2018 2057
2019 case Button1: 2058 case Button1:
2020 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2059 if (scrollBar.align == SB_ALIGN_CENTRE)
2021 csrO = ev.y - scrollBar.top; 2060 csrO = ev.y - scrollBar.top;
2022 /* FALLTHROUGH */ 2061 /* FALLTHROUGH */
2023 2062
2024 case Button3: 2063 case Button3:
2025 if (scrollBar.style != R_SB_XTERM) 2064 if (scrollBar.style != SB_STYLE_XTERM)
2026 { 2065 {
2027 if (scrollbar_above_slider (ev.y)) 2066 if (scrollBar.above_slider (ev.y))
2028# ifdef RXVT_SCROLL_FULL 2067# ifdef RXVT_SCROLL_FULL
2029 scr_page (UP, nrow - 1); 2068 scr_page (UP, nrow - 1);
2030# else 2069# else
2031 scr_page (UP, nrow / 4); 2070 scr_page (UP, nrow / 4);
2032# endif 2071# endif
2033 else if (scrollbar_below_slider (ev.y)) 2072 else if (scrollBar.below_slider (ev.y))
2034# ifdef RXVT_SCROLL_FULL 2073# ifdef RXVT_SCROLL_FULL
2035 scr_page (DN, nrow - 1); 2074 scr_page (DN, nrow - 1);
2036# else 2075# else
2037 scr_page (DN, nrow / 4); 2076 scr_page (DN, nrow / 4);
2038# endif 2077# endif
2039 else 2078 else
2040 scrollBar.setMotion (); 2079 scrollBar.state = SB_STATE_MOTION;
2041 } 2080 }
2042 else 2081 else
2043 { 2082 {
2044 scr_page ((ev.button == Button1 ? DN : UP), 2083 scr_page ((ev.button == Button1 ? DN : UP),
2045 (nrow 2084 (nrow
2046 * scrollbar_position (ev.y) 2085 * scrollBar.position (ev.y)
2047 / scrollbar_size ())); 2086 / scrollBar.size ()));
2048 } 2087 }
2049 2088
2050 break; 2089 break;
2051 } 2090 }
2052 } 2091 }
… …
2062 2101
2063 csrO = 0; /* reset csr Offset */ 2102 csrO = 0; /* reset csr Offset */
2064 if (!bypass_keystate) 2103 if (!bypass_keystate)
2065 reportmode = !! (priv_modes & PrivMode_mouse_report); 2104 reportmode = !! (priv_modes & PrivMode_mouse_report);
2066 2105
2067 if (scrollbar_isUpDn ()) 2106 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2068 { 2107 {
2069 scrollBar.setIdle (); 2108 scrollBar.state = SB_STATE_IDLE;
2070 scrollbar_show (0); 2109 scrollBar.show (0);
2071 } 2110 }
2072 2111
2073#ifdef SELECTION_SCROLLING 2112#ifdef SELECTION_SCROLLING
2074 sel_scroll_ev.stop(); 2113 sel_scroll_ev.stop();
2075#endif 2114#endif
… …
2124 case Button3: 2163 case Button3:
2125 selection_make (ev.time); 2164 selection_make (ev.time);
2126 break; 2165 break;
2127 2166
2128 case Button2: 2167 case Button2:
2129 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2168 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2130 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2169 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2131 break; 2170 break;
2132 2171
2133#ifdef MOUSE_WHEEL 2172#ifdef MOUSE_WHEEL
2134 case Button4: 2173 case Button4:
2135 case Button5: 2174 case Button5:
… …
2155 2194
2156 if (!slip_wheel_ev.is_active ()) 2195 if (!slip_wheel_ev.is_active ())
2157 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2196 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2158 } 2197 }
2159 else 2198 else
2199# endif
2160 { 2200 {
2161# endif
2162 scr_page (v, i); 2201 scr_page (v, i);
2163 scrollbar_show (1); 2202 scrollBar.show (1);
2164# ifdef MOUSE_SLIP_WHEELING
2165 } 2203 }
2166# endif
2167 } 2204 }
2168 break; 2205 break;
2169#endif 2206#endif
2170 } 2207 }
2171 } 2208 }
2172} 2209}
2173 2210
2174/*}}} */ 2211/*}}} */
2175 2212
2176bool 2213void
2177rxvt_term::cmd_parse () 2214rxvt_term::cmd_parse ()
2178{ 2215{
2179 bool flag = false;
2180 wchar_t ch = NOCHAR; 2216 wchar_t ch = NOCHAR;
2181 char *seq_begin; // remember start of esc-sequence here 2217 char *seq_begin; // remember start of esc-sequence here
2182 2218
2183 for (;;) 2219 for (;;)
2184 { 2220 {
2185 if (ch == NOCHAR) 2221 if (ecb_unlikely (ch == NOCHAR))
2186 { 2222 {
2187 seq_begin = cmdbuf_ptr; 2223 seq_begin = cmdbuf_ptr;
2188 ch = next_char (); 2224 ch = next_char ();
2189 2225
2190 if (ch == NOCHAR) 2226 if (ch == NOCHAR)
2191 break; 2227 break;
2192 } 2228 }
2193 2229
2194 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2230 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2195 { 2231 {
2196 if (!seen_input) 2232 if (ecb_unlikely (!seen_input))
2197 { 2233 {
2198 seen_input = 1; 2234 seen_input = 1;
2199 // many badly-written programs (e.g. jed) contain a race condition: 2235 // many badly-written programs (e.g. jed) contain a race condition:
2200 // they first read the screensize and then install a SIGWINCH handler. 2236 // they first read the screensize and then install a SIGWINCH handler.
2201 // some window managers resize the window early, and these programs 2237 // some window managers resize the window early, and these programs
… …
2214 wchar_t *str = buf; 2250 wchar_t *str = buf;
2215 wchar_t *eol = str + min (ncol, UBUFSIZ); 2251 wchar_t *eol = str + min (ncol, UBUFSIZ);
2216 2252
2217 for (;;) 2253 for (;;)
2218 { 2254 {
2219 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2255 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2220 break; 2256 break;
2221 2257
2222 *str++ = ch; 2258 *str++ = ch;
2223 2259
2224 if (ch == C0_LF || str >= eol) 2260 if (ecb_unlikely (ch == C0_LF || str >= eol))
2225 { 2261 {
2226 if (ch == C0_LF) 2262 if (ch == C0_LF)
2227 nlines++; 2263 nlines++;
2228 2264
2229 refresh_count++; 2265 refresh_count++;
… …
2278 * What the heck we'll cheat and only refresh less than every page-full. 2314 * What the heck we'll cheat and only refresh less than every page-full.
2279 * if skipScroll is enabled. 2315 * if skipScroll is enabled.
2280 */ 2316 */
2281 if (refreshnow) 2317 if (refreshnow)
2282 { 2318 {
2283 flag = true;
2284 scr_refresh (); 2319 scr_refresh ();
2285 want_refresh = 1; 2320 want_refresh = 1;
2286 } 2321 }
2287
2288 } 2322 }
2289 else 2323 else
2290 { 2324 {
2291 try 2325 try
2292 { 2326 {
… …
2300 } 2334 }
2301 2335
2302 ch = NOCHAR; 2336 ch = NOCHAR;
2303 } 2337 }
2304 } 2338 }
2305
2306 return flag;
2307} 2339}
2308 2340
2309// read the next character 2341// read the next character
2310wchar_t 2342wchar_t
2311rxvt_term::next_char () NOTHROW 2343rxvt_term::next_char () NOTHROW
2312{ 2344{
2313 while (cmdbuf_ptr < cmdbuf_endp) 2345 while (cmdbuf_ptr < cmdbuf_endp)
2314 { 2346 {
2315 // assume 7-bit to be ascii ALWAYS 2347 // assume 7-bit to be ascii ALWAYS
2316 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2348 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2317 return *cmdbuf_ptr++; 2349 return *cmdbuf_ptr++;
2318 2350
2319 wchar_t wc; 2351 wchar_t wc;
2320 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2352 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2321 2353
… …
2325 cmdbuf_ptr = cmdbuf_endp; 2357 cmdbuf_ptr = cmdbuf_endp;
2326 break; 2358 break;
2327 } 2359 }
2328 2360
2329 if (len == (size_t)-1) 2361 if (len == (size_t)-1)
2362 {
2363 mbstate.reset (); // reset now undefined conversion state
2330 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2364 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2365 }
2331 2366
2332 // assume wchar == unicode 2367 // assume wchar == unicode
2333 cmdbuf_ptr += len; 2368 cmdbuf_ptr += len;
2334 return wc & UNICODE_MASK; 2369 return wc & UNICODE_MASK;
2335 } 2370 }
… …
2346 : NOCHAR; 2381 : NOCHAR;
2347} 2382}
2348 2383
2349static class out_of_input out_of_input; 2384static class out_of_input out_of_input;
2350 2385
2351/* rxvt_cmd_getc () - Return next input character */
2352/*
2353 * Return the next input character after first passing any keyboard input
2354 * to the command.
2355 */
2356wchar_t 2386wchar_t
2357rxvt_term::cmd_getc () THROW ((class out_of_input)) 2387rxvt_term::cmd_getc () THROW ((class out_of_input))
2358{ 2388{
2359 wchar_t c = next_char (); 2389 wchar_t c = next_char ();
2360 2390
… …
2379/*----------------------------------------------------------------------*/ 2409/*----------------------------------------------------------------------*/
2380#ifdef PRINTPIPE 2410#ifdef PRINTPIPE
2381FILE * 2411FILE *
2382rxvt_term::popen_printer () 2412rxvt_term::popen_printer ()
2383{ 2413{
2384 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2414 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2385 2415
2386 if (stream == NULL) 2416 if (stream == NULL)
2387 rxvt_warn ("can't open printer pipe, not printing.\n"); 2417 rxvt_warn ("can't open printer pipe, not printing.\n");
2388 2418
2389 return stream; 2419 return stream;
… …
2400 * simulate attached vt100 printer 2430 * simulate attached vt100 printer
2401 */ 2431 */
2402void 2432void
2403rxvt_term::process_print_pipe () 2433rxvt_term::process_print_pipe ()
2404{ 2434{
2405 int done; 2435 FILE *fd = popen_printer ();
2406 FILE *fd;
2407 2436
2408 if ((fd = popen_printer ()) == NULL) 2437 if (!fd)
2409 return; 2438 return;
2410 2439
2411 /* 2440 /*
2412 * Send all input to the printer until either ESC[4i or ESC[?4i 2441 * Send all input to the printer until either ESC[4i or ESC[?4i
2413 * is received. 2442 * is received.
2414 */ 2443 */
2415 for (done = 0; !done;) 2444 for (int done = 0; !done; )
2416 { 2445 {
2417 unsigned char buf[8]; 2446 unsigned char buf[8];
2418 unicode_t ch; 2447 unicode_t ch;
2419 unsigned int i, len; 2448 unsigned int i, len;
2420 2449
… …
2454 pclose_printer (fd); 2483 pclose_printer (fd);
2455} 2484}
2456#endif /* PRINTPIPE */ 2485#endif /* PRINTPIPE */
2457/*}}} */ 2486/*}}} */
2458 2487
2459/* *INDENT-OFF* */
2460enum { 2488enum {
2461 C1_40 = 0x40, 2489 C1_40 = 0x40,
2462 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2490 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2463 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2491 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2464 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2492 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2465 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2493 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2466}; 2494};
2467/* *INDENT-ON* */
2468 2495
2469/*{{{ process non-printing single characters */ 2496/*{{{ process non-printing single characters */
2470void 2497void
2471rxvt_term::process_nonprinting (unicode_t ch) 2498rxvt_term::process_nonprinting (unicode_t ch)
2472{ 2499{
… …
2565 break; 2592 break;
2566 case 'Z': /* identify the terminal type */ 2593 case 'Z': /* identify the terminal type */
2567 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2594 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2568 break; 2595 break;
2569 case '<': /* turn off VT52 mode */ 2596 case '<': /* turn off VT52 mode */
2570 PrivMode (0, PrivMode_vt52); 2597 priv_modes &= ~PrivMode_vt52;
2571 break; 2598 break;
2572 case 'F': /* use special graphics character set */ 2599 case 'F': /* use special graphics character set */
2573 case 'G': /* use regular character set */ 2600 case 'G': /* use regular character set */
2574 /* unimplemented */ 2601 /* unimplemented */
2575 break; 2602 break;
… …
2594 return; 2621 return;
2595 } 2622 }
2596 2623
2597 switch (ch) 2624 switch (ch)
2598 { 2625 {
2599 /* case 1: do_tek_mode (); break; */
2600 case '#': 2626 case '#':
2601 if (cmd_getc () == '8') 2627 if (cmd_getc () == '8')
2602 scr_E (); 2628 scr_E ();
2603 break; 2629 break;
2604 case '(': 2630 case '(':
… …
2627#if !ENABLE_MINIMAL 2653#if !ENABLE_MINIMAL
2628 case '9': 2654 case '9':
2629 scr_forwardindex (); 2655 scr_forwardindex ();
2630 break; 2656 break;
2631#endif 2657#endif
2658 // DECPAM/DECPNM
2632 case '=': 2659 case '=':
2660 priv_modes |= PrivMode_aplKP;
2661 break;
2633 case '>': 2662 case '>':
2634 PrivMode ((ch == '='), PrivMode_aplKP); 2663 priv_modes &= ~PrivMode_aplKP;
2635 break; 2664 break;
2636 2665
2637 case C1_40: 2666 case C1_40:
2638 cmd_getc (); 2667 cmd_getc ();
2639 break; 2668 break;
… …
2643 2672
2644 /* 8.3.87: NEXT LINE */ 2673 /* 8.3.87: NEXT LINE */
2645 case C1_NEL: /* ESC E */ 2674 case C1_NEL: /* ESC E */
2646 { 2675 {
2647 wchar_t nlcr[] = { C0_LF, C0_CR }; 2676 wchar_t nlcr[] = { C0_LF, C0_CR };
2648 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2677 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2649 } 2678 }
2650 break; 2679 break;
2651 2680
2652 /* kidnapped escape sequence: Should be 8.3.48 */ 2681 /* kidnapped escape sequence: Should be 8.3.48 */
2653 case C1_ESA: /* ESC G */ 2682 case C1_ESA: /* ESC G */
2654 process_graphics (); 2683 // used by original rxvt for rob nations own graphics mode
2684 if (cmd_getc () == 'Q')
2685 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2655 break; 2686 break;
2656 2687
2657 /* 8.3.63: CHARACTER TABULATION SET */ 2688 /* 8.3.63: CHARACTER TABULATION SET */
2658 case C1_HTS: /* ESC H */ 2689 case C1_HTS: /* ESC H */
2659 scr_set_tab (1); 2690 scr_set_tab (1);
… …
2663 case C1_RI: /* ESC M */ 2694 case C1_RI: /* ESC M */
2664 scr_index (DN); 2695 scr_index (DN);
2665 break; 2696 break;
2666 2697
2667 /* 8.3.142: SINGLE-SHIFT TWO */ 2698 /* 8.3.142: SINGLE-SHIFT TWO */
2668 /*case C1_SS2: scr_single_shift (2); break; */ 2699 /* case C1_SS2: break; */
2669 2700
2670 /* 8.3.143: SINGLE-SHIFT THREE */ 2701 /* 8.3.143: SINGLE-SHIFT THREE */
2671 /*case C1_SS3: scr_single_shift (3); break; */ 2702 /* case C1_SS3: break; */
2672 2703
2673 /* 8.3.27: DEVICE CONTROL STRING */ 2704 /* 8.3.27: DEVICE CONTROL STRING */
2674 case C1_DCS: /* ESC P */ 2705 case C1_DCS: /* ESC P */
2675 process_dcs_seq (); 2706 process_dcs_seq ();
2676 break; 2707 break;
… …
2678 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2709 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2679 case C1_SCI: /* ESC Z */ 2710 case C1_SCI: /* ESC Z */
2680 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2711 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2681 break; /* steal obsolete ESC [ c */ 2712 break; /* steal obsolete ESC [ c */
2682 2713
2683 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2714 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2684 case C1_CSI: /* ESC [ */ 2715 case C1_CSI: /* ESC [ */
2685 process_csi_seq (); 2716 process_csi_seq ();
2686 break; 2717 break;
2687 2718
2688 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2719 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2689 case C1_OSC: /* ESC ] */ 2720 case C1_OSC: /* ESC ] */
2690 process_osc_seq (); 2721 process_osc_seq ();
2691 break; 2722 break;
2692 2723
2693 /* 8.3.106: RESET TO INITIAL STATE */ 2724 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2694 case 'c': 2725 case 'c':
2695 mbstate.reset (); 2726 mbstate.reset ();
2696 scr_poweron (); 2727 scr_poweron ();
2697 scrollbar_show (1); 2728 scrollBar.show (1);
2698 break; 2729 break;
2699 2730
2700 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2731 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2701 case 'n': 2732 case 'n':
2702 scr_charset_choose (2); 2733 scr_charset_choose (2);
… …
2709 } 2740 }
2710} 2741}
2711/*}}} */ 2742/*}}} */
2712 2743
2713/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2744/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2714/* *INDENT-OFF* */
2715enum { 2745enum {
2716 CSI_ICH = 0x40, 2746 CSI_ICH = 0x40,
2717 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2747 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2718 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2748 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2719 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2749 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2722 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2752 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2723 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2753 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2724 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2754 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2725}; 2755};
2726 2756
2727#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2757#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2728 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2758 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2729 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2759 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2730#define get_byte_array_bit(array, bit) \ 2760#define get_byte_array_bit(array, bit) \
2731 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2761 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2732 2762
2733const unsigned char csi_defaults[] = 2763static const unsigned char csi_defaults[] =
2734 { 2764 {
2735 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2765 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2736 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2766 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2737 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2767 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2738 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2768 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2739 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2769 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2740 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2770 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2741 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2771 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2742 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2772 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2743 }; 2773 };
2744/* *INDENT-ON* */
2745 2774
2746void 2775void
2747rxvt_term::process_csi_seq () 2776rxvt_term::process_csi_seq ()
2748{ 2777{
2749 unicode_t ch, priv, i; 2778 unicode_t ch, priv, i;
… …
2753 2782
2754 nargs = 0; 2783 nargs = 0;
2755 2784
2756 priv = 0; 2785 priv = 0;
2757 ch = cmd_getc (); 2786 ch = cmd_getc ();
2758 if (ch >= '<' && ch <= '?') 2787 if ((ch >= '<' && ch <= '?') || ch == '!')
2759 { 2788 {
2760 /* '<' '=' '>' '?' */ 2789 /* '<' '=' '>' '?' '!' */
2761 priv = ch; 2790 priv = ch;
2762 ch = cmd_getc (); 2791 ch = cmd_getc ();
2763 } 2792 }
2764 2793
2765 /* read any numerical arguments */ 2794 /* read any numerical arguments */
… …
2814 // versions. 2843 // versions.
2815 // 2844 //
2816 tt_printf ("\033[>%d;95;0c", 'U'); 2845 tt_printf ("\033[>%d;95;0c", 'U');
2817 } 2846 }
2818 break; 2847 break;
2848
2819 case '?': 2849 case '?':
2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2850 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2821 process_terminal_mode (ch, priv, nargs, arg); 2851 process_terminal_mode (ch, priv, nargs, arg);
2822 break; 2852 break;
2853
2854 case '!':
2855 if (ch == CSI_70)
2856 {
2857 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2858 scr_soft_reset ();
2859
2860 static const int pm_h[] = { 7, 25 };
2861 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2862
2863 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2864 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2823 } 2865 }
2866 break;
2867 }
2868
2824 return; 2869 return;
2825 } 2870 }
2826 2871
2827 switch (ch) 2872 switch (ch)
2828 { 2873 {
… …
2842 } 2887 }
2843 break; 2888 break;
2844#endif 2889#endif
2845 2890
2846 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2891 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2847 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2892 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2848 arg[0] = -arg[0]; 2893 arg[0] = -arg[0];
2849 /* FALLTHROUGH */ 2894 /* FALLTHROUGH */
2850 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2895 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2851 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2896 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2852 scr_gotorc (arg[0], 0, RELATIVE); 2897 scr_gotorc (arg[0], 0, RELATIVE);
2853 break; 2898 break;
2854 2899
2855 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2900 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2856 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2901 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3043 } 3088 }
3044} 3089}
3045/*}}} */ 3090/*}}} */
3046 3091
3047#if !ENABLE_MINIMAL 3092#if !ENABLE_MINIMAL
3048/* ARGSUSED */
3049void 3093void
3050rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3094rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3051{ 3095{
3052 int x, y; 3096 int x, y;
3053 XWindowAttributes wattr; 3097 XWindowAttributes wattr;
… …
3062 { 3106 {
3063 /* 3107 /*
3064 * commands 3108 * commands
3065 */ 3109 */
3066 case 1: /* deiconify window */ 3110 case 1: /* deiconify window */
3067 XMapWindow (dpy, parent[0]); 3111 XMapWindow (dpy, parent);
3068 break; 3112 break;
3069 case 2: /* iconify window */ 3113 case 2: /* iconify window */
3070 XIconifyWindow (dpy, parent[0], display->screen); 3114 XIconifyWindow (dpy, parent, display->screen);
3071 break; 3115 break;
3072 case 3: /* set position (pixels) */ 3116 case 3: /* set position (pixels) */
3073 XMoveWindow (dpy, parent[0], args[1], args[2]); 3117 XMoveWindow (dpy, parent, args[1], args[2]);
3074 break; 3118 break;
3075 case 4: /* set size (pixels) */ 3119 case 4: /* set size (pixels) */
3076 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3120 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3077 break; 3121 break;
3078 case 5: /* raise window */ 3122 case 5: /* raise window */
3079 XRaiseWindow (dpy, parent[0]); 3123 XRaiseWindow (dpy, parent);
3080 break; 3124 break;
3081 case 6: /* lower window */ 3125 case 6: /* lower window */
3082 XLowerWindow (dpy, parent[0]); 3126 XLowerWindow (dpy, parent);
3083 break; 3127 break;
3084 case 7: /* refresh window */ 3128 case 7: /* refresh window */
3085 scr_touch (true); 3129 scr_touch (true);
3086 break; 3130 break;
3087 case 8: /* set size (chars) */ 3131 case 8: /* set size (chars) */
… …
3090 break; 3134 break;
3091 3135
3092 //case 9: NYI, TODO, restore maximized window or maximize window 3136 //case 9: NYI, TODO, restore maximized window or maximize window
3093 default: 3137 default:
3094 if (args[0] >= 24) /* set height (chars) */ 3138 if (args[0] >= 24) /* set height (chars) */
3095 set_widthheight ((unsigned int)width, 3139 set_widthheight ((unsigned int)vt_width,
3096 (unsigned int) (args[1] * fheight)); 3140 (unsigned int) (args[1] * fheight));
3097 break; 3141 break;
3098 3142
3099 /* 3143 /*
3100 * reports - some output format copied from XTerm 3144 * reports - some output format copied from XTerm
3101 */ 3145 */
3102 case 11: /* report window state */ 3146 case 11: /* report window state */
3103 XGetWindowAttributes (dpy, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent, &wattr);
3104 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3148 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3105 break; 3149 break;
3106 case 13: /* report window position */ 3150 case 13: /* report window position */
3107 XGetWindowAttributes (dpy, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent, &wattr);
3108 XTranslateCoordinates (dpy, parent[0], wattr.root, 3152 XTranslateCoordinates (dpy, parent, wattr.root,
3109 -wattr.border_width, -wattr.border_width, 3153 -wattr.border_width, -wattr.border_width,
3110 &x, &y, &wdummy); 3154 &x, &y, &wdummy);
3111 tt_printf ("\033[3;%d;%dt", x, y); 3155 tt_printf ("\033[3;%d;%dt", x, y);
3112 break; 3156 break;
3113 case 14: /* report window size (pixels) */ 3157 case 14: /* report window size (pixels) */
3114 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3115 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3159 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3116 break; 3160 break;
3117 case 18: /* report text area size (chars) */ 3161 case 18: /* report text area size (chars) */
3118 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3162 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3119 break; 3163 break;
… …
3121 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3165 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3122 break; 3166 break;
3123 case 20: /* report icon label */ 3167 case 20: /* report icon label */
3124 { 3168 {
3125 char *s; 3169 char *s;
3126 XGetIconName (dpy, parent[0], &s); 3170 XGetIconName (dpy, parent, &s);
3127 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3171 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3128 XFree (s); 3172 XFree (s);
3129 } 3173 }
3130 break; 3174 break;
3131 case 21: /* report window title */ 3175 case 21: /* report window title */
3132 { 3176 {
3133 char *s; 3177 char *s;
3134 XFetchName (dpy, parent[0], &s); 3178 XFetchName (dpy, parent, &s);
3135 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3179 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3136 XFree (s); 3180 XFree (s);
3137 } 3181 }
3138 break; 3182 break;
3139 } 3183 }
… …
3195 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3239 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3196 */ 3240 */
3197void 3241void
3198rxvt_term::process_dcs_seq () 3242rxvt_term::process_dcs_seq ()
3199{ 3243{
3200 char *s;
3201 unicode_t eh;
3202
3203 /* 3244 /*
3204 * Not handled yet 3245 * Not handled yet
3205 */ 3246 */
3247
3248 unicode_t eh;
3206 s = get_to_st (eh); 3249 char *s = get_to_st (eh);
3207 if (s) 3250 if (s)
3208 free (s); 3251 free (s);
3209 3252
3210 return; 3253 return;
3211} 3254}
… …
3215 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3258 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3216 */ 3259 */
3217void 3260void
3218rxvt_term::process_osc_seq () 3261rxvt_term::process_osc_seq ()
3219{ 3262{
3220 unicode_t ch, eh;
3221 int arg; 3263 int arg;
3222 3264
3223 ch = cmd_getc (); 3265 unicode_t ch = cmd_getc ();
3224 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3266 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3225 arg = arg * 10 + (ch - '0'); 3267 arg = arg * 10 + (ch - '0');
3226 3268
3227 if (ch == ';') 3269 if (ch == ';')
3228 { 3270 {
3271 unicode_t eh;
3229 char *s = get_to_st (eh); 3272 char *s = get_to_st (eh);
3230 3273
3231 if (s) 3274 if (s)
3232 { 3275 {
3233 process_xterm_seq (arg, s, eh); 3276 process_xterm_seq (arg, s, eh);
… …
3257 3300
3258/* 3301/*
3259 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3302 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3260 */ 3303 */
3261void 3304void
3262rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3305rxvt_term::process_xterm_seq (int op, char *str, char resp)
3263{ 3306{
3264 int color; 3307 int color;
3265 char *buf, *name; 3308 char *buf, *name;
3266 bool query = str[0] == '?' && !str[1]; 3309 bool query = str[0] == '?' && !str[1];
3267 int saveop = op; 3310 int saveop = op;
… …
3294 unsigned long bytes_after; 3337 unsigned long bytes_after;
3295 unsigned char *value = 0; 3338 unsigned char *value = 0;
3296 const char *str = ""; 3339 const char *str = "";
3297 3340
3298 if (prop 3341 if (prop
3299 && XGetWindowProperty (dpy, parent[0], 3342 && XGetWindowProperty (dpy, parent,
3300 prop, 0, 1<<16, 0, AnyPropertyType, 3343 prop, 0, 1<<16, 0, AnyPropertyType,
3301 &actual_type, &actual_format, 3344 &actual_type, &actual_format,
3302 &nitems, &bytes_after, &value) == Success 3345 &nitems, &bytes_after, &value) == Success
3303 && actual_type != None 3346 && actual_type != None
3304 && actual_format == 8) 3347 && actual_format == 8)
… …
3308 3351
3309 XFree (value); 3352 XFree (value);
3310 } 3353 }
3311 else 3354 else
3312 { 3355 {
3313 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3356 char *eq = strchr (str, '=');
3314 3357
3315 if (eq) 3358 if (eq)
3316 { 3359 {
3317 *eq = 0; 3360 *eq = 0;
3318 set_utf8_property (display->atom (str), eq + 1); 3361 set_utf8_property (display->atom (str), eq + 1);
3319 } 3362 }
3320 else 3363 else
3321 XDeleteProperty (dpy, parent[0], 3364 XDeleteProperty (dpy, parent,
3322 display->atom (str)); 3365 display->atom (str));
3323 } 3366 }
3324 break; 3367 break;
3325 3368
3326 case XTerm_Color: 3369 case XTerm_Color:
… …
3339 *buf++ = '\0'; 3382 *buf++ = '\0';
3340 3383
3341 process_color_seq (op, color, name, resp); 3384 process_color_seq (op, color, name, resp);
3342 } 3385 }
3343 break; 3386 break;
3387 case Rxvt_restoreFG:
3344 case XTerm_Color00: 3388 case XTerm_Color00:
3345 process_color_seq (op, Color_fg, str, resp); 3389 process_color_seq (op, Color_fg, str, resp);
3346 break; 3390 break;
3391 case Rxvt_restoreBG:
3347 case XTerm_Color01: 3392 case XTerm_Color01:
3348 process_color_seq (op, Color_bg, str, resp); 3393 process_color_seq (op, Color_bg, str, resp);
3349 break; 3394 break;
3350#ifndef NO_CURSORCOLOR 3395#ifndef NO_CURSORCOLOR
3351 case XTerm_Color_cursor: 3396 case XTerm_Color_cursor:
… …
3356 process_color_seq (op, Color_pointer_fg, str, resp); 3401 process_color_seq (op, Color_pointer_fg, str, resp);
3357 break; 3402 break;
3358 case XTerm_Color_pointer_bg: 3403 case XTerm_Color_pointer_bg:
3359 process_color_seq (op, Color_pointer_bg, str, resp); 3404 process_color_seq (op, Color_pointer_bg, str, resp);
3360 break; 3405 break;
3406#ifdef OPTION_HC
3407 case XTerm_Color_HC:
3408 process_color_seq (op, Color_HC, str, resp);
3409 break;
3410 case XTerm_Color_HTC:
3411 process_color_seq (op, Color_HTC, str, resp);
3412 break;
3413#endif
3361#ifndef NO_BOLD_UNDERLINE_REVERSE 3414#ifndef NO_BOLD_UNDERLINE_REVERSE
3362 case XTerm_Color_RV:
3363 process_color_seq (op, Color_RV, str, resp);
3364 break;
3365 case Rxvt_Color_BD:
3366 case URxvt_Color_BD: 3415 case URxvt_Color_BD:
3367 process_color_seq (op, Color_BD, str, resp); 3416 process_color_seq (op, Color_BD, str, resp);
3368 break; 3417 break;
3369 case Rxvt_Color_UL:
3370 case URxvt_Color_UL: 3418 case URxvt_Color_UL:
3371 process_color_seq (op, Color_UL, str, resp); 3419 process_color_seq (op, Color_UL, str, resp);
3372 break; 3420 break;
3373 case URxvt_Color_IT: 3421 case URxvt_Color_IT:
3374 process_color_seq (op, Color_IT, str, resp); 3422 process_color_seq (op, Color_IT, str, resp);
3375 break; 3423 break;
3376#endif 3424#endif
3425 case URxvt_Color_border:
3426 process_color_seq (op, Color_border, str, resp);
3427 break;
3377#if ENABLE_TRANSPARENCY 3428#if ENABLE_TRANSPARENCY
3378 case URxvt_Color_tint: 3429 case URxvt_Color_tint:
3379 process_color_seq (op, Color_tint, str, resp); 3430 process_color_seq (op, Color_tint, str, resp);
3380 { 3431 {
3381 bool changed = false; 3432 bool changed = false;
3433
3382 if (ISSET_PIXCOLOR (Color_tint)) 3434 if (ISSET_PIXCOLOR (Color_tint))
3383 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3435 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3384 else 3436
3385 changed = bgPixmap.unset_tint ();
3386 if (changed) 3437 if (changed)
3387 update_background (); 3438 update_background ();
3388 } 3439 }
3389 3440
3390 break; 3441 break;
… …
3394 case Rxvt_Pixmap: 3445 case Rxvt_Pixmap:
3395 if (!strcmp (str, "?")) 3446 if (!strcmp (str, "?"))
3396 { 3447 {
3397 char str[256]; 3448 char str[256];
3398 3449
3399 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3450 sprintf (str, "[%dx%d+%d+%d]",
3400 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3451 min (h_scale, 32767), min (v_scale, 32767),
3401 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3452 min (h_align, 32767), min (v_align, 32767));
3402 process_xterm_seq (XTerm_title, str, CHAR_ST); 3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3403 } 3454 }
3404 else 3455 else
3405 { 3456 {
3406 int changed = 0; 3457 bool changed = false;
3407 3458
3408 if (*str != ';') 3459 if (*str != ';')
3409 { 3460 {
3410 /* reset to default scaling :*/
3411 bgPixmap.unset_geometry ();
3412 if (bgPixmap.set_file (str)) /* change pixmap */ 3461 if (bg_set_file (str)) /* change pixmap */
3413 changed++; 3462 changed = true;
3414 str = strchr (str, ';');
3415 if (str == NULL)
3416 bgPixmap.set_defaultGeometry ();
3417 } 3463 }
3418 while (str) 3464 else
3419 { 3465 {
3420 str++; 3466 str++;
3421 if (bgPixmap.set_geometry (str)) 3467 if (bg_set_geometry (str, true))
3422 changed++; 3468 changed = true;
3423 str = strchr (str, ';');
3424 } 3469 }
3470
3425 if (changed) 3471 if (changed)
3472 {
3473 if (bg_window_position_sensitive ())
3474 {
3475 int x, y;
3476 get_window_origin (x, y);
3477 bg_set_position (x, y);
3478 }
3426 update_background (); 3479 update_background ();
3480 }
3427 } 3481 }
3428 break; 3482 break;
3429#endif 3483#endif
3430
3431 case Rxvt_restoreFG:
3432 set_window_color (Color_fg, str);
3433 break;
3434 case Rxvt_restoreBG:
3435 set_window_color (Color_bg, str);
3436 break;
3437 3484
3438 case XTerm_logfile: 3485 case XTerm_logfile:
3439 // TODO, when secure mode? 3486 // TODO, when secure mode?
3440 break; 3487 break;
3441 3488
… …
3508 break; 3555 break;
3509#endif 3556#endif
3510 3557
3511#if ENABLE_PERL 3558#if ENABLE_PERL
3512 case URxvt_perl: 3559 case URxvt_perl:
3513 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3560 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3514 ; // no responses yet
3515 break; 3561 break;
3516#endif 3562#endif
3517 } 3563 }
3518} 3564}
3519/*----------------------------------------------------------------------*/ 3565/*----------------------------------------------------------------------*/
… …
3542 { 3588 {
3543 if (mode == 'r') 3589 if (mode == 'r')
3544 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3590 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3545 else 3591 else
3546 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3592 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3547 PrivMode (state, bit); 3593
3594 if (state)
3595 priv_modes |= bit;
3596 else
3597 priv_modes &= ~bit;
3548 } 3598 }
3549 3599
3550 return state; 3600 return state;
3551} 3601}
3552 3602
3553/* we're not using priv _yet_ */ 3603/* we're not using priv _yet_ */
3554void 3604void
3555rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3605rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3556{ 3606{
3557 unsigned int i, j; 3607 unsigned int i, j;
3558 int state; 3608 int state;
3559 3609
3560 static const struct 3610 static const struct
3561 { 3611 {
3562 const int argval; 3612 const int argval;
3563 const unsigned long bit; 3613 const unsigned long bit;
3564 } argtopriv[] = { 3614 } argtopriv[] = {
3565 { 1, PrivMode_aplCUR }, 3615 { 1, PrivMode_aplCUR }, // DECCKM
3566 { 2, PrivMode_vt52 }, 3616 { 2, PrivMode_vt52 }, // DECANM
3567 { 3, PrivMode_132 }, 3617 { 3, PrivMode_132 }, // DECCOLM
3568 { 4, PrivMode_smoothScroll }, 3618 { 4, PrivMode_smoothScroll }, // DECSCLM
3569 { 5, PrivMode_rVideo }, 3619 { 5, PrivMode_rVideo }, // DECSCNM
3570 { 6, PrivMode_relOrigin }, 3620 { 6, PrivMode_relOrigin }, // DECOM
3571 { 7, PrivMode_Autowrap }, 3621 { 7, PrivMode_Autowrap }, // DECAWM
3572 // 8, bi-directional support mode 3622 // 8, auto-repeat keys // DECARM
3573 { 9, PrivMode_MouseX10 }, 3623 { 9, PrivMode_MouseX10 },
3574 // 18, 19 printing-related 3624 // 18 end FF to printer after print screen
3625 // 19 Print screen prints full screen/scroll region
3575 { 25, PrivMode_VisibleCursor }, 3626 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3576#ifdef scrollBar_esc 3627#ifdef scrollBar_esc
3577 { scrollBar_esc, PrivMode_scrollBar }, 3628 { scrollBar_esc, PrivMode_scrollBar },
3578#endif 3629#endif
3579 { 35, PrivMode_ShiftKeys }, // rxvt extension 3630 { 35, PrivMode_ShiftKeys }, // rxvt extension
3631 // 38, tektronix mode // DECTEK
3580 { 40, PrivMode_132OK }, 3632 { 40, PrivMode_132OK },
3581 // 41 xterm more fixes NYI 3633 // 41 xterm more fixes NYI
3582 // 45 margin bell NYI 3634 // 45 margin bell NYI
3583 // 46 start logging 3635 // 46 start logging
3584 { 47, PrivMode_Screen }, 3636 { 47, PrivMode_Screen },
3585 { 66, PrivMode_aplKP }, 3637 { 66, PrivMode_aplKP }, // DECNKM
3586#ifndef NO_BACKSPACE_KEY 3638#ifndef NO_BACKSPACE_KEY
3587 { 67, PrivMode_BackSpace }, 3639 { 67, PrivMode_BackSpace }, // DECBKM
3588#endif 3640#endif
3589 { 1000, PrivMode_MouseX11 }, 3641 { 1000, PrivMode_MouseX11 },
3590 { 1002, PrivMode_MouseBtnEvent }, 3642 { 1002, PrivMode_MouseBtnEvent },
3591 { 1003, PrivMode_MouseAnyEvent }, 3643 { 1003, PrivMode_MouseAnyEvent },
3644#if ENABLE_FRILLS
3645 { 1005, PrivMode_ExtModeMouse },
3646#endif
3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3647 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3593 { 1011, PrivMode_Keypress }, // rxvt extension 3648 { 1011, PrivMode_Keypress }, // rxvt extension
3649#if ENABLE_FRILLS
3650 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3651#endif
3594 // 1035 enable modifiers for alt, numlock NYI 3652 // 1035 enable modifiers for alt, numlock NYI
3595 // 1036 send ESC for meta keys NYI 3653 // 1036 send ESC for meta keys NYI
3596 // 1037 send DEL for keypad delete NYI 3654 // 1037 send DEL for keypad delete NYI
3597 { 1047, PrivMode_Screen }, 3655 { 1047, PrivMode_Screen },
3598 // 1048 save and restore cursor 3656 // 1048 save and restore cursor, implemented in code
3599 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3657 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3658 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3659 { 2004, PrivMode_BracketPaste },
3601 }; 3660 };
3602 3661
3603 if (nargs == 0) 3662 if (nargs == 0)
3604 return; 3663 return;
3605 3664
… …
3612 for (i = 0; i < nargs; i++) 3671 for (i = 0; i < nargs; i++)
3613 { 3672 {
3614 state = -1; 3673 state = -1;
3615 3674
3616 /* basic handling */ 3675 /* basic handling */
3617 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3676 for (j = 0; j < ecb_array_length (argtopriv); j++)
3618 if (argtopriv[j].argval == arg[i]) 3677 if (argtopriv[j].argval == arg[i])
3619 { 3678 {
3620 state = privcases (mode, argtopriv[j].bit); 3679 state = privcases (mode, argtopriv[j].bit);
3621 break; 3680 break;
3622 } 3681 }
… …
3630 3689
3631 scr_touch (true); 3690 scr_touch (true);
3632 break; 3691 break;
3633#endif 3692#endif
3634 case 1048: /* alternative cursor save */ 3693 case 1048: /* alternative cursor save */
3635 case 1049:
3636 if (option (Opt_secondaryScreen)) 3694 if (option (Opt_secondaryScreen))
3637 if (mode == 0) 3695 if (mode == 0)
3638 scr_cursor (RESTORE); 3696 scr_cursor (RESTORE);
3639 else if (mode == 1) 3697 else if (mode == 1)
3640 scr_cursor (SAVE); 3698 scr_cursor (SAVE);
… …
3649 case 2: /* VT52 mode */ 3707 case 2: /* VT52 mode */
3650 /* oddball mode. should be set regardless of set/reset 3708 /* oddball mode. should be set regardless of set/reset
3651 * parameter. Return from VT52 mode with an ESC < from 3709 * parameter. Return from VT52 mode with an ESC < from
3652 * within VT52 mode 3710 * within VT52 mode
3653 */ 3711 */
3654 PrivMode (1, PrivMode_vt52); 3712 priv_modes |= PrivMode_vt52;
3655 break; 3713 break;
3656 case 3: /* 80/132 */ 3714 case 3: /* 80/132 */
3657 if (priv_modes & PrivMode_132OK) 3715 if (priv_modes & PrivMode_132OK)
3658 set_widthheight (((state ? 132 : 80) * fwidth), height); 3716 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3659 break; 3717 break;
3660 case 4: /* smooth scrolling */ 3718 case 4: /* smooth scrolling */
3661 set_option (Opt_jumpScroll, !state); 3719 set_option (Opt_jumpScroll, !state);
3662 break; 3720 break;
3663 case 5: /* reverse video */ 3721 case 5: /* reverse video */
… …
3674 if (state) /* orthogonal */ 3732 if (state) /* orthogonal */
3675 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3733 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3676 break; 3734 break;
3677#ifdef scrollBar_esc 3735#ifdef scrollBar_esc
3678 case scrollBar_esc: 3736 case scrollBar_esc:
3679 if (scrollbar_mapping (state)) 3737 scrollBar.map (state);
3680 {
3681 resize_all_windows (0, 0, 0); 3738 resize_all_windows (0, 0, 0);
3682 scr_touch (true); 3739 scr_touch (true);
3683 }
3684 break; 3740 break;
3685#endif 3741#endif
3686 case 25: /* visible/invisible cursor */ 3742 case 25: /* visible/invisible cursor */
3687 scr_cursor_visible (state); 3743 scr_cursor_visible (state);
3688 break; 3744 break;
… …
3701 case 1003: 3757 case 1003:
3702 if (state) 3758 if (state)
3703 { 3759 {
3704 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3760 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3705 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3761 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3762 mouse_row = mouse_col = 0;
3706 vt_emask_mouse = PointerMotionMask; 3763 vt_emask_mouse = PointerMotionMask;
3707 } 3764 }
3708 else 3765 else
3709 vt_emask_mouse = NoEventMask; 3766 vt_emask_mouse = NoEventMask;
3767
3710 vt_select_input (); 3768 vt_select_input ();
3711 break; 3769 break;
3712 case 1010: /* scroll to bottom on TTY output inhibit */ 3770 case 1010: /* scroll to bottom on TTY output inhibit */
3713 set_option (Opt_scrollTtyOutput, !state); 3771 set_option (Opt_scrollTtyOutput, !state);
3714 break; 3772 break;
3715 case 1011: /* scroll to bottom on key press */ 3773 case 1011: /* scroll to bottom on key press */
3716 set_option (Opt_scrollTtyKeypress, state); 3774 set_option (Opt_scrollTtyKeypress, state);
3717 break; 3775 break;
3718 case 1047: /* secondary screen w/ clearing last */ 3776 case 1047: /* secondary screen w/ clearing last */
3719 if (option (Opt_secondaryScreen)) 3777 if (option (Opt_secondaryScreen))
3720 if (current_screen != PRIMARY) 3778 if (!state)
3721 scr_erase_screen (2); 3779 scr_erase_screen (2);
3780
3722 scr_change_screen (state); 3781 scr_change_screen (state);
3723 break; 3782 break;
3724 case 1049: /* secondary screen w/ clearing first */ 3783 case 1049: /* secondary screen w/ clearing first */
3784 if (option (Opt_secondaryScreen))
3785 if (state)
3786 scr_cursor (SAVE);
3787
3725 scr_change_screen (state); 3788 scr_change_screen (state);
3789
3726 if (option (Opt_secondaryScreen)) 3790 if (option (Opt_secondaryScreen))
3727 if (current_screen != PRIMARY) 3791 if (state)
3728 scr_erase_screen (2); 3792 scr_erase_screen (2);
3793 else
3794 scr_cursor (RESTORE);
3729 break; 3795 break;
3730 default: 3796 default:
3731 break; 3797 break;
3732 } 3798 }
3733 } 3799 }
… …
3886 } 3952 }
3887 } 3953 }
3888} 3954}
3889/*}}} */ 3955/*}}} */
3890 3956
3891/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3892void
3893rxvt_term::process_graphics ()
3894{
3895 unicode_t ch, cmd = cmd_getc ();
3896
3897 if (cmd == 'Q')
3898 {
3899 /* query graphics */
3900 tt_printf ("\033G0\012"); /* no graphics */
3901 return;
3902 }
3903 /* swallow other graphics sequences until terminating ':' */
3904 do
3905 ch = cmd_getc ();
3906 while (ch != ':');
3907}
3908/*}}} */
3909
3910/* ------------------------------------------------------------------------- */ 3957/* ------------------------------------------------------------------------- */
3911 3958
3912/* 3959/*
3913 * Send printf () formatted output to the command. 3960 * Send printf () formatted output to the command.
3914 * Only use for small amounts of data. 3961 * Only use for small amounts of data.
… …
3927 3974
3928/* ---------------------------------------------------------------------- */ 3975/* ---------------------------------------------------------------------- */
3929/* Write data to the pty as typed by the user, pasted with the mouse, 3976/* Write data to the pty as typed by the user, pasted with the mouse,
3930 * or generated by us in response to a query ESC sequence. 3977 * or generated by us in response to a query ESC sequence.
3931 */ 3978 */
3932const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3979static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3933 3980
3934void 3981void
3935rxvt_term::tt_write (const char *data, unsigned int len) 3982rxvt_term::tt_write (const char *data, unsigned int len)
3936{ 3983{
3937 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3984 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3942 3989
3943 if (v_buflen == 0) 3990 if (v_buflen == 0)
3944 { 3991 {
3945 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3992 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3946 3993
3994 max_it (written, 0);
3995
3947 if ((unsigned int)written == len) 3996 if (written == len)
3948 return; 3997 return;
3949 3998
3950 data += written; 3999 data += written;
3951 len -= written; 4000 len -= written;
3952 } 4001 }
3953 4002
3954 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3955 4004
3956 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
3957 v_buflen += len; 4006 v_buflen += len;
3958 4007
3959 pty_ev.set (ev::READ | ev::WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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