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.329 by ayin, Mon Jun 11 19:57:28 2007 UTC vs.
Revision 1.514 by root, Mon Jun 4 15:18:52 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,
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + 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
250} 256}
251#endif 257#endif
252 258
253void 259void ecb_cold
254rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
255{ 261{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 263
261 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
262 { 265 {
263 char mb[16]; 266 char mb[MB_LEN_MAX];
264 int len; 267 int len;
265 268
266 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
269 else 272 else
270 { 273 {
271 mb[0] = ch[0]; 274 mb[0] = ch;
272 len = 1; 275 len = 1;
273 } 276 }
274 277
275 if (len > 0) 278 if (len > 0)
276 tt_write (mb, len); 279 tt_write (mb, len);
… …
279 } 282 }
280 283
281 iso14755buf = 0; 284 iso14755buf = 0;
282} 285}
283 286
284int 287static int ecb_cold
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
303void 306static inline KeySym ecb_cold
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 ecb_cold
343map_function_key (KeySym keysym)
344{
345 int param = 0;
346
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
348 {
349 param = 11 + keysym - XK_F1;
350 if (keysym >= XK_F17)
351 param += 4;
352 else if (keysym >= XK_F15)
353 param += 3;
354 else if (keysym >= XK_F11)
355 param += 2;
356 else if (keysym >= XK_F6)
357 param += 1;
358 }
359 else
360 switch (keysym)
361 {
362 case XK_Find:
363 param = 1;
364 break;
365 case XK_Insert:
366 param = 2;
367 break;
368#ifdef DXK_Remove
369 case DXK_Remove:
370#endif
371 case XK_Execute:
372 param = 3;
373 break;
374 case XK_Select:
375 param = 4;
376 break;
377#ifndef UNSHIFTED_SCROLLKEYS
378 case XK_Prior:
379 param = 5;
380 break;
381 case XK_Next:
382 param = 6;
383 break;
384 case XK_Home:
385 param = 7;
386 break;
387 case XK_End:
388 param = 8;
389 break;
390#endif
391 case XK_Help:
392 param = 28;
393 break;
394 case XK_Menu:
395 param = 29;
396 break;
397 }
398 return param;
399}
400
401void ecb_cold
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
… …
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 423
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332
333 kbuf[0] = 0; 424 kbuf[0] = 0;
334 425
335#ifdef USE_XIM 426#if USE_XIM
336 if (Input_Context) 427 if (Input_Context)
337 { 428 {
338 Status status_return; 429 Status status_return;
339 430
340#if 0 431#if 0
… …
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
… …
519# endif 610# endif
520 return; 611 return;
521 } 612 }
522 else 613 else
523 { 614 {
524# if ENABLE_OVERLAY 615# if ISO_14755
525 scr_overlay_off (); 616 scr_overlay_off ();
526# endif 617# endif
527 iso14755buf = 0; 618 iso14755buf = 0;
528 } 619 }
529 } 620 }
621 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 622 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 623 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 624 if (!(iso14755buf & ISO_14755_STARTED))
533 { 625 {
534 iso14755buf |= ISO_14755_STARTED; 626 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 627# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 628 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 629 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 630# endif
539 } 631 }
540#endif 632#endif
… …
547 } 639 }
548#endif 640#endif
549 641
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 643 {
644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
645 unsigned int newlen = 1;
646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
552 { 653 {
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
553 newlen = 1; 684 newlen = 0;
554 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:
555 { 768 {
556#ifndef NO_BACKSPACE_KEY 769 int param = map_function_key (keysym);
557 case XK_BackSpace: 770 if (param > 0)
558 if (priv_modes & PrivMode_HaveBackSpace) 771 sprintf (kbuf,"\033[%d~", param);
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else 772 else
565 strcpy (kbuf, key_backspace);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, key_delete);
581 break;
582#endif
583 case XK_Tab:
584 if (shft)
585 strcpy (kbuf, "\033[Z");
586 else
587 {
588#ifdef CTRL_TAB_MAKES_META
589 if (ctrl)
590 meta = 1;
591#endif
592#ifdef MOD4_TAB_MAKES_META
593 if (ev.state & Mod4Mask)
594 meta = 1;
595#endif
596 newlen = 0;
597 }
598 break;
599
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z");
621 kbuf[2] = "DACB"[keysym - XK_Left];
622 /* do Shift first */
623 if (shft)
624 kbuf[2] = "dacb"[keysym - XK_Left];
625 else if (ctrl)
626 {
627 kbuf[1] = 'O';
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 }
630 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O';
632 break;
633
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next:
659 strcpy (kbuf, "\033[6~");
660 break;
661#endif
662 case XK_KP_Enter:
663 /* allow shift to override */
664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
665 {
666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
678 }
679 else
680 {
681 kbuf[0] = '\015';
682 kbuf[1] = '\0';
683 }
684 break;
685
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP");
697 kbuf[2] += (keysym - XK_KP_F1);
698 break;
699
700 case XK_KP_Multiply: /* "\033Oj" : "*" */
701 case XK_KP_Add: /* "\033Ok" : "+" */
702 case XK_KP_Separator: /* "\033Ol" : "," */
703 case XK_KP_Subtract: /* "\033Om" : "-" */
704 case XK_KP_Decimal: /* "\033On" : "." */
705 case XK_KP_Divide: /* "\033Oo" : "/" */
706 case XK_KP_0: /* "\033Op" : "0" */
707 case XK_KP_1: /* "\033Oq" : "1" */
708 case XK_KP_2: /* "\033Or" : "2" */
709 case XK_KP_3: /* "\033Os" : "3" */
710 case XK_KP_4: /* "\033Ot" : "4" */
711 case XK_KP_5: /* "\033Ou" : "5" */
712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */
717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert:
744 strcpy (kbuf, "\033[2~");
745 break;
746#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove:
748 /* FALLTHROUGH */
749#endif
750 case XK_Execute:
751 strcpy (kbuf, "\033[3~");
752 break;
753 case XK_Select:
754 strcpy (kbuf, "\033[4~");
755 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End:
767 strcpy (kbuf, KS_END);
768 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home:
780 strcpy (kbuf, KS_HOME);
781 break;
782
783#define FKEY(n, fkey) \
784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786 case XK_F1: /* "\033[11~" */
787 case XK_F2: /* "\033[12~" */
788 case XK_F3: /* "\033[13~" */
789 case XK_F4: /* "\033[14~" */
790 case XK_F5: /* "\033[15~" */
791 FKEY (11, XK_F1);
792 break;
793 case XK_F6: /* "\033[17~" */
794 case XK_F7: /* "\033[18~" */
795 case XK_F8: /* "\033[19~" */
796 case XK_F9: /* "\033[20~" */
797 case XK_F10: /* "\033[21~" */
798 FKEY (17, XK_F6);
799 break;
800 case XK_F11: /* "\033[23~" */
801 case XK_F12: /* "\033[24~" */
802 case XK_F13: /* "\033[25~" */
803 case XK_F14: /* "\033[26~" */
804 FKEY (23, XK_F11);
805 break;
806 case XK_F15: /* "\033[28~" */
807 case XK_F16: /* "\033[29~" */
808 FKEY (28, XK_F15);
809 break;
810 case XK_Help: /* "\033[28~" */
811 FKEY (28, XK_Help);
812 break;
813 case XK_Menu: /* "\033[29~" */
814 FKEY (29, XK_Menu);
815 break;
816 case XK_F17: /* "\033[31~" */
817 case XK_F18: /* "\033[32~" */
818 case XK_F19: /* "\033[33~" */
819 case XK_F20: /* "\033[34~" */
820 case XK_F21: /* "\033[35~" */
821 case XK_F22: /* "\033[36~" */
822 case XK_F23: /* "\033[37~" */
823 case XK_F24: /* "\033[38~" */
824 case XK_F25: /* "\033[39~" */
825 case XK_F26: /* "\033[40~" */
826 case XK_F27: /* "\033[41~" */
827 case XK_F28: /* "\033[42~" */
828 case XK_F29: /* "\033[43~" */
829 case XK_F30: /* "\033[44~" */
830 case XK_F31: /* "\033[45~" */
831 case XK_F32: /* "\033[46~" */
832 case XK_F33: /* "\033[47~" */
833 case XK_F34: /* "\033[48~" */
834 case XK_F35: /* "\033[49~" */
835 FKEY (31, XK_F17);
836 break;
837#undef FKEY
838 default:
839 newlen = 0; 773 newlen = 0;
840 break;
841 } 774 }
842 775 break;
843 if (newlen)
844 len = strlen (kbuf);
845 } 776 }
846 777
778 if (newlen)
779 len = strlen (kbuf);
780
781 if (len > 0)
782 {
847 /* 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 /*
848 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
849 */ 797 */
850#ifdef META8_OPTION 798#ifdef META8_OPTION
851 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
852 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
853#endif 801#endif
802 }
854 803
855 } 804 }
856 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
857 { 806 {
858 len = 1; 807 len = 1;
… …
892 { 841 {
893 view_start = 0; 842 view_start = 0;
894 want_refresh = 1; 843 want_refresh = 1;
895 } 844 }
896 845
897 /*
898 * these modifications only affect the static keybuffer
899 * pass Shift/Control indicators for function keys ending with `~'
900 *
901 * eg,
902 * Prior = "ESC[5~"
903 * Shift+Prior = "ESC[5$"
904 * Ctrl+Prior = "ESC[5^"
905 * Ctrl+Shift+Prior = "ESC[5@"
906 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
907 */
908 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
909 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
910
911 /* escape prefix */ 846 /* escape prefix */
912 if (meta 847 if (meta
913#ifdef META8_OPTION 848#ifdef META8_OPTION
914 && meta_char == C0_ESC 849 && meta_char == C0_ESC
915#endif 850#endif
… …
920 } 855 }
921 856
922 tt_write (kbuf, (unsigned int)len); 857 tt_write (kbuf, (unsigned int)len);
923} 858}
924 859
925void 860void ecb_cold
926rxvt_term::key_release (XKeyEvent &ev) 861rxvt_term::key_release (XKeyEvent &ev)
927{ 862{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 863#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym; 864 KeySym keysym;
930 865
… …
934#if ENABLE_FRILLS || ISO_14755 869#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 870 // ISO 14755 support
936 if (iso14755buf) 871 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 872 if (iso14755buf & ISO_14755_52)
938 { 873 {
939# if ENABLE_OVERLAY 874# if ISO_14755
940 scr_overlay_off (); 875 scr_overlay_off ();
941# endif 876# endif
942# if ISO_14755 877# if ISO_14755
943 // iso14755 part 5.2 handling: release time 878 // iso14755 part 5.2 handling: release time
944 // first: controls 879 // first: controls
… …
950 commit_iso14755 (); 885 commit_iso14755 ();
951 886
952 return; 887 return;
953 } 888 }
954 889
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 890 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
956 if (i[0] == keysym) 891 if (i[0] == keysym)
957 { 892 {
958 iso14755buf = ISO_14755_51 | i[1]; 893 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 (); 894 commit_iso14755 ();
960 895
… …
967 902
968 return; 903 return;
969 } 904 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 905 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 906 {
972# if ENABLE_OVERLAY 907# if ISO_14755
973 scr_overlay_off (); 908 scr_overlay_off ();
974# endif 909# endif
975 if (iso14755buf & ISO_14755_51) 910 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 911 commit_iso14755 ();
977#if ISO_14755 912#if ISO_14755
… …
997 else if (keysym == XK_Control_L || keysym == XK_Control_R) 932 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0; 933 mouse_slip_wheel_speed = 0;
999#endif 934#endif
1000} 935}
1001 936
1002#if defined (KEYSYM_RESOURCE)
1003unsigned int
1004rxvt_term::cmd_write (const char *str, unsigned int count)
1005{
1006 unsigned int n, s;
1007
1008 n = cmdbuf_ptr - cmdbuf_base;
1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1010
1011 if (n > 0 && s < count)
1012 {
1013 memmove (cmdbuf_base, cmdbuf_ptr,
1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1015 cmdbuf_ptr = cmdbuf_base;
1016 cmdbuf_endp -= n;
1017 s += n;
1018 }
1019
1020 if (count > s)
1021 {
1022 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1023 count = s;
1024 }
1025
1026 for (; count--;)
1027 *cmdbuf_endp++ = *str++;
1028
1029 cmd_parse ();
1030
1031 return 0;
1032}
1033#endif
1034
1035void 937void
1036rxvt_term::flush () 938rxvt_term::flush ()
1037{ 939{
1038 flush_ev.stop (); 940 flush_ev.stop ();
1039 941
1040#ifdef TRANSPARENT 942#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 943 if (bg_flags & BG_NEEDS_REFRESH)
1042 { 944 {
1043 want_full_refresh = 0; 945 bg_flags &= ~BG_NEEDS_REFRESH;
1044 scr_clear ();
1045 scr_touch (false); 946 scr_touch (false);
1046 } 947 }
1047#endif 948#endif
1048 949
1049 if (want_refresh) 950 if (want_refresh)
… …
1085 } 986 }
1086 while (row < end_row); 987 while (row < end_row);
1087 } 988 }
1088 989
1089 scr_refresh (); 990 scr_refresh ();
1090 scrollbar_show (1); 991 scrollBar.show (1);
1091#ifdef USE_XIM 992#if USE_XIM
1092 IMSendSpot (); 993 im_send_spot ();
1093#endif 994#endif
1094 } 995 }
1095 996
1096 display->flush (); 997 display->flush ();
1097} 998}
1098 999
1000/* checks whether a refresh is requested and starts the refresh timer */
1099void 1001void
1100rxvt_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)
1101{ 1012{
1102 make_current (); 1013 make_current ();
1103 1014
1104 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108}
1109
1110void
1111rxvt_term::flush_cb (time_watcher &w)
1112{
1113 make_current ();
1114
1115 refresh_limit = 1;
1116 refresh_count = 0; 1015 refresh_count = 0;
1117 flush (); 1016 flush ();
1118} 1017}
1119 1018
1120#ifdef CURSOR_BLINK 1019#ifdef CURSOR_BLINK
1121void 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
1122rxvt_term::cursor_blink_cb (time_watcher &w) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1123{ 1037{
1124 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1125 want_refresh = 1; 1039 want_refresh = 1;
1126 1040 refresh_check ();
1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1128} 1041}
1129#endif 1042#endif
1130 1043
1131#ifdef TEXT_BLINK 1044#ifdef TEXT_BLINK
1132void 1045void
1133rxvt_term::text_blink_cb (time_watcher &w) 1046rxvt_term::text_blink_cb (ev::timer &w, int revents)
1134{ 1047{
1135 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1048 if (scr_refresh_rend (RS_Blink, RS_Blink))
1136 { 1049 {
1137 hidden_text = !hidden_text; 1050 hidden_text = !hidden_text;
1138 want_refresh = 1; 1051 want_refresh = 1;
1139 w.start (w.at + TEXT_BLINK_INTERVAL); 1052 refresh_check ();
1140 } 1053 }
1054 else
1055 w.stop ();
1141} 1056}
1142#endif 1057#endif
1143 1058
1144#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1145void 1060void
1146rxvt_term::cont_scroll_cb (time_watcher &w) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1147{ 1062{
1148 if ((scrollbar_isUp() || scrollbar_isDn()) && 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1149 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1150 { 1065 {
1151 want_refresh = 1; 1066 want_refresh = 1;
1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1067 refresh_check ();
1153 } 1068 }
1069 else
1070 w.stop ();
1154} 1071}
1155#endif 1072#endif
1156 1073
1157#ifdef SELECTION_SCROLLING 1074#ifdef SELECTION_SCROLLING
1158void 1075void
1159rxvt_term::sel_scroll_cb (time_watcher &w) 1076rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1160{ 1077{
1161 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1078 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1162 { 1079 {
1163 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1080 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1164 want_refresh = 1; 1081 want_refresh = 1;
1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1082 refresh_check ();
1166 } 1083 }
1084 else
1085 w.stop ();
1167} 1086}
1168#endif 1087#endif
1169 1088
1170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1171void 1090void
1172rxvt_term::slip_wheel_cb (time_watcher &w) 1091rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1173{ 1092{
1174 if (mouse_slip_wheel_speed == 0 1093 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1176 : scr_page (UP, mouse_slip_wheel_speed))
1177 { 1094 {
1178 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0;
1180
1181 want_refresh = 1; 1095 want_refresh = 1;
1182 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 ();
1183 } 1103 }
1184} 1104}
1185#endif 1105#endif
1186 1106
1187#if LINUX_YIELD_HACK 1107#if LINUX_YIELD_HACK
1188static struct event_handler 1108static struct event_handler
1189{ 1109{
1190 check_watcher yield_ev; 1110 ev::prepare yield_ev;
1191 1111
1192 void yield_cb (check_watcher &w) 1112 void yield_cb (ev::prepare &w, int revents)
1193 { 1113 {
1194 // this should really be sched_yield(), but the linux guys thought 1114 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than 1115 // that giving a process calling sched_yield () less cpu time than
1196 // 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
1197 // 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.
1198 1121
1199 struct timespec ts = { 0, 0 }; 1122 struct timespec ts = { 0, 1000 };
1200 nanosleep (&ts, 0); 1123 nanosleep (&ts, 0);
1201 1124
1202 w.stop (); 1125 w.stop ();
1203 } 1126 }
1204 1127
… …
1207 { 1130 {
1208 } 1131 }
1209} event_handler; 1132} event_handler;
1210#endif 1133#endif
1211 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
1212bool 1168bool
1213rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1214{ 1170{
1215 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 cmdbuf_reify ();
1216 1172
1217 if (CBUFSIZ == n) 1173 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1218 { 1174
1219 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1175 if (!avail)
1220 n = 0;
1221 } 1176 {
1222 1177 // normally this indicates a "too long" command sequence - just drop the data we have
1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
1224 cmdbuf_ptr = cmdbuf_base; 1178 cmdbuf_ptr = cmdbuf_base;
1225 cmdbuf_endp = cmdbuf_ptr + n; 1179 cmdbuf_endp = cmdbuf_ptr;
1180 avail = CBUFSIZ;
1181 }
1226 1182
1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1228 1184
1229 if (r > 0) 1185 if (r > 0)
1230 { 1186 {
1231 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1232 return true; 1188 return true;
… …
1248 1204
1249 return false; 1205 return false;
1250} 1206}
1251 1207
1252void 1208void
1253rxvt_term::pty_cb (io_watcher &w, short revents) 1209rxvt_term::pty_cb (ev::io &w, int revents)
1254{ 1210{
1255 make_current (); 1211 make_current ();
1256 1212
1257 if (revents & EVENT_READ) 1213 if (revents & ev::READ)
1258 // loop, but don't allow a single term to monopolize us 1214 // loop, but don't allow a single term to monopolize us
1259 while (pty_fill ()) 1215 for (int i = CBUFCNT; i-- && pty_fill (); )
1260 if (cmd_parse ()) 1216 cmd_parse ();
1261 break;
1262 1217
1263 if (revents & EVENT_WRITE) 1218 if (revents & ev::WRITE)
1264 pty_write (); 1219 pty_write ();
1265}
1266 1220
1267void 1221 refresh_check ();
1222}
1223
1224void ecb_cold
1268rxvt_term::pointer_unblank () 1225rxvt_term::pointer_unblank ()
1269{ 1226{
1270 XDefineCursor (dpy, vt, TermWin_cursor); 1227 XDefineCursor (dpy, vt, TermWin_cursor);
1271 recolour_cursor (); 1228 recolour_cursor ();
1272 1229
1273#ifdef POINTER_BLANK 1230#ifdef POINTER_BLANK
1274 hidden_pointer = 0; 1231 hidden_pointer = 0;
1275 1232
1276 if (option (Opt_pointerBlank)) 1233 if (option (Opt_pointerBlank))
1277 pointer_ev.start (NOW + pointerBlankDelay); 1234 pointer_ev.start (pointerBlankDelay);
1278#endif 1235#endif
1279} 1236}
1280 1237
1281#ifdef POINTER_BLANK 1238#ifdef POINTER_BLANK
1282void 1239void ecb_cold
1283rxvt_term::pointer_blank () 1240rxvt_term::pointer_blank ()
1284{ 1241{
1285 if (!option (Opt_pointerBlank)) 1242 if (!option (Opt_pointerBlank))
1286 return; 1243 return;
1287 1244
… …
1289 XFlush (dpy); 1246 XFlush (dpy);
1290 1247
1291 hidden_pointer = 1; 1248 hidden_pointer = 1;
1292} 1249}
1293 1250
1294void 1251void ecb_cold
1295rxvt_term::pointer_cb (time_watcher &w) 1252rxvt_term::pointer_cb (ev::timer &w, int revents)
1296{ 1253{
1297 make_current (); 1254 make_current ();
1298 1255
1299 pointer_blank (); 1256 pointer_blank ();
1300} 1257}
… …
1303void 1260void
1304rxvt_term::mouse_report (XButtonEvent &ev) 1261rxvt_term::mouse_report (XButtonEvent &ev)
1305{ 1262{
1306 int button_number, key_state = 0; 1263 int button_number, key_state = 0;
1307 int x, y; 1264 int x, y;
1265 int code = 32;
1308 1266
1309 x = ev.x; 1267 x = Pixel2Col (ev.x) + 1;
1310 y = ev.y; 1268 y = Pixel2Row (ev.y) + 1;
1311 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 }
1312 1279
1313 if (MEvent.button == AnyButton) 1280 if (MEvent.button == AnyButton)
1314 button_number = 3; 1281 button_number = 3;
1315 else 1282 else
1316 { 1283 {
1317 button_number = MEvent.button - Button1; 1284 button_number = MEvent.button - Button1;
1318 /* add 0x3D for wheel events, like xterm does */ 1285 /* add 0x3D for wheel events, like xterm does */
1319 if (button_number >= 3) 1286 if (button_number >= 3)
1320 button_number += (64 - 3); 1287 button_number += 64 - 3;
1321 } 1288 }
1322 1289
1323 if (priv_modes & PrivMode_MouseX10) 1290 if (priv_modes & PrivMode_MouseX10)
1324 { 1291 {
1325 /* 1292 /*
… …
1357 fputc ('A', stderr); 1324 fputc ('A', stderr);
1358 if (key_state & 32) 1325 if (key_state & 32)
1359 fputc ('2', stderr); 1326 fputc ('2', stderr);
1360 fprintf (stderr, "]: <%d>, %d/%d\n", 1327 fprintf (stderr, "]: <%d>, %d/%d\n",
1361 button_number, 1328 button_number,
1362 x + 1, 1329 x,
1363 y + 1); 1330 y);
1364#endif 1331#endif
1365 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
1366 tt_printf ("\033[M%c%c%c", 1346 tt_printf ("\033[M%c%c%c",
1367 (32 + button_number + key_state), 1347 code + button_number + key_state,
1368 (32 + x + 1), 1348 32 + x,
1369 (32 + y + 1)); 1349 32 + y);
1370} 1350}
1371 1351
1372/*{{{ process an X event */ 1352/*{{{ process an X event */
1373void 1353void ecb_hot
1374rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
1375{ 1355{
1376 make_current (); 1356 make_current ();
1377 1357
1378 dLocal (Display *, dpy); 1358 dLocal (Display *, dpy);
… …
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1414 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out (); 1415 focus_out ();
1436 } 1416 }
1437#endif 1417#endif
1438 } 1418 }
1439 break;
1440
1441 case MappingNotify:
1442 XRefreshKeyboardMapping (&ev.xmapping);
1443 break; 1419 break;
1444 1420
1445 /* 1421 /*
1446 * XXX: this is not the _current_ arrangement 1422 * XXX: this is not the _current_ arrangement
1447 * Here's my conclusion: 1423 * Here's my conclusion:
… …
1480 && ev.xfocus.mode != NotifyGrab) 1456 && ev.xfocus.mode != NotifyGrab)
1481 focus_out (); 1457 focus_out ();
1482 break; 1458 break;
1483 1459
1484 case ConfigureNotify: 1460 case ConfigureNotify:
1485 if (ev.xconfigure.window == parent[0]) 1461 if (ev.xconfigure.window == parent)
1486 { 1462 {
1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488 ; 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
1489 1484
1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1491 { 1486 {
1492 seen_resize = 1; 1487 seen_resize = 1;
1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND
1495 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1498 scr_touch (true);
1499 }
1500#endif
1501 } 1489 }
1490 else
1491 {
1492#ifdef HAVE_BG_PIXMAP
1493 if (moved)
1494 update_background ();
1495#endif
1496 }
1502 1497
1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505#ifdef TRANSPARENT
1506 if (option (Opt_transparent))
1507 check_our_parents ();
1508#endif
1509 } 1499 }
1510 break; 1500 break;
1511 1501
1512 case PropertyNotify: 1502 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1503 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1515 && ev.xproperty.state == PropertyNewValue)
1516 selection_property (ev.xproperty.window, ev.xproperty.atom);
1517
1518 break; 1504 break;
1519 1505
1520 case SelectionClear: 1506 case SelectionClear:
1521 selection_clear (); 1507 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1522 break;
1523
1524 case SelectionNotify:
1525 if (selection_wait == Sel_normal)
1526 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1527 break; 1508 break;
1528 1509
1529 case SelectionRequest: 1510 case SelectionRequest:
1530 selection_send (ev.xselectionrequest); 1511 selection_send (ev.xselectionrequest);
1531 break; 1512 break;
1532 1513
1533 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
1534 mapped = 1; 1531 mapped = 1;
1535#ifdef TEXT_BLINK 1532#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1533 text_blink_ev.start ();
1537#endif 1534#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1535 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break; 1536 break;
1540 1537
1541 case UnmapNotify: 1538 case UnmapNotify:
… …
1543#ifdef TEXT_BLINK 1540#ifdef TEXT_BLINK
1544 text_blink_ev.stop (); 1541 text_blink_ev.stop ();
1545#endif 1542#endif
1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1543 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break; 1544 break;
1548
1549#ifdef TRANSPARENT
1550 case ReparentNotify:
1551 rootwin_cb (ev);
1552 break;
1553#endif /* TRANSPARENT */
1554 1545
1555 case GraphicsExpose: 1546 case GraphicsExpose:
1556 case Expose: 1547 case Expose:
1557 if (ev.xany.window == vt) 1548 if (ev.xany.window == vt)
1558 { 1549 {
1559 do 1550 do
1551 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1554 }
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1556
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1558
1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1560 {
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1561 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1562 ev.xexpose.width, ev.xexpose.height, false);
1563 }
1569 1564
1570 want_refresh = 1; 1565 want_refresh = 1;
1571 } 1566 }
1572 else 1567 else
1573 { 1568 {
… …
1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1577 ; 1572 ;
1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1579 ; 1574 ;
1580 1575
1581 if (isScrollbarWindow (ev.xany.window)) 1576 if (scrollBar.state && ev.xany.window == scrollBar.win)
1582 { 1577 {
1583 scrollBar.setIdle (); 1578 scrollBar.state = SB_STATE_IDLE;
1584 scrollbar_show (0); 1579 scrollBar.show (0);
1585 } 1580 }
1586
1587#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (dpy, ev.xany.window);
1590#endif
1591 } 1581 }
1592 break; 1582 break;
1593 1583
1594 case MotionNotify: 1584 case MotionNotify:
1595#ifdef POINTER_BLANK 1585#ifdef POINTER_BLANK
1596 if (hidden_pointer) 1586 if (hidden_pointer)
1597 pointer_unblank (); 1587 pointer_unblank ();
1598#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);
1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1600 break; 1593 break;
1601 1594
1602 if (ev.xany.window == vt) 1595 if (ev.xany.window == vt)
1603 { 1596 {
… …
1637 int dist; 1630 int dist;
1638 1631
1639 /* don't clobber the current delay if we are 1632 /* don't clobber the current delay if we are
1640 * already in the middle of scrolling. 1633 * already in the middle of scrolling.
1641 */ 1634 */
1642 if (!sel_scroll_ev.active) 1635 if (!sel_scroll_ev.is_active ())
1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1636 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1644 1637
1645 /* save the event params so we can highlight 1638 /* save the event params so we can highlight
1646 * the selection in the pending-scroll loop 1639 * the selection in the pending-scroll loop
1647 */ 1640 */
1648 selection_save_x = ev.xbutton.x; 1641 selection_save_x = ev.xbutton.x;
… …
1656 dist = int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1657 } 1650 }
1658 else 1651 else
1659 { 1652 {
1660 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1661 dist = ev.xbutton.y - (int_bwidth + height); 1654 dist = ev.xbutton.y - (int_bwidth + vt_height);
1662 } 1655 }
1663 1656
1664 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1665 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1666 + 1; 1659 + 1;
… …
1670 else 1663 else
1671 { 1664 {
1672 /* we are within the text window, so we 1665 /* we are within the text window, so we
1673 * shouldn't be scrolling 1666 * shouldn't be scrolling
1674 */ 1667 */
1675 if (sel_scroll_ev.active)
1676 sel_scroll_ev.stop(); 1668 sel_scroll_ev.stop();
1677 } 1669 }
1678#endif 1670#endif
1679#ifdef MOUSE_THRESHOLD 1671#ifdef MOUSE_THRESHOLD
1680 } 1672 }
1681#endif 1673#endif
1682 } 1674 }
1683 } 1675 }
1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1685 { 1677 {
1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1687 MotionNotify, &ev)) 1679 MotionNotify, &ev))
1688 ; 1680 ;
1689 1681
1690 XQueryPointer (dpy, scrollBar.win, 1682 XQueryPointer (dpy, scrollBar.win,
1691 &unused_root, &unused_child, 1683 &unused_root, &unused_child,
1692 &unused_root_x, &unused_root_y, 1684 &unused_root_x, &unused_root_y,
1693 &ev.xbutton.x, &ev.xbutton.y, 1685 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1686 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1687 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1696 scrollbar_size ()); 1688 scrollBar.size ());
1697 want_refresh = 1; 1689 want_refresh = 1;
1698 refresh_limit = 0;
1699 scrollbar_show (1); 1690 scrollBar.show (1);
1700 } 1691 }
1701 break; 1692 break;
1702 } 1693 }
1703 1694
1704#if defined(CURSOR_BLINK) 1695#if defined(CURSOR_BLINK)
1705 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1696 if (ev.type == KeyPress)
1706 { 1697 cursor_blink_reset ();
1707 if (hidden_cursor)
1708 {
1709 hidden_cursor = 0;
1710 want_refresh = 1;
1711 }
1712
1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1714 }
1715#endif 1698#endif
1716 1699
1717#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1719 { 1702 {
… …
1725 1708
1726 if (ev.type == KeyPress && hidden_pointer == 0) 1709 if (ev.type == KeyPress && hidden_pointer == 0)
1727 pointer_blank (); 1710 pointer_blank ();
1728 } 1711 }
1729#endif 1712#endif
1730}
1731 1713
1732void 1714 refresh_check ();
1715}
1716
1717#if ENABLE_FRILLS
1718void ecb_cold
1719rxvt_term::set_urgency (bool enable)
1720{
1721 if (enable == urgency_hint)
1722 return;
1723
1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1725 {
1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1727 XSetWMHints (dpy, parent, h);
1728 urgency_hint = enable;
1729 XFree (h);
1730 }
1731}
1732#endif
1733
1734void ecb_cold
1733rxvt_term::focus_in () 1735rxvt_term::focus_in ()
1734{ 1736{
1735 if (!focus) 1737 if (!focus)
1736 { 1738 {
1737 focus = 1; 1739 focus = 1;
1738 want_refresh = 1; 1740 want_refresh = 1;
1739 1741
1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1741
1742#if USE_XIM 1742#if USE_XIM
1743 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1744 { 1744 {
1745 IMSetPosition (); 1745 im_set_position ();
1746 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1747 } 1747 }
1748#endif 1748#endif
1749#if CURSOR_BLINK 1749#if CURSOR_BLINK
1750 if (option (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1751 cursor_blink_ev.again ();
1752#endif 1752#endif
1753#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1755 { 1755 {
1756 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1757 scr_recolour (); 1757 scr_recolour ();
1758 } 1758 }
1759#endif 1759#endif
1760#if ENABLE_FRILLS 1760#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell)) 1761 if (option (Opt_urgentOnBell))
1762 { 1762 set_urgency (0);
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]);
1766 if (h != NULL)
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1771 }
1772#endif 1763#endif
1773 }
1774}
1775 1764
1776void 1765 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1766 }
1767}
1768
1769void ecb_cold
1777rxvt_term::focus_out () 1770rxvt_term::focus_out ()
1778{ 1771{
1779 if (focus) 1772 if (focus)
1780 { 1773 {
1781 focus = 0; 1774 focus = 0;
1782 want_refresh = 1; 1775 want_refresh = 1;
1783 1776
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1777#if ENABLE_FRILLS
1785 1778 if (option (Opt_urgentOnBell))
1779 set_urgency (0);
1780#endif
1786#if ENABLE_FRILLS || ISO_14755 1781#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf) 1782 if (iso14755buf)
1788 { 1783 {
1789 iso14755buf = 0; 1784 iso14755buf = 0;
1790# if ENABLE_OVERLAY 1785# if ISO_14755
1791 scr_overlay_off (); 1786 scr_overlay_off ();
1792# endif 1787# endif
1793 } 1788 }
1794#endif 1789#endif
1795#if USE_XIM 1790#if USE_XIM
… …
1797 XUnsetICFocus (Input_Context); 1792 XUnsetICFocus (Input_Context);
1798#endif 1793#endif
1799#if CURSOR_BLINK 1794#if CURSOR_BLINK
1800 if (option (Opt_cursorBlink)) 1795 if (option (Opt_cursorBlink))
1801 cursor_blink_ev.stop (); 1796 cursor_blink_ev.stop ();
1797
1802 hidden_cursor = 0; 1798 hidden_cursor = 0;
1803#endif 1799#endif
1804#if OFF_FOCUS_FADING 1800#if OFF_FOCUS_FADING
1805 if (rs[Rs_fade]) 1801 if (rs[Rs_fade])
1806 { 1802 {
1807 pix_colors = pix_colors_unfocused; 1803 pix_colors = pix_colors_unfocused;
1808 scr_recolour (); 1804 scr_recolour ();
1809 } 1805 }
1810#endif 1806#endif
1811 }
1812}
1813 1807
1814void 1808 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1809 }
1810}
1811
1812void ecb_cold
1815rxvt_term::update_fade_color (unsigned int idx) 1813rxvt_term::update_fade_color (unsigned int idx)
1816{ 1814{
1817#if OFF_FOCUS_FADING 1815#if OFF_FOCUS_FADING
1818 if (rs[Rs_fade]) 1816 if (rs[Rs_fade])
1819 { 1817 {
… …
1822 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);
1823 } 1821 }
1824#endif 1822#endif
1825} 1823}
1826 1824
1827#if TRANSPARENT || ENABLE_PERL 1825#if ENABLE_TRANSPARENCY || ENABLE_PERL
1828void 1826void ecb_hot
1829rxvt_term::rootwin_cb (XEvent &ev) 1827rxvt_term::rootwin_cb (XEvent &ev)
1830{ 1828{
1831 make_current (); 1829 make_current ();
1832 1830
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1832 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return; 1833 return;
1836 1834
1837# if TRANSPARENT 1835# if ENABLE_TRANSPARENCY
1838 switch (ev.type) 1836 switch (ev.type)
1839 { 1837 {
1840 case PropertyNotify: 1838 case PropertyNotify:
1841 /* 1839 /*
1842 * 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,
1843 * 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.
1844 */ 1842 */
1845 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1843 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1844 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1847 return; 1845 {
1846 bg_set_root_pixmap ();
1847 update_background ();
1848 }
1848 1849
1849 /* FALLTHROUGH */
1850 case ReparentNotify:
1851 if (option (Opt_transparent))
1852 check_our_parents ();
1853 break; 1850 break;
1854 } 1851 }
1855# endif 1852# endif
1853
1854 refresh_check ();
1856} 1855}
1857#endif 1856#endif
1858 1857
1859void 1858void
1860rxvt_term::button_press (XButtonEvent &ev) 1859rxvt_term::button_press (XButtonEvent &ev)
… …
1891 /* save the xbutton state (for ButtonRelease) */ 1890 /* save the xbutton state (for ButtonRelease) */
1892 MEvent.state = ev.state; 1891 MEvent.state = ev.state;
1893#ifdef MOUSE_REPORT_DOUBLECLICK 1892#ifdef MOUSE_REPORT_DOUBLECLICK
1894 if (ev.button == MEvent.button && clickintime) 1893 if (ev.button == MEvent.button && clickintime)
1895 { 1894 {
1896 /* same button, within alloted time */ 1895 /* same button, within allowed time */
1897 MEvent.clicks++; 1896 MEvent.clicks++;
1898 1897
1899 if (MEvent.clicks > 1) 1898 if (MEvent.clicks > 1)
1900 { 1899 {
1901 /* only report double clicks */ 1900 /* only report double clicks */
… …
1915 mouse_report (ev); 1914 mouse_report (ev);
1916 } 1915 }
1917#else 1916#else
1918 MEvent.button = ev.button; 1917 MEvent.button = ev.button;
1919 mouse_report (ev); 1918 mouse_report (ev);
1920#endif /* MOUSE_REPORT_DOUBLECLICK */ 1919#endif /* MOUSE_REPORT_DOUBLECLICK */
1921 1920
1922 } 1921 }
1923 else 1922 else
1924 { 1923 {
1925 if (ev.button != MEvent.button) 1924 if (ev.button != MEvent.button)
… …
1973 } 1972 }
1974 1973
1975 /* 1974 /*
1976 * Scrollbar window processing of button press 1975 * Scrollbar window processing of button press
1977 */ 1976 */
1978 if (isScrollbarWindow (ev.window)) 1977 if (scrollBar.state && ev.window == scrollBar.win)
1979 { 1978 {
1980 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;
1981 /* 1987 /*
1982 * Rxvt-style scrollbar: 1988 * Rxvt-style scrollbar:
1983 * move up if mouse is above slider 1989 * move up if mouse is above slider
1984 * move dn if mouse is below slider 1990 * move dn if mouse is below slider
1985 * 1991 *
… …
1994 /* 2000 /*
1995 * Mouse report disabled scrollbar: 2001 * Mouse report disabled scrollbar:
1996 * arrow buttons - send up/down 2002 * arrow buttons - send up/down
1997 * click on scrollbar - send pageup/down 2003 * click on scrollbar - send pageup/down
1998 */ 2004 */
1999 if ((scrollBar.style == R_SB_NEXT 2005 if (direction == UP)
2000 && scrollbarnext_upButton (ev.y))
2001 || (scrollBar.style == R_SB_RXVT
2002 && scrollbarrxvt_upButton (ev.y)))
2003 tt_printf ("\033[A"); 2006 tt_printf ("\033[A");
2004 else if ((scrollBar.style == R_SB_NEXT 2007 else if (direction == DN)
2005 && scrollbarnext_dnButton (ev.y))
2006 || (scrollBar.style == R_SB_RXVT
2007 && scrollbarrxvt_dnButton (ev.y)))
2008 tt_printf ("\033[B"); 2008 tt_printf ("\033[B");
2009 else 2009 else
2010 switch (ev.button) 2010 switch (ev.button)
2011 { 2011 {
2012 case Button2: 2012 case Button2:
… …
2019 tt_printf ("\033[5~"); 2019 tt_printf ("\033[5~");
2020 break; 2020 break;
2021 } 2021 }
2022 } 2022 }
2023 else 2023 else
2024#endif /* NO_SCROLLBAR_REPORT */ 2024#endif /* NO_SCROLLBAR_REPORT */
2025
2026 {
2027 char upordown = 0;
2028
2029 if (scrollBar.style == R_SB_NEXT)
2030 { 2025 {
2031 if (scrollbarnext_upButton (ev.y)) 2026 if (direction != NO_DIR)
2032 upordown = -1; /* up */
2033 else if (scrollbarnext_dnButton (ev.y))
2034 upordown = 1; /* down */
2035 }
2036 else if (scrollBar.style == R_SB_RXVT)
2037 {
2038 if (scrollbarrxvt_upButton (ev.y))
2039 upordown = -1; /* up */
2040 else if (scrollbarrxvt_dnButton (ev.y))
2041 upordown = 1; /* down */
2042 }
2043 if (upordown)
2044 { 2027 {
2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2028#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2029 if (!cont_scroll_ev.is_active ())
2046 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2030 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2047#endif 2031#endif
2048 if (scr_page (upordown < 0 ? UP : DN, 1)) 2032 if (scr_page (direction, 1))
2049 { 2033 {
2050 if (upordown < 0) 2034 if (direction == UP)
2051 scrollBar.setUp (); 2035 scrollBar.state = SB_STATE_UP;
2052 else 2036 else
2053 scrollBar.setDn (); 2037 scrollBar.state = SB_STATE_DOWN;
2054 } 2038 }
2055 } 2039 }
2056 else 2040 else
2057 switch (ev.button) 2041 switch (ev.button)
2058 { 2042 {
2059 case Button2: 2043 case Button2:
2060 switch (scrollbar_align) 2044 switch (scrollBar.align)
2061 { 2045 {
2062 case R_SB_ALIGN_TOP: 2046 case SB_ALIGN_TOP:
2063 csrO = 0; 2047 csrO = 0;
2064 break; 2048 break;
2065 case R_SB_ALIGN_CENTRE: 2049 case SB_ALIGN_CENTRE:
2066 csrO = (scrollBar.bot - scrollBar.top) / 2; 2050 csrO = (scrollBar.bot - scrollBar.top) / 2;
2067 break; 2051 break;
2068 case R_SB_ALIGN_BOTTOM: 2052 case SB_ALIGN_BOTTOM:
2069 csrO = scrollBar.bot - scrollBar.top; 2053 csrO = scrollBar.bot - scrollBar.top;
2070 break; 2054 break;
2071 } 2055 }
2072 2056
2073 if (scrollBar.style == R_SB_XTERM 2057 if (scrollBar.style == SB_STYLE_XTERM
2074 || scrollbar_above_slider (ev.y) 2058 || scrollBar.above_slider (ev.y)
2075 || scrollbar_below_slider (ev.y)) 2059 || scrollBar.below_slider (ev.y))
2076 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2060 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2077 2061
2078 scrollBar.setMotion (); 2062 scrollBar.state = SB_STATE_MOTION;
2079 break; 2063 break;
2080 2064
2081 case Button1: 2065 case Button1:
2082 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2066 if (scrollBar.align == SB_ALIGN_CENTRE)
2083 csrO = ev.y - scrollBar.top; 2067 csrO = ev.y - scrollBar.top;
2084 /* FALLTHROUGH */ 2068 /* FALLTHROUGH */
2085 2069
2086 case Button3: 2070 case Button3:
2087 if (scrollBar.style != R_SB_XTERM) 2071 if (scrollBar.style != SB_STYLE_XTERM)
2088 { 2072 {
2089 if (scrollbar_above_slider (ev.y)) 2073 if (scrollBar.above_slider (ev.y))
2090# ifdef RXVT_SCROLL_FULL 2074# ifdef RXVT_SCROLL_FULL
2091 scr_page (UP, nrow - 1); 2075 scr_page (UP, nrow - 1);
2092# else 2076# else
2093 scr_page (UP, nrow / 4); 2077 scr_page (UP, nrow / 4);
2094# endif 2078# endif
2095 else if (scrollbar_below_slider (ev.y)) 2079 else if (scrollBar.below_slider (ev.y))
2096# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
2097 scr_page (DN, nrow - 1); 2081 scr_page (DN, nrow - 1);
2098# else 2082# else
2099 scr_page (DN, nrow / 4); 2083 scr_page (DN, nrow / 4);
2100# endif 2084# endif
2101 else 2085 else
2102 scrollBar.setMotion (); 2086 scrollBar.state = SB_STATE_MOTION;
2103 } 2087 }
2104 else 2088 else
2105 { 2089 {
2106 scr_page ((ev.button == Button1 ? DN : UP), 2090 scr_page ((ev.button == Button1 ? DN : UP),
2107 (nrow 2091 (nrow
2108 * scrollbar_position (ev.y) 2092 * scrollBar.position (ev.y)
2109 / scrollbar_size ())); 2093 / scrollBar.size ()));
2110 } 2094 }
2111 2095
2112 break; 2096 break;
2113 } 2097 }
2114 } 2098 }
… …
2124 2108
2125 csrO = 0; /* reset csr Offset */ 2109 csrO = 0; /* reset csr Offset */
2126 if (!bypass_keystate) 2110 if (!bypass_keystate)
2127 reportmode = !! (priv_modes & PrivMode_mouse_report); 2111 reportmode = !! (priv_modes & PrivMode_mouse_report);
2128 2112
2129 if (scrollbar_isUpDn ()) 2113 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2130 { 2114 {
2131 scrollBar.setIdle (); 2115 scrollBar.state = SB_STATE_IDLE;
2132 scrollbar_show (0); 2116 scrollBar.show (0);
2133 } 2117 }
2134 2118
2135#ifdef SELECTION_SCROLLING 2119#ifdef SELECTION_SCROLLING
2136 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop(); 2120 sel_scroll_ev.stop();
2138#endif 2121#endif
2139 2122
2140 if (ev.window == vt) 2123 if (ev.window == vt)
2141 { 2124 {
2142 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)))
… …
2166 mouse_report (ev); 2149 mouse_report (ev);
2167 } 2150 }
2168#else /* MOUSE_REPORT_DOUBLECLICK */ 2151#else /* MOUSE_REPORT_DOUBLECLICK */
2169 MEvent.button = AnyButton; 2152 MEvent.button = AnyButton;
2170 mouse_report (ev); 2153 mouse_report (ev);
2171#endif /* MOUSE_REPORT_DOUBLECLICK */ 2154#endif /* MOUSE_REPORT_DOUBLECLICK */
2172 return; 2155 return;
2173 } 2156 }
2174 2157
2175 /* 2158 /*
2176 * dumb hack to compensate for the failure of click-and-drag 2159 * dumb hack to compensate for the failure of click-and-drag
… …
2187 case Button3: 2170 case Button3:
2188 selection_make (ev.time); 2171 selection_make (ev.time);
2189 break; 2172 break;
2190 2173
2191 case Button2: 2174 case Button2:
2192 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?
2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2194 break; 2177 break;
2195 2178
2196#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2197 case Button4: 2180 case Button4:
2198 case Button5: 2181 case Button5:
… …
2214 { 2197 {
2215 mouse_slip_wheel_speed += v ? -1 : 1; 2198 mouse_slip_wheel_speed += v ? -1 : 1;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2199 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2200 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218 2201
2219 if (slip_wheel_ev.at < NOW) 2202 if (!slip_wheel_ev.is_active ())
2220 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2203 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2221
2222 slip_wheel_ev.start ();
2223 } 2204 }
2224 else 2205 else
2206# endif
2225 { 2207 {
2226# endif
2227 scr_page (v, i); 2208 scr_page (v, i);
2228 scrollbar_show (1); 2209 scrollBar.show (1);
2229# ifdef MOUSE_SLIP_WHEELING
2230 } 2210 }
2231# endif
2232 } 2211 }
2233 break; 2212 break;
2234#endif 2213#endif
2235 } 2214 }
2236 } 2215 }
2237} 2216}
2238 2217
2239/*}}} */ 2218/*}}} */
2240 2219
2241bool 2220void ecb_hot
2242rxvt_term::cmd_parse () 2221rxvt_term::cmd_parse ()
2243{ 2222{
2244 bool flag = false;
2245 wchar_t ch = NOCHAR; 2223 wchar_t ch = NOCHAR;
2246 char *seq_begin; // remember start of esc-sequence here 2224 char *seq_begin; // remember start of esc-sequence here
2247 2225
2248 for (;;) 2226 for (;;)
2249 { 2227 {
2250 if (ch == NOCHAR) 2228 if (ecb_unlikely (ch == NOCHAR))
2251 { 2229 {
2252 seq_begin = cmdbuf_ptr; 2230 seq_begin = cmdbuf_ptr;
2253 ch = next_char (); 2231 ch = next_char ();
2254 2232
2255 if (ch == NOCHAR) 2233 if (ch == NOCHAR)
2256 break; 2234 break;
2257 } 2235 }
2258 2236
2259 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))
2260 { 2238 {
2261 if (!seen_input) 2239 if (ecb_unlikely (!seen_input))
2262 { 2240 {
2263 seen_input = 1; 2241 seen_input = 1;
2264 // many badly-written programs (e.g. jed) contain a race condition: 2242 // many badly-written programs (e.g. jed) contain a race condition:
2265 // they first read the screensize and then install a SIGWINCH handler. 2243 // they first read the screensize and then install a SIGWINCH handler.
2266 // some window managers resize the window early, and these programs 2244 // some window managers resize the window early, and these programs
… …
2279 wchar_t *str = buf; 2257 wchar_t *str = buf;
2280 wchar_t *eol = str + min (ncol, UBUFSIZ); 2258 wchar_t *eol = str + min (ncol, UBUFSIZ);
2281 2259
2282 for (;;) 2260 for (;;)
2283 { 2261 {
2284 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)))
2285 break; 2263 break;
2286 2264
2287 *str++ = ch; 2265 *str++ = ch;
2288 2266
2289 if (ch == C0_LF || str >= eol) 2267 if (ecb_unlikely (ch == C0_LF || str >= eol))
2290 { 2268 {
2291 if (ch == C0_LF) 2269 if (ch == C0_LF)
2292 nlines++; 2270 nlines++;
2293 2271
2294 refresh_count++; 2272 refresh_count++;
2295 2273
2296 if (!option (Opt_jumpScroll) 2274 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2297 || (refresh_count >= refresh_limit * (nrow - 1)))
2298 { 2275 {
2299 refreshnow = true;
2300 refresh_count = 0; 2276 refresh_count = 0;
2277
2278 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2279 {
2280 refreshnow = true;
2301 ch = NOCHAR; 2281 ch = NOCHAR;
2302 break; 2282 break;
2283 }
2303 } 2284 }
2304 2285
2305 // scr_add_lines only works for nlines <= nrow - 1. 2286 // scr_add_lines only works for nlines <= nrow - 1.
2306 if (nlines >= nrow - 1) 2287 if (nlines >= nrow - 1)
2307 { 2288 {
… …
2335 && 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))))
2336 scr_add_lines (buf, str - buf, nlines); 2317 scr_add_lines (buf, str - buf, nlines);
2337 2318
2338 /* 2319 /*
2339 * 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
2340 * 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.
2341 * the number of pages between refreshes is refresh_limit, which 2322 * if skipScroll is enabled.
2342 * is incremented here because we must be doing flat-out scrolling.
2343 */ 2323 */
2344 if (refreshnow) 2324 if (refreshnow)
2345 { 2325 {
2346 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2347 refresh_limit++;
2348 else
2349 {
2350 flag = true;
2351 //TODO: due to popular request, implement "skipscroll" option here
2352 scr_refresh (); 2326 scr_refresh ();
2353 want_refresh = 1; 2327 want_refresh = 1;
2354 }
2355 } 2328 }
2356
2357 } 2329 }
2358 else 2330 else
2359 { 2331 {
2360 try 2332 try
2361 { 2333 {
… …
2369 } 2341 }
2370 2342
2371 ch = NOCHAR; 2343 ch = NOCHAR;
2372 } 2344 }
2373 } 2345 }
2374
2375 return flag;
2376} 2346}
2377 2347
2378// read the next character 2348// read the next character
2379wchar_t 2349wchar_t ecb_hot
2380rxvt_term::next_char () NOTHROW 2350rxvt_term::next_char () NOTHROW
2381{ 2351{
2382 while (cmdbuf_ptr < cmdbuf_endp) 2352 while (cmdbuf_ptr < cmdbuf_endp)
2383 { 2353 {
2384 // assume 7-bit to be ascii ALWAYS 2354 // assume 7-bit to be ascii ALWAYS
2385 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2355 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2386 return *cmdbuf_ptr++; 2356 return *cmdbuf_ptr++;
2387 2357
2388 wchar_t wc; 2358 wchar_t wc;
2389 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);
2390 2360
… …
2394 cmdbuf_ptr = cmdbuf_endp; 2364 cmdbuf_ptr = cmdbuf_endp;
2395 break; 2365 break;
2396 } 2366 }
2397 2367
2398 if (len == (size_t)-1) 2368 if (len == (size_t)-1)
2369 {
2370 mbstate.reset (); // reset now undefined conversion state
2399 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 }
2400 2373
2401 // assume wchar == unicode 2374 // assume wchar == unicode
2402 cmdbuf_ptr += len; 2375 cmdbuf_ptr += len;
2403 return wc & UNICODE_MASK; 2376 return wc & UNICODE_MASK;
2404 } 2377 }
2405 2378
2406 return NOCHAR; 2379 return NOCHAR;
2407} 2380}
2408 2381
2409// read the next octet 2382// read the next octet
2410uint32_t 2383uint32_t ecb_hot
2411rxvt_term::next_octet () NOTHROW 2384rxvt_term::next_octet () NOTHROW
2412{ 2385{
2413 return cmdbuf_ptr < cmdbuf_endp 2386 return cmdbuf_ptr < cmdbuf_endp
2414 ? (unsigned char)*cmdbuf_ptr++ 2387 ? (unsigned char)*cmdbuf_ptr++
2415 : NOCHAR; 2388 : NOCHAR;
2416} 2389}
2417 2390
2418static class out_of_input out_of_input; 2391static class out_of_input out_of_input;
2419 2392
2420/* rxvt_cmd_getc () - Return next input character */ 2393wchar_t ecb_hot
2421/*
2422 * Return the next input character after first passing any keyboard input
2423 * to the command.
2424 */
2425wchar_t
2426rxvt_term::cmd_getc () THROW ((class out_of_input)) 2394rxvt_term::cmd_getc () THROW ((class out_of_input))
2427{ 2395{
2428 wchar_t c = next_char (); 2396 wchar_t c = next_char ();
2429 2397
2430 if (c == NOCHAR) 2398 if (c == NOCHAR)
2431 throw out_of_input; 2399 throw out_of_input;
2432 2400
2433 return c; 2401 return c;
2434} 2402}
2435 2403
2436uint32_t 2404uint32_t ecb_hot
2437rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2405rxvt_term::cmd_get8 () THROW ((class out_of_input))
2438{ 2406{
2439 uint32_t c = next_octet (); 2407 uint32_t c = next_octet ();
2440 2408
2441 if (c == NOCHAR) 2409 if (c == NOCHAR)
… …
2445} 2413}
2446 2414
2447/*{{{ print pipe */ 2415/*{{{ print pipe */
2448/*----------------------------------------------------------------------*/ 2416/*----------------------------------------------------------------------*/
2449#ifdef PRINTPIPE 2417#ifdef PRINTPIPE
2450FILE * 2418FILE * ecb_cold
2451rxvt_term::popen_printer () 2419rxvt_term::popen_printer ()
2452{ 2420{
2453 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2421 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2454 2422
2455 if (stream == NULL) 2423 if (stream == NULL)
2456 rxvt_warn ("can't open printer pipe, not printing.\n"); 2424 rxvt_warn ("can't open printer pipe, not printing.\n");
2457 2425
2458 return stream; 2426 return stream;
2459} 2427}
2460 2428
2461int 2429int ecb_cold
2462rxvt_term::pclose_printer (FILE *stream) 2430rxvt_term::pclose_printer (FILE *stream)
2463{ 2431{
2464 fflush (stream); 2432 fflush (stream);
2465 return pclose (stream); 2433 return pclose (stream);
2466} 2434}
2467 2435
2468/* 2436/*
2469 * simulate attached vt100 printer 2437 * simulate attached vt100 printer
2470 */ 2438 */
2471void 2439void ecb_cold
2472rxvt_term::process_print_pipe () 2440rxvt_term::process_print_pipe ()
2473{ 2441{
2474 int done; 2442 FILE *fd = popen_printer ();
2475 FILE *fd;
2476 2443
2477 if ((fd = popen_printer ()) == NULL) 2444 if (!fd)
2478 return; 2445 return;
2479 2446
2480 /* 2447 /*
2481 * 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
2482 * is received. 2449 * is received.
2483 */ 2450 */
2484 for (done = 0; !done;) 2451 for (int done = 0; !done; )
2485 { 2452 {
2486 unsigned char buf[8]; 2453 unsigned char buf[8];
2487 unicode_t ch; 2454 unicode_t ch;
2488 unsigned int i, len; 2455 unsigned int i, len;
2489 2456
… …
2520 } 2487 }
2521 } 2488 }
2522 2489
2523 pclose_printer (fd); 2490 pclose_printer (fd);
2524} 2491}
2525#endif /* PRINTPIPE */ 2492#endif /* PRINTPIPE */
2526/*}}} */ 2493/*}}} */
2527 2494
2528/* *INDENT-OFF* */
2529enum { 2495enum {
2530 C1_40 = 0x40, 2496 C1_40 = 0x40,
2531 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,
2532 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,
2533 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,
2534 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,
2535}; 2501};
2536/* *INDENT-ON* */
2537 2502
2538/*{{{ process non-printing single characters */ 2503/*{{{ process non-printing single characters */
2539void 2504void ecb_hot
2540rxvt_term::process_nonprinting (unicode_t ch) 2505rxvt_term::process_nonprinting (unicode_t ch)
2541{ 2506{
2542 switch (ch) 2507 switch (ch)
2543 { 2508 {
2544 case C0_ESC: 2509 case C0_ESC:
… …
2580 process_dcs_seq (); 2545 process_dcs_seq ();
2581 break; 2546 break;
2582 case 0x9b: /* CSI */ 2547 case 0x9b: /* CSI */
2583 process_csi_seq (); 2548 process_csi_seq ();
2584 break; 2549 break;
2585 case 0x9d: /* CSI */ 2550 case 0x9d: /* OSC */
2586 process_osc_seq (); 2551 process_osc_seq ();
2587 break; 2552 break;
2588#endif 2553#endif
2589 } 2554 }
2590} 2555}
2591/*}}} */ 2556/*}}} */
2592 2557
2593 2558
2594/*{{{ process VT52 escape sequences */ 2559/*{{{ process VT52 escape sequences */
2595void 2560void ecb_cold
2596rxvt_term::process_escape_vt52 (unicode_t ch) 2561rxvt_term::process_escape_vt52 (unicode_t ch)
2597{ 2562{
2598 int row, col; 2563 int row, col;
2599 2564
2600 switch (ch) 2565 switch (ch)
… …
2634 break; 2599 break;
2635 case 'Z': /* identify the terminal type */ 2600 case 'Z': /* identify the terminal type */
2636 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2637 break; 2602 break;
2638 case '<': /* turn off VT52 mode */ 2603 case '<': /* turn off VT52 mode */
2639 PrivMode (0, PrivMode_vt52); 2604 priv_modes &= ~PrivMode_vt52;
2640 break; 2605 break;
2641 case 'F': /* use special graphics character set */ 2606 case 'F': /* use special graphics character set */
2642 case 'G': /* use regular character set */ 2607 case 'G': /* use regular character set */
2643 /* unimplemented */ 2608 /* unimplemented */
2644 break; 2609 break;
… …
2650} 2615}
2651/*}}} */ 2616/*}}} */
2652 2617
2653 2618
2654/*{{{ process escape sequences */ 2619/*{{{ process escape sequences */
2655void 2620void ecb_hot
2656rxvt_term::process_escape_seq () 2621rxvt_term::process_escape_seq ()
2657{ 2622{
2658 unicode_t ch = cmd_getc (); 2623 unicode_t ch = cmd_getc ();
2659 2624
2660 if (priv_modes & PrivMode_vt52) 2625 if (priv_modes & PrivMode_vt52)
… …
2663 return; 2628 return;
2664 } 2629 }
2665 2630
2666 switch (ch) 2631 switch (ch)
2667 { 2632 {
2668 /* case 1: do_tek_mode (); break; */
2669 case '#': 2633 case '#':
2670 if (cmd_getc () == '8') 2634 if (cmd_getc () == '8')
2671 scr_E (); 2635 scr_E ();
2672 break; 2636 break;
2673 case '(': 2637 case '(':
… …
2696#if !ENABLE_MINIMAL 2660#if !ENABLE_MINIMAL
2697 case '9': 2661 case '9':
2698 scr_forwardindex (); 2662 scr_forwardindex ();
2699 break; 2663 break;
2700#endif 2664#endif
2665 // DECPAM/DECPNM
2701 case '=': 2666 case '=':
2667 priv_modes |= PrivMode_aplKP;
2668 break;
2702 case '>': 2669 case '>':
2703 PrivMode ((ch == '='), PrivMode_aplKP); 2670 priv_modes &= ~PrivMode_aplKP;
2704 break; 2671 break;
2705 2672
2706 case C1_40: 2673 case C1_40:
2707 cmd_getc (); 2674 cmd_getc ();
2708 break; 2675 break;
… …
2712 2679
2713 /* 8.3.87: NEXT LINE */ 2680 /* 8.3.87: NEXT LINE */
2714 case C1_NEL: /* ESC E */ 2681 case C1_NEL: /* ESC E */
2715 { 2682 {
2716 wchar_t nlcr[] = { C0_LF, C0_CR }; 2683 wchar_t nlcr[] = { C0_LF, C0_CR };
2717 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2684 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2718 } 2685 }
2719 break; 2686 break;
2720 2687
2721 /* kidnapped escape sequence: Should be 8.3.48 */ 2688 /* kidnapped escape sequence: Should be 8.3.48 */
2722 case C1_ESA: /* ESC G */ 2689 case C1_ESA: /* ESC G */
2723 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 */
2724 break; 2693 break;
2725 2694
2726 /* 8.3.63: CHARACTER TABULATION SET */ 2695 /* 8.3.63: CHARACTER TABULATION SET */
2727 case C1_HTS: /* ESC H */ 2696 case C1_HTS: /* ESC H */
2728 scr_set_tab (1); 2697 scr_set_tab (1);
… …
2732 case C1_RI: /* ESC M */ 2701 case C1_RI: /* ESC M */
2733 scr_index (DN); 2702 scr_index (DN);
2734 break; 2703 break;
2735 2704
2736 /* 8.3.142: SINGLE-SHIFT TWO */ 2705 /* 8.3.142: SINGLE-SHIFT TWO */
2737 /*case C1_SS2: scr_single_shift (2); break; */ 2706 /* case C1_SS2: break; */
2738 2707
2739 /* 8.3.143: SINGLE-SHIFT THREE */ 2708 /* 8.3.143: SINGLE-SHIFT THREE */
2740 /*case C1_SS3: scr_single_shift (3); break; */ 2709 /* case C1_SS3: break; */
2741 2710
2742 /* 8.3.27: DEVICE CONTROL STRING */ 2711 /* 8.3.27: DEVICE CONTROL STRING */
2743 case C1_DCS: /* ESC P */ 2712 case C1_DCS: /* ESC P */
2744 process_dcs_seq (); 2713 process_dcs_seq ();
2745 break; 2714 break;
… …
2747 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2716 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2748 case C1_SCI: /* ESC Z */ 2717 case C1_SCI: /* ESC Z */
2749 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2718 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2750 break; /* steal obsolete ESC [ c */ 2719 break; /* steal obsolete ESC [ c */
2751 2720
2752 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2721 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2753 case C1_CSI: /* ESC [ */ 2722 case C1_CSI: /* ESC [ */
2754 process_csi_seq (); 2723 process_csi_seq ();
2755 break; 2724 break;
2756 2725
2757 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2726 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2758 case C1_OSC: /* ESC ] */ 2727 case C1_OSC: /* ESC ] */
2759 process_osc_seq (); 2728 process_osc_seq ();
2760 break; 2729 break;
2761 2730
2762 /* 8.3.106: RESET TO INITIAL STATE */ 2731 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2763 case 'c': 2732 case 'c':
2764 mbstate.reset (); 2733 mbstate.reset ();
2765 scr_poweron (); 2734 scr_poweron ();
2766 scrollbar_show (1); 2735 scrollBar.show (1);
2767 break; 2736 break;
2768 2737
2769 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2738 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2770 case 'n': 2739 case 'n':
2771 scr_charset_choose (2); 2740 scr_charset_choose (2);
… …
2778 } 2747 }
2779} 2748}
2780/*}}} */ 2749/*}}} */
2781 2750
2782/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2751/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2783/* *INDENT-OFF* */
2784enum { 2752enum {
2785 CSI_ICH = 0x40, 2753 CSI_ICH = 0x40,
2786 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,
2787 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 ,
2788 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,
… …
2791 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,
2792 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 ,
2793 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
2794}; 2762};
2795 2763
2796#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2764#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2797 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2798 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2799#define get_byte_array_bit(array, bit) \ 2767#define get_byte_array_bit(array, bit) \
2800 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2768 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2801 2769
2802const unsigned char csi_defaults[] = 2770static const unsigned char csi_defaults[] =
2803 { 2771 {
2804 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, */
2805 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, */
2806 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, */
2807 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, [, \, ], ^, _, */
2808 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, */
2809 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, */
2810 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, */
2811 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, {, |, }, ~, */
2812 }; 2780 };
2813/* *INDENT-ON* */
2814 2781
2815void 2782void ecb_hot
2816rxvt_term::process_csi_seq () 2783rxvt_term::process_csi_seq ()
2817{ 2784{
2818 unicode_t ch, priv, i; 2785 unicode_t ch, priv, i;
2819 unsigned int nargs, p; 2786 unsigned int nargs, p;
2820 int n, ndef; 2787 int n, ndef;
2821 int arg[ESC_ARGS]; 2788 int arg[ESC_ARGS] = { };
2822 2789
2823 for (nargs = ESC_ARGS; nargs > 0;) 2790 nargs = 0;
2824 arg[--nargs] = 0;
2825 2791
2826 priv = 0; 2792 priv = 0;
2827 ch = cmd_getc (); 2793 ch = cmd_getc ();
2828 if (ch >= '<' && ch <= '?') 2794 if ((ch >= '<' && ch <= '?') || ch == '!')
2795 {
2829 { /* '<' '=' '>' '?' */ 2796 /* '<' '=' '>' '?' '!' */
2830 priv = ch; 2797 priv = ch;
2831 ch = cmd_getc (); 2798 ch = cmd_getc ();
2832 } 2799 }
2833 2800
2834 /* read any numerical arguments */ 2801 /* read any numerical arguments */
… …
2873 switch (priv) 2840 switch (priv)
2874 { 2841 {
2875 case '>': 2842 case '>':
2876 if (ch == CSI_DA) /* secondary device attributes */ 2843 if (ch == CSI_DA) /* secondary device attributes */
2877 { 2844 {
2878 // 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,
2879 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2846 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2880 // 2847 //
2881 // 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
2882 // 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
2883 // that we do not support xterm mouse reporting (should be 95 when we do). 2850 // versions.
2884 // 2851 //
2885 tt_printf ("\033[>%d;94;0c", 'U'); 2852 tt_printf ("\033[>%d;95;0c", 'U');
2886 } 2853 }
2887 break; 2854 break;
2855
2888 case '?': 2856 case '?':
2889 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2857 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2890 process_terminal_mode (ch, priv, nargs, arg); 2858 process_terminal_mode (ch, priv, nargs, arg);
2891 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);
2892 } 2872 }
2873 break;
2874 }
2875
2893 return; 2876 return;
2894 } 2877 }
2895 2878
2896 switch (ch) 2879 switch (ch)
2897 { 2880 {
… …
2911 } 2894 }
2912 break; 2895 break;
2913#endif 2896#endif
2914 2897
2915 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2898 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2916 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2899 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2917 arg[0] = -arg[0]; 2900 arg[0] = -arg[0];
2918 /* FALLTHROUGH */ 2901 /* FALLTHROUGH */
2919 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2902 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2920 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2903 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2921 scr_gotorc (arg[0], 0, RELATIVE); 2904 scr_gotorc (arg[0], 0, RELATIVE);
2922 break; 2905 break;
2923 2906
2924 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2907 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2925 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2908 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3112 } 3095 }
3113} 3096}
3114/*}}} */ 3097/*}}} */
3115 3098
3116#if !ENABLE_MINIMAL 3099#if !ENABLE_MINIMAL
3117/* ARGSUSED */
3118void 3100void
3119rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3101rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3120{ 3102{
3121 int x, y; 3103 int x, y;
3122 XWindowAttributes wattr; 3104 XWindowAttributes wattr;
… …
3131 { 3113 {
3132 /* 3114 /*
3133 * commands 3115 * commands
3134 */ 3116 */
3135 case 1: /* deiconify window */ 3117 case 1: /* deiconify window */
3136 XMapWindow (dpy, parent[0]); 3118 XMapWindow (dpy, parent);
3137 break; 3119 break;
3138 case 2: /* iconify window */ 3120 case 2: /* iconify window */
3139 XIconifyWindow (dpy, parent[0], display->screen); 3121 XIconifyWindow (dpy, parent, display->screen);
3140 break; 3122 break;
3141 case 3: /* set position (pixels) */ 3123 case 3: /* set position (pixels) */
3142 XMoveWindow (dpy, parent[0], args[1], args[2]); 3124 XMoveWindow (dpy, parent, args[1], args[2]);
3143 break; 3125 break;
3144 case 4: /* set size (pixels) */ 3126 case 4: /* set size (pixels) */
3145 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3127 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3146 break; 3128 break;
3147 case 5: /* raise window */ 3129 case 5: /* raise window */
3148 XRaiseWindow (dpy, parent[0]); 3130 XRaiseWindow (dpy, parent);
3149 break; 3131 break;
3150 case 6: /* lower window */ 3132 case 6: /* lower window */
3151 XLowerWindow (dpy, parent[0]); 3133 XLowerWindow (dpy, parent);
3152 break; 3134 break;
3153 case 7: /* refresh window */ 3135 case 7: /* refresh window */
3154 scr_touch (true); 3136 scr_touch (true);
3155 break; 3137 break;
3156 case 8: /* set size (chars) */ 3138 case 8: /* set size (chars) */
… …
3159 break; 3141 break;
3160 3142
3161 //case 9: NYI, TODO, restore maximized window or maximize window 3143 //case 9: NYI, TODO, restore maximized window or maximize window
3162 default: 3144 default:
3163 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3164 set_widthheight ((unsigned int)width, 3146 set_widthheight ((unsigned int)vt_width,
3165 (unsigned int) (args[1] * fheight)); 3147 (unsigned int) (args[1] * fheight));
3166 break; 3148 break;
3167 3149
3168 /* 3150 /*
3169 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
3170 */ 3152 */
3171 case 11: /* report window state */ 3153 case 11: /* report window state */
3172 XGetWindowAttributes (dpy, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent, &wattr);
3173 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3155 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3174 break; 3156 break;
3175 case 13: /* report window position */ 3157 case 13: /* report window position */
3176 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3177 XTranslateCoordinates (dpy, parent[0], wattr.root, 3159 XTranslateCoordinates (dpy, parent, wattr.root,
3178 -wattr.border_width, -wattr.border_width, 3160 -wattr.border_width, -wattr.border_width,
3179 &x, &y, &wdummy); 3161 &x, &y, &wdummy);
3180 tt_printf ("\033[3;%d;%dt", x, y); 3162 tt_printf ("\033[3;%d;%dt", x, y);
3181 break; 3163 break;
3182 case 14: /* report window size (pixels) */ 3164 case 14: /* report window size (pixels) */
3183 XGetWindowAttributes (dpy, parent[0], &wattr); 3165 XGetWindowAttributes (dpy, parent, &wattr);
3184 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3166 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3185 break; 3167 break;
3186 case 18: /* report text area size (chars) */ 3168 case 18: /* report text area size (chars) */
3187 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3188 break; 3170 break;
… …
3190 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3172 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3191 break; 3173 break;
3192 case 20: /* report icon label */ 3174 case 20: /* report icon label */
3193 { 3175 {
3194 char *s; 3176 char *s;
3195 XGetIconName (dpy, parent[0], &s); 3177 XGetIconName (dpy, parent, &s);
3196 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 */
3197 XFree (s); 3179 XFree (s);
3198 } 3180 }
3199 break; 3181 break;
3200 case 21: /* report window title */ 3182 case 21: /* report window title */
3201 { 3183 {
3202 char *s; 3184 char *s;
3203 XFetchName (dpy, parent[0], &s); 3185 XFetchName (dpy, parent, &s);
3204 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 */
3205 XFree (s); 3187 XFree (s);
3206 } 3188 }
3207 break; 3189 break;
3208 } 3190 }
… …
3264 * 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)'
3265 */ 3247 */
3266void 3248void
3267rxvt_term::process_dcs_seq () 3249rxvt_term::process_dcs_seq ()
3268{ 3250{
3269 char *s;
3270 unicode_t eh;
3271
3272 /* 3251 /*
3273 * Not handled yet 3252 * Not handled yet
3274 */ 3253 */
3254
3255 unicode_t eh;
3275 s = get_to_st (eh); 3256 char *s = get_to_st (eh);
3276 if (s) 3257 if (s)
3277 free (s); 3258 free (s);
3278 3259
3279 return; 3260 return;
3280} 3261}
… …
3284 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3265 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3285 */ 3266 */
3286void 3267void
3287rxvt_term::process_osc_seq () 3268rxvt_term::process_osc_seq ()
3288{ 3269{
3289 unicode_t ch, eh;
3290 int arg; 3270 int arg;
3291 3271
3292 ch = cmd_getc (); 3272 unicode_t ch = cmd_getc ();
3293 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3273 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3294 arg = arg * 10 + (ch - '0'); 3274 arg = arg * 10 + (ch - '0');
3295 3275
3296 if (ch == ';') 3276 if (ch == ';')
3297 { 3277 {
3278 unicode_t eh;
3298 char *s = get_to_st (eh); 3279 char *s = get_to_st (eh);
3299 3280
3300 if (s) 3281 if (s)
3301 { 3282 {
3302 process_xterm_seq (arg, s, eh); 3283 process_xterm_seq (arg, s, eh);
… …
3326 3307
3327/* 3308/*
3328 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3309 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3329 */ 3310 */
3330void 3311void
3331rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3312rxvt_term::process_xterm_seq (int op, char *str, char resp)
3332{ 3313{
3333 int color; 3314 int color;
3334 char *buf, *name; 3315 char *buf, *name;
3335 bool query = str[0] == '?' && !str[1]; 3316 bool query = str[0] == '?' && !str[1];
3336 int saveop = op; 3317 int saveop = op;
… …
3363 unsigned long bytes_after; 3344 unsigned long bytes_after;
3364 unsigned char *value = 0; 3345 unsigned char *value = 0;
3365 const char *str = ""; 3346 const char *str = "";
3366 3347
3367 if (prop 3348 if (prop
3368 && XGetWindowProperty (dpy, parent[0], 3349 && XGetWindowProperty (dpy, parent,
3369 prop, 0, 1<<16, 0, AnyPropertyType, 3350 prop, 0, 1<<16, 0, AnyPropertyType,
3370 &actual_type, &actual_format, 3351 &actual_type, &actual_format,
3371 &nitems, &bytes_after, &value) == Success 3352 &nitems, &bytes_after, &value) == Success
3372 && actual_type != None 3353 && actual_type != None
3373 && actual_format == 8) 3354 && actual_format == 8)
… …
3377 3358
3378 XFree (value); 3359 XFree (value);
3379 } 3360 }
3380 else 3361 else
3381 { 3362 {
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3363 char *eq = strchr (str, '=');
3383 3364
3384 if (eq) 3365 if (eq)
3385 { 3366 {
3386 *eq = 0; 3367 *eq = 0;
3387 set_utf8_property (display->atom (str), eq + 1); 3368 set_utf8_property (display->atom (str), eq + 1);
3388 } 3369 }
3389 else 3370 else
3390 XDeleteProperty (dpy, parent[0], 3371 XDeleteProperty (dpy, parent,
3391 display->atom (str)); 3372 display->atom (str));
3392 } 3373 }
3393 break; 3374 break;
3394 3375
3395 case XTerm_Color: 3376 case XTerm_Color:
… …
3408 *buf++ = '\0'; 3389 *buf++ = '\0';
3409 3390
3410 process_color_seq (op, color, name, resp); 3391 process_color_seq (op, color, name, resp);
3411 } 3392 }
3412 break; 3393 break;
3394 case Rxvt_restoreFG:
3413 case XTerm_Color00: 3395 case XTerm_Color00:
3414 process_color_seq (op, Color_fg, str, resp); 3396 process_color_seq (op, Color_fg, str, resp);
3415 break; 3397 break;
3398 case Rxvt_restoreBG:
3416 case XTerm_Color01: 3399 case XTerm_Color01:
3417 process_color_seq (op, Color_bg, str, resp); 3400 process_color_seq (op, Color_bg, str, resp);
3418 break; 3401 break;
3419#ifndef NO_CURSORCOLOR 3402#ifndef NO_CURSORCOLOR
3420 case XTerm_Color_cursor: 3403 case XTerm_Color_cursor:
… …
3425 process_color_seq (op, Color_pointer_fg, str, resp); 3408 process_color_seq (op, Color_pointer_fg, str, resp);
3426 break; 3409 break;
3427 case XTerm_Color_pointer_bg: 3410 case XTerm_Color_pointer_bg:
3428 process_color_seq (op, Color_pointer_bg, str, resp); 3411 process_color_seq (op, Color_pointer_bg, str, resp);
3429 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
3430#ifndef NO_BOLD_UNDERLINE_REVERSE 3421#ifndef NO_BOLD_UNDERLINE_REVERSE
3431 case XTerm_Color_RV:
3432 process_color_seq (op, Color_RV, str, resp);
3433 break;
3434 case Rxvt_Color_BD:
3435 case URxvt_Color_BD: 3422 case URxvt_Color_BD:
3436 process_color_seq (op, Color_BD, str, resp); 3423 process_color_seq (op, Color_BD, str, resp);
3437 break; 3424 break;
3438 case Rxvt_Color_UL:
3439 case URxvt_Color_UL: 3425 case URxvt_Color_UL:
3440 process_color_seq (op, Color_UL, str, resp); 3426 process_color_seq (op, Color_UL, str, resp);
3441 break; 3427 break;
3442 case URxvt_Color_IT: 3428 case URxvt_Color_IT:
3443 process_color_seq (op, Color_IT, str, resp); 3429 process_color_seq (op, Color_IT, str, resp);
3444 break; 3430 break;
3445#endif 3431#endif
3446#if TRANSPARENT && TINTING 3432 case URxvt_Color_border:
3433 process_color_seq (op, Color_border, str, resp);
3434 break;
3435#if ENABLE_TRANSPARENCY
3447 case URxvt_Color_tint: 3436 case URxvt_Color_tint:
3448 process_color_seq (op, Color_tint, str, resp); 3437 process_color_seq (op, Color_tint, str, resp);
3438 {
3439 bool changed = false;
3449 3440
3450 check_our_parents (); 3441 if (ISSET_PIXCOLOR (Color_tint))
3442 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3451 3443
3452 if (am_transparent) 3444 if (changed)
3453 want_full_refresh = want_refresh = 1; 3445 update_background ();
3446 }
3454 3447
3455 break; 3448 break;
3456#endif 3449#endif
3457 3450
3451#if BG_IMAGE_FROM_FILE
3458 case Rxvt_Pixmap: 3452 case Rxvt_Pixmap:
3453 if (!strcmp (str, "?"))
3459 { 3454 {
3455 char str[256];
3456 int h_scale = 0, v_scale = 0;
3457 int h_align = 0, v_align = 0;
3458 if (image_vec.size () > 0)
3459 {
3460 h_scale = image_vec[0].h_scale;
3461 v_scale = image_vec[0].v_scale;
3462 h_align = image_vec[0].h_align;
3463 v_align = image_vec[0].v_align;
3464 }
3465
3466 sprintf (str, "[%dx%d+%d+%d]",
3467 h_scale, v_scale,
3468 h_align, v_align);
3469 process_xterm_seq (XTerm_title, str, CHAR_ST);
3470 }
3471 else
3472 {
3473 bool changed = false;
3474
3460 if (*str != ';') 3475 if (*str != ';')
3461 { 3476 {
3462#if XPM_BACKGROUND 3477 if (image_vec.size () > 0)
3463 scale_pixmap (""); /* reset to default scaling */ 3478 changed = image_vec[0].set_file_geometry (str);
3464 set_bgPixmap (str); /* change pixmap */ 3479 else
3465 scr_touch (true); 3480 {
3466#endif 3481 rxvt_image *image = new_image ();
3482 if (!image->set_file_geometry (str))
3483 image_vec.pop_back ();
3484 else
3485 changed = true;
3486 }
3467 } 3487 }
3468 3488 else
3469 int changed = 0;
3470
3471 while ((str = strchr (str, ';')) != NULL)
3472 { 3489 {
3473 str++; 3490 str++;
3474#if XPM_BACKGROUND 3491 if (image_vec.size () > 0)
3475 changed += scale_pixmap (str); 3492 changed = image_vec[0].set_geometry (str, true);
3476#endif
3477 } 3493 }
3478 3494
3479 if (changed) 3495 if (changed)
3480 { 3496 {
3481#ifdef XPM_BACKGROUND 3497 if (bg_window_position_sensitive ())
3482 resize_pixmap (); 3498 {
3483 scr_touch (true); 3499 int x, y;
3484#endif 3500 get_window_origin (x, y);
3501 bg_set_position (x, y);
3502 }
3503 update_background ();
3485 } 3504 }
3486#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3487 if (option (Opt_transparent))
3488 check_our_parents ();
3489#endif
3490 } 3505 }
3491 break; 3506 break;
3492 3507#endif
3493 case Rxvt_restoreFG:
3494 set_window_color (Color_fg, str);
3495 break;
3496 case Rxvt_restoreBG:
3497 set_window_color (Color_bg, str);
3498 break;
3499 3508
3500 case XTerm_logfile: 3509 case XTerm_logfile:
3501 // TODO, when secure mode? 3510 // TODO, when secure mode?
3502 break; 3511 break;
3503 3512
… …
3570 break; 3579 break;
3571#endif 3580#endif
3572 3581
3573#if ENABLE_PERL 3582#if ENABLE_PERL
3574 case URxvt_perl: 3583 case URxvt_perl:
3575 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3584 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3576 ; // no responses yet
3577 break; 3585 break;
3578#endif 3586#endif
3579 } 3587 }
3580} 3588}
3581/*----------------------------------------------------------------------*/ 3589/*----------------------------------------------------------------------*/
… …
3588 * 's' = save 3596 * 's' = save
3589 * 'r' = restore 3597 * 'r' = restore
3590 * 't' = toggle 3598 * 't' = toggle
3591 * so no need for fancy checking 3599 * so no need for fancy checking
3592 */ 3600 */
3593int 3601int ecb_cold
3594rxvt_term::privcases (int mode, unsigned long bit) 3602rxvt_term::privcases (int mode, unsigned long bit)
3595{ 3603{
3596 int state; 3604 int state;
3597 3605
3598 if (mode == 's') 3606 if (mode == 's')
3599 { 3607 {
3600 SavedModes |= (priv_modes & bit); 3608 if (priv_modes & bit)
3609 SavedModes |= bit;
3610 else
3611 SavedModes &= ~bit;
3601 return -1; 3612 return -1;
3602 } 3613 }
3603 else 3614 else
3604 { 3615 {
3605 if (mode == 'r') 3616 if (mode == 'r')
3606 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3617 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3607 else 3618 else
3608 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3619 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3609 PrivMode (state, bit); 3620
3621 if (state)
3622 priv_modes |= bit;
3623 else
3624 priv_modes &= ~bit;
3610 } 3625 }
3611 3626
3612 return state; 3627 return state;
3613} 3628}
3614 3629
3615/* we're not using priv _yet_ */ 3630/* we're not using priv _yet_ */
3616void 3631void
3617rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3632rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3618{ 3633{
3619 unsigned int i, j; 3634 unsigned int i, j;
3620 int state; 3635 int state;
3621 3636
3622 static const struct 3637 static const struct
3623 { 3638 {
3624 const int argval; 3639 const int argval;
3625 const unsigned long bit; 3640 const unsigned long bit;
3626 }
3627
3628 argtopriv[] = { 3641 } argtopriv[] = {
3629 { 1, PrivMode_aplCUR }, 3642 { 1, PrivMode_aplCUR }, // DECCKM
3630 { 2, PrivMode_vt52 }, 3643 { 2, PrivMode_vt52 }, // DECANM
3631 { 3, PrivMode_132 }, 3644 { 3, PrivMode_132 }, // DECCOLM
3632 { 4, PrivMode_smoothScroll }, 3645 { 4, PrivMode_smoothScroll }, // DECSCLM
3633 { 5, PrivMode_rVideo }, 3646 { 5, PrivMode_rVideo }, // DECSCNM
3634 { 6, PrivMode_relOrigin }, 3647 { 6, PrivMode_relOrigin }, // DECOM
3635 { 7, PrivMode_Autowrap }, 3648 { 7, PrivMode_Autowrap }, // DECAWM
3636 // 8, bi-directional support mode 3649 // 8, auto-repeat keys // DECARM
3637 { 9, PrivMode_MouseX10 }, 3650 { 9, PrivMode_MouseX10 },
3638 // 18, 19 printing-related 3651 // 18 end FF to printer after print screen
3652 // 19 Print screen prints full screen/scroll region
3639 { 25, PrivMode_VisibleCursor }, 3653 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3640#ifdef scrollBar_esc 3654#ifdef scrollBar_esc
3641 { scrollBar_esc, PrivMode_scrollBar }, 3655 { scrollBar_esc, PrivMode_scrollBar },
3642#endif 3656#endif
3643 { 35, PrivMode_ShiftKeys }, // rxvt extension 3657 { 35, PrivMode_ShiftKeys }, // rxvt extension
3658 // 38, tektronix mode // DECTEK
3644 { 40, PrivMode_132OK }, 3659 { 40, PrivMode_132OK },
3645 // 41 xterm more fixes NYI 3660 // 41 xterm more fixes NYI
3646 // 45 margin bell NYI 3661 // 45 margin bell NYI
3647 // 46 start logging 3662 // 46 start logging
3648 { 47, PrivMode_Screen }, 3663 { 47, PrivMode_Screen },
3649 { 66, PrivMode_aplKP }, 3664 { 66, PrivMode_aplKP }, // DECNKM
3650#ifndef NO_BACKSPACE_KEY 3665#ifndef NO_BACKSPACE_KEY
3651 { 67, PrivMode_BackSpace }, 3666 { 67, PrivMode_BackSpace }, // DECBKM
3652#endif 3667#endif
3653 { 1000, PrivMode_MouseX11 }, 3668 { 1000, PrivMode_MouseX11 },
3654 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3669 { 1002, PrivMode_MouseBtnEvent },
3655 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3670 { 1003, PrivMode_MouseAnyEvent },
3656 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3671#if ENABLE_FRILLS
3672 { 1005, PrivMode_ExtModeMouse },
3673#endif
3657 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3674 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3658 { 1011, PrivMode_Keypress }, // rxvt extension 3675 { 1011, PrivMode_Keypress }, // rxvt extension
3676#if ENABLE_FRILLS
3677 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3678#endif
3659 // 1035 enable modifiers for alt, numlock NYI 3679 // 1035 enable modifiers for alt, numlock NYI
3660 // 1036 send ESC for meta keys NYI 3680 // 1036 send ESC for meta keys NYI
3661 // 1037 send DEL for keypad delete NYI 3681 // 1037 send DEL for keypad delete NYI
3662 { 1047, PrivMode_Screen }, 3682 { 1047, PrivMode_Screen },
3663 // 1048 save and restore cursor 3683 // 1048 save and restore cursor, implemented in code
3664 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3684 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3665 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3685 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3686 { 2004, PrivMode_BracketPaste },
3666 }; 3687 };
3667 3688
3668 if (nargs == 0) 3689 if (nargs == 0)
3669 return; 3690 return;
3670 3691
… …
3677 for (i = 0; i < nargs; i++) 3698 for (i = 0; i < nargs; i++)
3678 { 3699 {
3679 state = -1; 3700 state = -1;
3680 3701
3681 /* basic handling */ 3702 /* basic handling */
3682 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3703 for (j = 0; j < ecb_array_length (argtopriv); j++)
3683 if (argtopriv[j].argval == arg[i]) 3704 if (argtopriv[j].argval == arg[i])
3684 { 3705 {
3685 state = privcases (mode, argtopriv[j].bit); 3706 state = privcases (mode, argtopriv[j].bit);
3686 break; 3707 break;
3687 } 3708 }
… …
3695 3716
3696 scr_touch (true); 3717 scr_touch (true);
3697 break; 3718 break;
3698#endif 3719#endif
3699 case 1048: /* alternative cursor save */ 3720 case 1048: /* alternative cursor save */
3700 case 1049:
3701 if (option (Opt_secondaryScreen)) 3721 if (option (Opt_secondaryScreen))
3702 if (mode == 0) 3722 if (mode == 0)
3703 scr_cursor (RESTORE); 3723 scr_cursor (RESTORE);
3704 else if (mode == 1) 3724 else if (mode == 1)
3705 scr_cursor (SAVE); 3725 scr_cursor (SAVE);
… …
3714 case 2: /* VT52 mode */ 3734 case 2: /* VT52 mode */
3715 /* oddball mode. should be set regardless of set/reset 3735 /* oddball mode. should be set regardless of set/reset
3716 * parameter. Return from VT52 mode with an ESC < from 3736 * parameter. Return from VT52 mode with an ESC < from
3717 * within VT52 mode 3737 * within VT52 mode
3718 */ 3738 */
3719 PrivMode (1, PrivMode_vt52); 3739 priv_modes |= PrivMode_vt52;
3720 break; 3740 break;
3721 case 3: /* 80/132 */ 3741 case 3: /* 80/132 */
3722 if (priv_modes & PrivMode_132OK) 3742 if (priv_modes & PrivMode_132OK)
3723 set_widthheight (((state ? 132 : 80) * fwidth), height); 3743 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3724 break; 3744 break;
3725 case 4: /* smooth scrolling */ 3745 case 4: /* smooth scrolling */
3726 set_option (Opt_jumpScroll, !state); 3746 set_option (Opt_jumpScroll, !state);
3727 break; 3747 break;
3728 case 5: /* reverse video */ 3748 case 5: /* reverse video */
… …
3735 scr_autowrap (state); 3755 scr_autowrap (state);
3736 break; 3756 break;
3737 /* case 8: - auto repeat, can't do on a per window basis */ 3757 /* case 8: - auto repeat, can't do on a per window basis */
3738 case 9: /* X10 mouse reporting */ 3758 case 9: /* X10 mouse reporting */
3739 if (state) /* orthogonal */ 3759 if (state) /* orthogonal */
3740 priv_modes &= ~PrivMode_MouseX11; 3760 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3741 break; 3761 break;
3742#ifdef scrollBar_esc 3762#ifdef scrollBar_esc
3743 case scrollBar_esc: 3763 case scrollBar_esc:
3744 if (scrollbar_mapping (state)) 3764 scrollBar.map (state);
3745 {
3746 resize_all_windows (0, 0, 0); 3765 resize_all_windows (0, 0, 0);
3747 scr_touch (true); 3766 scr_touch (true);
3748 }
3749 break; 3767 break;
3750#endif 3768#endif
3751 case 25: /* visible/invisible cursor */ 3769 case 25: /* visible/invisible cursor */
3752 scr_cursor_visible (state); 3770 scr_cursor_visible (state);
3753 break; 3771 break;
… …
3758 break; 3776 break;
3759 /* case 66: - application key pad */ 3777 /* case 66: - application key pad */
3760 /* case 67: - backspace key */ 3778 /* case 67: - backspace key */
3761 case 1000: /* X11 mouse reporting */ 3779 case 1000: /* X11 mouse reporting */
3762 if (state) /* orthogonal */ 3780 if (state) /* orthogonal */
3763 priv_modes &= ~PrivMode_MouseX10; 3781 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3764 break; 3782 break;
3765#if 0
3766 case 1001: 3783 case 1002:
3767 break; /* X11 mouse highlighting */ 3784 case 1003:
3768#endif 3785 if (state)
3786 {
3787 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3788 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3789 mouse_row = mouse_col = 0;
3790 vt_emask_mouse = PointerMotionMask;
3791 }
3792 else
3793 vt_emask_mouse = NoEventMask;
3794
3795 vt_select_input ();
3796 break;
3769 case 1010: /* scroll to bottom on TTY output inhibit */ 3797 case 1010: /* scroll to bottom on TTY output inhibit */
3770 set_option (Opt_scrollTtyOutput, !state); 3798 set_option (Opt_scrollTtyOutput, !state);
3771 break; 3799 break;
3772 case 1011: /* scroll to bottom on key press */ 3800 case 1011: /* scroll to bottom on key press */
3773 set_option (Opt_scrollTtyKeypress, state); 3801 set_option (Opt_scrollTtyKeypress, state);
3774 break; 3802 break;
3775 case 1047: /* secondary screen w/ clearing last */ 3803 case 1047: /* secondary screen w/ clearing last */
3776 if (option (Opt_secondaryScreen)) 3804 if (option (Opt_secondaryScreen))
3777 if (current_screen != PRIMARY) 3805 if (!state)
3778 scr_erase_screen (2); 3806 scr_erase_screen (2);
3807
3779 scr_change_screen (state); 3808 scr_change_screen (state);
3780 break; 3809 break;
3781 case 1049: /* secondary screen w/ clearing first */ 3810 case 1049: /* secondary screen w/ clearing first */
3811 if (option (Opt_secondaryScreen))
3812 if (state)
3813 scr_cursor (SAVE);
3814
3782 scr_change_screen (state); 3815 scr_change_screen (state);
3816
3783 if (option (Opt_secondaryScreen)) 3817 if (option (Opt_secondaryScreen))
3784 if (current_screen != PRIMARY) 3818 if (state)
3785 scr_erase_screen (2); 3819 scr_erase_screen (2);
3820 else
3821 scr_cursor (RESTORE);
3786 break; 3822 break;
3787 default: 3823 default:
3788 break; 3824 break;
3789 } 3825 }
3790 } 3826 }
3791} 3827}
3792/*}}} */ 3828/*}}} */
3793 3829
3794/*{{{ process sgr sequences */ 3830/*{{{ process sgr sequences */
3795void 3831void ecb_hot
3796rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3832rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3797{ 3833{
3798 unsigned int i; 3834 unsigned int i;
3799 short rendset; 3835 short rendset;
3800 int rendstyle; 3836 int rendstyle;
… …
3943 } 3979 }
3944 } 3980 }
3945} 3981}
3946/*}}} */ 3982/*}}} */
3947 3983
3948/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3949void
3950rxvt_term::process_graphics ()
3951{
3952 unicode_t ch, cmd = cmd_getc ();
3953
3954 if (cmd == 'Q')
3955 { /* query graphics */
3956 tt_printf ("\033G0\012"); /* no graphics */
3957 return;
3958 }
3959 /* swallow other graphics sequences until terminating ':' */
3960 do
3961 ch = cmd_getc ();
3962 while (ch != ':');
3963}
3964/*}}} */
3965
3966/* ------------------------------------------------------------------------- */ 3984/* ------------------------------------------------------------------------- */
3967 3985
3968/* 3986/*
3969 * Send printf () formatted output to the command. 3987 * Send printf () formatted output to the command.
3970 * Only use for small amounts of data. 3988 * Only use for small amounts of data.
… …
3983 4001
3984/* ---------------------------------------------------------------------- */ 4002/* ---------------------------------------------------------------------- */
3985/* Write data to the pty as typed by the user, pasted with the mouse, 4003/* Write data to the pty as typed by the user, pasted with the mouse,
3986 * or generated by us in response to a query ESC sequence. 4004 * or generated by us in response to a query ESC sequence.
3987 */ 4005 */
3988const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4006static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3989 4007
3990void 4008void
3991rxvt_term::tt_write (const char *data, unsigned int len) 4009rxvt_term::tt_write (const char *data, unsigned int len)
3992{ 4010{
3993 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4011 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3998 4016
3999 if (v_buflen == 0) 4017 if (v_buflen == 0)
4000 { 4018 {
4001 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4019 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4002 4020
4021 max_it (written, 0);
4022
4003 if ((unsigned int)written == len) 4023 if (written == len)
4004 return; 4024 return;
4005 4025
4006 data += written; 4026 data += written;
4007 len -= written; 4027 len -= written;
4008 } 4028 }
4009 4029
4010 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4030 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4011 4031
4012 memcpy (v_buffer + v_buflen, data, len); 4032 memcpy (v_buffer + v_buflen, data, len);
4013 v_buflen += len; 4033 v_buflen += len;
4014 4034
4015 pty_ev.set (EVENT_READ | EVENT_WRITE); 4035 pty_ev.set (ev::READ | ev::WRITE);
4016} 4036}
4017 4037
4018void rxvt_term::pty_write () 4038void rxvt_term::pty_write ()
4019{ 4039{
4020 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4040 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4025 4045
4026 if (v_buflen == 0) 4046 if (v_buflen == 0)
4027 { 4047 {
4028 free (v_buffer); 4048 free (v_buffer);
4029 v_buffer = 0; 4049 v_buffer = 0;
4030 v_buflen = 0;
4031 4050
4032 pty_ev.set (EVENT_READ); 4051 pty_ev.set (ev::READ);
4033 return; 4052 return;
4034 } 4053 }
4035 4054
4036 memmove (v_buffer, v_buffer + written, v_buflen); 4055 memmove (v_buffer, v_buffer + written, v_buflen);
4037 } 4056 }
4038 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4057 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4039 pty_ev.set (EVENT_READ); 4058 pty_ev.set (ev::READ);
4040} 4059}
4041 4060
4042/*----------------------- end-of-file (C source) -----------------------*/ 4061/*----------------------- end-of-file (C source) -----------------------*/
4043 4062

Diff Legend

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