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.347 by sasha, Wed Aug 15 22:41:52 2007 UTC vs.
Revision 1.515 by root, Tue Jun 5 11:00:40 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)
… …
130 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
131#endif 132#endif
132 0, 133 0,
133}; 134};
134 135
135void 136void ecb_cold
136rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
137{ 138{
138 x = Pixel2Col (x); 139 x = Pixel2Col (x);
139 y = Pixel2Row (y); 140 y = Pixel2Row (y);
140 141
… …
157 158
158 x--; 159 x--;
159 } 160 }
160} 161}
161 162
162void 163void ecb_cold
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
196 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
200 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
201 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
202 207
203 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
205 210
206 if (y >= 0) 211 if (y >= 0)
207 { 212 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 214 x = 0;
210 } 215 }
211 216
212 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
213 218
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 220
216 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
217 { 222 {
… …
220 ch = *chr++; 225 ch = *chr++;
221 226
222 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
225# if !UNICODE3 230# if !UNICODE_3
226 if (ch >= 0x10000) 231 if (ch >= 0x10000)
227 ch = 0xfffd; 232 ch = 0xfffd;
228# endif 233# endif
229 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
230 235
… …
236// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
239// } 244// }
240 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
241 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
242
243 free (fname); 249 free (fname[i]);
250 }
244 251
245# if ENABLE_COMBINING 252# if ENABLE_COMBINING
246 if (alloc) 253 if (alloc)
247 delete [] alloc; 254 delete [] alloc;
248# endif 255# endif
249} 256}
250#endif 257#endif
251 258
252void 259void ecb_cold
253rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
254{ 261{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259 263
260 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
261 { 265 {
262 char mb[16]; 266 char mb[MB_LEN_MAX];
263 int len; 267 int len;
264 268
265 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
267 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
268 else 272 else
269 { 273 {
270 mb[0] = ch[0]; 274 mb[0] = ch;
271 len = 1; 275 len = 1;
272 } 276 }
273 277
274 if (len > 0) 278 if (len > 0)
275 tt_write (mb, len); 279 tt_write (mb, len);
… …
278 } 282 }
279 283
280 iso14755buf = 0; 284 iso14755buf = 0;
281} 285}
282 286
283int 287static int ecb_cold
284rxvt_term::hex_keyval (XKeyEvent &ev) 288hex_keyval (XKeyEvent &ev)
285{ 289{
286 // check wether this event corresponds to a hex digit 290 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 291 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 292 for (int index = 0; index < 8; index++)
289 { 293 {
290 KeySym k = XLookupKeysym (&ev, index); 294 KeySym k = XLookupKeysym (&ev, index);
291 295
… …
297 301
298 return -1; 302 return -1;
299} 303}
300#endif 304#endif
301 305
302void 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
303rxvt_term::key_press (XKeyEvent &ev) 402rxvt_term::key_press (XKeyEvent &ev)
304{ 403{
305 int ctrl, meta, shft, len; 404 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 405 KeySym keysym;
308 int valid_keysym; 406 int valid_keysym;
309 char kbuf[KBUFSZ]; 407 char kbuf[KBUFSZ];
310 408
311#if ISO_14755 409#if ISO_14755
… …
321 */ 419 */
322 shft = ev.state & ShiftMask; 420 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
325 423
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331
332 kbuf[0] = 0; 424 kbuf[0] = 0;
333 425
334#ifdef USE_XIM 426#if USE_XIM
335 if (Input_Context) 427 if (Input_Context)
336 { 428 {
337 Status status_return; 429 Status status_return;
338 430
339#if 0 431#if 0
… …
410#ifdef PAGING_CONTEXT_LINES 502#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 503 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 504#else
413 lnsppg = nrow * 4 / 5; 505 lnsppg = nrow * 4 / 5;
414#endif 506#endif
507 max_it (lnsppg, 1);
508
415 if (keysym == XK_Prior) 509 if (keysym == XK_Prior)
416 { 510 {
417 scr_page (UP, lnsppg); 511 scr_page (UP, lnsppg);
418 return; 512 return;
419 } 513 }
… …
472 selection_request (ev.time); 566 selection_request (ev.time);
473 return; 567 return;
474#if TODO 568#if TODO
475 /* rxvt extras */ 569 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 571 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 573 return;
482#endif 574#endif
483 } 575 }
484 } 576 }
485 } 577 }
486 578
487#if ENABLE_FRILLS || ISO_14755 579#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 580 // ISO 14755 support
489 if (shft && ctrl) 581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 582 {
491 int hv; 583 int hv;
492 584
493 if (iso14755buf & ISO_14755_51 585 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 586 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 616 scr_overlay_off ();
525# endif 617# endif
526 iso14755buf = 0; 618 iso14755buf = 0;
527 } 619 }
528 } 620 }
621 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 622 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 623 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 624 if (!(iso14755buf & ISO_14755_STARTED))
532 { 625 {
533 iso14755buf |= ISO_14755_STARTED; 626 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 627# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 628 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 639 }
547#endif 640#endif
548 641
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 643 {
644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
645 unsigned int newlen = 1;
646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
551 { 653 {
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
552 newlen = 1; 684 newlen = 0;
553 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:
554 { 768 {
555#ifndef NO_BACKSPACE_KEY 769 int param = map_function_key (keysym);
556 case XK_BackSpace: 770 if (param > 0)
557 if (priv_modes & PrivMode_HaveBackSpace) 771 sprintf (kbuf,"\033[%d~", param);
558 {
559 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
560 ^ !!ctrl) ? '\b' : '\177';
561 kbuf[1] = '\0';
562 }
563 else 772 else
564 strcpy (kbuf, key_backspace);
565 break;
566#endif
567#ifndef NO_DELETE_KEY
568# ifdef XK_KP_Prior
569 case XK_KP_Delete:
570 /* allow shift to override */
571 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
572 {
573 strcpy (kbuf, "\033On");
574 break;
575 }
576 /* FALLTHROUGH */
577# endif
578 case XK_Delete:
579 strcpy (kbuf, key_delete);
580 break;
581#endif
582 case XK_Tab:
583 if (shft)
584 strcpy (kbuf, "\033[Z");
585 else
586 {
587#ifdef CTRL_TAB_MAKES_META
588 if (ctrl)
589 meta = 1;
590#endif
591#ifdef MOD4_TAB_MAKES_META
592 if (ev.state & Mod4Mask)
593 meta = 1;
594#endif
595 newlen = 0;
596 }
597 break;
598
599#ifdef XK_KP_Left
600 case XK_KP_Up: /* \033Ox or standard */
601 case XK_KP_Down: /* \033Or or standard */
602 case XK_KP_Right: /* \033Ov or standard */
603 case XK_KP_Left: /* \033Ot or standard */
604 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
605 {
606 strcpy (kbuf, "\033OZ");
607 kbuf[2] = "txvr"[keysym - XK_KP_Left];
608 break;
609 }
610 else
611 /* translate to std. cursor key */
612 keysym = XK_Left + (keysym - XK_KP_Left);
613 /* FALLTHROUGH */
614#endif
615 case XK_Up: /* "\033[A" */
616 case XK_Down: /* "\033[B" */
617 case XK_Right: /* "\033[C" */
618 case XK_Left: /* "\033[D" */
619 strcpy (kbuf, "\033[Z");
620 kbuf[2] = "DACB"[keysym - XK_Left];
621 /* do Shift first */
622 if (shft)
623 kbuf[2] = "dacb"[keysym - XK_Left];
624 else if (ctrl)
625 {
626 kbuf[1] = 'O';
627 kbuf[2] = "dacb"[keysym - XK_Left];
628 }
629 else if (priv_modes & PrivMode_aplCUR)
630 kbuf[1] = 'O';
631 break;
632
633#ifndef UNSHIFTED_SCROLLKEYS
634# ifdef XK_KP_Prior
635 case XK_KP_Prior:
636 /* allow shift to override */
637 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
638 {
639 strcpy (kbuf, "\033Oy");
640 break;
641 }
642 /* FALLTHROUGH */
643# endif
644 case XK_Prior:
645 strcpy (kbuf, "\033[5~");
646 break;
647# ifdef XK_KP_Next
648 case XK_KP_Next:
649 /* allow shift to override */
650 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
651 {
652 strcpy (kbuf, "\033Os");
653 break;
654 }
655 /* FALLTHROUGH */
656# endif
657 case XK_Next:
658 strcpy (kbuf, "\033[6~");
659 break;
660#endif
661 case XK_KP_Enter:
662 /* allow shift to override */
663 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
664 {
665 strcpy (kbuf, "\033OM");
666 break;
667 }
668
669 /* FALLTHROUGH */
670
671 case XK_Return:
672 if (priv_modes & PrivMode_LFNL)
673 {
674 kbuf[0] = '\015';
675 kbuf[1] = '\012';
676 kbuf[2] = '\0';
677 }
678 else
679 {
680 kbuf[0] = '\015';
681 kbuf[1] = '\0';
682 }
683 break;
684
685#ifdef XK_KP_Begin
686 case XK_KP_Begin:
687 strcpy (kbuf, "\033Ou");
688 break;
689
690#endif
691 case XK_KP_F1: /* "\033OP" */
692 case XK_KP_F2: /* "\033OQ" */
693 case XK_KP_F3: /* "\033OR" */
694 case XK_KP_F4: /* "\033OS" */
695 strcpy (kbuf, "\033OP");
696 kbuf[2] += (keysym - XK_KP_F1);
697 break;
698
699 case XK_KP_Multiply: /* "\033Oj" : "*" */
700 case XK_KP_Add: /* "\033Ok" : "+" */
701 case XK_KP_Separator: /* "\033Ol" : "," */
702 case XK_KP_Subtract: /* "\033Om" : "-" */
703 case XK_KP_Decimal: /* "\033On" : "." */
704 case XK_KP_Divide: /* "\033Oo" : "/" */
705 case XK_KP_0: /* "\033Op" : "0" */
706 case XK_KP_1: /* "\033Oq" : "1" */
707 case XK_KP_2: /* "\033Or" : "2" */
708 case XK_KP_3: /* "\033Os" : "3" */
709 case XK_KP_4: /* "\033Ot" : "4" */
710 case XK_KP_5: /* "\033Ou" : "5" */
711 case XK_KP_6: /* "\033Ov" : "6" */
712 case XK_KP_7: /* "\033Ow" : "7" */
713 case XK_KP_8: /* "\033Ox" : "8" */
714 case XK_KP_9: /* "\033Oy" : "9" */
715 /* allow shift to override */
716 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
717 {
718 strcpy (kbuf, "\033Oj");
719 kbuf[2] += (keysym - XK_KP_Multiply);
720 }
721 else
722 {
723 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
724 kbuf[1] = '\0';
725 }
726 break;
727
728 case XK_Find:
729 strcpy (kbuf, "\033[1~");
730 break;
731
732#ifdef XK_KP_Insert
733 case XK_KP_Insert:
734 /* allow shift to override */
735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
736 {
737 strcpy (kbuf, "\033Op");
738 break;
739 }
740 /* FALLTHROUGH */
741#endif
742 case XK_Insert:
743 strcpy (kbuf, "\033[2~");
744 break;
745#ifdef DXK_Remove /* support for DEC remove like key */
746 case DXK_Remove:
747 /* FALLTHROUGH */
748#endif
749 case XK_Execute:
750 strcpy (kbuf, "\033[3~");
751 break;
752 case XK_Select:
753 strcpy (kbuf, "\033[4~");
754 break;
755#ifdef XK_KP_End
756 case XK_KP_End:
757 /* allow shift to override */
758 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
759 {
760 strcpy (kbuf, "\033Oq");
761 break;
762 }
763 /* FALLTHROUGH */
764#endif
765 case XK_End:
766 strcpy (kbuf, KS_END);
767 break;
768#ifdef XK_KP_Home
769 case XK_KP_Home:
770 /* allow shift to override */
771 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
772 {
773 strcpy (kbuf, "\033Ow");
774 break;
775 }
776 /* FALLTHROUGH */
777#endif
778 case XK_Home:
779 strcpy (kbuf, KS_HOME);
780 break;
781
782#define FKEY(n, fkey) \
783 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
784
785 case XK_F1: /* "\033[11~" */
786 case XK_F2: /* "\033[12~" */
787 case XK_F3: /* "\033[13~" */
788 case XK_F4: /* "\033[14~" */
789 case XK_F5: /* "\033[15~" */
790 FKEY (11, XK_F1);
791 break;
792 case XK_F6: /* "\033[17~" */
793 case XK_F7: /* "\033[18~" */
794 case XK_F8: /* "\033[19~" */
795 case XK_F9: /* "\033[20~" */
796 case XK_F10: /* "\033[21~" */
797 FKEY (17, XK_F6);
798 break;
799 case XK_F11: /* "\033[23~" */
800 case XK_F12: /* "\033[24~" */
801 case XK_F13: /* "\033[25~" */
802 case XK_F14: /* "\033[26~" */
803 FKEY (23, XK_F11);
804 break;
805 case XK_F15: /* "\033[28~" */
806 case XK_F16: /* "\033[29~" */
807 FKEY (28, XK_F15);
808 break;
809 case XK_Help: /* "\033[28~" */
810 FKEY (28, XK_Help);
811 break;
812 case XK_Menu: /* "\033[29~" */
813 FKEY (29, XK_Menu);
814 break;
815 case XK_F17: /* "\033[31~" */
816 case XK_F18: /* "\033[32~" */
817 case XK_F19: /* "\033[33~" */
818 case XK_F20: /* "\033[34~" */
819 case XK_F21: /* "\033[35~" */
820 case XK_F22: /* "\033[36~" */
821 case XK_F23: /* "\033[37~" */
822 case XK_F24: /* "\033[38~" */
823 case XK_F25: /* "\033[39~" */
824 case XK_F26: /* "\033[40~" */
825 case XK_F27: /* "\033[41~" */
826 case XK_F28: /* "\033[42~" */
827 case XK_F29: /* "\033[43~" */
828 case XK_F30: /* "\033[44~" */
829 case XK_F31: /* "\033[45~" */
830 case XK_F32: /* "\033[46~" */
831 case XK_F33: /* "\033[47~" */
832 case XK_F34: /* "\033[48~" */
833 case XK_F35: /* "\033[49~" */
834 FKEY (31, XK_F17);
835 break;
836#undef FKEY
837 default:
838 newlen = 0; 773 newlen = 0;
839 break;
840 } 774 }
841 775 break;
842 if (newlen)
843 len = strlen (kbuf);
844 } 776 }
845 777
778 if (newlen)
779 len = strlen (kbuf);
780
781 if (len > 0)
782 {
846 /* 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 /*
847 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
848 */ 797 */
849#ifdef META8_OPTION 798#ifdef META8_OPTION
850 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
851 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
852#endif 801#endif
802 }
853 803
854 } 804 }
855 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
856 { 806 {
857 len = 1; 807 len = 1;
… …
891 { 841 {
892 view_start = 0; 842 view_start = 0;
893 want_refresh = 1; 843 want_refresh = 1;
894 } 844 }
895 845
896 /*
897 * these modifications only affect the static keybuffer
898 * pass Shift/Control indicators for function keys ending with `~'
899 *
900 * eg,
901 * Prior = "ESC[5~"
902 * Shift+Prior = "ESC[5$"
903 * Ctrl+Prior = "ESC[5^"
904 * Ctrl+Shift+Prior = "ESC[5@"
905 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
906 */
907 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
908 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
909
910 /* escape prefix */ 846 /* escape prefix */
911 if (meta 847 if (meta
912#ifdef META8_OPTION 848#ifdef META8_OPTION
913 && meta_char == C0_ESC 849 && meta_char == C0_ESC
914#endif 850#endif
… …
919 } 855 }
920 856
921 tt_write (kbuf, (unsigned int)len); 857 tt_write (kbuf, (unsigned int)len);
922} 858}
923 859
924void 860void ecb_cold
925rxvt_term::key_release (XKeyEvent &ev) 861rxvt_term::key_release (XKeyEvent &ev)
926{ 862{
927#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 863#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
928 KeySym keysym; 864 KeySym keysym;
929 865
… …
949 commit_iso14755 (); 885 commit_iso14755 ();
950 886
951 return; 887 return;
952 } 888 }
953 889
954 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 890 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
955 if (i[0] == keysym) 891 if (i[0] == keysym)
956 { 892 {
957 iso14755buf = ISO_14755_51 | i[1]; 893 iso14755buf = ISO_14755_51 | i[1];
958 commit_iso14755 (); 894 commit_iso14755 ();
959 895
… …
996 else if (keysym == XK_Control_L || keysym == XK_Control_R) 932 else if (keysym == XK_Control_L || keysym == XK_Control_R)
997 mouse_slip_wheel_speed = 0; 933 mouse_slip_wheel_speed = 0;
998#endif 934#endif
999} 935}
1000 936
1001#if defined (KEYSYM_RESOURCE)
1002unsigned int
1003rxvt_term::cmd_write (const char *str, unsigned int count)
1004{
1005 unsigned int n, s;
1006
1007 n = cmdbuf_ptr - cmdbuf_base;
1008 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1009
1010 if (n > 0 && s < count)
1011 {
1012 memmove (cmdbuf_base, cmdbuf_ptr,
1013 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1014 cmdbuf_ptr = cmdbuf_base;
1015 cmdbuf_endp -= n;
1016 s += n;
1017 }
1018
1019 if (count > s)
1020 {
1021 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1022 count = s;
1023 }
1024
1025 for (; count--;)
1026 *cmdbuf_endp++ = *str++;
1027
1028 cmd_parse ();
1029
1030 return 0;
1031}
1032#endif
1033
1034void 937void
1035rxvt_term::flush () 938rxvt_term::flush ()
1036{ 939{
1037 flush_ev.stop (); 940 flush_ev.stop ();
1038 941
1039#ifdef ENABLE_TRANSPARENCY 942#ifdef HAVE_BG_PIXMAP
1040 if (want_full_refresh) 943 if (bg_flags & BG_NEEDS_REFRESH)
1041 { 944 {
1042 want_full_refresh = 0; 945 bg_flags &= ~BG_NEEDS_REFRESH;
1043 scr_clear ();
1044 scr_touch (false); 946 scr_touch (false);
1045 } 947 }
1046#endif 948#endif
1047 949
1048 if (want_refresh) 950 if (want_refresh)
… …
1084 } 986 }
1085 while (row < end_row); 987 while (row < end_row);
1086 } 988 }
1087 989
1088 scr_refresh (); 990 scr_refresh ();
1089 scrollbar_show (1); 991 scrollBar.show (1);
1090#ifdef USE_XIM 992#if USE_XIM
1091 IMSendSpot (); 993 im_send_spot ();
1092#endif 994#endif
1093 } 995 }
1094 996
1095 display->flush (); 997 display->flush ();
1096} 998}
1097 999
1000/* checks whether a refresh is requested and starts the refresh timer */
1098void 1001void
1099rxvt_term::check_cb (check_watcher &w) 1002rxvt_term::refresh_check ()
1100{ 1003{
1101 make_current (); 1004 if (want_refresh && !flush_ev.is_active ())
1005 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102 1006
1103 display->flush (); 1007 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107} 1008}
1108 1009
1109void 1010void
1110rxvt_term::flush_cb (time_watcher &w) 1011rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1012{
1112 make_current (); 1013 make_current ();
1113 1014
1114 refresh_count = 0; 1015 refresh_count = 0;
1115 flush (); 1016 flush ();
1116} 1017}
1117 1018
1118#ifdef CURSOR_BLINK 1019#ifdef CURSOR_BLINK
1119void 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
1120rxvt_term::cursor_blink_cb (time_watcher &w) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1037{
1122 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1039 want_refresh = 1;
1124 1040 refresh_check ();
1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1126} 1041}
1127#endif 1042#endif
1128 1043
1129#ifdef TEXT_BLINK 1044#ifdef TEXT_BLINK
1130void 1045void
1131rxvt_term::text_blink_cb (time_watcher &w) 1046rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132{ 1047{
1133 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1048 if (scr_refresh_rend (RS_Blink, RS_Blink))
1134 { 1049 {
1135 hidden_text = !hidden_text; 1050 hidden_text = !hidden_text;
1136 want_refresh = 1; 1051 want_refresh = 1;
1137 w.start (w.at + TEXT_BLINK_INTERVAL); 1052 refresh_check ();
1138 } 1053 }
1054 else
1055 w.stop ();
1139} 1056}
1140#endif 1057#endif
1141 1058
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1060void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1062{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1148 { 1065 {
1149 want_refresh = 1; 1066 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1067 refresh_check ();
1151 } 1068 }
1069 else
1070 w.stop ();
1152} 1071}
1153#endif 1072#endif
1154 1073
1155#ifdef SELECTION_SCROLLING 1074#ifdef SELECTION_SCROLLING
1156void 1075void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1076rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1077{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1078 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160 { 1079 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1080 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1081 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1082 refresh_check ();
1164 } 1083 }
1084 else
1085 w.stop ();
1165} 1086}
1166#endif 1087#endif
1167 1088
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1090void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1091rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1092{
1172 if (mouse_slip_wheel_speed == 0 1093 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174 : scr_page (UP, mouse_slip_wheel_speed))
1175 { 1094 {
1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1179 want_refresh = 1; 1095 want_refresh = 1;
1180 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 ();
1181 } 1103 }
1182} 1104}
1183#endif 1105#endif
1184 1106
1185#if LINUX_YIELD_HACK 1107#if LINUX_YIELD_HACK
1186static struct event_handler 1108static struct event_handler
1187{ 1109{
1188 check_watcher yield_ev; 1110 ev::prepare yield_ev;
1189 1111
1190 void yield_cb (check_watcher &w) 1112 void yield_cb (ev::prepare &w, int revents)
1191 { 1113 {
1192 // this should really be sched_yield(), but the linux guys thought 1114 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than 1115 // that giving a process calling sched_yield () less cpu time than
1194 // 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
1195 // 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.
1196 1121
1197 struct timespec ts = { 0, 0 }; 1122 struct timespec ts = { 0, 1000 };
1198 nanosleep (&ts, 0); 1123 nanosleep (&ts, 0);
1199 1124
1200 w.stop (); 1125 w.stop ();
1201 } 1126 }
1202 1127
… …
1205 { 1130 {
1206 } 1131 }
1207} event_handler; 1132} event_handler;
1208#endif 1133#endif
1209 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
1210bool 1168bool
1211rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1212{ 1170{
1213 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 cmdbuf_reify ();
1214 1172
1215 if (CBUFSIZ == n) 1173 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1216 { 1174
1217 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1175 if (!avail)
1218 n = 0;
1219 } 1176 {
1220 1177 // normally this indicates a "too long" command sequence - just drop the data we have
1221 memmove (cmdbuf_base, cmdbuf_ptr, n);
1222 cmdbuf_ptr = cmdbuf_base; 1178 cmdbuf_ptr = cmdbuf_base;
1223 cmdbuf_endp = cmdbuf_ptr + n; 1179 cmdbuf_endp = cmdbuf_ptr;
1180 avail = CBUFSIZ;
1181 }
1224 1182
1225 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1226 1184
1227 if (r > 0) 1185 if (r > 0)
1228 { 1186 {
1229 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1230 return true; 1188 return true;
… …
1246 1204
1247 return false; 1205 return false;
1248} 1206}
1249 1207
1250void 1208void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1209rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1210{
1253 make_current (); 1211 make_current ();
1254 1212
1255 if (revents & EVENT_READ) 1213 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1214 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1215 for (int i = CBUFCNT; i-- && pty_fill (); )
1258 if (cmd_parse ()) 1216 cmd_parse ();
1259 break;
1260 1217
1261 if (revents & EVENT_WRITE) 1218 if (revents & ev::WRITE)
1262 pty_write (); 1219 pty_write ();
1263}
1264 1220
1265void 1221 refresh_check ();
1222}
1223
1224void ecb_cold
1266rxvt_term::pointer_unblank () 1225rxvt_term::pointer_unblank ()
1267{ 1226{
1268 XDefineCursor (dpy, vt, TermWin_cursor); 1227 XDefineCursor (dpy, vt, TermWin_cursor);
1269 recolour_cursor (); 1228 recolour_cursor ();
1270 1229
1271#ifdef POINTER_BLANK 1230#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1231 hidden_pointer = 0;
1273 1232
1274 if (option (Opt_pointerBlank)) 1233 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1234 pointer_ev.start (pointerBlankDelay);
1276#endif 1235#endif
1277} 1236}
1278 1237
1279#ifdef POINTER_BLANK 1238#ifdef POINTER_BLANK
1280void 1239void ecb_cold
1281rxvt_term::pointer_blank () 1240rxvt_term::pointer_blank ()
1282{ 1241{
1283 if (!option (Opt_pointerBlank)) 1242 if (!option (Opt_pointerBlank))
1284 return; 1243 return;
1285 1244
… …
1287 XFlush (dpy); 1246 XFlush (dpy);
1288 1247
1289 hidden_pointer = 1; 1248 hidden_pointer = 1;
1290} 1249}
1291 1250
1292void 1251void ecb_cold
1293rxvt_term::pointer_cb (time_watcher &w) 1252rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1253{
1295 make_current (); 1254 make_current ();
1296 1255
1297 pointer_blank (); 1256 pointer_blank ();
1298} 1257}
… …
1301void 1260void
1302rxvt_term::mouse_report (XButtonEvent &ev) 1261rxvt_term::mouse_report (XButtonEvent &ev)
1303{ 1262{
1304 int button_number, key_state = 0; 1263 int button_number, key_state = 0;
1305 int x, y; 1264 int x, y;
1265 int code = 32;
1306 1266
1307 x = ev.x; 1267 x = Pixel2Col (ev.x) + 1;
1308 y = ev.y; 1268 y = Pixel2Row (ev.y) + 1;
1309 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 }
1310 1279
1311 if (MEvent.button == AnyButton) 1280 if (MEvent.button == AnyButton)
1312 button_number = 3; 1281 button_number = 3;
1313 else 1282 else
1314 { 1283 {
1315 button_number = MEvent.button - Button1; 1284 button_number = MEvent.button - Button1;
1316 /* add 0x3D for wheel events, like xterm does */ 1285 /* add 0x3D for wheel events, like xterm does */
1317 if (button_number >= 3) 1286 if (button_number >= 3)
1318 button_number += (64 - 3); 1287 button_number += 64 - 3;
1319 } 1288 }
1320 1289
1321 if (priv_modes & PrivMode_MouseX10) 1290 if (priv_modes & PrivMode_MouseX10)
1322 { 1291 {
1323 /* 1292 /*
… …
1355 fputc ('A', stderr); 1324 fputc ('A', stderr);
1356 if (key_state & 32) 1325 if (key_state & 32)
1357 fputc ('2', stderr); 1326 fputc ('2', stderr);
1358 fprintf (stderr, "]: <%d>, %d/%d\n", 1327 fprintf (stderr, "]: <%d>, %d/%d\n",
1359 button_number, 1328 button_number,
1360 x + 1, 1329 x,
1361 y + 1); 1330 y);
1362#endif 1331#endif
1363 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
1364 tt_printf ("\033[M%c%c%c", 1346 tt_printf ("\033[M%c%c%c",
1365 (32 + button_number + key_state), 1347 code + button_number + key_state,
1366 (32 + x + 1), 1348 32 + x,
1367 (32 + y + 1)); 1349 32 + y);
1368} 1350}
1369 1351
1370/*{{{ process an X event */ 1352/*{{{ process an X event */
1371void 1353void ecb_hot
1372rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
1373{ 1355{
1374 make_current (); 1356 make_current ();
1375 1357
1376 dLocal (Display *, dpy); 1358 dLocal (Display *, dpy);
… …
1474 && ev.xfocus.mode != NotifyGrab) 1456 && ev.xfocus.mode != NotifyGrab)
1475 focus_out (); 1457 focus_out ();
1476 break; 1458 break;
1477 1459
1478 case ConfigureNotify: 1460 case ConfigureNotify:
1479 if (ev.xconfigure.window == parent[0]) 1461 if (ev.xconfigure.window == parent)
1480 { 1462 {
1481 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1482 ; 1464 ;
1465
1466 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1467
1468#ifdef HAVE_BG_PIXMAP
1469 if (bg_window_position_sensitive ())
1470 want_position_change = true;
1471#endif
1472
1473 bool moved = false;
1474
1475 if (want_position_change)
1476 {
1477 int x, y;
1478
1479 if (ev.xconfigure.send_event)
1480 {
1481 x = ev.xconfigure.x;
1482 y = ev.xconfigure.y;
1483 }
1484 else
1485 get_window_origin (x, y);
1486
1487 if (x != parent_x || y != parent_y)
1488 {
1489 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1490 parent_x = x;
1491 parent_y = y;
1492 }
1493
1494 if (bg_set_position (x, y)
1495 || !(bg_flags & BG_IS_VALID))
1496 moved = true;
1497 }
1483 1498
1484 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1499 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1485 { 1500 {
1486 seen_resize = 1; 1501 seen_resize = 1;
1487 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1502 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1488 } 1503 }
1489 else 1504 else
1490 { 1505 {
1491#ifdef ENABLE_TRANSPARENCY 1506#ifdef HAVE_BG_PIXMAP
1492 if (option (Opt_transparent)) 1507 if (moved)
1493 if (bgPixmap.render ()) 1508 update_background ();
1494 scr_touch (false);
1495#endif 1509#endif
1496 } 1510 }
1511
1497 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1498 } 1513 }
1499 break; 1514 break;
1500 1515
1501 case PropertyNotify: 1516 case PropertyNotify:
1502 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1517 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1503 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1504 && ev.xproperty.state == PropertyNewValue)
1505 selection_property (ev.xproperty.window, ev.xproperty.atom);
1506
1507 break; 1518 break;
1508 1519
1509 case SelectionClear: 1520 case SelectionClear:
1510 selection_clear (); 1521 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1511 break;
1512
1513 case SelectionNotify:
1514 if (selection_wait == Sel_normal)
1515 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1516 break; 1522 break;
1517 1523
1518 case SelectionRequest: 1524 case SelectionRequest:
1519 selection_send (ev.xselectionrequest); 1525 selection_send (ev.xselectionrequest);
1520 break; 1526 break;
1521 1527
1522 case MapNotify: 1528 case MapNotify:
1529#ifdef HAVE_BG_PIXMAP
1530 /* This is needed specifically to fix the case of no window manager or a
1531 * non-reparenting window manager. In those cases we never get first
1532 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1533 * care of multiplicity of ConfigureNotify events arriving while WM does
1534 * reparenting.
1535 * We should not render background immediately, as there could be several
1536 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1537 * by scheduling background redraw as soon as we can, but giving a short
1538 * bit of time for ConfigureNotifies to arrive.
1539 * We should render background PRIOR to drawing any text, but AFTER all
1540 * of ConfigureNotifys for the best results.
1541 */
1542 if (!(bg_flags & BG_IS_VALID))
1543 update_background_ev.start (0.025);
1544#endif
1523 mapped = 1; 1545 mapped = 1;
1524#ifdef TEXT_BLINK 1546#ifdef TEXT_BLINK
1525 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1547 text_blink_ev.start ();
1526#endif 1548#endif
1527 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1549 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1528 break; 1550 break;
1529 1551
1530 case UnmapNotify: 1552 case UnmapNotify:
… …
1532#ifdef TEXT_BLINK 1554#ifdef TEXT_BLINK
1533 text_blink_ev.stop (); 1555 text_blink_ev.stop ();
1534#endif 1556#endif
1535 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1557 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1536 break; 1558 break;
1537
1538#ifdef ENABLE_TRANSPARENCY
1539 case ReparentNotify:
1540 rootwin_cb (ev);
1541 break;
1542#endif /* ENABLE_TRANSPARENCY */
1543 1559
1544 case GraphicsExpose: 1560 case GraphicsExpose:
1545 case Expose: 1561 case Expose:
1546 if (ev.xany.window == vt) 1562 if (ev.xany.window == vt)
1547 { 1563 {
1548 do 1564 do
1565 {
1549 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1550 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, false);
1568 }
1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1569 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1552 1570
1553 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1571 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1554 1572
1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1574 {
1556 scr_expose (ev.xexpose.x, ev.xexpose.y, 1575 scr_expose (ev.xexpose.x, ev.xexpose.y,
1557 ev.xexpose.width, ev.xexpose.height, False); 1576 ev.xexpose.width, ev.xexpose.height, false);
1577 }
1558 1578
1559 want_refresh = 1; 1579 want_refresh = 1;
1560 } 1580 }
1561 else 1581 else
1562 { 1582 {
… …
1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1585 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1566 ; 1586 ;
1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1587 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1568 ; 1588 ;
1569 1589
1570 if (isScrollbarWindow (ev.xany.window)) 1590 if (scrollBar.state && ev.xany.window == scrollBar.win)
1571 { 1591 {
1572 scrollBar.setIdle (); 1592 scrollBar.state = SB_STATE_IDLE;
1573 scrollbar_show (0); 1593 scrollBar.show (0);
1574 } 1594 }
1575 } 1595 }
1576 break; 1596 break;
1577 1597
1578 case MotionNotify: 1598 case MotionNotify:
1579#ifdef POINTER_BLANK 1599#ifdef POINTER_BLANK
1580 if (hidden_pointer) 1600 if (hidden_pointer)
1581 pointer_unblank (); 1601 pointer_unblank ();
1582#endif 1602#endif
1603 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1604 || priv_modes & PrivMode_MouseAnyEvent)
1605 mouse_report (ev.xbutton);
1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1606 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1584 break; 1607 break;
1585 1608
1586 if (ev.xany.window == vt) 1609 if (ev.xany.window == vt)
1587 { 1610 {
… …
1621 int dist; 1644 int dist;
1622 1645
1623 /* don't clobber the current delay if we are 1646 /* don't clobber the current delay if we are
1624 * already in the middle of scrolling. 1647 * already in the middle of scrolling.
1625 */ 1648 */
1626 if (!sel_scroll_ev.active) 1649 if (!sel_scroll_ev.is_active ())
1627 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1650 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1628 1651
1629 /* save the event params so we can highlight 1652 /* save the event params so we can highlight
1630 * the selection in the pending-scroll loop 1653 * the selection in the pending-scroll loop
1631 */ 1654 */
1632 selection_save_x = ev.xbutton.x; 1655 selection_save_x = ev.xbutton.x;
… …
1640 dist = int_bwidth - ev.xbutton.y; 1663 dist = int_bwidth - ev.xbutton.y;
1641 } 1664 }
1642 else 1665 else
1643 { 1666 {
1644 scroll_selection_dir = DN; 1667 scroll_selection_dir = DN;
1645 dist = ev.xbutton.y - (int_bwidth + height); 1668 dist = ev.xbutton.y - (int_bwidth + vt_height);
1646 } 1669 }
1647 1670
1648 scroll_selection_lines = Pixel2Height (dist) 1671 scroll_selection_lines = Pixel2Height (dist)
1649 / SELECTION_SCROLL_LINE_SPEEDUP 1672 / SELECTION_SCROLL_LINE_SPEEDUP
1650 + 1; 1673 + 1;
… …
1654 else 1677 else
1655 { 1678 {
1656 /* we are within the text window, so we 1679 /* we are within the text window, so we
1657 * shouldn't be scrolling 1680 * shouldn't be scrolling
1658 */ 1681 */
1659 if (sel_scroll_ev.active)
1660 sel_scroll_ev.stop(); 1682 sel_scroll_ev.stop();
1661 } 1683 }
1662#endif 1684#endif
1663#ifdef MOUSE_THRESHOLD 1685#ifdef MOUSE_THRESHOLD
1664 } 1686 }
1665#endif 1687#endif
1666 } 1688 }
1667 } 1689 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1669 { 1691 {
1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1693 MotionNotify, &ev))
1672 ; 1694 ;
1673 1695
1674 XQueryPointer (dpy, scrollBar.win, 1696 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1697 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1698 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1699 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1700 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1701 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1680 scrollbar_size ()); 1702 scrollBar.size ());
1681 want_refresh = 1; 1703 want_refresh = 1;
1682 scrollbar_show (1); 1704 scrollBar.show (1);
1683 } 1705 }
1684 break; 1706 break;
1685 } 1707 }
1686 1708
1687#if defined(CURSOR_BLINK) 1709#if defined(CURSOR_BLINK)
1688 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1710 if (ev.type == KeyPress)
1689 { 1711 cursor_blink_reset ();
1690 if (hidden_cursor)
1691 {
1692 hidden_cursor = 0;
1693 want_refresh = 1;
1694 }
1695
1696 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1697 }
1698#endif 1712#endif
1699 1713
1700#if defined(POINTER_BLANK) 1714#if defined(POINTER_BLANK)
1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1715 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1702 { 1716 {
… …
1708 1722
1709 if (ev.type == KeyPress && hidden_pointer == 0) 1723 if (ev.type == KeyPress && hidden_pointer == 0)
1710 pointer_blank (); 1724 pointer_blank ();
1711 } 1725 }
1712#endif 1726#endif
1713}
1714 1727
1715void 1728 refresh_check ();
1729}
1730
1731#if ENABLE_FRILLS
1732void ecb_cold
1733rxvt_term::set_urgency (bool enable)
1734{
1735 if (enable == urgency_hint)
1736 return;
1737
1738 if (XWMHints *h = XGetWMHints (dpy, parent))
1739 {
1740 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1741 XSetWMHints (dpy, parent, h);
1742 urgency_hint = enable;
1743 XFree (h);
1744 }
1745}
1746#endif
1747
1748void ecb_cold
1716rxvt_term::focus_in () 1749rxvt_term::focus_in ()
1717{ 1750{
1718 if (!focus) 1751 if (!focus)
1719 { 1752 {
1720 focus = 1; 1753 focus = 1;
1721 want_refresh = 1; 1754 want_refresh = 1;
1722 1755
1723 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1724
1725#if USE_XIM 1756#if USE_XIM
1726 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1727 { 1758 {
1728 IMSetPosition (); 1759 im_set_position ();
1729 XSetICFocus (Input_Context); 1760 XSetICFocus (Input_Context);
1730 } 1761 }
1731#endif 1762#endif
1732#if CURSOR_BLINK 1763#if CURSOR_BLINK
1733 if (option (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
1734 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1765 cursor_blink_ev.again ();
1735#endif 1766#endif
1736#if OFF_FOCUS_FADING 1767#if OFF_FOCUS_FADING
1737 if (rs[Rs_fade]) 1768 if (rs[Rs_fade])
1738 { 1769 {
1739 pix_colors = pix_colors_focused; 1770 pix_colors = pix_colors_focused;
1740 scr_recolour (); 1771 scr_recolour ();
1741 } 1772 }
1742#endif 1773#endif
1743#if ENABLE_FRILLS 1774#if ENABLE_FRILLS
1744 if (option (Opt_urgentOnBell)) 1775 if (option (Opt_urgentOnBell))
1745 { 1776 set_urgency (0);
1746 XWMHints *h;
1747
1748 h = XGetWMHints(dpy, parent[0]);
1749 if (h != NULL)
1750 {
1751 h->flags &= ~XUrgencyHint;
1752 XSetWMHints(dpy, parent[0], h);
1753 }
1754 }
1755#endif 1777#endif
1756 }
1757}
1758 1778
1759void 1779 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1780 }
1781}
1782
1783void ecb_cold
1760rxvt_term::focus_out () 1784rxvt_term::focus_out ()
1761{ 1785{
1762 if (focus) 1786 if (focus)
1763 { 1787 {
1764 focus = 0; 1788 focus = 0;
1765 want_refresh = 1; 1789 want_refresh = 1;
1766 1790
1767 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1791#if ENABLE_FRILLS
1768 1792 if (option (Opt_urgentOnBell))
1793 set_urgency (0);
1794#endif
1769#if ENABLE_FRILLS || ISO_14755 1795#if ENABLE_FRILLS || ISO_14755
1770 if (iso14755buf) 1796 if (iso14755buf)
1771 { 1797 {
1772 iso14755buf = 0; 1798 iso14755buf = 0;
1773# if ISO_14755 1799# if ISO_14755
… …
1780 XUnsetICFocus (Input_Context); 1806 XUnsetICFocus (Input_Context);
1781#endif 1807#endif
1782#if CURSOR_BLINK 1808#if CURSOR_BLINK
1783 if (option (Opt_cursorBlink)) 1809 if (option (Opt_cursorBlink))
1784 cursor_blink_ev.stop (); 1810 cursor_blink_ev.stop ();
1811
1785 hidden_cursor = 0; 1812 hidden_cursor = 0;
1786#endif 1813#endif
1787#if OFF_FOCUS_FADING 1814#if OFF_FOCUS_FADING
1788 if (rs[Rs_fade]) 1815 if (rs[Rs_fade])
1789 { 1816 {
1790 pix_colors = pix_colors_unfocused; 1817 pix_colors = pix_colors_unfocused;
1791 scr_recolour (); 1818 scr_recolour ();
1792 } 1819 }
1793#endif 1820#endif
1794 }
1795}
1796 1821
1797void 1822 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1823 }
1824}
1825
1826void ecb_cold
1798rxvt_term::update_fade_color (unsigned int idx) 1827rxvt_term::update_fade_color (unsigned int idx)
1799{ 1828{
1800#if OFF_FOCUS_FADING 1829#if OFF_FOCUS_FADING
1801 if (rs[Rs_fade]) 1830 if (rs[Rs_fade])
1802 { 1831 {
… …
1806 } 1835 }
1807#endif 1836#endif
1808} 1837}
1809 1838
1810#if ENABLE_TRANSPARENCY || ENABLE_PERL 1839#if ENABLE_TRANSPARENCY || ENABLE_PERL
1811void 1840void ecb_hot
1812rxvt_term::rootwin_cb (XEvent &ev) 1841rxvt_term::rootwin_cb (XEvent &ev)
1813{ 1842{
1814 make_current (); 1843 make_current ();
1815 1844
1816 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1845 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
… …
1826 * use the property to determine the pixmap. We use it later on. 1855 * use the property to determine the pixmap. We use it later on.
1827 */ 1856 */
1828 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1857 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1829 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1858 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1830 { 1859 {
1831 bgPixmap.set_root_pixmap (); 1860 bg_set_root_pixmap ();
1832 bgPixmap.render (); 1861 update_background ();
1833 } 1862 }
1863
1834 break; 1864 break;
1835 } 1865 }
1836# endif 1866# endif
1867
1868 refresh_check ();
1837} 1869}
1838#endif 1870#endif
1839 1871
1840void 1872void
1841rxvt_term::button_press (XButtonEvent &ev) 1873rxvt_term::button_press (XButtonEvent &ev)
… …
1872 /* save the xbutton state (for ButtonRelease) */ 1904 /* save the xbutton state (for ButtonRelease) */
1873 MEvent.state = ev.state; 1905 MEvent.state = ev.state;
1874#ifdef MOUSE_REPORT_DOUBLECLICK 1906#ifdef MOUSE_REPORT_DOUBLECLICK
1875 if (ev.button == MEvent.button && clickintime) 1907 if (ev.button == MEvent.button && clickintime)
1876 { 1908 {
1877 /* same button, within alloted time */ 1909 /* same button, within allowed time */
1878 MEvent.clicks++; 1910 MEvent.clicks++;
1879 1911
1880 if (MEvent.clicks > 1) 1912 if (MEvent.clicks > 1)
1881 { 1913 {
1882 /* only report double clicks */ 1914 /* only report double clicks */
… …
1896 mouse_report (ev); 1928 mouse_report (ev);
1897 } 1929 }
1898#else 1930#else
1899 MEvent.button = ev.button; 1931 MEvent.button = ev.button;
1900 mouse_report (ev); 1932 mouse_report (ev);
1901#endif /* MOUSE_REPORT_DOUBLECLICK */ 1933#endif /* MOUSE_REPORT_DOUBLECLICK */
1902 1934
1903 } 1935 }
1904 else 1936 else
1905 { 1937 {
1906 if (ev.button != MEvent.button) 1938 if (ev.button != MEvent.button)
… …
1954 } 1986 }
1955 1987
1956 /* 1988 /*
1957 * Scrollbar window processing of button press 1989 * Scrollbar window processing of button press
1958 */ 1990 */
1959 if (isScrollbarWindow (ev.window)) 1991 if (scrollBar.state && ev.window == scrollBar.win)
1960 { 1992 {
1961 scrollBar.setIdle (); 1993 page_dirn direction = NO_DIR;
1994
1995 if (scrollBar.upButton (ev.y))
1996 direction = UP; /* up */
1997 else if (scrollBar.dnButton (ev.y))
1998 direction = DN; /* down */
1999
2000 scrollBar.state = SB_STATE_IDLE;
1962 /* 2001 /*
1963 * Rxvt-style scrollbar: 2002 * Rxvt-style scrollbar:
1964 * move up if mouse is above slider 2003 * move up if mouse is above slider
1965 * move dn if mouse is below slider 2004 * move dn if mouse is below slider
1966 * 2005 *
… …
1975 /* 2014 /*
1976 * Mouse report disabled scrollbar: 2015 * Mouse report disabled scrollbar:
1977 * arrow buttons - send up/down 2016 * arrow buttons - send up/down
1978 * click on scrollbar - send pageup/down 2017 * click on scrollbar - send pageup/down
1979 */ 2018 */
1980 if ((scrollBar.style == R_SB_NEXT 2019 if (direction == UP)
1981 && scrollbarnext_upButton (ev.y))
1982 || (scrollBar.style == R_SB_RXVT
1983 && scrollbarrxvt_upButton (ev.y)))
1984 tt_printf ("\033[A"); 2020 tt_printf ("\033[A");
1985 else if ((scrollBar.style == R_SB_NEXT 2021 else if (direction == DN)
1986 && scrollbarnext_dnButton (ev.y))
1987 || (scrollBar.style == R_SB_RXVT
1988 && scrollbarrxvt_dnButton (ev.y)))
1989 tt_printf ("\033[B"); 2022 tt_printf ("\033[B");
1990 else 2023 else
1991 switch (ev.button) 2024 switch (ev.button)
1992 { 2025 {
1993 case Button2: 2026 case Button2:
… …
2000 tt_printf ("\033[5~"); 2033 tt_printf ("\033[5~");
2001 break; 2034 break;
2002 } 2035 }
2003 } 2036 }
2004 else 2037 else
2005#endif /* NO_SCROLLBAR_REPORT */ 2038#endif /* NO_SCROLLBAR_REPORT */
2006
2007 {
2008 char upordown = 0;
2009
2010 if (scrollBar.style == R_SB_NEXT)
2011 { 2039 {
2012 if (scrollbarnext_upButton (ev.y)) 2040 if (direction != NO_DIR)
2013 upordown = -1; /* up */
2014 else if (scrollbarnext_dnButton (ev.y))
2015 upordown = 1; /* down */
2016 }
2017 else if (scrollBar.style == R_SB_RXVT)
2018 {
2019 if (scrollbarrxvt_upButton (ev.y))
2020 upordown = -1; /* up */
2021 else if (scrollbarrxvt_dnButton (ev.y))
2022 upordown = 1; /* down */
2023 }
2024 if (upordown)
2025 { 2041 {
2026#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2042#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2043 if (!cont_scroll_ev.is_active ())
2027 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2044 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2028#endif 2045#endif
2029 if (scr_page (upordown < 0 ? UP : DN, 1)) 2046 if (scr_page (direction, 1))
2030 { 2047 {
2031 if (upordown < 0) 2048 if (direction == UP)
2032 scrollBar.setUp (); 2049 scrollBar.state = SB_STATE_UP;
2033 else 2050 else
2034 scrollBar.setDn (); 2051 scrollBar.state = SB_STATE_DOWN;
2035 } 2052 }
2036 } 2053 }
2037 else 2054 else
2038 switch (ev.button) 2055 switch (ev.button)
2039 { 2056 {
2040 case Button2: 2057 case Button2:
2041 switch (scrollbar_align) 2058 switch (scrollBar.align)
2042 { 2059 {
2043 case R_SB_ALIGN_TOP: 2060 case SB_ALIGN_TOP:
2044 csrO = 0; 2061 csrO = 0;
2045 break; 2062 break;
2046 case R_SB_ALIGN_CENTRE: 2063 case SB_ALIGN_CENTRE:
2047 csrO = (scrollBar.bot - scrollBar.top) / 2; 2064 csrO = (scrollBar.bot - scrollBar.top) / 2;
2048 break; 2065 break;
2049 case R_SB_ALIGN_BOTTOM: 2066 case SB_ALIGN_BOTTOM:
2050 csrO = scrollBar.bot - scrollBar.top; 2067 csrO = scrollBar.bot - scrollBar.top;
2051 break; 2068 break;
2052 } 2069 }
2053 2070
2054 if (scrollBar.style == R_SB_XTERM 2071 if (scrollBar.style == SB_STYLE_XTERM
2055 || scrollbar_above_slider (ev.y) 2072 || scrollBar.above_slider (ev.y)
2056 || scrollbar_below_slider (ev.y)) 2073 || scrollBar.below_slider (ev.y))
2057 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2074 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2058 2075
2059 scrollBar.setMotion (); 2076 scrollBar.state = SB_STATE_MOTION;
2060 break; 2077 break;
2061 2078
2062 case Button1: 2079 case Button1:
2063 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2080 if (scrollBar.align == SB_ALIGN_CENTRE)
2064 csrO = ev.y - scrollBar.top; 2081 csrO = ev.y - scrollBar.top;
2065 /* FALLTHROUGH */ 2082 /* FALLTHROUGH */
2066 2083
2067 case Button3: 2084 case Button3:
2068 if (scrollBar.style != R_SB_XTERM) 2085 if (scrollBar.style != SB_STYLE_XTERM)
2069 { 2086 {
2070 if (scrollbar_above_slider (ev.y)) 2087 if (scrollBar.above_slider (ev.y))
2071# ifdef RXVT_SCROLL_FULL 2088# ifdef RXVT_SCROLL_FULL
2072 scr_page (UP, nrow - 1); 2089 scr_page (UP, nrow - 1);
2073# else 2090# else
2074 scr_page (UP, nrow / 4); 2091 scr_page (UP, nrow / 4);
2075# endif 2092# endif
2076 else if (scrollbar_below_slider (ev.y)) 2093 else if (scrollBar.below_slider (ev.y))
2077# ifdef RXVT_SCROLL_FULL 2094# ifdef RXVT_SCROLL_FULL
2078 scr_page (DN, nrow - 1); 2095 scr_page (DN, nrow - 1);
2079# else 2096# else
2080 scr_page (DN, nrow / 4); 2097 scr_page (DN, nrow / 4);
2081# endif 2098# endif
2082 else 2099 else
2083 scrollBar.setMotion (); 2100 scrollBar.state = SB_STATE_MOTION;
2084 } 2101 }
2085 else 2102 else
2086 { 2103 {
2087 scr_page ((ev.button == Button1 ? DN : UP), 2104 scr_page ((ev.button == Button1 ? DN : UP),
2088 (nrow 2105 (nrow
2089 * scrollbar_position (ev.y) 2106 * scrollBar.position (ev.y)
2090 / scrollbar_size ())); 2107 / scrollBar.size ()));
2091 } 2108 }
2092 2109
2093 break; 2110 break;
2094 } 2111 }
2095 } 2112 }
… …
2105 2122
2106 csrO = 0; /* reset csr Offset */ 2123 csrO = 0; /* reset csr Offset */
2107 if (!bypass_keystate) 2124 if (!bypass_keystate)
2108 reportmode = !! (priv_modes & PrivMode_mouse_report); 2125 reportmode = !! (priv_modes & PrivMode_mouse_report);
2109 2126
2110 if (scrollbar_isUpDn ()) 2127 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2111 { 2128 {
2112 scrollBar.setIdle (); 2129 scrollBar.state = SB_STATE_IDLE;
2113 scrollbar_show (0); 2130 scrollBar.show (0);
2114 } 2131 }
2115 2132
2116#ifdef SELECTION_SCROLLING 2133#ifdef SELECTION_SCROLLING
2117 if (sel_scroll_ev.active)
2118 sel_scroll_ev.stop(); 2134 sel_scroll_ev.stop();
2119#endif 2135#endif
2120 2136
2121 if (ev.window == vt) 2137 if (ev.window == vt)
2122 { 2138 {
2123 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2139 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2147 mouse_report (ev); 2163 mouse_report (ev);
2148 } 2164 }
2149#else /* MOUSE_REPORT_DOUBLECLICK */ 2165#else /* MOUSE_REPORT_DOUBLECLICK */
2150 MEvent.button = AnyButton; 2166 MEvent.button = AnyButton;
2151 mouse_report (ev); 2167 mouse_report (ev);
2152#endif /* MOUSE_REPORT_DOUBLECLICK */ 2168#endif /* MOUSE_REPORT_DOUBLECLICK */
2153 return; 2169 return;
2154 } 2170 }
2155 2171
2156 /* 2172 /*
2157 * dumb hack to compensate for the failure of click-and-drag 2173 * dumb hack to compensate for the failure of click-and-drag
… …
2168 case Button3: 2184 case Button3:
2169 selection_make (ev.time); 2185 selection_make (ev.time);
2170 break; 2186 break;
2171 2187
2172 case Button2: 2188 case Button2:
2173 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2189 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2174 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2190 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2175 break; 2191 break;
2176 2192
2177#ifdef MOUSE_WHEEL 2193#ifdef MOUSE_WHEEL
2178 case Button4: 2194 case Button4:
2179 case Button5: 2195 case Button5:
… …
2195 { 2211 {
2196 mouse_slip_wheel_speed += v ? -1 : 1; 2212 mouse_slip_wheel_speed += v ? -1 : 1;
2197 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2213 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2198 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2214 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2199 2215
2200 if (slip_wheel_ev.at < NOW) 2216 if (!slip_wheel_ev.is_active ())
2201 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2217 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2202
2203 slip_wheel_ev.start ();
2204 } 2218 }
2205 else 2219 else
2220# endif
2206 { 2221 {
2207# endif
2208 scr_page (v, i); 2222 scr_page (v, i);
2209 scrollbar_show (1); 2223 scrollBar.show (1);
2210# ifdef MOUSE_SLIP_WHEELING
2211 } 2224 }
2212# endif
2213 } 2225 }
2214 break; 2226 break;
2215#endif 2227#endif
2216 } 2228 }
2217 } 2229 }
2218} 2230}
2219 2231
2220/*}}} */ 2232/*}}} */
2221 2233
2222bool 2234void ecb_hot
2223rxvt_term::cmd_parse () 2235rxvt_term::cmd_parse ()
2224{ 2236{
2225 bool flag = false;
2226 wchar_t ch = NOCHAR; 2237 wchar_t ch = NOCHAR;
2227 char *seq_begin; // remember start of esc-sequence here 2238 char *seq_begin; // remember start of esc-sequence here
2228 2239
2229 for (;;) 2240 for (;;)
2230 { 2241 {
2231 if (ch == NOCHAR) 2242 if (ecb_unlikely (ch == NOCHAR))
2232 { 2243 {
2233 seq_begin = cmdbuf_ptr; 2244 seq_begin = cmdbuf_ptr;
2234 ch = next_char (); 2245 ch = next_char ();
2235 2246
2236 if (ch == NOCHAR) 2247 if (ch == NOCHAR)
2237 break; 2248 break;
2238 } 2249 }
2239 2250
2240 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2251 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2241 { 2252 {
2242 if (!seen_input) 2253 if (ecb_unlikely (!seen_input))
2243 { 2254 {
2244 seen_input = 1; 2255 seen_input = 1;
2245 // many badly-written programs (e.g. jed) contain a race condition: 2256 // many badly-written programs (e.g. jed) contain a race condition:
2246 // they first read the screensize and then install a SIGWINCH handler. 2257 // they first read the screensize and then install a SIGWINCH handler.
2247 // some window managers resize the window early, and these programs 2258 // some window managers resize the window early, and these programs
… …
2260 wchar_t *str = buf; 2271 wchar_t *str = buf;
2261 wchar_t *eol = str + min (ncol, UBUFSIZ); 2272 wchar_t *eol = str + min (ncol, UBUFSIZ);
2262 2273
2263 for (;;) 2274 for (;;)
2264 { 2275 {
2265 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2276 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2266 break; 2277 break;
2267 2278
2268 *str++ = ch; 2279 *str++ = ch;
2269 2280
2270 if (ch == C0_LF || str >= eol) 2281 if (ecb_unlikely (ch == C0_LF || str >= eol))
2271 { 2282 {
2272 if (ch == C0_LF) 2283 if (ch == C0_LF)
2273 nlines++; 2284 nlines++;
2274 2285
2275 refresh_count++; 2286 refresh_count++;
2276 2287
2277 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2288 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2278 { 2289 {
2279 refresh_count = 0; 2290 refresh_count = 0;
2280 2291
2281 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2292 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2282 { 2293 {
2283 refreshnow = true; 2294 refreshnow = true;
2284 ch = NOCHAR; 2295 ch = NOCHAR;
2285 break; 2296 break;
2286 } 2297 }
… …
2324 * What the heck we'll cheat and only refresh less than every page-full. 2335 * What the heck we'll cheat and only refresh less than every page-full.
2325 * if skipScroll is enabled. 2336 * if skipScroll is enabled.
2326 */ 2337 */
2327 if (refreshnow) 2338 if (refreshnow)
2328 { 2339 {
2329 flag = true;
2330 scr_refresh (); 2340 scr_refresh ();
2331 want_refresh = 1; 2341 want_refresh = 1;
2332 } 2342 }
2333
2334 } 2343 }
2335 else 2344 else
2336 { 2345 {
2337 try 2346 try
2338 { 2347 {
… …
2346 } 2355 }
2347 2356
2348 ch = NOCHAR; 2357 ch = NOCHAR;
2349 } 2358 }
2350 } 2359 }
2351
2352 return flag;
2353} 2360}
2354 2361
2355// read the next character 2362// read the next character
2356wchar_t 2363wchar_t ecb_hot
2357rxvt_term::next_char () NOTHROW 2364rxvt_term::next_char () NOTHROW
2358{ 2365{
2359 while (cmdbuf_ptr < cmdbuf_endp) 2366 while (cmdbuf_ptr < cmdbuf_endp)
2360 { 2367 {
2361 // assume 7-bit to be ascii ALWAYS 2368 // assume 7-bit to be ascii ALWAYS
2362 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2369 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2363 return *cmdbuf_ptr++; 2370 return *cmdbuf_ptr++;
2364 2371
2365 wchar_t wc; 2372 wchar_t wc;
2366 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2373 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2367 2374
… …
2371 cmdbuf_ptr = cmdbuf_endp; 2378 cmdbuf_ptr = cmdbuf_endp;
2372 break; 2379 break;
2373 } 2380 }
2374 2381
2375 if (len == (size_t)-1) 2382 if (len == (size_t)-1)
2383 {
2384 mbstate.reset (); // reset now undefined conversion state
2376 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2385 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2386 }
2377 2387
2378 // assume wchar == unicode 2388 // assume wchar == unicode
2379 cmdbuf_ptr += len; 2389 cmdbuf_ptr += len;
2380 return wc & UNICODE_MASK; 2390 return wc & UNICODE_MASK;
2381 } 2391 }
2382 2392
2383 return NOCHAR; 2393 return NOCHAR;
2384} 2394}
2385 2395
2386// read the next octet 2396// read the next octet
2387uint32_t 2397uint32_t ecb_hot
2388rxvt_term::next_octet () NOTHROW 2398rxvt_term::next_octet () NOTHROW
2389{ 2399{
2390 return cmdbuf_ptr < cmdbuf_endp 2400 return cmdbuf_ptr < cmdbuf_endp
2391 ? (unsigned char)*cmdbuf_ptr++ 2401 ? (unsigned char)*cmdbuf_ptr++
2392 : NOCHAR; 2402 : NOCHAR;
2393} 2403}
2394 2404
2395static class out_of_input out_of_input; 2405static class out_of_input out_of_input;
2396 2406
2397/* rxvt_cmd_getc () - Return next input character */ 2407wchar_t ecb_hot
2398/*
2399 * Return the next input character after first passing any keyboard input
2400 * to the command.
2401 */
2402wchar_t
2403rxvt_term::cmd_getc () THROW ((class out_of_input)) 2408rxvt_term::cmd_getc () THROW ((class out_of_input))
2404{ 2409{
2405 wchar_t c = next_char (); 2410 wchar_t c = next_char ();
2406 2411
2407 if (c == NOCHAR) 2412 if (c == NOCHAR)
2408 throw out_of_input; 2413 throw out_of_input;
2409 2414
2410 return c; 2415 return c;
2411} 2416}
2412 2417
2413uint32_t 2418uint32_t ecb_hot
2414rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2419rxvt_term::cmd_get8 () THROW ((class out_of_input))
2415{ 2420{
2416 uint32_t c = next_octet (); 2421 uint32_t c = next_octet ();
2417 2422
2418 if (c == NOCHAR) 2423 if (c == NOCHAR)
… …
2422} 2427}
2423 2428
2424/*{{{ print pipe */ 2429/*{{{ print pipe */
2425/*----------------------------------------------------------------------*/ 2430/*----------------------------------------------------------------------*/
2426#ifdef PRINTPIPE 2431#ifdef PRINTPIPE
2427FILE * 2432FILE * ecb_cold
2428rxvt_term::popen_printer () 2433rxvt_term::popen_printer ()
2429{ 2434{
2430 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2435 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2431 2436
2432 if (stream == NULL) 2437 if (stream == NULL)
2433 rxvt_warn ("can't open printer pipe, not printing.\n"); 2438 rxvt_warn ("can't open printer pipe, not printing.\n");
2434 2439
2435 return stream; 2440 return stream;
2436} 2441}
2437 2442
2438int 2443int ecb_cold
2439rxvt_term::pclose_printer (FILE *stream) 2444rxvt_term::pclose_printer (FILE *stream)
2440{ 2445{
2441 fflush (stream); 2446 fflush (stream);
2442 return pclose (stream); 2447 return pclose (stream);
2443} 2448}
2444 2449
2445/* 2450/*
2446 * simulate attached vt100 printer 2451 * simulate attached vt100 printer
2447 */ 2452 */
2448void 2453void ecb_cold
2449rxvt_term::process_print_pipe () 2454rxvt_term::process_print_pipe ()
2450{ 2455{
2451 int done; 2456 FILE *fd = popen_printer ();
2452 FILE *fd;
2453 2457
2454 if ((fd = popen_printer ()) == NULL) 2458 if (!fd)
2455 return; 2459 return;
2456 2460
2457 /* 2461 /*
2458 * Send all input to the printer until either ESC[4i or ESC[?4i 2462 * Send all input to the printer until either ESC[4i or ESC[?4i
2459 * is received. 2463 * is received.
2460 */ 2464 */
2461 for (done = 0; !done;) 2465 for (int done = 0; !done; )
2462 { 2466 {
2463 unsigned char buf[8]; 2467 unsigned char buf[8];
2464 unicode_t ch; 2468 unicode_t ch;
2465 unsigned int i, len; 2469 unsigned int i, len;
2466 2470
… …
2497 } 2501 }
2498 } 2502 }
2499 2503
2500 pclose_printer (fd); 2504 pclose_printer (fd);
2501} 2505}
2502#endif /* PRINTPIPE */ 2506#endif /* PRINTPIPE */
2503/*}}} */ 2507/*}}} */
2504 2508
2505/* *INDENT-OFF* */
2506enum { 2509enum {
2507 C1_40 = 0x40, 2510 C1_40 = 0x40,
2508 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2511 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2509 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2512 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2510 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2513 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2511 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2514 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2512}; 2515};
2513/* *INDENT-ON* */
2514 2516
2515/*{{{ process non-printing single characters */ 2517/*{{{ process non-printing single characters */
2516void 2518void ecb_hot
2517rxvt_term::process_nonprinting (unicode_t ch) 2519rxvt_term::process_nonprinting (unicode_t ch)
2518{ 2520{
2519 switch (ch) 2521 switch (ch)
2520 { 2522 {
2521 case C0_ESC: 2523 case C0_ESC:
… …
2567} 2569}
2568/*}}} */ 2570/*}}} */
2569 2571
2570 2572
2571/*{{{ process VT52 escape sequences */ 2573/*{{{ process VT52 escape sequences */
2572void 2574void ecb_cold
2573rxvt_term::process_escape_vt52 (unicode_t ch) 2575rxvt_term::process_escape_vt52 (unicode_t ch)
2574{ 2576{
2575 int row, col; 2577 int row, col;
2576 2578
2577 switch (ch) 2579 switch (ch)
… …
2611 break; 2613 break;
2612 case 'Z': /* identify the terminal type */ 2614 case 'Z': /* identify the terminal type */
2613 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2615 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2614 break; 2616 break;
2615 case '<': /* turn off VT52 mode */ 2617 case '<': /* turn off VT52 mode */
2616 PrivMode (0, PrivMode_vt52); 2618 priv_modes &= ~PrivMode_vt52;
2617 break; 2619 break;
2618 case 'F': /* use special graphics character set */ 2620 case 'F': /* use special graphics character set */
2619 case 'G': /* use regular character set */ 2621 case 'G': /* use regular character set */
2620 /* unimplemented */ 2622 /* unimplemented */
2621 break; 2623 break;
… …
2627} 2629}
2628/*}}} */ 2630/*}}} */
2629 2631
2630 2632
2631/*{{{ process escape sequences */ 2633/*{{{ process escape sequences */
2632void 2634void ecb_hot
2633rxvt_term::process_escape_seq () 2635rxvt_term::process_escape_seq ()
2634{ 2636{
2635 unicode_t ch = cmd_getc (); 2637 unicode_t ch = cmd_getc ();
2636 2638
2637 if (priv_modes & PrivMode_vt52) 2639 if (priv_modes & PrivMode_vt52)
… …
2640 return; 2642 return;
2641 } 2643 }
2642 2644
2643 switch (ch) 2645 switch (ch)
2644 { 2646 {
2645 /* case 1: do_tek_mode (); break; */
2646 case '#': 2647 case '#':
2647 if (cmd_getc () == '8') 2648 if (cmd_getc () == '8')
2648 scr_E (); 2649 scr_E ();
2649 break; 2650 break;
2650 case '(': 2651 case '(':
… …
2673#if !ENABLE_MINIMAL 2674#if !ENABLE_MINIMAL
2674 case '9': 2675 case '9':
2675 scr_forwardindex (); 2676 scr_forwardindex ();
2676 break; 2677 break;
2677#endif 2678#endif
2679 // DECPAM/DECPNM
2678 case '=': 2680 case '=':
2681 priv_modes |= PrivMode_aplKP;
2682 break;
2679 case '>': 2683 case '>':
2680 PrivMode ((ch == '='), PrivMode_aplKP); 2684 priv_modes &= ~PrivMode_aplKP;
2681 break; 2685 break;
2682 2686
2683 case C1_40: 2687 case C1_40:
2684 cmd_getc (); 2688 cmd_getc ();
2685 break; 2689 break;
… …
2689 2693
2690 /* 8.3.87: NEXT LINE */ 2694 /* 8.3.87: NEXT LINE */
2691 case C1_NEL: /* ESC E */ 2695 case C1_NEL: /* ESC E */
2692 { 2696 {
2693 wchar_t nlcr[] = { C0_LF, C0_CR }; 2697 wchar_t nlcr[] = { C0_LF, C0_CR };
2694 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2698 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2695 } 2699 }
2696 break; 2700 break;
2697 2701
2698 /* kidnapped escape sequence: Should be 8.3.48 */ 2702 /* kidnapped escape sequence: Should be 8.3.48 */
2699 case C1_ESA: /* ESC G */ 2703 case C1_ESA: /* ESC G */
2700 process_graphics (); 2704 // used by original rxvt for rob nations own graphics mode
2705 if (cmd_getc () == 'Q')
2706 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2701 break; 2707 break;
2702 2708
2703 /* 8.3.63: CHARACTER TABULATION SET */ 2709 /* 8.3.63: CHARACTER TABULATION SET */
2704 case C1_HTS: /* ESC H */ 2710 case C1_HTS: /* ESC H */
2705 scr_set_tab (1); 2711 scr_set_tab (1);
… …
2709 case C1_RI: /* ESC M */ 2715 case C1_RI: /* ESC M */
2710 scr_index (DN); 2716 scr_index (DN);
2711 break; 2717 break;
2712 2718
2713 /* 8.3.142: SINGLE-SHIFT TWO */ 2719 /* 8.3.142: SINGLE-SHIFT TWO */
2714 /*case C1_SS2: scr_single_shift (2); break; */ 2720 /* case C1_SS2: break; */
2715 2721
2716 /* 8.3.143: SINGLE-SHIFT THREE */ 2722 /* 8.3.143: SINGLE-SHIFT THREE */
2717 /*case C1_SS3: scr_single_shift (3); break; */ 2723 /* case C1_SS3: break; */
2718 2724
2719 /* 8.3.27: DEVICE CONTROL STRING */ 2725 /* 8.3.27: DEVICE CONTROL STRING */
2720 case C1_DCS: /* ESC P */ 2726 case C1_DCS: /* ESC P */
2721 process_dcs_seq (); 2727 process_dcs_seq ();
2722 break; 2728 break;
… …
2724 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2730 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2725 case C1_SCI: /* ESC Z */ 2731 case C1_SCI: /* ESC Z */
2726 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2732 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2727 break; /* steal obsolete ESC [ c */ 2733 break; /* steal obsolete ESC [ c */
2728 2734
2729 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2735 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2730 case C1_CSI: /* ESC [ */ 2736 case C1_CSI: /* ESC [ */
2731 process_csi_seq (); 2737 process_csi_seq ();
2732 break; 2738 break;
2733 2739
2734 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2740 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2735 case C1_OSC: /* ESC ] */ 2741 case C1_OSC: /* ESC ] */
2736 process_osc_seq (); 2742 process_osc_seq ();
2737 break; 2743 break;
2738 2744
2739 /* 8.3.106: RESET TO INITIAL STATE */ 2745 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2740 case 'c': 2746 case 'c':
2741 mbstate.reset (); 2747 mbstate.reset ();
2742 scr_poweron (); 2748 scr_poweron ();
2743 scrollbar_show (1); 2749 scrollBar.show (1);
2744 break; 2750 break;
2745 2751
2746 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2752 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2747 case 'n': 2753 case 'n':
2748 scr_charset_choose (2); 2754 scr_charset_choose (2);
… …
2755 } 2761 }
2756} 2762}
2757/*}}} */ 2763/*}}} */
2758 2764
2759/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2765/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2760/* *INDENT-OFF* */
2761enum { 2766enum {
2762 CSI_ICH = 0x40, 2767 CSI_ICH = 0x40,
2763 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2768 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2764 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2769 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2765 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2770 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2768 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2773 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2769 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2774 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2770 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2775 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2771}; 2776};
2772 2777
2773#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2778#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2774 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2779 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2775 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2780 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2776#define get_byte_array_bit(array, bit) \ 2781#define get_byte_array_bit(array, bit) \
2777 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2782 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2778 2783
2779const unsigned char csi_defaults[] = 2784static const unsigned char csi_defaults[] =
2780 { 2785 {
2781 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2786 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2782 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2787 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2783 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2788 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2784 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2789 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2785 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2790 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2786 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2791 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2787 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2792 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2788 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2793 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2789 }; 2794 };
2790/* *INDENT-ON* */
2791 2795
2792void 2796void ecb_hot
2793rxvt_term::process_csi_seq () 2797rxvt_term::process_csi_seq ()
2794{ 2798{
2795 unicode_t ch, priv, i; 2799 unicode_t ch, priv, i;
2796 unsigned int nargs, p; 2800 unsigned int nargs, p;
2797 int n, ndef; 2801 int n, ndef;
2798 int arg[ESC_ARGS]; 2802 int arg[ESC_ARGS] = { };
2799 2803
2800 memset (arg, 0, sizeof (arg));
2801 nargs = 0; 2804 nargs = 0;
2802 2805
2803 priv = 0; 2806 priv = 0;
2804 ch = cmd_getc (); 2807 ch = cmd_getc ();
2805 if (ch >= '<' && ch <= '?') 2808 if ((ch >= '<' && ch <= '?') || ch == '!')
2809 {
2806 { /* '<' '=' '>' '?' */ 2810 /* '<' '=' '>' '?' '!' */
2807 priv = ch; 2811 priv = ch;
2808 ch = cmd_getc (); 2812 ch = cmd_getc ();
2809 } 2813 }
2810 2814
2811 /* read any numerical arguments */ 2815 /* read any numerical arguments */
… …
2854 { 2858 {
2855 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2859 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2856 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2860 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2857 // 2861 //
2858 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2862 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2859 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2863 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2860 // that we do not support xterm mouse reporting (should be 95 when we do). 2864 // versions.
2861 // 2865 //
2862 tt_printf ("\033[>%d;94;0c", 'U'); 2866 tt_printf ("\033[>%d;95;0c", 'U');
2863 } 2867 }
2864 break; 2868 break;
2869
2865 case '?': 2870 case '?':
2866 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2871 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2867 process_terminal_mode (ch, priv, nargs, arg); 2872 process_terminal_mode (ch, priv, nargs, arg);
2868 break; 2873 break;
2874
2875 case '!':
2876 if (ch == CSI_70)
2877 {
2878 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2879 scr_soft_reset ();
2880
2881 static const int pm_h[] = { 7, 25 };
2882 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2883
2884 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2885 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2869 } 2886 }
2887 break;
2888 }
2889
2870 return; 2890 return;
2871 } 2891 }
2872 2892
2873 switch (ch) 2893 switch (ch)
2874 { 2894 {
… …
2888 } 2908 }
2889 break; 2909 break;
2890#endif 2910#endif
2891 2911
2892 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2912 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2893 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2913 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2894 arg[0] = -arg[0]; 2914 arg[0] = -arg[0];
2895 /* FALLTHROUGH */ 2915 /* FALLTHROUGH */
2896 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2916 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2897 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2917 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2898 scr_gotorc (arg[0], 0, RELATIVE); 2918 scr_gotorc (arg[0], 0, RELATIVE);
2899 break; 2919 break;
2900 2920
2901 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2921 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2902 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2922 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3089 } 3109 }
3090} 3110}
3091/*}}} */ 3111/*}}} */
3092 3112
3093#if !ENABLE_MINIMAL 3113#if !ENABLE_MINIMAL
3094/* ARGSUSED */
3095void 3114void
3096rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3115rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3097{ 3116{
3098 int x, y; 3117 int x, y;
3099 XWindowAttributes wattr; 3118 XWindowAttributes wattr;
… …
3108 { 3127 {
3109 /* 3128 /*
3110 * commands 3129 * commands
3111 */ 3130 */
3112 case 1: /* deiconify window */ 3131 case 1: /* deiconify window */
3113 XMapWindow (dpy, parent[0]); 3132 XMapWindow (dpy, parent);
3114 break; 3133 break;
3115 case 2: /* iconify window */ 3134 case 2: /* iconify window */
3116 XIconifyWindow (dpy, parent[0], display->screen); 3135 XIconifyWindow (dpy, parent, display->screen);
3117 break; 3136 break;
3118 case 3: /* set position (pixels) */ 3137 case 3: /* set position (pixels) */
3119 XMoveWindow (dpy, parent[0], args[1], args[2]); 3138 XMoveWindow (dpy, parent, args[1], args[2]);
3120 break; 3139 break;
3121 case 4: /* set size (pixels) */ 3140 case 4: /* set size (pixels) */
3122 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3141 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3123 break; 3142 break;
3124 case 5: /* raise window */ 3143 case 5: /* raise window */
3125 XRaiseWindow (dpy, parent[0]); 3144 XRaiseWindow (dpy, parent);
3126 break; 3145 break;
3127 case 6: /* lower window */ 3146 case 6: /* lower window */
3128 XLowerWindow (dpy, parent[0]); 3147 XLowerWindow (dpy, parent);
3129 break; 3148 break;
3130 case 7: /* refresh window */ 3149 case 7: /* refresh window */
3131 scr_touch (true); 3150 scr_touch (true);
3132 break; 3151 break;
3133 case 8: /* set size (chars) */ 3152 case 8: /* set size (chars) */
… …
3136 break; 3155 break;
3137 3156
3138 //case 9: NYI, TODO, restore maximized window or maximize window 3157 //case 9: NYI, TODO, restore maximized window or maximize window
3139 default: 3158 default:
3140 if (args[0] >= 24) /* set height (chars) */ 3159 if (args[0] >= 24) /* set height (chars) */
3141 set_widthheight ((unsigned int)width, 3160 set_widthheight ((unsigned int)vt_width,
3142 (unsigned int) (args[1] * fheight)); 3161 (unsigned int) (args[1] * fheight));
3143 break; 3162 break;
3144 3163
3145 /* 3164 /*
3146 * reports - some output format copied from XTerm 3165 * reports - some output format copied from XTerm
3147 */ 3166 */
3148 case 11: /* report window state */ 3167 case 11: /* report window state */
3149 XGetWindowAttributes (dpy, parent[0], &wattr); 3168 XGetWindowAttributes (dpy, parent, &wattr);
3150 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3169 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3151 break; 3170 break;
3152 case 13: /* report window position */ 3171 case 13: /* report window position */
3153 XGetWindowAttributes (dpy, parent[0], &wattr); 3172 XGetWindowAttributes (dpy, parent, &wattr);
3154 XTranslateCoordinates (dpy, parent[0], wattr.root, 3173 XTranslateCoordinates (dpy, parent, wattr.root,
3155 -wattr.border_width, -wattr.border_width, 3174 -wattr.border_width, -wattr.border_width,
3156 &x, &y, &wdummy); 3175 &x, &y, &wdummy);
3157 tt_printf ("\033[3;%d;%dt", x, y); 3176 tt_printf ("\033[3;%d;%dt", x, y);
3158 break; 3177 break;
3159 case 14: /* report window size (pixels) */ 3178 case 14: /* report window size (pixels) */
3160 XGetWindowAttributes (dpy, parent[0], &wattr); 3179 XGetWindowAttributes (dpy, parent, &wattr);
3161 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3180 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3162 break; 3181 break;
3163 case 18: /* report text area size (chars) */ 3182 case 18: /* report text area size (chars) */
3164 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3183 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3165 break; 3184 break;
… …
3167 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3186 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3168 break; 3187 break;
3169 case 20: /* report icon label */ 3188 case 20: /* report icon label */
3170 { 3189 {
3171 char *s; 3190 char *s;
3172 XGetIconName (dpy, parent[0], &s); 3191 XGetIconName (dpy, parent, &s);
3173 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3192 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3174 XFree (s); 3193 XFree (s);
3175 } 3194 }
3176 break; 3195 break;
3177 case 21: /* report window title */ 3196 case 21: /* report window title */
3178 { 3197 {
3179 char *s; 3198 char *s;
3180 XFetchName (dpy, parent[0], &s); 3199 XFetchName (dpy, parent, &s);
3181 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3200 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3182 XFree (s); 3201 XFree (s);
3183 } 3202 }
3184 break; 3203 break;
3185 } 3204 }
… …
3241 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3260 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3242 */ 3261 */
3243void 3262void
3244rxvt_term::process_dcs_seq () 3263rxvt_term::process_dcs_seq ()
3245{ 3264{
3246 char *s;
3247 unicode_t eh;
3248
3249 /* 3265 /*
3250 * Not handled yet 3266 * Not handled yet
3251 */ 3267 */
3268
3269 unicode_t eh;
3252 s = get_to_st (eh); 3270 char *s = get_to_st (eh);
3253 if (s) 3271 if (s)
3254 free (s); 3272 free (s);
3255 3273
3256 return; 3274 return;
3257} 3275}
… …
3261 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3279 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3262 */ 3280 */
3263void 3281void
3264rxvt_term::process_osc_seq () 3282rxvt_term::process_osc_seq ()
3265{ 3283{
3266 unicode_t ch, eh;
3267 int arg; 3284 int arg;
3268 3285
3269 ch = cmd_getc (); 3286 unicode_t ch = cmd_getc ();
3270 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3287 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3271 arg = arg * 10 + (ch - '0'); 3288 arg = arg * 10 + (ch - '0');
3272 3289
3273 if (ch == ';') 3290 if (ch == ';')
3274 { 3291 {
3292 unicode_t eh;
3275 char *s = get_to_st (eh); 3293 char *s = get_to_st (eh);
3276 3294
3277 if (s) 3295 if (s)
3278 { 3296 {
3279 process_xterm_seq (arg, s, eh); 3297 process_xterm_seq (arg, s, eh);
… …
3303 3321
3304/* 3322/*
3305 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3323 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3306 */ 3324 */
3307void 3325void
3308rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3326rxvt_term::process_xterm_seq (int op, char *str, char resp)
3309{ 3327{
3310 int color; 3328 int color;
3311 char *buf, *name; 3329 char *buf, *name;
3312 bool query = str[0] == '?' && !str[1]; 3330 bool query = str[0] == '?' && !str[1];
3313 int saveop = op; 3331 int saveop = op;
… …
3340 unsigned long bytes_after; 3358 unsigned long bytes_after;
3341 unsigned char *value = 0; 3359 unsigned char *value = 0;
3342 const char *str = ""; 3360 const char *str = "";
3343 3361
3344 if (prop 3362 if (prop
3345 && XGetWindowProperty (dpy, parent[0], 3363 && XGetWindowProperty (dpy, parent,
3346 prop, 0, 1<<16, 0, AnyPropertyType, 3364 prop, 0, 1<<16, 0, AnyPropertyType,
3347 &actual_type, &actual_format, 3365 &actual_type, &actual_format,
3348 &nitems, &bytes_after, &value) == Success 3366 &nitems, &bytes_after, &value) == Success
3349 && actual_type != None 3367 && actual_type != None
3350 && actual_format == 8) 3368 && actual_format == 8)
… …
3354 3372
3355 XFree (value); 3373 XFree (value);
3356 } 3374 }
3357 else 3375 else
3358 { 3376 {
3359 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3377 char *eq = strchr (str, '=');
3360 3378
3361 if (eq) 3379 if (eq)
3362 { 3380 {
3363 *eq = 0; 3381 *eq = 0;
3364 set_utf8_property (display->atom (str), eq + 1); 3382 set_utf8_property (display->atom (str), eq + 1);
3365 } 3383 }
3366 else 3384 else
3367 XDeleteProperty (dpy, parent[0], 3385 XDeleteProperty (dpy, parent,
3368 display->atom (str)); 3386 display->atom (str));
3369 } 3387 }
3370 break; 3388 break;
3371 3389
3372 case XTerm_Color: 3390 case XTerm_Color:
… …
3385 *buf++ = '\0'; 3403 *buf++ = '\0';
3386 3404
3387 process_color_seq (op, color, name, resp); 3405 process_color_seq (op, color, name, resp);
3388 } 3406 }
3389 break; 3407 break;
3408 case Rxvt_restoreFG:
3390 case XTerm_Color00: 3409 case XTerm_Color00:
3391 process_color_seq (op, Color_fg, str, resp); 3410 process_color_seq (op, Color_fg, str, resp);
3392 break; 3411 break;
3412 case Rxvt_restoreBG:
3393 case XTerm_Color01: 3413 case XTerm_Color01:
3394 process_color_seq (op, Color_bg, str, resp); 3414 process_color_seq (op, Color_bg, str, resp);
3395 break; 3415 break;
3396#ifndef NO_CURSORCOLOR 3416#ifndef NO_CURSORCOLOR
3397 case XTerm_Color_cursor: 3417 case XTerm_Color_cursor:
… …
3402 process_color_seq (op, Color_pointer_fg, str, resp); 3422 process_color_seq (op, Color_pointer_fg, str, resp);
3403 break; 3423 break;
3404 case XTerm_Color_pointer_bg: 3424 case XTerm_Color_pointer_bg:
3405 process_color_seq (op, Color_pointer_bg, str, resp); 3425 process_color_seq (op, Color_pointer_bg, str, resp);
3406 break; 3426 break;
3427#ifdef OPTION_HC
3428 case XTerm_Color_HC:
3429 process_color_seq (op, Color_HC, str, resp);
3430 break;
3431 case XTerm_Color_HTC:
3432 process_color_seq (op, Color_HTC, str, resp);
3433 break;
3434#endif
3407#ifndef NO_BOLD_UNDERLINE_REVERSE 3435#ifndef NO_BOLD_UNDERLINE_REVERSE
3408 case XTerm_Color_RV:
3409 process_color_seq (op, Color_RV, str, resp);
3410 break;
3411 case Rxvt_Color_BD:
3412 case URxvt_Color_BD: 3436 case URxvt_Color_BD:
3413 process_color_seq (op, Color_BD, str, resp); 3437 process_color_seq (op, Color_BD, str, resp);
3414 break; 3438 break;
3415 case Rxvt_Color_UL:
3416 case URxvt_Color_UL: 3439 case URxvt_Color_UL:
3417 process_color_seq (op, Color_UL, str, resp); 3440 process_color_seq (op, Color_UL, str, resp);
3418 break; 3441 break;
3419 case URxvt_Color_IT: 3442 case URxvt_Color_IT:
3420 process_color_seq (op, Color_IT, str, resp); 3443 process_color_seq (op, Color_IT, str, resp);
3421 break; 3444 break;
3422#endif 3445#endif
3446 case URxvt_Color_border:
3447 process_color_seq (op, Color_border, str, resp);
3448 break;
3423#if ENABLE_TRANSPARENCY 3449#if ENABLE_TRANSPARENCY
3424 case URxvt_Color_tint: 3450 case URxvt_Color_tint:
3425 process_color_seq (op, Color_tint, str, resp); 3451 process_color_seq (op, Color_tint, str, resp);
3426 { 3452 {
3427 bool changed = false; 3453 bool changed = false;
3454
3428 if (ISSET_PIXCOLOR (Color_tint)) 3455 if (ISSET_PIXCOLOR (Color_tint))
3429 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3456 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3430 else 3457
3431 changed = bgPixmap.unset_tint ();
3432 if (changed) 3458 if (changed)
3433 bgPixmap.render (); 3459 update_background ();
3434 } 3460 }
3435 3461
3436 break; 3462 break;
3437#endif 3463#endif
3438 3464
3439#if XPM_BACKGROUND 3465#if BG_IMAGE_FROM_FILE
3440 case Rxvt_Pixmap: 3466 case Rxvt_Pixmap:
3441 if (!strcmp (str, "?")) 3467 if (!strcmp (str, "?"))
3442 { 3468 {
3443 char str[256]; 3469 char str[256];
3470 int h_scale = 0, v_scale = 0;
3471 int h_align = 0, v_align = 0;
3472 if (image_vec.size () > 0)
3473 {
3474 h_scale = image_vec[0].h_scale;
3475 v_scale = image_vec[0].v_scale;
3476 h_align = image_vec[0].h_align;
3477 v_align = image_vec[0].v_align;
3478 }
3444 3479
3445 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3480 sprintf (str, "[%dx%d+%d+%d]",
3446 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3481 h_scale, v_scale,
3447 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3482 h_align, v_align);
3448 process_xterm_seq (XTerm_title, str, CHAR_ST); 3483 process_xterm_seq (XTerm_title, str, CHAR_ST);
3449 } 3484 }
3450 else 3485 else
3451 { 3486 {
3452 int changed = 0; 3487 bool changed = false;
3453 3488
3454 if (*str != ';') 3489 if (*str != ';')
3455 { 3490 {
3456 /* reset to default scaling :*/ 3491 if (image_vec.size () > 0)
3457 bgPixmap.unset_geometry (); 3492 changed = image_vec[0].set_file_geometry (str);
3458 if (bgPixmap.set_file (str)) /* change pixmap */ 3493 else
3494 {
3495 rxvt_image *image = new_image ();
3496 if (!image->set_file_geometry (str))
3497 image_vec.pop_back ();
3498 else
3459 changed++; 3499 changed = true;
3460 str = strchr (str, ';'); 3500 }
3461 if (str == NULL)
3462 bgPixmap.set_defaultGeometry ();
3463 } 3501 }
3464 while (str) 3502 else
3465 { 3503 {
3466 str++; 3504 str++;
3467 if (bgPixmap.set_geometry (str)) 3505 if (image_vec.size () > 0)
3468 changed++; 3506 changed = image_vec[0].set_geometry (str, true);
3469 str = strchr (str, ';');
3470 } 3507 }
3508
3471 if (changed) 3509 if (changed)
3472 { 3510 {
3473 bgPixmap.render (); 3511 if (bg_window_position_sensitive ())
3474 scr_touch (true); 3512 {
3513 int x, y;
3514 get_window_origin (x, y);
3515 bg_set_position (x, y);
3516 }
3517 update_background ();
3475 } 3518 }
3476 } 3519 }
3477 break; 3520 break;
3478#endif 3521#endif
3479
3480 case Rxvt_restoreFG:
3481 set_window_color (Color_fg, str);
3482 break;
3483 case Rxvt_restoreBG:
3484 set_window_color (Color_bg, str);
3485 break;
3486 3522
3487 case XTerm_logfile: 3523 case XTerm_logfile:
3488 // TODO, when secure mode? 3524 // TODO, when secure mode?
3489 break; 3525 break;
3490 3526
… …
3557 break; 3593 break;
3558#endif 3594#endif
3559 3595
3560#if ENABLE_PERL 3596#if ENABLE_PERL
3561 case URxvt_perl: 3597 case URxvt_perl:
3562 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3598 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3563 ; // no responses yet
3564 break; 3599 break;
3565#endif 3600#endif
3566 } 3601 }
3567} 3602}
3568/*----------------------------------------------------------------------*/ 3603/*----------------------------------------------------------------------*/
… …
3575 * 's' = save 3610 * 's' = save
3576 * 'r' = restore 3611 * 'r' = restore
3577 * 't' = toggle 3612 * 't' = toggle
3578 * so no need for fancy checking 3613 * so no need for fancy checking
3579 */ 3614 */
3580int 3615int ecb_cold
3581rxvt_term::privcases (int mode, unsigned long bit) 3616rxvt_term::privcases (int mode, unsigned long bit)
3582{ 3617{
3583 int state; 3618 int state;
3584 3619
3585 if (mode == 's') 3620 if (mode == 's')
3586 { 3621 {
3587 SavedModes |= (priv_modes & bit); 3622 if (priv_modes & bit)
3623 SavedModes |= bit;
3624 else
3625 SavedModes &= ~bit;
3588 return -1; 3626 return -1;
3589 } 3627 }
3590 else 3628 else
3591 { 3629 {
3592 if (mode == 'r') 3630 if (mode == 'r')
3593 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3631 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3594 else 3632 else
3595 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3633 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3596 PrivMode (state, bit); 3634
3635 if (state)
3636 priv_modes |= bit;
3637 else
3638 priv_modes &= ~bit;
3597 } 3639 }
3598 3640
3599 return state; 3641 return state;
3600} 3642}
3601 3643
3602/* we're not using priv _yet_ */ 3644/* we're not using priv _yet_ */
3603void 3645void
3604rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3646rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3605{ 3647{
3606 unsigned int i, j; 3648 unsigned int i, j;
3607 int state; 3649 int state;
3608 3650
3609 static const struct 3651 static const struct
3610 { 3652 {
3611 const int argval; 3653 const int argval;
3612 const unsigned long bit; 3654 const unsigned long bit;
3613 } argtopriv[] = { 3655 } argtopriv[] = {
3614 { 1, PrivMode_aplCUR }, 3656 { 1, PrivMode_aplCUR }, // DECCKM
3615 { 2, PrivMode_vt52 }, 3657 { 2, PrivMode_vt52 }, // DECANM
3616 { 3, PrivMode_132 }, 3658 { 3, PrivMode_132 }, // DECCOLM
3617 { 4, PrivMode_smoothScroll }, 3659 { 4, PrivMode_smoothScroll }, // DECSCLM
3618 { 5, PrivMode_rVideo }, 3660 { 5, PrivMode_rVideo }, // DECSCNM
3619 { 6, PrivMode_relOrigin }, 3661 { 6, PrivMode_relOrigin }, // DECOM
3620 { 7, PrivMode_Autowrap }, 3662 { 7, PrivMode_Autowrap }, // DECAWM
3621 // 8, bi-directional support mode 3663 // 8, auto-repeat keys // DECARM
3622 { 9, PrivMode_MouseX10 }, 3664 { 9, PrivMode_MouseX10 },
3623 // 18, 19 printing-related 3665 // 18 end FF to printer after print screen
3666 // 19 Print screen prints full screen/scroll region
3624 { 25, PrivMode_VisibleCursor }, 3667 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3625#ifdef scrollBar_esc 3668#ifdef scrollBar_esc
3626 { scrollBar_esc, PrivMode_scrollBar }, 3669 { scrollBar_esc, PrivMode_scrollBar },
3627#endif 3670#endif
3628 { 35, PrivMode_ShiftKeys }, // rxvt extension 3671 { 35, PrivMode_ShiftKeys }, // rxvt extension
3672 // 38, tektronix mode // DECTEK
3629 { 40, PrivMode_132OK }, 3673 { 40, PrivMode_132OK },
3630 // 41 xterm more fixes NYI 3674 // 41 xterm more fixes NYI
3631 // 45 margin bell NYI 3675 // 45 margin bell NYI
3632 // 46 start logging 3676 // 46 start logging
3633 { 47, PrivMode_Screen }, 3677 { 47, PrivMode_Screen },
3634 { 66, PrivMode_aplKP }, 3678 { 66, PrivMode_aplKP }, // DECNKM
3635#ifndef NO_BACKSPACE_KEY 3679#ifndef NO_BACKSPACE_KEY
3636 { 67, PrivMode_BackSpace }, 3680 { 67, PrivMode_BackSpace }, // DECBKM
3637#endif 3681#endif
3638 { 1000, PrivMode_MouseX11 }, 3682 { 1000, PrivMode_MouseX11 },
3639 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3683 { 1002, PrivMode_MouseBtnEvent },
3640 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3684 { 1003, PrivMode_MouseAnyEvent },
3641 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3685#if ENABLE_FRILLS
3686 { 1005, PrivMode_ExtModeMouse },
3687#endif
3642 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3688 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3643 { 1011, PrivMode_Keypress }, // rxvt extension 3689 { 1011, PrivMode_Keypress }, // rxvt extension
3690#if ENABLE_FRILLS
3691 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3692#endif
3644 // 1035 enable modifiers for alt, numlock NYI 3693 // 1035 enable modifiers for alt, numlock NYI
3645 // 1036 send ESC for meta keys NYI 3694 // 1036 send ESC for meta keys NYI
3646 // 1037 send DEL for keypad delete NYI 3695 // 1037 send DEL for keypad delete NYI
3647 { 1047, PrivMode_Screen }, 3696 { 1047, PrivMode_Screen },
3648 // 1048 save and restore cursor 3697 // 1048 save and restore cursor, implemented in code
3649 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3698 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3650 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3699 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3700 { 2004, PrivMode_BracketPaste },
3651 }; 3701 };
3652 3702
3653 if (nargs == 0) 3703 if (nargs == 0)
3654 return; 3704 return;
3655 3705
… …
3662 for (i = 0; i < nargs; i++) 3712 for (i = 0; i < nargs; i++)
3663 { 3713 {
3664 state = -1; 3714 state = -1;
3665 3715
3666 /* basic handling */ 3716 /* basic handling */
3667 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3717 for (j = 0; j < ecb_array_length (argtopriv); j++)
3668 if (argtopriv[j].argval == arg[i]) 3718 if (argtopriv[j].argval == arg[i])
3669 { 3719 {
3670 state = privcases (mode, argtopriv[j].bit); 3720 state = privcases (mode, argtopriv[j].bit);
3671 break; 3721 break;
3672 } 3722 }
… …
3680 3730
3681 scr_touch (true); 3731 scr_touch (true);
3682 break; 3732 break;
3683#endif 3733#endif
3684 case 1048: /* alternative cursor save */ 3734 case 1048: /* alternative cursor save */
3685 case 1049:
3686 if (option (Opt_secondaryScreen)) 3735 if (option (Opt_secondaryScreen))
3687 if (mode == 0) 3736 if (mode == 0)
3688 scr_cursor (RESTORE); 3737 scr_cursor (RESTORE);
3689 else if (mode == 1) 3738 else if (mode == 1)
3690 scr_cursor (SAVE); 3739 scr_cursor (SAVE);
… …
3699 case 2: /* VT52 mode */ 3748 case 2: /* VT52 mode */
3700 /* oddball mode. should be set regardless of set/reset 3749 /* oddball mode. should be set regardless of set/reset
3701 * parameter. Return from VT52 mode with an ESC < from 3750 * parameter. Return from VT52 mode with an ESC < from
3702 * within VT52 mode 3751 * within VT52 mode
3703 */ 3752 */
3704 PrivMode (1, PrivMode_vt52); 3753 priv_modes |= PrivMode_vt52;
3705 break; 3754 break;
3706 case 3: /* 80/132 */ 3755 case 3: /* 80/132 */
3707 if (priv_modes & PrivMode_132OK) 3756 if (priv_modes & PrivMode_132OK)
3708 set_widthheight (((state ? 132 : 80) * fwidth), height); 3757 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3709 break; 3758 break;
3710 case 4: /* smooth scrolling */ 3759 case 4: /* smooth scrolling */
3711 set_option (Opt_jumpScroll, !state); 3760 set_option (Opt_jumpScroll, !state);
3712 break; 3761 break;
3713 case 5: /* reverse video */ 3762 case 5: /* reverse video */
… …
3720 scr_autowrap (state); 3769 scr_autowrap (state);
3721 break; 3770 break;
3722 /* case 8: - auto repeat, can't do on a per window basis */ 3771 /* case 8: - auto repeat, can't do on a per window basis */
3723 case 9: /* X10 mouse reporting */ 3772 case 9: /* X10 mouse reporting */
3724 if (state) /* orthogonal */ 3773 if (state) /* orthogonal */
3725 priv_modes &= ~PrivMode_MouseX11; 3774 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3726 break; 3775 break;
3727#ifdef scrollBar_esc 3776#ifdef scrollBar_esc
3728 case scrollBar_esc: 3777 case scrollBar_esc:
3729 if (scrollbar_mapping (state)) 3778 scrollBar.map (state);
3730 {
3731 resize_all_windows (0, 0, 0); 3779 resize_all_windows (0, 0, 0);
3732 scr_touch (true); 3780 scr_touch (true);
3733 }
3734 break; 3781 break;
3735#endif 3782#endif
3736 case 25: /* visible/invisible cursor */ 3783 case 25: /* visible/invisible cursor */
3737 scr_cursor_visible (state); 3784 scr_cursor_visible (state);
3738 break; 3785 break;
… …
3743 break; 3790 break;
3744 /* case 66: - application key pad */ 3791 /* case 66: - application key pad */
3745 /* case 67: - backspace key */ 3792 /* case 67: - backspace key */
3746 case 1000: /* X11 mouse reporting */ 3793 case 1000: /* X11 mouse reporting */
3747 if (state) /* orthogonal */ 3794 if (state) /* orthogonal */
3748 priv_modes &= ~PrivMode_MouseX10; 3795 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3749 break; 3796 break;
3750#if 0
3751 case 1001: 3797 case 1002:
3752 break; /* X11 mouse highlighting */ 3798 case 1003:
3753#endif 3799 if (state)
3800 {
3801 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3802 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3803 mouse_row = mouse_col = 0;
3804 vt_emask_mouse = PointerMotionMask;
3805 }
3806 else
3807 vt_emask_mouse = NoEventMask;
3808
3809 vt_select_input ();
3810 break;
3754 case 1010: /* scroll to bottom on TTY output inhibit */ 3811 case 1010: /* scroll to bottom on TTY output inhibit */
3755 set_option (Opt_scrollTtyOutput, !state); 3812 set_option (Opt_scrollTtyOutput, !state);
3756 break; 3813 break;
3757 case 1011: /* scroll to bottom on key press */ 3814 case 1011: /* scroll to bottom on key press */
3758 set_option (Opt_scrollTtyKeypress, state); 3815 set_option (Opt_scrollTtyKeypress, state);
3759 break; 3816 break;
3760 case 1047: /* secondary screen w/ clearing last */ 3817 case 1047: /* secondary screen w/ clearing last */
3761 if (option (Opt_secondaryScreen)) 3818 if (option (Opt_secondaryScreen))
3762 if (current_screen != PRIMARY) 3819 if (!state)
3763 scr_erase_screen (2); 3820 scr_erase_screen (2);
3821
3764 scr_change_screen (state); 3822 scr_change_screen (state);
3765 break; 3823 break;
3766 case 1049: /* secondary screen w/ clearing first */ 3824 case 1049: /* secondary screen w/ clearing first */
3825 if (option (Opt_secondaryScreen))
3826 if (state)
3827 scr_cursor (SAVE);
3828
3767 scr_change_screen (state); 3829 scr_change_screen (state);
3830
3768 if (option (Opt_secondaryScreen)) 3831 if (option (Opt_secondaryScreen))
3769 if (current_screen != PRIMARY) 3832 if (state)
3770 scr_erase_screen (2); 3833 scr_erase_screen (2);
3834 else
3835 scr_cursor (RESTORE);
3771 break; 3836 break;
3772 default: 3837 default:
3773 break; 3838 break;
3774 } 3839 }
3775 } 3840 }
3776} 3841}
3777/*}}} */ 3842/*}}} */
3778 3843
3779/*{{{ process sgr sequences */ 3844/*{{{ process sgr sequences */
3780void 3845void ecb_hot
3781rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3846rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3782{ 3847{
3783 unsigned int i; 3848 unsigned int i;
3784 short rendset; 3849 short rendset;
3785 int rendstyle; 3850 int rendstyle;
… …
3928 } 3993 }
3929 } 3994 }
3930} 3995}
3931/*}}} */ 3996/*}}} */
3932 3997
3933/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3934void
3935rxvt_term::process_graphics ()
3936{
3937 unicode_t ch, cmd = cmd_getc ();
3938
3939 if (cmd == 'Q')
3940 { /* query graphics */
3941 tt_printf ("\033G0\012"); /* no graphics */
3942 return;
3943 }
3944 /* swallow other graphics sequences until terminating ':' */
3945 do
3946 ch = cmd_getc ();
3947 while (ch != ':');
3948}
3949/*}}} */
3950
3951/* ------------------------------------------------------------------------- */ 3998/* ------------------------------------------------------------------------- */
3952 3999
3953/* 4000/*
3954 * Send printf () formatted output to the command. 4001 * Send printf () formatted output to the command.
3955 * Only use for small amounts of data. 4002 * Only use for small amounts of data.
… …
3968 4015
3969/* ---------------------------------------------------------------------- */ 4016/* ---------------------------------------------------------------------- */
3970/* Write data to the pty as typed by the user, pasted with the mouse, 4017/* Write data to the pty as typed by the user, pasted with the mouse,
3971 * or generated by us in response to a query ESC sequence. 4018 * or generated by us in response to a query ESC sequence.
3972 */ 4019 */
3973const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4020static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3974 4021
3975void 4022void
3976rxvt_term::tt_write (const char *data, unsigned int len) 4023rxvt_term::tt_write (const char *data, unsigned int len)
3977{ 4024{
3978 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4025 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3983 4030
3984 if (v_buflen == 0) 4031 if (v_buflen == 0)
3985 { 4032 {
3986 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4033 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3987 4034
4035 max_it (written, 0);
4036
3988 if ((unsigned int)written == len) 4037 if (written == len)
3989 return; 4038 return;
3990 4039
3991 data += written; 4040 data += written;
3992 len -= written; 4041 len -= written;
3993 } 4042 }
3994 4043
3995 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4044 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3996 4045
3997 memcpy (v_buffer + v_buflen, data, len); 4046 memcpy (v_buffer + v_buflen, data, len);
3998 v_buflen += len; 4047 v_buflen += len;
3999 4048
4000 pty_ev.set (EVENT_READ | EVENT_WRITE); 4049 pty_ev.set (ev::READ | ev::WRITE);
4001} 4050}
4002 4051
4003void rxvt_term::pty_write () 4052void rxvt_term::pty_write ()
4004{ 4053{
4005 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4054 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4010 4059
4011 if (v_buflen == 0) 4060 if (v_buflen == 0)
4012 { 4061 {
4013 free (v_buffer); 4062 free (v_buffer);
4014 v_buffer = 0; 4063 v_buffer = 0;
4015 v_buflen = 0;
4016 4064
4017 pty_ev.set (EVENT_READ); 4065 pty_ev.set (ev::READ);
4018 return; 4066 return;
4019 } 4067 }
4020 4068
4021 memmove (v_buffer, v_buffer + written, v_buflen); 4069 memmove (v_buffer, v_buffer + written, v_buflen);
4022 } 4070 }
4023 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4071 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4024 pty_ev.set (EVENT_READ); 4072 pty_ev.set (ev::READ);
4025} 4073}
4026 4074
4027/*----------------------- end-of-file (C source) -----------------------*/ 4075/*----------------------- end-of-file (C source) -----------------------*/
4028 4076

Diff Legend

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