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.314 by root, Thu Jul 6 23:48:11 2006 UTC vs.
Revision 1.509 by sf-exg, Thu May 17 10:18:32 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)
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
162 162
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
221 ch = *chr++; 225 ch = *chr++;
222 226
223 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
226# if !UNICODE3 230# if !UNICODE_3
227 if (ch >= 0x10000) 231 if (ch >= 0x10000)
228 ch = 0xfffd; 232 ch = 0xfffd;
229# endif 233# endif
230 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
231 235
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
251#endif 257#endif
252 258
253void 259void
254rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
255{ 261{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 263
261 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
262 { 265 {
263 char mb[16]; 266 char mb[MB_LEN_MAX];
264 int len; 267 int len;
265 268
266 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
269 else 272 else
270 { 273 {
271 mb[0] = ch[0]; 274 mb[0] = ch;
272 len = 1; 275 len = 1;
273 } 276 }
274 277
275 if (len > 0) 278 if (len > 0)
276 tt_write (mb, len); 279 tt_write (mb, len);
… …
279 } 282 }
280 283
281 iso14755buf = 0; 284 iso14755buf = 0;
282} 285}
283 286
284int 287static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 288hex_keyval (XKeyEvent &ev)
286{ 289{
287 // check wether this event corresponds to a hex digit 290 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 291 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 292 for (int index = 0; index < 8; index++)
290 { 293 {
291 KeySym k = XLookupKeysym (&ev, index); 294 KeySym k = XLookupKeysym (&ev, index);
292 295
… …
298 301
299 return -1; 302 return -1;
300} 303}
301#endif 304#endif
302 305
306static inline KeySym
307translate_keypad (KeySym keysym, bool kp)
308{
309#ifdef XK_KP_Home
310 static const KeySym keypadtrans[] = {
311 XK_KP_7, // XK_KP_Home
312 XK_KP_4, // XK_KP_Left
313 XK_KP_8, // XK_KP_Up
314 XK_KP_6, // XK_KP_Right
315 XK_KP_2, // XK_KP_Down
316# ifndef UNSHIFTED_SCROLLKEYS
317 XK_KP_9, // XK_KP_Prior
318 XK_KP_3, // XK_KP_Next
319# else
320 XK_Prior,
321 XK_Next,
322# endif
323 XK_KP_1, // XK_KP_End
324 XK_KP_5, // XK_KP_Begin
325 };
326
327 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
328 {
329 unsigned int index = keysym - XK_KP_Home;
330 keysym = kp ? keypadtrans[index] : XK_Home + index;
331 }
332 else if (keysym == XK_KP_Insert)
333 keysym = kp ? XK_KP_0 : XK_Insert;
334# ifndef NO_DELETE_KEY
335 else if (keysym == XK_KP_Delete)
336 keysym = kp ? XK_KP_Decimal : XK_Delete;
337# endif
338#endif
339 return keysym;
340}
341
342static inline int
343map_function_key (KeySym keysym)
344{
345 int param = 0;
346
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
348 {
349 param = 11 + keysym - XK_F1;
350 if (keysym >= XK_F17)
351 param += 4;
352 else if (keysym >= XK_F15)
353 param += 3;
354 else if (keysym >= XK_F11)
355 param += 2;
356 else if (keysym >= XK_F6)
357 param += 1;
358 }
359 else
360 switch (keysym)
361 {
362 case XK_Find:
363 param = 1;
364 break;
365 case XK_Insert:
366 param = 2;
367 break;
368#ifdef DXK_Remove
369 case DXK_Remove:
370#endif
371 case XK_Execute:
372 param = 3;
373 break;
374 case XK_Select:
375 param = 4;
376 break;
377#ifndef UNSHIFTED_SCROLLKEYS
378 case XK_Prior:
379 param = 5;
380 break;
381 case XK_Next:
382 param = 6;
383 break;
384 case XK_Home:
385 param = 7;
386 break;
387 case XK_End:
388 param = 8;
389 break;
390#endif
391 case XK_Help:
392 param = 28;
393 break;
394 case XK_Menu:
395 param = 29;
396 break;
397 }
398 return param;
399}
400
303void 401void
304rxvt_term::key_press (XKeyEvent &ev) 402rxvt_term::key_press (XKeyEvent &ev)
305{ 403{
306 int ctrl, meta, shft, len; 404 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 405 KeySym keysym;
309 int valid_keysym; 406 int valid_keysym;
310 char kbuf[KBUFSZ]; 407 char kbuf[KBUFSZ];
311 408
312#if ISO_14755 409#if ISO_14755
… …
321 * Always permit `shift' to override the current setting 418 * Always permit `shift' to override the current setting
322 */ 419 */
323 shft = ev.state & ShiftMask; 420 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
326
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332 423
333 kbuf[0] = 0; 424 kbuf[0] = 0;
334 425
335#ifdef USE_XIM 426#ifdef USE_XIM
336 if (Input_Context) 427 if (Input_Context)
… …
411#ifdef PAGING_CONTEXT_LINES 502#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 503 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 504#else
414 lnsppg = nrow * 4 / 5; 505 lnsppg = nrow * 4 / 5;
415#endif 506#endif
507 max_it (lnsppg, 1);
508
416 if (keysym == XK_Prior) 509 if (keysym == XK_Prior)
417 { 510 {
418 scr_page (UP, lnsppg); 511 scr_page (UP, lnsppg);
419 return; 512 return;
420 } 513 }
… …
473 selection_request (ev.time); 566 selection_request (ev.time);
474 return; 567 return;
475#if TODO 568#if TODO
476 /* rxvt extras */ 569 /* rxvt extras */
477 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
478 change_font (FONT_UP);
479 return; 571 return;
480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
481 change_font (FONT_DN);
482 return; 573 return;
483#endif 574#endif
484 } 575 }
485 } 576 }
486 } 577 }
487 578
488#if ENABLE_FRILLS || ISO_14755 579#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 580 // ISO 14755 support
490 if (shft && ctrl) 581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 582 {
492 int hv; 583 int hv;
493 584
494 if (iso14755buf & ISO_14755_51 585 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 586 && (keysym == XK_space || keysym == XK_KP_Space
… …
497 { 588 {
498 commit_iso14755 (); 589 commit_iso14755 ();
499 iso14755buf = ISO_14755_51; 590 iso14755buf = ISO_14755_51;
500# if ISO_14755 591# if ISO_14755
501 iso14755_51 (0); 592 iso14755_51 (0);
593# endif
594 return;
595 }
596 else if (keysym == XK_BackSpace)
597 {
598 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
599# if ISO_14755
600 iso14755_51 (iso14755buf & ISO_14755_MASK);
502# endif 601# endif
503 return; 602 return;
504 } 603 }
505 else if ((hv = hex_keyval (ev)) >= 0) 604 else if ((hv = hex_keyval (ev)) >= 0)
506 { 605 {
… …
511# endif 610# endif
512 return; 611 return;
513 } 612 }
514 else 613 else
515 { 614 {
516# if ENABLE_OVERLAY 615# if ISO_14755
517 scr_overlay_off (); 616 scr_overlay_off ();
518# endif 617# endif
519 iso14755buf = 0; 618 iso14755buf = 0;
520 } 619 }
521 } 620 }
621 else if (option (Opt_iso14755) &&
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 622 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 623 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
524 if (!(iso14755buf & ISO_14755_STARTED)) 624 if (!(iso14755buf & ISO_14755_STARTED))
525 { 625 {
526 iso14755buf |= ISO_14755_STARTED; 626 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY 627# if ISO_14755
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 628 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode"); 629 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif 630# endif
531 } 631 }
532#endif 632#endif
533 633
534#ifdef PRINTPIPE 634#ifdef PRINTPIPE
535 if (keysym == XK_Print) 635 if (keysym == XK_Print)
536 { 636 {
537 scr_printscreen (ctrl | shft); 637 scr_printscreen (ctrl | shft);
538 return; 638 return;
539 } 639 }
540#endif 640#endif
541 641
542 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543 { 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)
544 { 653 {
654#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace)
657 {
658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
659 ^ !!ctrl) ? '\b' : '\177';
660 kbuf[1] = '\0';
661 }
662 else
663 strcpy (kbuf, rs[Rs_backspace_key]);
664 break;
665#endif
666#ifndef NO_DELETE_KEY
667 case XK_Delete:
668 strcpy (kbuf, rs[Rs_delete_key]);
669 break;
670#endif
671 case XK_Tab:
672 if (shft)
673 strcpy (kbuf, "\033[Z");
674 else
675 {
676#ifdef CTRL_TAB_MAKES_META
677 if (ctrl)
678 meta = 1;
679#endif
680#ifdef MOD4_TAB_MAKES_META
681 if (ev.state & Mod4Mask)
682 meta = 1;
683#endif
545 newlen = 1; 684 newlen = 0;
546 switch (keysym) 685 }
686 break;
687
688 case XK_Up: /* "\033[A" */
689 case XK_Down: /* "\033[B" */
690 case XK_Right: /* "\033[C" */
691 case XK_Left: /* "\033[D" */
692 strcpy (kbuf, "\033[Z");
693 kbuf[2] = "DACB"[keysym - XK_Left];
694 /* do Shift first */
695 if (shft)
696 kbuf[2] = "dacb"[keysym - XK_Left];
697 else if (ctrl)
698 {
699 kbuf[1] = 'O';
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 }
702 else if (priv_modes & PrivMode_aplCUR)
703 kbuf[1] = 'O';
704 break;
705
706 case XK_KP_Enter:
707 /* allow shift to override */
708 if (kp)
709 {
710 strcpy (kbuf, "\033OM");
711 break;
712 }
713
714 /* FALLTHROUGH */
715
716 case XK_Return:
717 if (priv_modes & PrivMode_LFNL)
718 {
719 kbuf[0] = '\015';
720 kbuf[1] = '\012';
721 kbuf[2] = '\0';
722 }
723 else
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\0';
727 }
728 break;
729
730 case XK_KP_F1: /* "\033OP" */
731 case XK_KP_F2: /* "\033OQ" */
732 case XK_KP_F3: /* "\033OR" */
733 case XK_KP_F4: /* "\033OS" */
734 strcpy (kbuf, "\033OP");
735 kbuf[2] += (keysym - XK_KP_F1);
736 break;
737
738 case XK_KP_Multiply: /* "\033Oj" : "*" */
739 case XK_KP_Add: /* "\033Ok" : "+" */
740 case XK_KP_Separator: /* "\033Ol" : "," */
741 case XK_KP_Subtract: /* "\033Om" : "-" */
742 case XK_KP_Decimal: /* "\033On" : "." */
743 case XK_KP_Divide: /* "\033Oo" : "/" */
744 case XK_KP_0: /* "\033Op" : "0" */
745 case XK_KP_1: /* "\033Oq" : "1" */
746 case XK_KP_2: /* "\033Or" : "2" */
747 case XK_KP_3: /* "\033Os" : "3" */
748 case XK_KP_4: /* "\033Ot" : "4" */
749 case XK_KP_5: /* "\033Ou" : "5" */
750 case XK_KP_6: /* "\033Ov" : "6" */
751 case XK_KP_7: /* "\033Ow" : "7" */
752 case XK_KP_8: /* "\033Ox" : "8" */
753 case XK_KP_9: /* "\033Oy" : "9" */
754 /* allow shift to override */
755 if (kp)
756 {
757 strcpy (kbuf, "\033Oj");
758 kbuf[2] += (keysym - XK_KP_Multiply);
759 }
760 else
761 {
762 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
763 kbuf[1] = '\0';
764 }
765 break;
766
767 default:
547 { 768 {
548#ifndef NO_BACKSPACE_KEY 769 int param = map_function_key (keysym);
549 case XK_BackSpace: 770 if (param > 0)
550 if (priv_modes & PrivMode_HaveBackSpace) 771 sprintf (kbuf,"\033[%d~", param);
551 {
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0';
555 }
556 else 772 else
557 strcpy (kbuf, key_backspace);
558 break;
559#endif
560#ifndef NO_DELETE_KEY
561# ifdef XK_KP_Prior
562 case XK_KP_Delete:
563 /* allow shift to override */
564 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
565 {
566 strcpy (kbuf, "\033On");
567 break;
568 }
569 /* FALLTHROUGH */
570# endif
571 case XK_Delete:
572 strcpy (kbuf, key_delete);
573 break;
574#endif
575 case XK_Tab:
576 if (shft)
577 strcpy (kbuf, "\033[Z");
578 else
579 {
580#ifdef CTRL_TAB_MAKES_META
581 if (ctrl)
582 meta = 1;
583#endif
584#ifdef MOD4_TAB_MAKES_META
585 if (ev.state & Mod4Mask)
586 meta = 1;
587#endif
588 newlen = 0;
589 }
590 break;
591
592#ifdef XK_KP_Left
593 case XK_KP_Up: /* \033Ox or standard */
594 case XK_KP_Down: /* \033Or or standard */
595 case XK_KP_Right: /* \033Ov or standard */
596 case XK_KP_Left: /* \033Ot or standard */
597 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
598 {
599 strcpy (kbuf, "\033OZ");
600 kbuf[2] = "txvr"[keysym - XK_KP_Left];
601 break;
602 }
603 else
604 /* translate to std. cursor key */
605 keysym = XK_Left + (keysym - XK_KP_Left);
606 /* FALLTHROUGH */
607#endif
608 case XK_Up: /* "\033[A" */
609 case XK_Down: /* "\033[B" */
610 case XK_Right: /* "\033[C" */
611 case XK_Left: /* "\033[D" */
612 strcpy (kbuf, "\033[Z");
613 kbuf[2] = "DACB"[keysym - XK_Left];
614 /* do Shift first */
615 if (shft)
616 kbuf[2] = "dacb"[keysym - XK_Left];
617 else if (ctrl)
618 {
619 kbuf[1] = 'O';
620 kbuf[2] = "dacb"[keysym - XK_Left];
621 }
622 else if (priv_modes & PrivMode_aplCUR)
623 kbuf[1] = 'O';
624 break;
625
626#ifndef UNSHIFTED_SCROLLKEYS
627# ifdef XK_KP_Prior
628 case XK_KP_Prior:
629 /* allow shift to override */
630 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
631 {
632 strcpy (kbuf, "\033Oy");
633 break;
634 }
635 /* FALLTHROUGH */
636# endif
637 case XK_Prior:
638 strcpy (kbuf, "\033[5~");
639 break;
640# ifdef XK_KP_Next
641 case XK_KP_Next:
642 /* allow shift to override */
643 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
644 {
645 strcpy (kbuf, "\033Os");
646 break;
647 }
648 /* FALLTHROUGH */
649# endif
650 case XK_Next:
651 strcpy (kbuf, "\033[6~");
652 break;
653#endif
654 case XK_KP_Enter:
655 /* allow shift to override */
656 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
657 {
658 strcpy (kbuf, "\033OM");
659 break;
660 }
661
662 /* FALLTHROUGH */
663
664 case XK_Return:
665 if (priv_modes & PrivMode_LFNL)
666 {
667 kbuf[0] = '\015';
668 kbuf[1] = '\012';
669 kbuf[2] = '\0';
670 }
671 else
672 {
673 kbuf[0] = '\015';
674 kbuf[1] = '\0';
675 }
676 break;
677
678#ifdef XK_KP_Begin
679 case XK_KP_Begin:
680 strcpy (kbuf, "\033Ou");
681 break;
682
683#endif
684 case XK_KP_F1: /* "\033OP" */
685 case XK_KP_F2: /* "\033OQ" */
686 case XK_KP_F3: /* "\033OR" */
687 case XK_KP_F4: /* "\033OS" */
688 strcpy (kbuf, "\033OP");
689 kbuf[2] += (keysym - XK_KP_F1);
690 break;
691
692 case XK_KP_Multiply: /* "\033Oj" : "*" */
693 case XK_KP_Add: /* "\033Ok" : "+" */
694 case XK_KP_Separator: /* "\033Ol" : "," */
695 case XK_KP_Subtract: /* "\033Om" : "-" */
696 case XK_KP_Decimal: /* "\033On" : "." */
697 case XK_KP_Divide: /* "\033Oo" : "/" */
698 case XK_KP_0: /* "\033Op" : "0" */
699 case XK_KP_1: /* "\033Oq" : "1" */
700 case XK_KP_2: /* "\033Or" : "2" */
701 case XK_KP_3: /* "\033Os" : "3" */
702 case XK_KP_4: /* "\033Ot" : "4" */
703 case XK_KP_5: /* "\033Ou" : "5" */
704 case XK_KP_6: /* "\033Ov" : "6" */
705 case XK_KP_7: /* "\033Ow" : "7" */
706 case XK_KP_8: /* "\033Ox" : "8" */
707 case XK_KP_9: /* "\033Oy" : "9" */
708 /* allow shift to override */
709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
710 {
711 strcpy (kbuf, "\033Oj");
712 kbuf[2] += (keysym - XK_KP_Multiply);
713 }
714 else
715 {
716 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
717 kbuf[1] = '\0';
718 }
719 break;
720
721 case XK_Find:
722 strcpy (kbuf, "\033[1~");
723 break;
724
725#ifdef XK_KP_End
726 case XK_KP_Insert:
727 /* allow shift to override */
728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
729 {
730 strcpy (kbuf, "\033Op");
731 break;
732 }
733 /* FALLTHROUGH */
734#endif
735 case XK_Insert:
736 strcpy (kbuf, "\033[2~");
737 break;
738#ifdef DXK_Remove /* support for DEC remove like key */
739 case DXK_Remove:
740 /* FALLTHROUGH */
741#endif
742 case XK_Execute:
743 strcpy (kbuf, "\033[3~");
744 break;
745 case XK_Select:
746 strcpy (kbuf, "\033[4~");
747 break;
748#ifdef XK_KP_End
749 case XK_KP_End:
750 /* allow shift to override */
751 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
752 {
753 strcpy (kbuf, "\033Oq");
754 break;
755 }
756 /* FALLTHROUGH */
757#endif
758 case XK_End:
759 strcpy (kbuf, KS_END);
760 break;
761#ifdef XK_KP_Home
762 case XK_KP_Home:
763 /* allow shift to override */
764 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
765 {
766 strcpy (kbuf, "\033Ow");
767 break;
768 }
769 /* FALLTHROUGH */
770#endif
771 case XK_Home:
772 strcpy (kbuf, KS_HOME);
773 break;
774
775#define FKEY(n, fkey) \
776 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
777
778 case XK_F1: /* "\033[11~" */
779 case XK_F2: /* "\033[12~" */
780 case XK_F3: /* "\033[13~" */
781 case XK_F4: /* "\033[14~" */
782 case XK_F5: /* "\033[15~" */
783 FKEY (11, XK_F1);
784 break;
785 case XK_F6: /* "\033[17~" */
786 case XK_F7: /* "\033[18~" */
787 case XK_F8: /* "\033[19~" */
788 case XK_F9: /* "\033[20~" */
789 case XK_F10: /* "\033[21~" */
790 FKEY (17, XK_F6);
791 break;
792 case XK_F11: /* "\033[23~" */
793 case XK_F12: /* "\033[24~" */
794 case XK_F13: /* "\033[25~" */
795 case XK_F14: /* "\033[26~" */
796 FKEY (23, XK_F11);
797 break;
798 case XK_F15: /* "\033[28~" */
799 case XK_F16: /* "\033[29~" */
800 FKEY (28, XK_F15);
801 break;
802 case XK_Help: /* "\033[28~" */
803 FKEY (28, XK_Help);
804 break;
805 case XK_Menu: /* "\033[29~" */
806 FKEY (29, XK_Menu);
807 break;
808 case XK_F17: /* "\033[31~" */
809 case XK_F18: /* "\033[32~" */
810 case XK_F19: /* "\033[33~" */
811 case XK_F20: /* "\033[34~" */
812 case XK_F21: /* "\033[35~" */
813 case XK_F22: /* "\033[36~" */
814 case XK_F23: /* "\033[37~" */
815 case XK_F24: /* "\033[38~" */
816 case XK_F25: /* "\033[39~" */
817 case XK_F26: /* "\033[40~" */
818 case XK_F27: /* "\033[41~" */
819 case XK_F28: /* "\033[42~" */
820 case XK_F29: /* "\033[43~" */
821 case XK_F30: /* "\033[44~" */
822 case XK_F31: /* "\033[45~" */
823 case XK_F32: /* "\033[46~" */
824 case XK_F33: /* "\033[47~" */
825 case XK_F34: /* "\033[48~" */
826 case XK_F35: /* "\033[49~" */
827 FKEY (31, XK_F17);
828 break;
829#undef FKEY
830 default:
831 newlen = 0; 773 newlen = 0;
832 break;
833 } 774 }
834 775 break;
835 if (newlen)
836 len = strlen (kbuf);
837 } 776 }
838 777
778 if (newlen)
779 len = strlen (kbuf);
780
781 if (len > 0)
782 {
839 /* 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 /*
840 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
841 */ 797 */
842#ifdef META8_OPTION 798#ifdef META8_OPTION
843 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
844 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
845#endif 801#endif
802 }
846 803
847 } 804 }
848 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
849 { 806 {
850 len = 1; 807 len = 1;
… …
877 return; 834 return;
878 835
879 if (len <= 0) 836 if (len <= 0)
880 return; /* not mapped */ 837 return; /* not mapped */
881 838
882 if (OPTION (Opt_scrollTtyKeypress)) 839 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 840 if (view_start)
884 { 841 {
885 view_start = 0; 842 view_start = 0;
886 want_refresh = 1; 843 want_refresh = 1;
887 } 844 }
888 845
889 /*
890 * these modifications only affect the static keybuffer
891 * pass Shift/Control indicators for function keys ending with `~'
892 *
893 * eg,
894 * Prior = "ESC[5~"
895 * Shift+Prior = "ESC[5$"
896 * Ctrl+Prior = "ESC[5^"
897 * Ctrl+Shift+Prior = "ESC[5@"
898 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
899 */
900 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
901 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
902
903 /* escape prefix */ 846 /* escape prefix */
904 if (meta 847 if (meta
905#ifdef META8_OPTION 848#ifdef META8_OPTION
906 && meta_char == C0_ESC 849 && meta_char == C0_ESC
907#endif 850#endif
… …
926#if ENABLE_FRILLS || ISO_14755 869#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 870 // ISO 14755 support
928 if (iso14755buf) 871 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 872 if (iso14755buf & ISO_14755_52)
930 { 873 {
931# if ENABLE_OVERLAY 874# if ISO_14755
932 scr_overlay_off (); 875 scr_overlay_off ();
933# endif 876# endif
934# if ISO_14755 877# if ISO_14755
935 // iso14755 part 5.2 handling: release time 878 // iso14755 part 5.2 handling: release time
936 // first: controls 879 // first: controls
… …
942 commit_iso14755 (); 885 commit_iso14755 ();
943 886
944 return; 887 return;
945 } 888 }
946 889
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 890 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
948 if (i[0] == keysym) 891 if (i[0] == keysym)
949 { 892 {
950 iso14755buf = ISO_14755_51 | i[1]; 893 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 (); 894 commit_iso14755 ();
952 895
… …
959 902
960 return; 903 return;
961 } 904 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 905 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 906 {
964# if ENABLE_OVERLAY 907# if ISO_14755
965 scr_overlay_off (); 908 scr_overlay_off ();
966# endif 909# endif
967 if (iso14755buf & ISO_14755_51) 910 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 911 commit_iso14755 ();
969#if ISO_14755 912#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 913 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 914 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 915 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 916
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 917 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 918 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
989 else if (keysym == XK_Control_L || keysym == XK_Control_R) 932 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0; 933 mouse_slip_wheel_speed = 0;
991#endif 934#endif
992} 935}
993 936
994#if defined (KEYSYM_RESOURCE)
995unsigned int
996rxvt_term::cmd_write (const char *str, unsigned int count)
997{
998 unsigned int n, s;
999
1000 n = cmdbuf_ptr - cmdbuf_base;
1001 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1002
1003 if (n > 0 && s < count)
1004 {
1005 memmove (cmdbuf_base, cmdbuf_ptr,
1006 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1007 cmdbuf_ptr = cmdbuf_base;
1008 cmdbuf_endp -= n;
1009 s += n;
1010 }
1011
1012 if (count > s)
1013 {
1014 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1015 count = s;
1016 }
1017
1018 for (; count--;)
1019 *cmdbuf_endp++ = *str++;
1020
1021 cmd_parse ();
1022
1023 return 0;
1024}
1025#endif
1026
1027void 937void
1028rxvt_term::flush () 938rxvt_term::flush ()
1029{ 939{
1030 flush_ev.stop (); 940 flush_ev.stop ();
1031 941
1032#ifdef TRANSPARENT 942#ifdef HAVE_BG_PIXMAP
1033 if (want_full_refresh) 943 if (bg_flags & BG_NEEDS_REFRESH)
1034 { 944 {
1035 want_full_refresh = 0; 945 bg_flags &= ~BG_NEEDS_REFRESH;
1036 scr_clear ();
1037 scr_touch (false); 946 scr_touch (false);
1038 } 947 }
1039#endif 948#endif
1040 949
1041 if (want_refresh) 950 if (want_refresh)
… …
1077 } 986 }
1078 while (row < end_row); 987 while (row < end_row);
1079 } 988 }
1080 989
1081 scr_refresh (); 990 scr_refresh ();
1082 scrollbar_show (1); 991 scrollBar.show (1);
1083#ifdef USE_XIM 992#ifdef USE_XIM
1084 IMSendSpot (); 993 im_send_spot ();
1085#endif 994#endif
1086 } 995 }
1087 996
1088 display->flush (); 997 display->flush ();
1089} 998}
1090 999
1000/* checks whether a refresh is requested and starts the refresh timer */
1091void 1001void
1092rxvt_term::check_cb (check_watcher &w) 1002rxvt_term::refresh_check ()
1003{
1004 if (want_refresh && !flush_ev.is_active ())
1005 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1006
1007 display->flush ();
1008}
1009
1010void
1011rxvt_term::flush_cb (ev::timer &w, int revents)
1093{ 1012{
1094 make_current (); 1013 make_current ();
1095 1014
1096 display->flush ();
1097
1098 if (want_refresh && !flush_ev.active)
1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1100}
1101
1102void
1103rxvt_term::flush_cb (time_watcher &w)
1104{
1105 make_current ();
1106
1107 refresh_limit = 1;
1108 refresh_count = 0; 1015 refresh_count = 0;
1109 flush (); 1016 flush ();
1110} 1017}
1111 1018
1112#ifdef CURSOR_BLINK 1019#ifdef CURSOR_BLINK
1113void 1020void
1021rxvt_term::cursor_blink_reset ()
1022{
1023 if (hidden_cursor)
1024 {
1025 hidden_cursor = 0;
1026 want_refresh = 1;
1027 }
1028
1029 if (option (Opt_cursorBlink))
1030 cursor_blink_ev.again ();
1031 else
1032 cursor_blink_ev.stop ();
1033}
1034
1035void
1114rxvt_term::cursor_blink_cb (time_watcher &w) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1115{ 1037{
1116 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1117 want_refresh = 1; 1039 want_refresh = 1;
1118 1040 refresh_check ();
1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1120} 1041}
1121#endif 1042#endif
1122 1043
1123#ifdef TEXT_BLINK 1044#ifdef TEXT_BLINK
1124void 1045void
1125rxvt_term::text_blink_cb (time_watcher &w) 1046rxvt_term::text_blink_cb (ev::timer &w, int revents)
1126{ 1047{
1127 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1048 if (scr_refresh_rend (RS_Blink, RS_Blink))
1128 { 1049 {
1129 hidden_text = !hidden_text; 1050 hidden_text = !hidden_text;
1130 want_refresh = 1; 1051 want_refresh = 1;
1131 w.start (w.at + TEXT_BLINK_INTERVAL); 1052 refresh_check ();
1132 } 1053 }
1054 else
1055 w.stop ();
1133} 1056}
1134#endif 1057#endif
1135 1058
1136#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137void 1060void
1138rxvt_term::cont_scroll_cb (time_watcher &w) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1139{ 1062{
1140 if ((scrollbar_isUp() || scrollbar_isDn()) && 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1141 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1142 { 1065 {
1143 want_refresh = 1; 1066 want_refresh = 1;
1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1067 refresh_check ();
1145 } 1068 }
1069 else
1070 w.stop ();
1146} 1071}
1147#endif 1072#endif
1148 1073
1149#ifdef SELECTION_SCROLLING 1074#ifdef SELECTION_SCROLLING
1150void 1075void
1151rxvt_term::sel_scroll_cb (time_watcher &w) 1076rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1152{ 1077{
1153 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1078 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1154 { 1079 {
1155 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1080 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156 want_refresh = 1; 1081 want_refresh = 1;
1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1082 refresh_check ();
1158 } 1083 }
1084 else
1085 w.stop ();
1159} 1086}
1160#endif 1087#endif
1161 1088
1162#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163void 1090void
1164rxvt_term::slip_wheel_cb (time_watcher &w) 1091rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1165{ 1092{
1166 if (mouse_slip_wheel_speed == 0 1093 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1168 : scr_page (UP, mouse_slip_wheel_speed))
1169 { 1094 {
1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0;
1172
1173 want_refresh = 1; 1095 want_refresh = 1;
1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1097 }
1098
1099 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1100 {
1101 mouse_slip_wheel_speed = 0;
1102 w.stop ();
1175 } 1103 }
1176} 1104}
1177#endif 1105#endif
1178 1106
1179#if LINUX_YIELD_HACK 1107#if LINUX_YIELD_HACK
1180static struct event_handler 1108static struct event_handler
1181{ 1109{
1182 check_watcher yield_ev; 1110 ev::prepare yield_ev;
1183 1111
1184 void yield_cb (check_watcher &w) 1112 void yield_cb (ev::prepare &w, int revents)
1185 { 1113 {
1186 // this should really be sched_yield(), but the linux guys thought 1114 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1115 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is 1116 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS. 1117 // allowed by the sus... as is returning ENOSYS.
1118 // since the linux guys additionally thought that breaking the only
1119 // known workaround against their unusable sched_yield hack is cool,
1120 // we just nanosleep a bit and hope for the best.
1190 1121
1191 struct timespec ts = { 0, 0 }; 1122 struct timespec ts = { 0, 1000 };
1192 nanosleep (&ts, 0); 1123 nanosleep (&ts, 0);
1193 1124
1194 w.stop (); 1125 w.stop ();
1195 } 1126 }
1196 1127
… …
1199 { 1130 {
1200 } 1131 }
1201} event_handler; 1132} event_handler;
1202#endif 1133#endif
1203 1134
1135/* make sure all the cmd data is at beginning of cmdbuf */
1136void
1137rxvt_term::cmdbuf_reify ()
1138{
1139 if (cmdbuf_ptr == cmdbuf_base)
1140 return;
1141
1142 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1143
1144 memmove (cmdbuf_base, cmdbuf_ptr, used);
1145 cmdbuf_ptr = cmdbuf_base;
1146 cmdbuf_endp = cmdbuf_ptr + used;
1147
1148}
1149
1150#if defined (KEYSYM_RESOURCE)
1151void
1152rxvt_term::cmdbuf_append (const char *str, size_t count)
1153{
1154 cmdbuf_reify ();
1155
1156 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1157
1158 if (count > avail)
1159 return;
1160
1161 memcpy (cmdbuf_endp, str, count);
1162 cmdbuf_endp += count;
1163
1164 cmd_parse ();
1165}
1166#endif
1167
1204bool 1168bool
1205rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1206{ 1170{
1207 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 cmdbuf_reify ();
1208 1172
1209 if (CBUFSIZ == n) 1173 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1210 { 1174
1211 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1175 if (!avail)
1212 n = 0;
1213 } 1176 {
1214 1177 // normally this indicates a "too long" command sequence - just drop the data we have
1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1216 cmdbuf_ptr = cmdbuf_base; 1178 cmdbuf_ptr = cmdbuf_base;
1217 cmdbuf_endp = cmdbuf_ptr + n; 1179 cmdbuf_endp = cmdbuf_ptr;
1180 avail = CBUFSIZ;
1181 }
1218 1182
1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1220 1184
1221 if (r > 0) 1185 if (r > 0)
1222 { 1186 {
1223 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1224 return true; 1188 return true;
… …
1232 } 1196 }
1233 else 1197 else
1234 { 1198 {
1235 pty_ev.stop (); 1199 pty_ev.stop ();
1236 1200
1237 if (!OPTION (Opt_hold)) 1201 if (!option (Opt_hold))
1238 destroy (); 1202 destroy ();
1239 } 1203 }
1240 1204
1241 return false; 1205 return false;
1242} 1206}
1243 1207
1244void 1208void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1209rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1210{
1247 make_current (); 1211 make_current ();
1248 1212
1249 if (revents & EVENT_READ) 1213 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1214 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1215 for (int i = CBUFCNT; i-- && pty_fill (); )
1252 if (cmd_parse ()) 1216 cmd_parse ();
1253 break;
1254 1217
1255 if (revents & EVENT_WRITE) 1218 if (revents & ev::WRITE)
1256 pty_write (); 1219 pty_write ();
1220
1221 refresh_check ();
1257} 1222}
1258 1223
1259void 1224void
1260rxvt_term::pointer_unblank () 1225rxvt_term::pointer_unblank ()
1261{ 1226{
… …
1263 recolour_cursor (); 1228 recolour_cursor ();
1264 1229
1265#ifdef POINTER_BLANK 1230#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1231 hidden_pointer = 0;
1267 1232
1268 if (OPTION (Opt_pointerBlank)) 1233 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1234 pointer_ev.start (pointerBlankDelay);
1270#endif 1235#endif
1271} 1236}
1272 1237
1273#ifdef POINTER_BLANK 1238#ifdef POINTER_BLANK
1274void 1239void
1275rxvt_term::pointer_blank () 1240rxvt_term::pointer_blank ()
1276{ 1241{
1277 if (!OPTION (Opt_pointerBlank)) 1242 if (!option (Opt_pointerBlank))
1278 return; 1243 return;
1279 1244
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1245 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1246 XFlush (dpy);
1282 1247
1283 hidden_pointer = 1; 1248 hidden_pointer = 1;
1284} 1249}
1285 1250
1286void 1251void
1287rxvt_term::pointer_cb (time_watcher &w) 1252rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1253{
1289 make_current (); 1254 make_current ();
1290 1255
1291 pointer_blank (); 1256 pointer_blank ();
1292} 1257}
… …
1295void 1260void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1261rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1262{
1298 int button_number, key_state = 0; 1263 int button_number, key_state = 0;
1299 int x, y; 1264 int x, y;
1265 int code = 32;
1300 1266
1301 x = ev.x; 1267 x = Pixel2Col (ev.x) + 1;
1302 y = ev.y; 1268 y = Pixel2Row (ev.y) + 1;
1303 pixel_position (&x, &y); 1269
1270 if (ev.type == MotionNotify)
1271 {
1272 if (x == mouse_row && y == mouse_col)
1273 return;
1274
1275 mouse_row = x;
1276 mouse_col = y;
1277 code += 32;
1278 }
1304 1279
1305 if (MEvent.button == AnyButton) 1280 if (MEvent.button == AnyButton)
1306 button_number = 3; 1281 button_number = 3;
1307 else 1282 else
1308 { 1283 {
1309 button_number = MEvent.button - Button1; 1284 button_number = MEvent.button - Button1;
1310 /* add 0x3D for wheel events, like xterm does */ 1285 /* add 0x3D for wheel events, like xterm does */
1311 if (button_number >= 3) 1286 if (button_number >= 3)
1312 button_number += (64 - 3); 1287 button_number += 64 - 3;
1313 } 1288 }
1314 1289
1315 if (priv_modes & PrivMode_MouseX10) 1290 if (priv_modes & PrivMode_MouseX10)
1316 { 1291 {
1317 /* 1292 /*
… …
1349 fputc ('A', stderr); 1324 fputc ('A', stderr);
1350 if (key_state & 32) 1325 if (key_state & 32)
1351 fputc ('2', stderr); 1326 fputc ('2', stderr);
1352 fprintf (stderr, "]: <%d>, %d/%d\n", 1327 fprintf (stderr, "]: <%d>, %d/%d\n",
1353 button_number, 1328 button_number,
1354 x + 1, 1329 x,
1355 y + 1); 1330 y);
1356#endif 1331#endif
1357 1332
1333#if ENABLE_FRILLS
1334 if (priv_modes & PrivMode_ExtMouseRight)
1335 tt_printf ("\033[%d;%d;%dM",
1336 code + button_number + key_state,
1337 x,
1338 y);
1339 else if (priv_modes & PrivMode_ExtModeMouse)
1340 tt_printf ("\033[M%c%lc%lc",
1341 code + button_number + key_state,
1342 wint_t (32 + x),
1343 wint_t (32 + y));
1344 else
1345#endif
1358 tt_printf ("\033[M%c%c%c", 1346 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1347 code + button_number + key_state,
1360 (32 + x + 1), 1348 32 + x,
1361 (32 + y + 1)); 1349 32 + y);
1362} 1350}
1363 1351
1364/*{{{ process an X event */ 1352/*{{{ process an X event */
1365void 1353void
1366rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1414 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1415 focus_out ();
1428 } 1416 }
1429#endif 1417#endif
1430 } 1418 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1419 break;
1436 1420
1437 /* 1421 /*
1438 * XXX: this is not the _current_ arrangement 1422 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1423 * Here's my conclusion:
… …
1458 break; 1442 break;
1459 } 1443 }
1460 break; 1444 break;
1461 1445
1462 case FocusIn: 1446 case FocusIn:
1447 if (ev.xfocus.detail != NotifyInferior
1448 && ev.xfocus.detail != NotifyPointer
1449 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1450 focus_in ();
1464 break; 1451 break;
1465 1452
1466 case FocusOut: 1453 case FocusOut:
1454 if (ev.xfocus.detail != NotifyInferior
1455 && ev.xfocus.detail != NotifyPointer
1456 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1457 focus_out ();
1468 break; 1458 break;
1469 1459
1470 case ConfigureNotify: 1460 case ConfigureNotify:
1471 if (ev.xconfigure.window == parent[0]) 1461 if (ev.xconfigure.window == parent)
1472 { 1462 {
1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ; 1464 ;
1465
1466#ifdef HAVE_BG_PIXMAP
1467 bool moved = false;
1468 if (bg_window_position_sensitive ())
1469 {
1470 int x, y;
1471 if (ev.xconfigure.send_event)
1472 {
1473 x = ev.xconfigure.x;
1474 y = ev.xconfigure.y;
1475 }
1476 else
1477 get_window_origin (x, y);
1478
1479 if (bg_set_position (x, y)
1480 || !(bg_flags & BG_IS_VALID))
1481 moved = true;
1482 }
1483#endif
1475 1484
1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1477 { 1486 {
1478 seen_resize = 1; 1487 seen_resize = 1;
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480 } 1489 }
1490 else
1491 {
1492#ifdef HAVE_BG_PIXMAP
1493 if (moved)
1494 update_background ();
1495#endif
1496 }
1481 1497
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1485 if (OPTION (Opt_transparent))
1486 check_our_parents ();
1487#endif
1488 } 1499 }
1489 break; 1500 break;
1490 1501
1491 case PropertyNotify: 1502 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1503 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1494 && ev.xproperty.state == PropertyNewValue)
1495 selection_property (ev.xproperty.window, ev.xproperty.atom);
1496
1497 break; 1504 break;
1498 1505
1499 case SelectionClear: 1506 case SelectionClear:
1500 selection_clear (); 1507 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1501 break;
1502
1503 case SelectionNotify:
1504 if (selection_wait == Sel_normal)
1505 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1506 break; 1508 break;
1507 1509
1508 case SelectionRequest: 1510 case SelectionRequest:
1509 selection_send (ev.xselectionrequest); 1511 selection_send (ev.xselectionrequest);
1510 break; 1512 break;
1511 1513
1512 case MapNotify: 1514 case MapNotify:
1515#ifdef HAVE_BG_PIXMAP
1516 /* This is needed specifically to fix the case of no window manager or a
1517 * non-reparenting window manager. In those cases we never get first
1518 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1519 * care of multiplicity of ConfigureNotify events arriving while WM does
1520 * reparenting.
1521 * We should not render background immediately, as there could be several
1522 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1523 * by scheduling background redraw as soon as we can, but giving a short
1524 * bit of time for ConfigureNotifies to arrive.
1525 * We should render background PRIOR to drawing any text, but AFTER all
1526 * of ConfigureNotifys for the best results.
1527 */
1528 if (!(bg_flags & BG_IS_VALID))
1529 update_background_ev.start (0.025);
1530#endif
1513 mapped = 1; 1531 mapped = 1;
1514#ifdef TEXT_BLINK 1532#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1533 text_blink_ev.start ();
1516#endif 1534#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1535 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1536 break;
1519 1537
1520 case UnmapNotify: 1538 case UnmapNotify:
… …
1522#ifdef TEXT_BLINK 1540#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1541 text_blink_ev.stop ();
1524#endif 1542#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1543 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1544 break;
1527
1528#ifdef TRANSPARENT
1529 case ReparentNotify:
1530 rootwin_cb (ev);
1531 break;
1532#endif /* TRANSPARENT */
1533 1545
1534 case GraphicsExpose: 1546 case GraphicsExpose:
1535 case Expose: 1547 case Expose:
1536 if (ev.xany.window == vt) 1548 if (ev.xany.window == vt)
1537 { 1549 {
1538 do 1550 do
1551 {
1539 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1540 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1554 }
1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1542 1556
1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544 1558
1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1560 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1561 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1562 ev.xexpose.width, ev.xexpose.height, false);
1563 }
1548 1564
1549 want_refresh = 1; 1565 want_refresh = 1;
1550 } 1566 }
1551 else 1567 else
1552 { 1568 {
… …
1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1556 ; 1572 ;
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1574 ;
1559 1575
1560 if (isScrollbarWindow (ev.xany.window)) 1576 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1577 {
1562 scrollBar.setIdle (); 1578 scrollBar.state = SB_STATE_IDLE;
1563 scrollbar_show (0); 1579 scrollBar.show (0);
1564 } 1580 }
1565
1566#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window);
1569#endif
1570 } 1581 }
1571 break; 1582 break;
1572 1583
1573 case MotionNotify: 1584 case MotionNotify:
1574#ifdef POINTER_BLANK 1585#ifdef POINTER_BLANK
1575 if (hidden_pointer) 1586 if (hidden_pointer)
1576 pointer_unblank (); 1587 pointer_unblank ();
1577#endif 1588#endif
1589 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1590 || priv_modes & PrivMode_MouseAnyEvent)
1591 mouse_report (ev.xbutton);
1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1579 break; 1593 break;
1580 1594
1581 if (ev.xany.window == vt) 1595 if (ev.xany.window == vt)
1582 { 1596 {
… …
1616 int dist; 1630 int dist;
1617 1631
1618 /* don't clobber the current delay if we are 1632 /* don't clobber the current delay if we are
1619 * already in the middle of scrolling. 1633 * already in the middle of scrolling.
1620 */ 1634 */
1621 if (!sel_scroll_ev.active) 1635 if (!sel_scroll_ev.is_active ())
1622 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1636 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1623 1637
1624 /* save the event params so we can highlight 1638 /* save the event params so we can highlight
1625 * the selection in the pending-scroll loop 1639 * the selection in the pending-scroll loop
1626 */ 1640 */
1627 selection_save_x = ev.xbutton.x; 1641 selection_save_x = ev.xbutton.x;
… …
1635 dist = int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1636 } 1650 }
1637 else 1651 else
1638 { 1652 {
1639 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1640 dist = ev.xbutton.y - (int_bwidth + height); 1654 dist = ev.xbutton.y - (int_bwidth + vt_height);
1641 } 1655 }
1642 1656
1643 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1644 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1645 + 1; 1659 + 1;
… …
1649 else 1663 else
1650 { 1664 {
1651 /* we are within the text window, so we 1665 /* we are within the text window, so we
1652 * shouldn't be scrolling 1666 * shouldn't be scrolling
1653 */ 1667 */
1654 if (sel_scroll_ev.active)
1655 sel_scroll_ev.stop(); 1668 sel_scroll_ev.stop();
1656 } 1669 }
1657#endif 1670#endif
1658#ifdef MOUSE_THRESHOLD 1671#ifdef MOUSE_THRESHOLD
1659 } 1672 }
1660#endif 1673#endif
1661 } 1674 }
1662 } 1675 }
1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1664 { 1677 {
1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1666 MotionNotify, &ev)) 1679 MotionNotify, &ev))
1667 ; 1680 ;
1668 1681
1669 XQueryPointer (dpy, scrollBar.win, 1682 XQueryPointer (dpy, scrollBar.win,
1670 &unused_root, &unused_child, 1683 &unused_root, &unused_child,
1671 &unused_root_x, &unused_root_y, 1684 &unused_root_x, &unused_root_y,
1672 &ev.xbutton.x, &ev.xbutton.y, 1685 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1686 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1687 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1688 scrollBar.size ());
1676 want_refresh = 1; 1689 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1690 scrollBar.show (1);
1679 } 1691 }
1680 break; 1692 break;
1681 } 1693 }
1682 1694
1683#if defined(CURSOR_BLINK) 1695#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1696 if (ev.type == KeyPress)
1685 { 1697 cursor_blink_reset ();
1686 if (hidden_cursor)
1687 {
1688 hidden_cursor = 0;
1689 want_refresh = 1;
1690 }
1691
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1693 }
1694#endif 1698#endif
1695 1699
1696#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1702 {
1699 if (ev.type == MotionNotify 1703 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1704 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1705 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1706 if (hidden_pointer)
… …
1704 1708
1705 if (ev.type == KeyPress && hidden_pointer == 0) 1709 if (ev.type == KeyPress && hidden_pointer == 0)
1706 pointer_blank (); 1710 pointer_blank ();
1707 } 1711 }
1708#endif 1712#endif
1713
1714 refresh_check ();
1709} 1715}
1716
1717#if ENABLE_FRILLS
1718void
1719rxvt_term::set_urgency (bool enable)
1720{
1721 if (enable == urgency_hint)
1722 return;
1723
1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1725 {
1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1727 XSetWMHints (dpy, parent, h);
1728 urgency_hint = enable;
1729 XFree (h);
1730 }
1731}
1732#endif
1710 1733
1711void 1734void
1712rxvt_term::focus_in () 1735rxvt_term::focus_in ()
1713{ 1736{
1714 if (!focus) 1737 if (!focus)
1715 { 1738 {
1716 focus = 1; 1739 focus = 1;
1717 want_refresh = 1; 1740 want_refresh = 1;
1718 1741
1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1720
1721#if USE_XIM 1742#if USE_XIM
1722 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1723 { 1744 {
1724 IMSetPosition (); 1745 im_set_position ();
1725 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1726 } 1747 }
1727#endif 1748#endif
1728#if CURSOR_BLINK 1749#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1751 cursor_blink_ev.again ();
1731#endif 1752#endif
1732#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1734 { 1755 {
1735 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1757 scr_recolour ();
1737 } 1758 }
1738#endif 1759#endif
1760#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell))
1762 set_urgency (0);
1763#endif
1764
1765 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1739 } 1766 }
1740} 1767}
1741 1768
1742void 1769void
1743rxvt_term::focus_out () 1770rxvt_term::focus_out ()
… …
1745 if (focus) 1772 if (focus)
1746 { 1773 {
1747 focus = 0; 1774 focus = 0;
1748 want_refresh = 1; 1775 want_refresh = 1;
1749 1776
1750 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1777#if ENABLE_FRILLS
1751 1778 if (option (Opt_urgentOnBell))
1779 set_urgency (0);
1780#endif
1752#if ENABLE_FRILLS || ISO_14755 1781#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf) 1782 if (iso14755buf)
1754 { 1783 {
1755 iso14755buf = 0; 1784 iso14755buf = 0;
1756# if ENABLE_OVERLAY 1785# if ISO_14755
1757 scr_overlay_off (); 1786 scr_overlay_off ();
1758# endif 1787# endif
1759 } 1788 }
1760#endif 1789#endif
1761#if USE_XIM 1790#if USE_XIM
1762 if (Input_Context != NULL) 1791 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1792 XUnsetICFocus (Input_Context);
1764#endif 1793#endif
1765#if CURSOR_BLINK 1794#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1795 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1796 cursor_blink_ev.stop ();
1797
1768 hidden_cursor = 0; 1798 hidden_cursor = 0;
1769#endif 1799#endif
1770#if OFF_FOCUS_FADING 1800#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1801 if (rs[Rs_fade])
1772 { 1802 {
1773 pix_colors = pix_colors_unfocused; 1803 pix_colors = pix_colors_unfocused;
1774 scr_recolour (); 1804 scr_recolour ();
1775 } 1805 }
1776#endif 1806#endif
1807
1808 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1777 } 1809 }
1778} 1810}
1779 1811
1780void 1812void
1781rxvt_term::update_fade_color (unsigned int idx) 1813rxvt_term::update_fade_color (unsigned int idx)
… …
1788 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1820 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1789 } 1821 }
1790#endif 1822#endif
1791} 1823}
1792 1824
1793#if TRANSPARENT || ENABLE_PERL 1825#if ENABLE_TRANSPARENCY || ENABLE_PERL
1794void 1826void
1795rxvt_term::rootwin_cb (XEvent &ev) 1827rxvt_term::rootwin_cb (XEvent &ev)
1796{ 1828{
1797 make_current (); 1829 make_current ();
1798 1830
1799 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1800 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1832 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1801 return; 1833 return;
1802 1834
1803# if TRANSPARENT 1835# if ENABLE_TRANSPARENCY
1804 switch (ev.type) 1836 switch (ev.type)
1805 { 1837 {
1806 case PropertyNotify: 1838 case PropertyNotify:
1807 /* 1839 /*
1808 * if user used some Esetroot compatible prog to set the root bg, 1840 * if user used some Esetroot compatible prog to set the root bg,
1809 * use the property to determine the pixmap. We use it later on. 1841 * use the property to determine the pixmap. We use it later on.
1810 */ 1842 */
1811 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1843 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1812 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1844 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1813 return; 1845 {
1846 bg_set_root_pixmap ();
1847 update_background ();
1848 }
1814 1849
1815 /* FALLTHROUGH */
1816 case ReparentNotify:
1817 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1818 want_refresh = want_full_refresh = 1;
1819 break; 1850 break;
1820 } 1851 }
1821# endif 1852# endif
1853
1854 refresh_check ();
1822} 1855}
1823#endif 1856#endif
1824 1857
1825void 1858void
1826rxvt_term::button_press (XButtonEvent &ev) 1859rxvt_term::button_press (XButtonEvent &ev)
… …
1857 /* save the xbutton state (for ButtonRelease) */ 1890 /* save the xbutton state (for ButtonRelease) */
1858 MEvent.state = ev.state; 1891 MEvent.state = ev.state;
1859#ifdef MOUSE_REPORT_DOUBLECLICK 1892#ifdef MOUSE_REPORT_DOUBLECLICK
1860 if (ev.button == MEvent.button && clickintime) 1893 if (ev.button == MEvent.button && clickintime)
1861 { 1894 {
1862 /* same button, within alloted time */ 1895 /* same button, within allowed time */
1863 MEvent.clicks++; 1896 MEvent.clicks++;
1864 1897
1865 if (MEvent.clicks > 1) 1898 if (MEvent.clicks > 1)
1866 { 1899 {
1867 /* only report double clicks */ 1900 /* only report double clicks */
… …
1881 mouse_report (ev); 1914 mouse_report (ev);
1882 } 1915 }
1883#else 1916#else
1884 MEvent.button = ev.button; 1917 MEvent.button = ev.button;
1885 mouse_report (ev); 1918 mouse_report (ev);
1886#endif /* MOUSE_REPORT_DOUBLECLICK */ 1919#endif /* MOUSE_REPORT_DOUBLECLICK */
1887 1920
1888 } 1921 }
1889 else 1922 else
1890 { 1923 {
1891 if (ev.button != MEvent.button) 1924 if (ev.button != MEvent.button)
… …
1939 } 1972 }
1940 1973
1941 /* 1974 /*
1942 * Scrollbar window processing of button press 1975 * Scrollbar window processing of button press
1943 */ 1976 */
1944 if (isScrollbarWindow (ev.window)) 1977 if (scrollBar.state && ev.window == scrollBar.win)
1945 { 1978 {
1946 scrollBar.setIdle (); 1979 page_dirn direction = NO_DIR;
1980
1981 if (scrollBar.upButton (ev.y))
1982 direction = UP; /* up */
1983 else if (scrollBar.dnButton (ev.y))
1984 direction = DN; /* down */
1985
1986 scrollBar.state = SB_STATE_IDLE;
1947 /* 1987 /*
1948 * Rxvt-style scrollbar: 1988 * Rxvt-style scrollbar:
1949 * move up if mouse is above slider 1989 * move up if mouse is above slider
1950 * move dn if mouse is below slider 1990 * move dn if mouse is below slider
1951 * 1991 *
… …
1960 /* 2000 /*
1961 * Mouse report disabled scrollbar: 2001 * Mouse report disabled scrollbar:
1962 * arrow buttons - send up/down 2002 * arrow buttons - send up/down
1963 * click on scrollbar - send pageup/down 2003 * click on scrollbar - send pageup/down
1964 */ 2004 */
1965 if ((scrollBar.style == R_SB_NEXT 2005 if (direction == UP)
1966 && scrollbarnext_upButton (ev.y))
1967 || (scrollBar.style == R_SB_RXVT
1968 && scrollbarrxvt_upButton (ev.y)))
1969 tt_printf ("\033[A"); 2006 tt_printf ("\033[A");
1970 else if ((scrollBar.style == R_SB_NEXT 2007 else if (direction == DN)
1971 && scrollbarnext_dnButton (ev.y))
1972 || (scrollBar.style == R_SB_RXVT
1973 && scrollbarrxvt_dnButton (ev.y)))
1974 tt_printf ("\033[B"); 2008 tt_printf ("\033[B");
1975 else 2009 else
1976 switch (ev.button) 2010 switch (ev.button)
1977 { 2011 {
1978 case Button2: 2012 case Button2:
… …
1985 tt_printf ("\033[5~"); 2019 tt_printf ("\033[5~");
1986 break; 2020 break;
1987 } 2021 }
1988 } 2022 }
1989 else 2023 else
1990#endif /* NO_SCROLLBAR_REPORT */ 2024#endif /* NO_SCROLLBAR_REPORT */
1991
1992 {
1993 char upordown = 0;
1994
1995 if (scrollBar.style == R_SB_NEXT)
1996 { 2025 {
1997 if (scrollbarnext_upButton (ev.y)) 2026 if (direction != NO_DIR)
1998 upordown = -1; /* up */
1999 else if (scrollbarnext_dnButton (ev.y))
2000 upordown = 1; /* down */
2001 }
2002 else if (scrollBar.style == R_SB_RXVT)
2003 {
2004 if (scrollbarrxvt_upButton (ev.y))
2005 upordown = -1; /* up */
2006 else if (scrollbarrxvt_dnButton (ev.y))
2007 upordown = 1; /* down */
2008 }
2009 if (upordown)
2010 { 2027 {
2011#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2028#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2029 if (!cont_scroll_ev.is_active ())
2012 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2030 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2013#endif 2031#endif
2014 if (scr_page (upordown < 0 ? UP : DN, 1)) 2032 if (scr_page (direction, 1))
2015 { 2033 {
2016 if (upordown < 0) 2034 if (direction == UP)
2017 scrollBar.setUp (); 2035 scrollBar.state = SB_STATE_UP;
2018 else 2036 else
2019 scrollBar.setDn (); 2037 scrollBar.state = SB_STATE_DOWN;
2020 } 2038 }
2021 } 2039 }
2022 else 2040 else
2023 switch (ev.button) 2041 switch (ev.button)
2024 { 2042 {
2025 case Button2: 2043 case Button2:
2026 switch (scrollbar_align) 2044 switch (scrollBar.align)
2027 { 2045 {
2028 case R_SB_ALIGN_TOP: 2046 case SB_ALIGN_TOP:
2029 csrO = 0; 2047 csrO = 0;
2030 break; 2048 break;
2031 case R_SB_ALIGN_CENTRE: 2049 case SB_ALIGN_CENTRE:
2032 csrO = (scrollBar.bot - scrollBar.top) / 2; 2050 csrO = (scrollBar.bot - scrollBar.top) / 2;
2033 break; 2051 break;
2034 case R_SB_ALIGN_BOTTOM: 2052 case SB_ALIGN_BOTTOM:
2035 csrO = scrollBar.bot - scrollBar.top; 2053 csrO = scrollBar.bot - scrollBar.top;
2036 break; 2054 break;
2037 } 2055 }
2038 2056
2039 if (scrollBar.style == R_SB_XTERM 2057 if (scrollBar.style == SB_STYLE_XTERM
2040 || scrollbar_above_slider (ev.y) 2058 || scrollBar.above_slider (ev.y)
2041 || scrollbar_below_slider (ev.y)) 2059 || scrollBar.below_slider (ev.y))
2042 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2060 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2043 2061
2044 scrollBar.setMotion (); 2062 scrollBar.state = SB_STATE_MOTION;
2045 break; 2063 break;
2046 2064
2047 case Button1: 2065 case Button1:
2048 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2066 if (scrollBar.align == SB_ALIGN_CENTRE)
2049 csrO = ev.y - scrollBar.top; 2067 csrO = ev.y - scrollBar.top;
2050 /* FALLTHROUGH */ 2068 /* FALLTHROUGH */
2051 2069
2052 case Button3: 2070 case Button3:
2053 if (scrollBar.style != R_SB_XTERM) 2071 if (scrollBar.style != SB_STYLE_XTERM)
2054 { 2072 {
2055 if (scrollbar_above_slider (ev.y)) 2073 if (scrollBar.above_slider (ev.y))
2056# ifdef RXVT_SCROLL_FULL 2074# ifdef RXVT_SCROLL_FULL
2057 scr_page (UP, nrow - 1); 2075 scr_page (UP, nrow - 1);
2058# else 2076# else
2059 scr_page (UP, nrow / 4); 2077 scr_page (UP, nrow / 4);
2060# endif 2078# endif
2061 else if (scrollbar_below_slider (ev.y)) 2079 else if (scrollBar.below_slider (ev.y))
2062# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
2063 scr_page (DN, nrow - 1); 2081 scr_page (DN, nrow - 1);
2064# else 2082# else
2065 scr_page (DN, nrow / 4); 2083 scr_page (DN, nrow / 4);
2066# endif 2084# endif
2067 else 2085 else
2068 scrollBar.setMotion (); 2086 scrollBar.state = SB_STATE_MOTION;
2069 } 2087 }
2070 else 2088 else
2071 { 2089 {
2072 scr_page ((ev.button == Button1 ? DN : UP), 2090 scr_page ((ev.button == Button1 ? DN : UP),
2073 (nrow 2091 (nrow
2074 * scrollbar_position (ev.y) 2092 * scrollBar.position (ev.y)
2075 / scrollbar_size ())); 2093 / scrollBar.size ()));
2076 } 2094 }
2077 2095
2078 break; 2096 break;
2079 } 2097 }
2080 } 2098 }
… …
2090 2108
2091 csrO = 0; /* reset csr Offset */ 2109 csrO = 0; /* reset csr Offset */
2092 if (!bypass_keystate) 2110 if (!bypass_keystate)
2093 reportmode = !! (priv_modes & PrivMode_mouse_report); 2111 reportmode = !! (priv_modes & PrivMode_mouse_report);
2094 2112
2095 if (scrollbar_isUpDn ()) 2113 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2096 { 2114 {
2097 scrollBar.setIdle (); 2115 scrollBar.state = SB_STATE_IDLE;
2098 scrollbar_show (0); 2116 scrollBar.show (0);
2099 } 2117 }
2100 2118
2101#ifdef SELECTION_SCROLLING 2119#ifdef SELECTION_SCROLLING
2102 if (sel_scroll_ev.active)
2103 sel_scroll_ev.stop(); 2120 sel_scroll_ev.stop();
2104#endif 2121#endif
2105 2122
2106 if (ev.window == vt) 2123 if (ev.window == vt)
2107 { 2124 {
2108 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2125 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2132 mouse_report (ev); 2149 mouse_report (ev);
2133 } 2150 }
2134#else /* MOUSE_REPORT_DOUBLECLICK */ 2151#else /* MOUSE_REPORT_DOUBLECLICK */
2135 MEvent.button = AnyButton; 2152 MEvent.button = AnyButton;
2136 mouse_report (ev); 2153 mouse_report (ev);
2137#endif /* MOUSE_REPORT_DOUBLECLICK */ 2154#endif /* MOUSE_REPORT_DOUBLECLICK */
2138 return; 2155 return;
2139 } 2156 }
2140 2157
2141 /* 2158 /*
2142 * dumb hack to compensate for the failure of click-and-drag 2159 * dumb hack to compensate for the failure of click-and-drag
… …
2153 case Button3: 2170 case Button3:
2154 selection_make (ev.time); 2171 selection_make (ev.time);
2155 break; 2172 break;
2156 2173
2157 case Button2: 2174 case Button2:
2158 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2175 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2159 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2160 break; 2177 break;
2161 2178
2162#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2163 case Button4: 2180 case Button4:
2164 case Button5: 2181 case Button5:
… …
2168 2185
2169 v = ev.button == Button4 ? UP : DN; 2186 v = ev.button == Button4 ? UP : DN;
2170 2187
2171 if (ev.state & ShiftMask) 2188 if (ev.state & ShiftMask)
2172 i = 1; 2189 i = 1;
2173 else if (OPTION (Opt_mouseWheelScrollPage)) 2190 else if (option (Opt_mouseWheelScrollPage))
2174 i = nrow - 1; 2191 i = nrow - 1;
2175 else 2192 else
2176 i = 5; 2193 i = 5;
2177 2194
2178# ifdef MOUSE_SLIP_WHEELING 2195# ifdef MOUSE_SLIP_WHEELING
… …
2180 { 2197 {
2181 mouse_slip_wheel_speed += v ? -1 : 1; 2198 mouse_slip_wheel_speed += v ? -1 : 1;
2182 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2199 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2183 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2200 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2184 2201
2185 if (slip_wheel_ev.at < NOW) 2202 if (!slip_wheel_ev.is_active ())
2186 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2203 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2187
2188 slip_wheel_ev.start ();
2189 } 2204 }
2190 else 2205 else
2206# endif
2191 { 2207 {
2192# endif
2193 scr_page (v, i); 2208 scr_page (v, i);
2194 scrollbar_show (1); 2209 scrollBar.show (1);
2195# ifdef MOUSE_SLIP_WHEELING
2196 } 2210 }
2197# endif
2198 } 2211 }
2199 break; 2212 break;
2200#endif 2213#endif
2201 } 2214 }
2202 } 2215 }
2203} 2216}
2204 2217
2205#ifdef TRANSPARENT
2206#if TINTING
2207/* taken from aterm-0.4.2 */
2208
2209typedef uint32_t RUINT32T;
2210
2211void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2212{
2213 int sh_r, sh_g, sh_b;
2214 RUINT32T mask_r, mask_g, mask_b;
2215 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2216 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2217 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2218 int i;
2219
2220 Visual *visual = term->visual;
2221
2222 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2223
2224 /* for convenience */
2225 mask_r = visual->red_mask;
2226 mask_g = visual->green_mask;
2227 mask_b = visual->blue_mask;
2228
2229 /* boring lookup table pre-initialization */
2230 switch (srcImage->bits_per_pixel) {
2231 case 15:
2232 if ((mask_r != 0x7c00) ||
2233 (mask_g != 0x03e0) ||
2234 (mask_b != 0x001f))
2235 return;
2236 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2237 lookup_r = lookup;
2238 lookup_g = lookup+32;
2239 lookup_b = lookup+32+32;
2240 sh_r = 10;
2241 sh_g = 5;
2242 sh_b = 0;
2243 break;
2244 case 16:
2245 if ((mask_r != 0xf800) ||
2246 (mask_g != 0x07e0) ||
2247 (mask_b != 0x001f))
2248 return;
2249 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2250 lookup_r = lookup;
2251 lookup_g = lookup+32;
2252 lookup_b = lookup+32+64;
2253 sh_r = 11;
2254 sh_g = 5;
2255 sh_b = 0;
2256 break;
2257 case 24:
2258 if ((mask_r != 0xff0000) ||
2259 (mask_g != 0x00ff00) ||
2260 (mask_b != 0x0000ff))
2261 return;
2262 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2263 lookup_r = lookup;
2264 lookup_g = lookup+256;
2265 lookup_b = lookup+256+256;
2266 sh_r = 16;
2267 sh_g = 8;
2268 sh_b = 0;
2269 break;
2270 case 32:
2271 if ((mask_r != 0xff0000) ||
2272 (mask_g != 0x00ff00) ||
2273 (mask_b != 0x0000ff))
2274 return;
2275 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2276 lookup_r = lookup;
2277 lookup_g = lookup+256;
2278 lookup_b = lookup+256+256;
2279 sh_r = 16;
2280 sh_g = 8;
2281 sh_b = 0;
2282 break;
2283 default:
2284 return; /* we do not support this color depth */
2285 }
2286
2287 /* prepare limits for color transformation (each channel is handled separately) */
2288 if (shade < 0) {
2289 shade = -shade;
2290 if (shade < 0) shade = 0;
2291 if (shade > 100) shade = 100;
2292
2293 lower_lim_r = 65535-rm;
2294 lower_lim_g = 65535-gm;
2295 lower_lim_b = 65535-bm;
2296
2297 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2298 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2299 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2300
2301 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2302 } else {
2303 if (shade < 0) shade = 0;
2304 if (shade > 100) shade = 100;
2305
2306 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2307
2308 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2309 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2310 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2311 }
2312
2313 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2314 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2315 {
2316 unsigned int tmp;
2317
2318 tmp = lower_lim_r;
2319 lower_lim_r = lower_lim_b;
2320 lower_lim_b = tmp;
2321
2322 tmp = upper_lim_r;
2323 upper_lim_r = upper_lim_b;
2324 upper_lim_b = tmp;
2325 }
2326
2327 /* fill our lookup tables */
2328 for (i = 0; i <= mask_r>>sh_r; i++)
2329 {
2330 RUINT32T tmp;
2331 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2332 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2333 lookup_r[i] = (tmp/65535)<<sh_r;
2334 }
2335 for (i = 0; i <= mask_g>>sh_g; i++)
2336 {
2337 RUINT32T tmp;
2338 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2339 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2340 lookup_g[i] = (tmp/65535)<<sh_g;
2341 }
2342 for (i = 0; i <= mask_b>>sh_b; i++)
2343 {
2344 RUINT32T tmp;
2345 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2346 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2347 lookup_b[i] = (tmp/65535)<<sh_b;
2348 }
2349
2350 /* apply table to input image (replacing colors by newly calculated ones) */
2351 switch (srcImage->bits_per_pixel)
2352 {
2353 case 15:
2354 {
2355 unsigned short *p1, *pf, *p, *pl;
2356 p1 = (unsigned short *) srcImage->data;
2357 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2358 while (p1 < pf)
2359 {
2360 p = p1;
2361 pl = p1 + srcImage->width;
2362 for (; p < pl; p++)
2363 {
2364 *p = lookup_r[(*p & 0x7c00)>>10] |
2365 lookup_g[(*p & 0x03e0)>> 5] |
2366 lookup_b[(*p & 0x001f)];
2367 }
2368 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2369 }
2370 break;
2371 }
2372 case 16:
2373 {
2374 unsigned short *p1, *pf, *p, *pl;
2375 p1 = (unsigned short *) srcImage->data;
2376 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377 while (p1 < pf)
2378 {
2379 p = p1;
2380 pl = p1 + srcImage->width;
2381 for (; p < pl; p++)
2382 {
2383 *p = lookup_r[(*p & 0xf800)>>11] |
2384 lookup_g[(*p & 0x07e0)>> 5] |
2385 lookup_b[(*p & 0x001f)];
2386 }
2387 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2388 }
2389 break;
2390 }
2391 case 24:
2392 {
2393 unsigned char *p1, *pf, *p, *pl;
2394 p1 = (unsigned char *) srcImage->data;
2395 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396 while (p1 < pf)
2397 {
2398 p = p1;
2399 pl = p1 + srcImage->width * 3;
2400 for (; p < pl; p += 3)
2401 {
2402 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2403 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2404 p[2] = lookup_r[(p[2] & 0x0000ff)];
2405 }
2406 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2407 }
2408 break;
2409 }
2410 case 32:
2411 {
2412 RUINT32T *p1, *pf, *p, *pl;
2413 p1 = (RUINT32T *) srcImage->data;
2414 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2415
2416 while (p1 < pf)
2417 {
2418 p = p1;
2419 pl = p1 + srcImage->width;
2420 for (; p < pl; p++)
2421 {
2422 *p = lookup_r[(*p & 0xff0000)>>16] |
2423 lookup_g[(*p & 0x00ff00)>> 8] |
2424 lookup_b[(*p & 0x0000ff)] |
2425 (*p & ~0xffffff);
2426 }
2427 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2428 }
2429 break;
2430 }
2431 }
2432
2433 free (lookup);
2434}
2435#endif
2436
2437/*
2438 * Check our parents are still who we think they are.
2439 * Do transparency updates if required
2440 */
2441int
2442rxvt_term::check_our_parents ()
2443{
2444 int i, pchanged, aformat, have_pixmap, rootdepth;
2445 unsigned long nitems, bytes_after;
2446 Atom atype;
2447 unsigned char *prop = NULL;
2448 Window root, oldp, *list;
2449 Pixmap rootpixmap = None;
2450 XWindowAttributes wattr, wrootattr;
2451
2452 pchanged = 0;
2453
2454 if (!OPTION (Opt_transparent))
2455 return pchanged; /* Don't try any more */
2456
2457 XGetWindowAttributes (dpy, display->root, &wrootattr);
2458 rootdepth = wrootattr.depth;
2459
2460 XGetWindowAttributes (dpy, parent[0], &wattr);
2461
2462 if (rootdepth != wattr.depth)
2463 {
2464 if (am_transparent)
2465 {
2466 pchanged = 1;
2467 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2468 am_transparent = am_pixmap_trans = 0;
2469 }
2470
2471 return pchanged; /* Don't try any more */
2472 }
2473
2474 /* Get all X ops out of the queue so that our information is up-to-date. */
2475 XSync (dpy, False);
2476
2477 /*
2478 * Make the frame window set by the window manager have
2479 * the root background. Some window managers put multiple nested frame
2480 * windows for each client, so we have to take care about that.
2481 */
2482 i = (xa[XA_XROOTPMAP_ID]
2483 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2485 &nitems, &bytes_after, &prop) == Success);
2486
2487 if (!i || prop == NULL)
2488 i = (xa[XA_ESETROOT_PMAP_ID]
2489 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491 &nitems, &bytes_after, &prop) == Success);
2492
2493 if (!i || prop == NULL
2494#if TINTING
2495 || !ISSET_PIXCOLOR (Color_tint)
2496#endif
2497 )
2498 have_pixmap = 0;
2499 else
2500 {
2501 have_pixmap = 1;
2502 rootpixmap = *(Pixmap *)prop;
2503 XFree (prop);
2504 }
2505
2506 if (have_pixmap)
2507 {
2508 /*
2509 * Copy display->root pixmap transparency
2510 */
2511 int sx, sy, nx, ny;
2512 unsigned int nw, nh;
2513 Window cr;
2514 XImage *image;
2515 GC gc;
2516 XGCValues gcvalue;
2517
2518 XTranslateCoordinates (dpy, parent[0], display->root,
2519 0, 0, &sx, &sy, &cr);
2520 nw = (unsigned int)szHint.width;
2521 nh = (unsigned int)szHint.height;
2522 nx = ny = 0;
2523
2524 if (sx < 0)
2525 {
2526 nw += sx;
2527 nx = -sx;
2528 sx = 0;
2529 }
2530
2531 if (sy < 0)
2532 {
2533 nh += sy;
2534 ny = -sy;
2535 sy = 0;
2536 }
2537
2538 min_it (nw, (unsigned int) (wrootattr.width - sx));
2539 min_it (nh, (unsigned int) (wrootattr.height - sy));
2540
2541 XSync (dpy, False);
2542 allowedxerror = -1;
2543 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2544
2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2546 /* XXX: may need a delay here? */
2547 allowedxerror = 0;
2548
2549 if (image == NULL)
2550 {
2551 if (am_transparent && am_pixmap_trans)
2552 {
2553 pchanged = 1;
2554 if (pixmap != None)
2555 {
2556 XFreePixmap (dpy, pixmap);
2557 pixmap = None;
2558 }
2559 }
2560
2561 am_pixmap_trans = 0;
2562 }
2563 else
2564 {
2565 if (pixmap != None)
2566 XFreePixmap (dpy, pixmap);
2567
2568#if TINTING
2569 if (ISSET_PIXCOLOR (Color_tint))
2570 {
2571 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2572
2573 rgba c;
2574 pix_colors_focused [Color_tint].get (c);
2575
2576 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2577 }
2578#endif
2579
2580 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2581 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2582 XPutImage (dpy, pixmap, gc, image, 0, 0,
2583 nx, ny, image->width, image->height);
2584 XFreeGC (dpy, gc);
2585 XDestroyImage (image);
2586 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2587 XClearWindow (dpy, parent[0]);
2588
2589 if (!am_transparent || !am_pixmap_trans)
2590 pchanged = 1;
2591
2592 am_transparent = am_pixmap_trans = 1;
2593 }
2594 }
2595
2596 if (am_pixmap_trans)
2597 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2598 else
2599 {
2600 unsigned int n;
2601 /*
2602 * InheritPixmap transparency
2603 */
2604 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2605 {
2606 oldp = parent[i];
2607 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2608 XFree (list);
2609
2610 if (parent[i] == display->root)
2611 {
2612 if (oldp != None)
2613 pchanged = 1;
2614
2615 break;
2616 }
2617
2618 if (oldp != parent[i])
2619 pchanged = 1;
2620 }
2621
2622 n = 0;
2623
2624 if (pchanged)
2625 for (; n < (unsigned int)i; n++)
2626 {
2627 XGetWindowAttributes (dpy, parent[n], &wattr);
2628
2629 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2630 {
2631 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2632 break;
2633 }
2634 }
2635
2636 if (n > (sizeof (parent) / sizeof (parent[0])))
2637 {
2638 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2639 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2640 am_transparent = 0;
2641 /* XXX: also turn off Opt_transparent? */
2642 }
2643 else
2644 {
2645 for (n = 0; n < (unsigned int)i; n++)
2646 {
2647 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2648 XClearWindow (dpy, parent[n]);
2649 }
2650
2651 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2652 am_transparent = 1;
2653 }
2654
2655 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2656 parent[i] = None;
2657 }
2658
2659 if (scrollBar.win)
2660 {
2661 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2662 scrollBar.setIdle ();
2663 scrollbar_show (0);
2664 }
2665
2666 if (am_transparent)
2667 {
2668 want_refresh = want_full_refresh = 1;
2669 if (am_pixmap_trans)
2670 flush ();
2671 }
2672
2673 return pchanged;
2674}
2675#endif
2676
2677/*}}} */ 2218/*}}} */
2678 2219
2679bool 2220void
2680rxvt_term::cmd_parse () 2221rxvt_term::cmd_parse ()
2681{ 2222{
2682 bool flag = false;
2683 wchar_t ch = NOCHAR; 2223 wchar_t ch = NOCHAR;
2684 char *seq_begin; // remember start of esc-sequence here 2224 char *seq_begin; // remember start of esc-sequence here
2685 2225
2686 for (;;) 2226 for (;;)
2687 { 2227 {
2688 if (ch == NOCHAR) 2228 if (ecb_unlikely (ch == NOCHAR))
2689 { 2229 {
2690 seq_begin = cmdbuf_ptr; 2230 seq_begin = cmdbuf_ptr;
2691 ch = next_char (); 2231 ch = next_char ();
2692 2232
2693 if (ch == NOCHAR) 2233 if (ch == NOCHAR)
2694 break; 2234 break;
2695 } 2235 }
2696 2236
2697 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2237 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2698 { 2238 {
2699 if (!seen_input) 2239 if (ecb_unlikely (!seen_input))
2700 { 2240 {
2701 seen_input = 1; 2241 seen_input = 1;
2702 // many badly-written programs (e.g. jed) contain a race condition: 2242 // many badly-written programs (e.g. jed) contain a race condition:
2703 // they first read the screensize and then install a SIGWINCH handler. 2243 // they first read the screensize and then install a SIGWINCH handler.
2704 // some window managers resize the window early, and these programs 2244 // some window managers resize the window early, and these programs
… …
2717 wchar_t *str = buf; 2257 wchar_t *str = buf;
2718 wchar_t *eol = str + min (ncol, UBUFSIZ); 2258 wchar_t *eol = str + min (ncol, UBUFSIZ);
2719 2259
2720 for (;;) 2260 for (;;)
2721 { 2261 {
2722 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2262 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2723 break; 2263 break;
2724 2264
2725 *str++ = ch; 2265 *str++ = ch;
2726 2266
2727 if (ch == C0_LF || str >= eol) 2267 if (ecb_unlikely (ch == C0_LF || str >= eol))
2728 { 2268 {
2729 if (ch == C0_LF) 2269 if (ch == C0_LF)
2730 nlines++; 2270 nlines++;
2731 2271
2732 refresh_count++; 2272 refresh_count++;
2733 2273
2734 if (!OPTION (Opt_jumpScroll) 2274 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2735 || (refresh_count >= refresh_limit * (nrow - 1)))
2736 { 2275 {
2737 refreshnow = true;
2738 refresh_count = 0; 2276 refresh_count = 0;
2277
2278 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2279 {
2280 refreshnow = true;
2739 ch = NOCHAR; 2281 ch = NOCHAR;
2740 break; 2282 break;
2283 }
2741 } 2284 }
2742 2285
2743 // scr_add_lines only works for nlines <= nrow - 1. 2286 // scr_add_lines only works for nlines <= nrow - 1.
2744 if (nlines >= nrow - 1) 2287 if (nlines >= nrow - 1)
2745 { 2288 {
… …
2773 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2316 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2774 scr_add_lines (buf, str - buf, nlines); 2317 scr_add_lines (buf, str - buf, nlines);
2775 2318
2776 /* 2319 /*
2777 * If there have been a lot of new lines, then update the screen 2320 * If there have been a lot of new lines, then update the screen
2778 * What the heck I'll cheat and only refresh less than every page-full. 2321 * What the heck we'll cheat and only refresh less than every page-full.
2779 * the number of pages between refreshes is refresh_limit, which 2322 * if skipScroll is enabled.
2780 * is incremented here because we must be doing flat-out scrolling.
2781 */ 2323 */
2782 if (refreshnow) 2324 if (refreshnow)
2783 { 2325 {
2784 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2785 refresh_limit++;
2786 else
2787 {
2788 flag = true;
2789 //TODO: due to popular request, implement "skipscroll" option here
2790 scr_refresh (); 2326 scr_refresh ();
2791 want_refresh = 1; 2327 want_refresh = 1;
2792 }
2793 } 2328 }
2794
2795 } 2329 }
2796 else 2330 else
2797 { 2331 {
2798 try 2332 try
2799 { 2333 {
… …
2807 } 2341 }
2808 2342
2809 ch = NOCHAR; 2343 ch = NOCHAR;
2810 } 2344 }
2811 } 2345 }
2812
2813 return flag;
2814} 2346}
2815 2347
2816// read the next character 2348// read the next character
2817wchar_t 2349wchar_t
2818rxvt_term::next_char () NOTHROW 2350rxvt_term::next_char () NOTHROW
2819{ 2351{
2820 while (cmdbuf_ptr < cmdbuf_endp) 2352 while (cmdbuf_ptr < cmdbuf_endp)
2821 { 2353 {
2822 // assume 7-bit to be ascii ALWAYS 2354 // assume 7-bit to be ascii ALWAYS
2823 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2355 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2824 return *cmdbuf_ptr++; 2356 return *cmdbuf_ptr++;
2825 2357
2826 wchar_t wc; 2358 wchar_t wc;
2827 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2359 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2828 2360
… …
2832 cmdbuf_ptr = cmdbuf_endp; 2364 cmdbuf_ptr = cmdbuf_endp;
2833 break; 2365 break;
2834 } 2366 }
2835 2367
2836 if (len == (size_t)-1) 2368 if (len == (size_t)-1)
2369 {
2370 mbstate.reset (); // reset now undefined conversion state
2837 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2371 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2372 }
2838 2373
2839 // assume wchar == unicode 2374 // assume wchar == unicode
2840 cmdbuf_ptr += len; 2375 cmdbuf_ptr += len;
2841 return wc & UNICODE_MASK; 2376 return wc & UNICODE_MASK;
2842 } 2377 }
… …
2853 : NOCHAR; 2388 : NOCHAR;
2854} 2389}
2855 2390
2856static class out_of_input out_of_input; 2391static class out_of_input out_of_input;
2857 2392
2858/* rxvt_cmd_getc () - Return next input character */
2859/*
2860 * Return the next input character after first passing any keyboard input
2861 * to the command.
2862 */
2863wchar_t 2393wchar_t
2864rxvt_term::cmd_getc () THROW ((class out_of_input)) 2394rxvt_term::cmd_getc () THROW ((class out_of_input))
2865{ 2395{
2866 wchar_t c = next_char (); 2396 wchar_t c = next_char ();
2867 2397
… …
2886/*----------------------------------------------------------------------*/ 2416/*----------------------------------------------------------------------*/
2887#ifdef PRINTPIPE 2417#ifdef PRINTPIPE
2888FILE * 2418FILE *
2889rxvt_term::popen_printer () 2419rxvt_term::popen_printer ()
2890{ 2420{
2891 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2421 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2892 2422
2893 if (stream == NULL) 2423 if (stream == NULL)
2894 rxvt_warn ("can't open printer pipe, not printing.\n"); 2424 rxvt_warn ("can't open printer pipe, not printing.\n");
2895 2425
2896 return stream; 2426 return stream;
… …
2907 * simulate attached vt100 printer 2437 * simulate attached vt100 printer
2908 */ 2438 */
2909void 2439void
2910rxvt_term::process_print_pipe () 2440rxvt_term::process_print_pipe ()
2911{ 2441{
2912 int done; 2442 FILE *fd = popen_printer ();
2913 FILE *fd;
2914 2443
2915 if ((fd = popen_printer ()) == NULL) 2444 if (!fd)
2916 return; 2445 return;
2917 2446
2918 /* 2447 /*
2919 * Send all input to the printer until either ESC[4i or ESC[?4i 2448 * Send all input to the printer until either ESC[4i or ESC[?4i
2920 * is received. 2449 * is received.
2921 */ 2450 */
2922 for (done = 0; !done;) 2451 for (int done = 0; !done; )
2923 { 2452 {
2924 unsigned char buf[8]; 2453 unsigned char buf[8];
2925 unicode_t ch; 2454 unicode_t ch;
2926 unsigned int i, len; 2455 unsigned int i, len;
2927 2456
… …
2946 { 2475 {
2947 if ((buf[len++] = cmd_getc ()) == 'i') 2476 if ((buf[len++] = cmd_getc ()) == 'i')
2948 break; /* done = 1 */ 2477 break; /* done = 1 */
2949 } 2478 }
2950 } 2479 }
2951 2480
2952 for (i = 0; i < len; i++) 2481 for (i = 0; i < len; i++)
2953 if (putc (buf[i], fd) == EOF) 2482 if (putc (buf[i], fd) == EOF)
2954 { 2483 {
2955 done = 1; 2484 done = 1;
2956 break; 2485 break;
… …
2958 } 2487 }
2959 } 2488 }
2960 2489
2961 pclose_printer (fd); 2490 pclose_printer (fd);
2962} 2491}
2963#endif /* PRINTPIPE */ 2492#endif /* PRINTPIPE */
2964/*}}} */ 2493/*}}} */
2965 2494
2966/* *INDENT-OFF* */
2967enum { 2495enum {
2968 C1_40 = 0x40, 2496 C1_40 = 0x40,
2969 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2497 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2970 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2498 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2971 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2499 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2972 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2500 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2973}; 2501};
2974/* *INDENT-ON* */
2975 2502
2976/*{{{ process non-printing single characters */ 2503/*{{{ process non-printing single characters */
2977void 2504void
2978rxvt_term::process_nonprinting (unicode_t ch) 2505rxvt_term::process_nonprinting (unicode_t ch)
2979{ 2506{
… …
3018 process_dcs_seq (); 2545 process_dcs_seq ();
3019 break; 2546 break;
3020 case 0x9b: /* CSI */ 2547 case 0x9b: /* CSI */
3021 process_csi_seq (); 2548 process_csi_seq ();
3022 break; 2549 break;
3023 case 0x9d: /* CSI */ 2550 case 0x9d: /* OSC */
3024 process_osc_seq (); 2551 process_osc_seq ();
3025 break; 2552 break;
3026#endif 2553#endif
3027 } 2554 }
3028} 2555}
… …
3072 break; 2599 break;
3073 case 'Z': /* identify the terminal type */ 2600 case 'Z': /* identify the terminal type */
3074 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3075 break; 2602 break;
3076 case '<': /* turn off VT52 mode */ 2603 case '<': /* turn off VT52 mode */
3077 PrivMode (0, PrivMode_vt52); 2604 priv_modes &= ~PrivMode_vt52;
3078 break; 2605 break;
3079 case 'F': /* use special graphics character set */ 2606 case 'F': /* use special graphics character set */
3080 case 'G': /* use regular character set */ 2607 case 'G': /* use regular character set */
3081 /* unimplemented */ 2608 /* unimplemented */
3082 break; 2609 break;
… …
3101 return; 2628 return;
3102 } 2629 }
3103 2630
3104 switch (ch) 2631 switch (ch)
3105 { 2632 {
3106 /* case 1: do_tek_mode (); break; */
3107 case '#': 2633 case '#':
3108 if (cmd_getc () == '8') 2634 if (cmd_getc () == '8')
3109 scr_E (); 2635 scr_E ();
3110 break; 2636 break;
3111 case '(': 2637 case '(':
… …
3134#if !ENABLE_MINIMAL 2660#if !ENABLE_MINIMAL
3135 case '9': 2661 case '9':
3136 scr_forwardindex (); 2662 scr_forwardindex ();
3137 break; 2663 break;
3138#endif 2664#endif
2665 // DECPAM/DECPNM
3139 case '=': 2666 case '=':
2667 priv_modes |= PrivMode_aplKP;
2668 break;
3140 case '>': 2669 case '>':
3141 PrivMode ((ch == '='), PrivMode_aplKP); 2670 priv_modes &= ~PrivMode_aplKP;
3142 break; 2671 break;
3143 2672
3144 case C1_40: 2673 case C1_40:
3145 cmd_getc (); 2674 cmd_getc ();
3146 break; 2675 break;
… …
3150 2679
3151 /* 8.3.87: NEXT LINE */ 2680 /* 8.3.87: NEXT LINE */
3152 case C1_NEL: /* ESC E */ 2681 case C1_NEL: /* ESC E */
3153 { 2682 {
3154 wchar_t nlcr[] = { C0_LF, C0_CR }; 2683 wchar_t nlcr[] = { C0_LF, C0_CR };
3155 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2684 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3156 } 2685 }
3157 break; 2686 break;
3158 2687
3159 /* kidnapped escape sequence: Should be 8.3.48 */ 2688 /* kidnapped escape sequence: Should be 8.3.48 */
3160 case C1_ESA: /* ESC G */ 2689 case C1_ESA: /* ESC G */
3161 process_graphics (); 2690 // used by original rxvt for rob nations own graphics mode
2691 if (cmd_getc () == 'Q')
2692 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3162 break; 2693 break;
3163 2694
3164 /* 8.3.63: CHARACTER TABULATION SET */ 2695 /* 8.3.63: CHARACTER TABULATION SET */
3165 case C1_HTS: /* ESC H */ 2696 case C1_HTS: /* ESC H */
3166 scr_set_tab (1); 2697 scr_set_tab (1);
… …
3170 case C1_RI: /* ESC M */ 2701 case C1_RI: /* ESC M */
3171 scr_index (DN); 2702 scr_index (DN);
3172 break; 2703 break;
3173 2704
3174 /* 8.3.142: SINGLE-SHIFT TWO */ 2705 /* 8.3.142: SINGLE-SHIFT TWO */
3175 /*case C1_SS2: scr_single_shift (2); break; */ 2706 /* case C1_SS2: break; */
3176 2707
3177 /* 8.3.143: SINGLE-SHIFT THREE */ 2708 /* 8.3.143: SINGLE-SHIFT THREE */
3178 /*case C1_SS3: scr_single_shift (3); break; */ 2709 /* case C1_SS3: break; */
3179 2710
3180 /* 8.3.27: DEVICE CONTROL STRING */ 2711 /* 8.3.27: DEVICE CONTROL STRING */
3181 case C1_DCS: /* ESC P */ 2712 case C1_DCS: /* ESC P */
3182 process_dcs_seq (); 2713 process_dcs_seq ();
3183 break; 2714 break;
… …
3185 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2716 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3186 case C1_SCI: /* ESC Z */ 2717 case C1_SCI: /* ESC Z */
3187 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2718 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3188 break; /* steal obsolete ESC [ c */ 2719 break; /* steal obsolete ESC [ c */
3189 2720
3190 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2721 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3191 case C1_CSI: /* ESC [ */ 2722 case C1_CSI: /* ESC [ */
3192 process_csi_seq (); 2723 process_csi_seq ();
3193 break; 2724 break;
3194 2725
3195 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2726 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3196 case C1_OSC: /* ESC ] */ 2727 case C1_OSC: /* ESC ] */
3197 process_osc_seq (); 2728 process_osc_seq ();
3198 break; 2729 break;
3199 2730
3200 /* 8.3.106: RESET TO INITIAL STATE */ 2731 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3201 case 'c': 2732 case 'c':
3202 mbstate.reset (); 2733 mbstate.reset ();
3203 scr_poweron (); 2734 scr_poweron ();
3204 scrollbar_show (1); 2735 scrollBar.show (1);
3205 break; 2736 break;
3206 2737
3207 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2738 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3208 case 'n': 2739 case 'n':
3209 scr_charset_choose (2); 2740 scr_charset_choose (2);
… …
3216 } 2747 }
3217} 2748}
3218/*}}} */ 2749/*}}} */
3219 2750
3220/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2751/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3221/* *INDENT-OFF* */
3222enum { 2752enum {
3223 CSI_ICH = 0x40, 2753 CSI_ICH = 0x40,
3224 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2754 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3225 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2755 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3226 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2756 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3229 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2759 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3230 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2760 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3231 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2761 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3232}; 2762};
3233 2763
3234#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2764#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3235 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3236 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3237#define get_byte_array_bit(array, bit) \ 2767#define get_byte_array_bit(array, bit) \
3238 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2768 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3239 2769
3240const unsigned char csi_defaults[] = 2770static const unsigned char csi_defaults[] =
3241 { 2771 {
3242 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2772 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3243 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2773 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3244 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2774 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3245 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2775 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3246 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2776 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3247 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2777 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3248 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2778 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3249 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2779 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3250 }; 2780 };
3251/* *INDENT-ON* */
3252 2781
3253void 2782void
3254rxvt_term::process_csi_seq () 2783rxvt_term::process_csi_seq ()
3255{ 2784{
3256 unicode_t ch, priv, i; 2785 unicode_t ch, priv, i;
3257 unsigned int nargs, p; 2786 unsigned int nargs, p;
3258 int n, ndef; 2787 int n, ndef;
3259 int arg[ESC_ARGS]; 2788 int arg[ESC_ARGS] = { };
3260 2789
3261 for (nargs = ESC_ARGS; nargs > 0;) 2790 nargs = 0;
3262 arg[--nargs] = 0;
3263 2791
3264 priv = 0; 2792 priv = 0;
3265 ch = cmd_getc (); 2793 ch = cmd_getc ();
3266 if (ch >= '<' && ch <= '?') 2794 if ((ch >= '<' && ch <= '?') || ch == '!')
2795 {
3267 { /* '<' '=' '>' '?' */ 2796 /* '<' '=' '>' '?' '!' */
3268 priv = ch; 2797 priv = ch;
3269 ch = cmd_getc (); 2798 ch = cmd_getc ();
3270 } 2799 }
3271 2800
3272 /* read any numerical arguments */ 2801 /* read any numerical arguments */
… …
3311 switch (priv) 2840 switch (priv)
3312 { 2841 {
3313 case '>': 2842 case '>':
3314 if (ch == CSI_DA) /* secondary device attributes */ 2843 if (ch == CSI_DA) /* secondary device attributes */
3315 { 2844 {
3316 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2845 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3317 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2846 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3318 // 2847 //
3319 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2848 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3320 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2849 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3321 // that we do not support xterm mouse reporting (should be 95 when we do). 2850 // versions.
3322 // 2851 //
3323 tt_printf ("\033[>%d;94;0c", 'U'); 2852 tt_printf ("\033[>%d;95;0c", 'U');
3324 } 2853 }
3325 break; 2854 break;
2855
3326 case '?': 2856 case '?':
3327 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2857 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3328 process_terminal_mode (ch, priv, nargs, arg); 2858 process_terminal_mode (ch, priv, nargs, arg);
3329 break; 2859 break;
2860
2861 case '!':
2862 if (ch == CSI_70)
2863 {
2864 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2865 scr_soft_reset ();
2866
2867 static const int pm_h[] = { 7, 25 };
2868 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2869
2870 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2871 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3330 } 2872 }
2873 break;
2874 }
2875
3331 return; 2876 return;
3332 } 2877 }
3333 2878
3334 switch (ch) 2879 switch (ch)
3335 { 2880 {
… …
3349 } 2894 }
3350 break; 2895 break;
3351#endif 2896#endif
3352 2897
3353 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2898 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3354 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2899 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3355 arg[0] = -arg[0]; 2900 arg[0] = -arg[0];
3356 /* FALLTHROUGH */ 2901 /* FALLTHROUGH */
3357 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2902 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3358 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2903 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3359 scr_gotorc (arg[0], 0, RELATIVE); 2904 scr_gotorc (arg[0], 0, RELATIVE);
3360 break; 2905 break;
3361 2906
3362 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2907 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3363 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2908 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3455 break; 3000 break;
3456 case 6: /* CPR requested */ 3001 case 6: /* CPR requested */
3457 scr_report_position (); 3002 scr_report_position ();
3458 break; 3003 break;
3459 case 7: /* unofficial extension */ 3004 case 7: /* unofficial extension */
3460 if (OPTION (Opt_insecure)) 3005 if (option (Opt_insecure))
3461 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3006 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3462 break; 3007 break;
3463 case 8: /* unofficial extension */ 3008 case 8: /* unofficial extension */
3464 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3009 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3465 break; 3010 break;
… …
3550 } 3095 }
3551} 3096}
3552/*}}} */ 3097/*}}} */
3553 3098
3554#if !ENABLE_MINIMAL 3099#if !ENABLE_MINIMAL
3555/* ARGSUSED */
3556void 3100void
3557rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3101rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3558{ 3102{
3559 int x, y; 3103 int x, y;
3560 XWindowAttributes wattr; 3104 XWindowAttributes wattr;
… …
3569 { 3113 {
3570 /* 3114 /*
3571 * commands 3115 * commands
3572 */ 3116 */
3573 case 1: /* deiconify window */ 3117 case 1: /* deiconify window */
3574 XMapWindow (dpy, parent[0]); 3118 XMapWindow (dpy, parent);
3575 break; 3119 break;
3576 case 2: /* iconify window */ 3120 case 2: /* iconify window */
3577 XIconifyWindow (dpy, parent[0], display->screen); 3121 XIconifyWindow (dpy, parent, display->screen);
3578 break; 3122 break;
3579 case 3: /* set position (pixels) */ 3123 case 3: /* set position (pixels) */
3580 XMoveWindow (dpy, parent[0], args[1], args[2]); 3124 XMoveWindow (dpy, parent, args[1], args[2]);
3581 break; 3125 break;
3582 case 4: /* set size (pixels) */ 3126 case 4: /* set size (pixels) */
3583 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3127 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3584 break; 3128 break;
3585 case 5: /* raise window */ 3129 case 5: /* raise window */
3586 XRaiseWindow (dpy, parent[0]); 3130 XRaiseWindow (dpy, parent);
3587 break; 3131 break;
3588 case 6: /* lower window */ 3132 case 6: /* lower window */
3589 XLowerWindow (dpy, parent[0]); 3133 XLowerWindow (dpy, parent);
3590 break; 3134 break;
3591 case 7: /* refresh window */ 3135 case 7: /* refresh window */
3592 scr_touch (true); 3136 scr_touch (true);
3593 break; 3137 break;
3594 case 8: /* set size (chars) */ 3138 case 8: /* set size (chars) */
… …
3597 break; 3141 break;
3598 3142
3599 //case 9: NYI, TODO, restore maximized window or maximize window 3143 //case 9: NYI, TODO, restore maximized window or maximize window
3600 default: 3144 default:
3601 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3602 set_widthheight ((unsigned int)width, 3146 set_widthheight ((unsigned int)vt_width,
3603 (unsigned int) (args[1] * fheight)); 3147 (unsigned int) (args[1] * fheight));
3604 break; 3148 break;
3605 3149
3606 /* 3150 /*
3607 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
3608 */ 3152 */
3609 case 11: /* report window state */ 3153 case 11: /* report window state */
3610 XGetWindowAttributes (dpy, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent, &wattr);
3611 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3155 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3612 break; 3156 break;
3613 case 13: /* report window position */ 3157 case 13: /* report window position */
3614 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3615 XTranslateCoordinates (dpy, parent[0], wattr.root, 3159 XTranslateCoordinates (dpy, parent, wattr.root,
3616 -wattr.border_width, -wattr.border_width, 3160 -wattr.border_width, -wattr.border_width,
3617 &x, &y, &wdummy); 3161 &x, &y, &wdummy);
3618 tt_printf ("\033[3;%d;%dt", x, y); 3162 tt_printf ("\033[3;%d;%dt", x, y);
3619 break; 3163 break;
3620 case 14: /* report window size (pixels) */ 3164 case 14: /* report window size (pixels) */
3621 XGetWindowAttributes (dpy, parent[0], &wattr); 3165 XGetWindowAttributes (dpy, parent, &wattr);
3622 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3166 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3623 break; 3167 break;
3624 case 18: /* report text area size (chars) */ 3168 case 18: /* report text area size (chars) */
3625 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3626 break; 3170 break;
… …
3628 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3172 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3629 break; 3173 break;
3630 case 20: /* report icon label */ 3174 case 20: /* report icon label */
3631 { 3175 {
3632 char *s; 3176 char *s;
3633 XGetIconName (dpy, parent[0], &s); 3177 XGetIconName (dpy, parent, &s);
3634 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3178 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3635 XFree (s); 3179 XFree (s);
3636 } 3180 }
3637 break; 3181 break;
3638 case 21: /* report window title */ 3182 case 21: /* report window title */
3639 { 3183 {
3640 char *s; 3184 char *s;
3641 XFetchName (dpy, parent[0], &s); 3185 XFetchName (dpy, parent, &s);
3642 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3186 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3643 XFree (s); 3187 XFree (s);
3644 } 3188 }
3645 break; 3189 break;
3646 } 3190 }
3647} 3191}
… …
3674 seen_esc = true; 3218 seen_esc = true;
3675 continue; 3219 continue;
3676 } 3220 }
3677 else if (ch == C0_BEL || ch == CHAR_ST) 3221 else if (ch == C0_BEL || ch == CHAR_ST)
3678 break; 3222 break;
3223 else if (ch == C0_SYN)
3224 ch = cmd_get8 ();
3679 else if (ch < 0x20) 3225 else if (ch < 0x20)
3680 return NULL; /* other control character - exit */ 3226 return NULL; /* other control character - exit */
3681 3227
3682 seen_esc = false; 3228 seen_esc = false;
3683 3229
3684 if (n >= STRING_MAX - 1) 3230 if (n >= STRING_MAX - 1)
3685 // stop at some sane length 3231 // stop at some sane length
3686 return NULL; 3232 return NULL;
3687 3233
3688 if (ch == C0_SYN)
3689 string[n++] = cmd_get8 ();
3690 else
3691 string[n++] = ch; 3234 string[n++] = ch;
3692 } 3235 }
3693 3236
3694 string[n++] = '\0'; 3237 string[n++] = '\0';
3695 3238
3696 ends_how = (ch == 0x5c ? C0_ESC : ch); 3239 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3703 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3246 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3704 */ 3247 */
3705void 3248void
3706rxvt_term::process_dcs_seq () 3249rxvt_term::process_dcs_seq ()
3707{ 3250{
3708 char *s;
3709 unicode_t eh;
3710
3711 /* 3251 /*
3712 * Not handled yet 3252 * Not handled yet
3713 */ 3253 */
3254
3255 unicode_t eh;
3714 s = get_to_st (eh); 3256 char *s = get_to_st (eh);
3715 if (s) 3257 if (s)
3716 free (s); 3258 free (s);
3717 3259
3718 return; 3260 return;
3719} 3261}
… …
3723 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3265 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3724 */ 3266 */
3725void 3267void
3726rxvt_term::process_osc_seq () 3268rxvt_term::process_osc_seq ()
3727{ 3269{
3728 unicode_t ch, eh;
3729 int arg; 3270 int arg;
3730 3271
3731 ch = cmd_getc (); 3272 unicode_t ch = cmd_getc ();
3732 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3273 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3733 arg = arg * 10 + (ch - '0'); 3274 arg = arg * 10 + (ch - '0');
3734 3275
3735 if (ch == ';') 3276 if (ch == ';')
3736 { 3277 {
3278 unicode_t eh;
3737 char *s = get_to_st (eh); 3279 char *s = get_to_st (eh);
3738 3280
3739 if (s) 3281 if (s)
3740 { 3282 {
3741 process_xterm_seq (arg, s, eh); 3283 process_xterm_seq (arg, s, eh);
… …
3765 3307
3766/* 3308/*
3767 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3309 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3768 */ 3310 */
3769void 3311void
3770rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3312rxvt_term::process_xterm_seq (int op, char *str, char resp)
3771{ 3313{
3772 int color; 3314 int color;
3773 char *buf, *name; 3315 char *buf, *name;
3774 bool query = str[0] == '?' && !str[1]; 3316 bool query = str[0] == '?' && !str[1];
3775 int saveop = op; 3317 int saveop = op;
3776 3318
3777 dLocal (Display *, dpy); 3319 dLocal (Display *, dpy);
3778 3320
3779 assert (str != NULL); 3321 assert (str != NULL);
3780 3322
3781 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3323 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3782 return; 3324 return;
3783 3325
3784 switch (op) 3326 switch (op)
3785 { 3327 {
… …
3802 unsigned long bytes_after; 3344 unsigned long bytes_after;
3803 unsigned char *value = 0; 3345 unsigned char *value = 0;
3804 const char *str = ""; 3346 const char *str = "";
3805 3347
3806 if (prop 3348 if (prop
3807 && XGetWindowProperty (dpy, parent[0], 3349 && XGetWindowProperty (dpy, parent,
3808 prop, 0, 1<<16, 0, AnyPropertyType, 3350 prop, 0, 1<<16, 0, AnyPropertyType,
3809 &actual_type, &actual_format, 3351 &actual_type, &actual_format,
3810 &nitems, &bytes_after, &value) == Success 3352 &nitems, &bytes_after, &value) == Success
3811 && actual_type != None 3353 && actual_type != None
3812 && actual_format == 8) 3354 && actual_format == 8)
… …
3816 3358
3817 XFree (value); 3359 XFree (value);
3818 } 3360 }
3819 else 3361 else
3820 { 3362 {
3821 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3363 char *eq = strchr (str, '=');
3822 3364
3823 if (eq) 3365 if (eq)
3824 { 3366 {
3825 *eq = 0; 3367 *eq = 0;
3826 set_utf8_property (display->atom (str), eq + 1); 3368 set_utf8_property (display->atom (str), eq + 1);
3827 } 3369 }
3828 else 3370 else
3829 XDeleteProperty (dpy, parent[0], 3371 XDeleteProperty (dpy, parent,
3830 display->atom (str)); 3372 display->atom (str));
3831 } 3373 }
3832 break; 3374 break;
3833 3375
3834 case XTerm_Color: 3376 case XTerm_Color:
… …
3847 *buf++ = '\0'; 3389 *buf++ = '\0';
3848 3390
3849 process_color_seq (op, color, name, resp); 3391 process_color_seq (op, color, name, resp);
3850 } 3392 }
3851 break; 3393 break;
3394 case Rxvt_restoreFG:
3852 case XTerm_Color00: 3395 case XTerm_Color00:
3853 process_color_seq (op, Color_fg, str, resp); 3396 process_color_seq (op, Color_fg, str, resp);
3854 break; 3397 break;
3398 case Rxvt_restoreBG:
3855 case XTerm_Color01: 3399 case XTerm_Color01:
3856 process_color_seq (op, Color_bg, str, resp); 3400 process_color_seq (op, Color_bg, str, resp);
3857 break; 3401 break;
3858#ifndef NO_CURSORCOLOR 3402#ifndef NO_CURSORCOLOR
3859 case XTerm_Color_cursor: 3403 case XTerm_Color_cursor:
… …
3864 process_color_seq (op, Color_pointer_fg, str, resp); 3408 process_color_seq (op, Color_pointer_fg, str, resp);
3865 break; 3409 break;
3866 case XTerm_Color_pointer_bg: 3410 case XTerm_Color_pointer_bg:
3867 process_color_seq (op, Color_pointer_bg, str, resp); 3411 process_color_seq (op, Color_pointer_bg, str, resp);
3868 break; 3412 break;
3413#ifdef OPTION_HC
3414 case XTerm_Color_HC:
3415 process_color_seq (op, Color_HC, str, resp);
3416 break;
3417 case XTerm_Color_HTC:
3418 process_color_seq (op, Color_HTC, str, resp);
3419 break;
3420#endif
3869#ifndef NO_BOLD_UNDERLINE_REVERSE 3421#ifndef NO_BOLD_UNDERLINE_REVERSE
3870 case XTerm_Color_RV:
3871 process_color_seq (op, Color_RV, str, resp);
3872 break;
3873 case Rxvt_Color_BD:
3874 case URxvt_Color_BD: 3422 case URxvt_Color_BD:
3875 process_color_seq (op, Color_BD, str, resp); 3423 process_color_seq (op, Color_BD, str, resp);
3876 break; 3424 break;
3877 case Rxvt_Color_UL:
3878 case URxvt_Color_UL: 3425 case URxvt_Color_UL:
3879 process_color_seq (op, Color_UL, str, resp); 3426 process_color_seq (op, Color_UL, str, resp);
3880 break; 3427 break;
3881 case URxvt_Color_IT: 3428 case URxvt_Color_IT:
3882 process_color_seq (op, Color_IT, str, resp); 3429 process_color_seq (op, Color_IT, str, resp);
3883 break; 3430 break;
3884#endif 3431#endif
3885#if TRANSPARENT && TINTING 3432 case URxvt_Color_border:
3433 process_color_seq (op, Color_border, str, resp);
3434 break;
3435#if ENABLE_TRANSPARENCY
3886 case URxvt_Color_tint: 3436 case URxvt_Color_tint:
3887 process_color_seq (op, Color_tint, str, resp); 3437 process_color_seq (op, Color_tint, str, resp);
3438 {
3439 bool changed = false;
3888 3440
3889 check_our_parents (); 3441 if (ISSET_PIXCOLOR (Color_tint))
3442 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3890 3443
3891 if (am_transparent) 3444 if (changed)
3892 want_full_refresh = want_refresh = 1; 3445 update_background ();
3446 }
3893 3447
3894 break; 3448 break;
3895#endif 3449#endif
3896 3450
3451#if BG_IMAGE_FROM_FILE
3897 case Rxvt_Pixmap: 3452 case Rxvt_Pixmap:
3453 if (!strcmp (str, "?"))
3898 { 3454 {
3455 char str[256];
3456
3457 sprintf (str, "[%dx%d+%d+%d]",
3458 min (bg_image.h_scale, 32767), min (bg_image.v_scale, 32767),
3459 min (bg_image.h_align, 32767), min (bg_image.v_align, 32767));
3460 process_xterm_seq (XTerm_title, str, CHAR_ST);
3461 }
3462 else
3463 {
3464 bool changed = false;
3465
3899 if (*str != ';') 3466 if (*str != ';')
3900 { 3467 {
3901#if XPM_BACKGROUND
3902 scale_pixmap (""); /* reset to default scaling */
3903 set_bgPixmap (str); /* change pixmap */ 3468 if (bg_image.set_file (str)) /* change pixmap */
3904 scr_touch (true); 3469 changed = true;
3905#endif
3906 } 3470 }
3907 3471 else
3908 int changed = 0;
3909
3910 while ((str = strchr (str, ';')) != NULL)
3911 { 3472 {
3912 str++; 3473 str++;
3913#if XPM_BACKGROUND 3474 if (bg_image.set_geometry (str, true))
3914 changed += scale_pixmap (str); 3475 changed = true;
3915#endif
3916 } 3476 }
3917 3477
3918 if (changed) 3478 if (changed)
3919 { 3479 {
3920#ifdef XPM_BACKGROUND 3480 if (bg_window_position_sensitive ())
3921 resize_pixmap (); 3481 {
3922 scr_touch (true); 3482 int x, y;
3923#endif 3483 get_window_origin (x, y);
3484 bg_set_position (x, y);
3485 }
3486 update_background ();
3924 } 3487 }
3925 } 3488 }
3926 break; 3489 break;
3927 3490#endif
3928 case Rxvt_restoreFG:
3929 set_window_color (Color_fg, str);
3930 break;
3931 case Rxvt_restoreBG:
3932 set_window_color (Color_bg, str);
3933 break;
3934 3491
3935 case XTerm_logfile: 3492 case XTerm_logfile:
3936 // TODO, when secure mode? 3493 // TODO, when secure mode?
3937 break; 3494 break;
3938 3495
… …
3956 case URxvt_italicFont: 3513 case URxvt_italicFont:
3957 case URxvt_boldItalicFont: 3514 case URxvt_boldItalicFont:
3958#endif 3515#endif
3959 if (query) 3516 if (query)
3960 tt_printf ("\33]%d;%-.250s%c", saveop, 3517 tt_printf ("\33]%d;%-.250s%c", saveop,
3961 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3518 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3962 ? fontset[op - URxvt_font]->fontdesc : "", 3519 ? fontset[op - URxvt_font]->fontdesc : "",
3963 resp); 3520 resp);
3964 else 3521 else
3965 { 3522 {
3966 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3523 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3980 break; 3537 break;
3981 3538
3982#if !ENABLE_MINIMAL 3539#if !ENABLE_MINIMAL
3983 case URxvt_locale: 3540 case URxvt_locale:
3984 if (query) 3541 if (query)
3985 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3542 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3986 else 3543 else
3987 { 3544 {
3988 set_locale (str); 3545 set_locale (str);
3989 pty->set_utf8_mode (enc_utf8); 3546 pty->set_utf8_mode (enc_utf8);
3990 init_xlocale (); 3547 init_xlocale ();
… …
4005 break; 3562 break;
4006#endif 3563#endif
4007 3564
4008#if ENABLE_PERL 3565#if ENABLE_PERL
4009 case URxvt_perl: 3566 case URxvt_perl:
4010 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3567 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4011 ; // no responses yet
4012 break; 3568 break;
4013#endif 3569#endif
4014 } 3570 }
4015} 3571}
4016/*----------------------------------------------------------------------*/ 3572/*----------------------------------------------------------------------*/
… …
4030{ 3586{
4031 int state; 3587 int state;
4032 3588
4033 if (mode == 's') 3589 if (mode == 's')
4034 { 3590 {
4035 SavedModes |= (priv_modes & bit); 3591 if (priv_modes & bit)
3592 SavedModes |= bit;
3593 else
3594 SavedModes &= ~bit;
4036 return -1; 3595 return -1;
4037 } 3596 }
4038 else 3597 else
4039 { 3598 {
4040 if (mode == 'r') 3599 if (mode == 'r')
4041 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3600 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4042 else 3601 else
4043 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3602 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4044 PrivMode (state, bit); 3603
3604 if (state)
3605 priv_modes |= bit;
3606 else
3607 priv_modes &= ~bit;
4045 } 3608 }
4046 3609
4047 return state; 3610 return state;
4048} 3611}
4049 3612
4050/* we're not using priv _yet_ */ 3613/* we're not using priv _yet_ */
4051void 3614void
4052rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3615rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
4053{ 3616{
4054 unsigned int i, j; 3617 unsigned int i, j;
4055 int state; 3618 int state;
4056 3619
4057 static const struct 3620 static const struct
4058 { 3621 {
4059 const int argval; 3622 const int argval;
4060 const unsigned long bit; 3623 const unsigned long bit;
4061 }
4062
4063 argtopriv[] = { 3624 } argtopriv[] = {
4064 { 1, PrivMode_aplCUR }, 3625 { 1, PrivMode_aplCUR }, // DECCKM
4065 { 2, PrivMode_vt52 }, 3626 { 2, PrivMode_vt52 }, // DECANM
4066 { 3, PrivMode_132 }, 3627 { 3, PrivMode_132 }, // DECCOLM
4067 { 4, PrivMode_smoothScroll }, 3628 { 4, PrivMode_smoothScroll }, // DECSCLM
4068 { 5, PrivMode_rVideo }, 3629 { 5, PrivMode_rVideo }, // DECSCNM
4069 { 6, PrivMode_relOrigin }, 3630 { 6, PrivMode_relOrigin }, // DECOM
4070 { 7, PrivMode_Autowrap }, 3631 { 7, PrivMode_Autowrap }, // DECAWM
4071 // 8, bi-directional support mode 3632 // 8, auto-repeat keys // DECARM
4072 { 9, PrivMode_MouseX10 }, 3633 { 9, PrivMode_MouseX10 },
4073 // 18, 19 printing-related 3634 // 18 end FF to printer after print screen
3635 // 19 Print screen prints full screen/scroll region
4074 { 25, PrivMode_VisibleCursor }, 3636 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
4075#ifdef scrollBar_esc 3637#ifdef scrollBar_esc
4076 { scrollBar_esc, PrivMode_scrollBar }, 3638 { scrollBar_esc, PrivMode_scrollBar },
4077#endif 3639#endif
4078 { 35, PrivMode_ShiftKeys }, // rxvt extension 3640 { 35, PrivMode_ShiftKeys }, // rxvt extension
3641 // 38, tektronix mode // DECTEK
4079 { 40, PrivMode_132OK }, 3642 { 40, PrivMode_132OK },
4080 // 41 xterm more fixes NYI 3643 // 41 xterm more fixes NYI
4081 // 45 margin bell NYI 3644 // 45 margin bell NYI
4082 // 46 start logging 3645 // 46 start logging
4083 { 47, PrivMode_Screen }, 3646 { 47, PrivMode_Screen },
4084 { 66, PrivMode_aplKP }, 3647 { 66, PrivMode_aplKP }, // DECNKM
4085#ifndef NO_BACKSPACE_KEY 3648#ifndef NO_BACKSPACE_KEY
4086 { 67, PrivMode_BackSpace }, 3649 { 67, PrivMode_BackSpace }, // DECBKM
4087#endif 3650#endif
4088 { 1000, PrivMode_MouseX11 }, 3651 { 1000, PrivMode_MouseX11 },
4089 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3652 { 1002, PrivMode_MouseBtnEvent },
4090 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3653 { 1003, PrivMode_MouseAnyEvent },
4091 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3654#if ENABLE_FRILLS
3655 { 1005, PrivMode_ExtModeMouse },
3656#endif
4092 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3657 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4093 { 1011, PrivMode_Keypress }, // rxvt extension 3658 { 1011, PrivMode_Keypress }, // rxvt extension
3659#if ENABLE_FRILLS
3660 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3661#endif
4094 // 1035 enable modifiers for alt, numlock NYI 3662 // 1035 enable modifiers for alt, numlock NYI
4095 // 1036 send ESC for meta keys NYI 3663 // 1036 send ESC for meta keys NYI
4096 // 1037 send DEL for keypad delete NYI 3664 // 1037 send DEL for keypad delete NYI
4097 { 1047, PrivMode_Screen }, 3665 { 1047, PrivMode_Screen },
4098 // 1048 save and restore cursor 3666 // 1048 save and restore cursor, implemented in code
4099 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3667 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4100 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3668 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3669 { 2004, PrivMode_BracketPaste },
4101 }; 3670 };
4102 3671
4103 if (nargs == 0) 3672 if (nargs == 0)
4104 return; 3673 return;
4105 3674
… …
4112 for (i = 0; i < nargs; i++) 3681 for (i = 0; i < nargs; i++)
4113 { 3682 {
4114 state = -1; 3683 state = -1;
4115 3684
4116 /* basic handling */ 3685 /* basic handling */
4117 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3686 for (j = 0; j < ecb_array_length (argtopriv); j++)
4118 if (argtopriv[j].argval == arg[i]) 3687 if (argtopriv[j].argval == arg[i])
4119 { 3688 {
4120 state = privcases (mode, argtopriv[j].bit); 3689 state = privcases (mode, argtopriv[j].bit);
4121 break; 3690 break;
4122 } 3691 }
… …
4130 3699
4131 scr_touch (true); 3700 scr_touch (true);
4132 break; 3701 break;
4133#endif 3702#endif
4134 case 1048: /* alternative cursor save */ 3703 case 1048: /* alternative cursor save */
4135 case 1049:
4136 if (OPTION (Opt_secondaryScreen)) 3704 if (option (Opt_secondaryScreen))
4137 if (mode == 0) 3705 if (mode == 0)
4138 scr_cursor (RESTORE); 3706 scr_cursor (RESTORE);
4139 else if (mode == 1) 3707 else if (mode == 1)
4140 scr_cursor (SAVE); 3708 scr_cursor (SAVE);
4141 break; 3709 break;
… …
4149 case 2: /* VT52 mode */ 3717 case 2: /* VT52 mode */
4150 /* oddball mode. should be set regardless of set/reset 3718 /* oddball mode. should be set regardless of set/reset
4151 * parameter. Return from VT52 mode with an ESC < from 3719 * parameter. Return from VT52 mode with an ESC < from
4152 * within VT52 mode 3720 * within VT52 mode
4153 */ 3721 */
4154 PrivMode (1, PrivMode_vt52); 3722 priv_modes |= PrivMode_vt52;
4155 break; 3723 break;
4156 case 3: /* 80/132 */ 3724 case 3: /* 80/132 */
4157 if (priv_modes & PrivMode_132OK) 3725 if (priv_modes & PrivMode_132OK)
4158 set_widthheight (((state ? 132 : 80) * fwidth), height); 3726 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4159 break; 3727 break;
4160 case 4: /* smooth scrolling */ 3728 case 4: /* smooth scrolling */
4161 set_option (Opt_jumpScroll, !state); 3729 set_option (Opt_jumpScroll, !state);
4162 break; 3730 break;
4163 case 5: /* reverse video */ 3731 case 5: /* reverse video */
… …
4170 scr_autowrap (state); 3738 scr_autowrap (state);
4171 break; 3739 break;
4172 /* case 8: - auto repeat, can't do on a per window basis */ 3740 /* case 8: - auto repeat, can't do on a per window basis */
4173 case 9: /* X10 mouse reporting */ 3741 case 9: /* X10 mouse reporting */
4174 if (state) /* orthogonal */ 3742 if (state) /* orthogonal */
4175 priv_modes &= ~PrivMode_MouseX11; 3743 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4176 break; 3744 break;
4177#ifdef scrollBar_esc 3745#ifdef scrollBar_esc
4178 case scrollBar_esc: 3746 case scrollBar_esc:
4179 if (scrollbar_mapping (state)) 3747 scrollBar.map (state);
4180 {
4181 resize_all_windows (0, 0, 0); 3748 resize_all_windows (0, 0, 0);
4182 scr_touch (true); 3749 scr_touch (true);
4183 }
4184 break; 3750 break;
4185#endif 3751#endif
4186 case 25: /* visible/invisible cursor */ 3752 case 25: /* visible/invisible cursor */
4187 scr_cursor_visible (state); 3753 scr_cursor_visible (state);
4188 break; 3754 break;
… …
4193 break; 3759 break;
4194 /* case 66: - application key pad */ 3760 /* case 66: - application key pad */
4195 /* case 67: - backspace key */ 3761 /* case 67: - backspace key */
4196 case 1000: /* X11 mouse reporting */ 3762 case 1000: /* X11 mouse reporting */
4197 if (state) /* orthogonal */ 3763 if (state) /* orthogonal */
4198 priv_modes &= ~PrivMode_MouseX10; 3764 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4199 break; 3765 break;
4200#if 0
4201 case 1001: 3766 case 1002:
4202 break; /* X11 mouse highlighting */ 3767 case 1003:
4203#endif 3768 if (state)
3769 {
3770 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3771 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3772 mouse_row = mouse_col = 0;
3773 vt_emask_mouse = PointerMotionMask;
3774 }
3775 else
3776 vt_emask_mouse = NoEventMask;
3777
3778 vt_select_input ();
3779 break;
4204 case 1010: /* scroll to bottom on TTY output inhibit */ 3780 case 1010: /* scroll to bottom on TTY output inhibit */
4205 set_option (Opt_scrollTtyOutput, !state); 3781 set_option (Opt_scrollTtyOutput, !state);
4206 break; 3782 break;
4207 case 1011: /* scroll to bottom on key press */ 3783 case 1011: /* scroll to bottom on key press */
4208 set_option (Opt_scrollTtyKeypress, state); 3784 set_option (Opt_scrollTtyKeypress, state);
4209 break; 3785 break;
4210 case 1047: /* secondary screen w/ clearing last */ 3786 case 1047: /* secondary screen w/ clearing last */
4211 if (OPTION (Opt_secondaryScreen)) 3787 if (option (Opt_secondaryScreen))
4212 if (current_screen != PRIMARY) 3788 if (!state)
4213 scr_erase_screen (2); 3789 scr_erase_screen (2);
3790
4214 scr_change_screen (state); 3791 scr_change_screen (state);
4215 break; 3792 break;
4216 case 1049: /* secondary screen w/ clearing first */ 3793 case 1049: /* secondary screen w/ clearing first */
3794 if (option (Opt_secondaryScreen))
3795 if (state)
3796 scr_cursor (SAVE);
3797
4217 scr_change_screen (state); 3798 scr_change_screen (state);
3799
4218 if (OPTION (Opt_secondaryScreen)) 3800 if (option (Opt_secondaryScreen))
4219 if (current_screen != PRIMARY) 3801 if (state)
4220 scr_erase_screen (2); 3802 scr_erase_screen (2);
3803 else
3804 scr_cursor (RESTORE);
4221 break; 3805 break;
4222 default: 3806 default:
4223 break; 3807 break;
4224 } 3808 }
4225 } 3809 }
… …
4378 } 3962 }
4379 } 3963 }
4380} 3964}
4381/*}}} */ 3965/*}}} */
4382 3966
4383/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4384void
4385rxvt_term::process_graphics ()
4386{
4387 unicode_t ch, cmd = cmd_getc ();
4388
4389 if (cmd == 'Q')
4390 { /* query graphics */
4391 tt_printf ("\033G0\012"); /* no graphics */
4392 return;
4393 }
4394 /* swallow other graphics sequences until terminating ':' */
4395 do
4396 ch = cmd_getc ();
4397 while (ch != ':');
4398}
4399/*}}} */
4400
4401/* ------------------------------------------------------------------------- */ 3967/* ------------------------------------------------------------------------- */
4402 3968
4403/* 3969/*
4404 * Send printf () formatted output to the command. 3970 * Send printf () formatted output to the command.
4405 * Only use for small amounts of data. 3971 * Only use for small amounts of data.
… …
4418 3984
4419/* ---------------------------------------------------------------------- */ 3985/* ---------------------------------------------------------------------- */
4420/* Write data to the pty as typed by the user, pasted with the mouse, 3986/* Write data to the pty as typed by the user, pasted with the mouse,
4421 * or generated by us in response to a query ESC sequence. 3987 * or generated by us in response to a query ESC sequence.
4422 */ 3988 */
4423const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3989static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4424 3990
4425void 3991void
4426rxvt_term::tt_write (const char *data, unsigned int len) 3992rxvt_term::tt_write (const char *data, unsigned int len)
4427{ 3993{
4428 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3994 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4433 3999
4434 if (v_buflen == 0) 4000 if (v_buflen == 0)
4435 { 4001 {
4436 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4002 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4437 4003
4004 max_it (written, 0);
4005
4438 if ((unsigned int)written == len) 4006 if (written == len)
4439 return; 4007 return;
4440 4008
4441 data += written; 4009 data += written;
4442 len -= written; 4010 len -= written;
4443 } 4011 }
4444 4012
4445 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4013 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4446 4014
4447 memcpy (v_buffer + v_buflen, data, len); 4015 memcpy (v_buffer + v_buflen, data, len);
4448 v_buflen += len; 4016 v_buflen += len;
4449 4017
4450 pty_ev.set (EVENT_READ | EVENT_WRITE); 4018 pty_ev.set (ev::READ | ev::WRITE);
4451} 4019}
4452 4020
4453void rxvt_term::pty_write () 4021void rxvt_term::pty_write ()
4454{ 4022{
4455 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4023 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4460 4028
4461 if (v_buflen == 0) 4029 if (v_buflen == 0)
4462 { 4030 {
4463 free (v_buffer); 4031 free (v_buffer);
4464 v_buffer = 0; 4032 v_buffer = 0;
4465 v_buflen = 0;
4466 4033
4467 pty_ev.set (EVENT_READ); 4034 pty_ev.set (ev::READ);
4468 return; 4035 return;
4469 } 4036 }
4470 4037
4471 memmove (v_buffer, v_buffer + written, v_buflen); 4038 memmove (v_buffer, v_buffer + written, v_buflen);
4472 } 4039 }
4473 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4040 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4474 pty_ev.set (EVENT_READ); 4041 pty_ev.set (ev::READ);
4475} 4042}
4476 4043
4477/*----------------------- end-of-file (C source) -----------------------*/ 4044/*----------------------- end-of-file (C source) -----------------------*/
4478 4045

Diff Legend

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