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.408 by ayin, Sat Feb 16 13:36:10 2008 UTC vs.
Revision 1.522 by sf-exg, Mon Jun 11 14:45:53 2012 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * 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
34 * 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
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
184 181
185 alloc = 0; 182 alloc = 0;
186 chr = &ch2; 183 chr = &ch2;
187 len = 1; 184 len = 1;
188 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189 189
190 char attr[80]; // plenty 190 char attr[80]; // plenty
191 191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 193 (int)r,
… …
197 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
203 210
204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
206 212
207 if (y >= 0) 213 if (y >= 0)
208 { 214 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 216 x = 0;
211 } 217 }
212 218
213 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
214 222
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 224
217 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
218 { 226 {
219 char buf[9]; 227 char buf[9];
220 228
221 ch = *chr++; 229 ch = *chr++;
222 230
223 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE_3 234# if !UNICODE_3
227 if (ch >= 0x10000) 235 if (ch >= 0x10000)
228 ch = 0xfffd; 236 ch = 0xfffd;
229# endif 237# endif
230 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
231 239
232 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 242 }
235 243
236// { 244// {
237// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
240// } 248// }
241 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
242 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
243
244 free (fname); 253 free (fname[i]);
254 }
245 255
246# if ENABLE_COMBINING 256# if ENABLE_COMBINING
247 if (alloc) 257 if (alloc)
248 delete [] alloc; 258 delete [] alloc;
249# endif 259# endif
250} 260}
251#endif 261#endif
252 262
253void 263void ecb_cold
254rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
255{ 265{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 267
261 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
262 { 269 {
263 char mb[16]; 270 char mb[MB_LEN_MAX];
264 int len; 271 int len;
265 272
266 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
269 else 276 else
270 { 277 {
271 mb[0] = ch[0]; 278 mb[0] = ch;
272 len = 1; 279 len = 1;
273 } 280 }
274 281
275 if (len > 0) 282 if (len > 0)
276 tt_write (mb, len); 283 tt_write (mb, len);
… …
279 } 286 }
280 287
281 iso14755buf = 0; 288 iso14755buf = 0;
282} 289}
283 290
284static int 291static int ecb_cold
285hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
286{ 293{
287 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
290 { 297 {
291 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
292 299
… …
298 305
299 return -1; 306 return -1;
300} 307}
301#endif 308#endif
302 309
303static inline KeySym 310static inline KeySym ecb_cold
304translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
305{ 312{
306#ifdef XK_KP_Home 313#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
… …
334# endif 341# endif
335#endif 342#endif
336 return keysym; 343 return keysym;
337} 344}
338 345
339void 346static inline int ecb_cold
347map_function_key (KeySym keysym)
348{
349 int param = 0;
350
351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
352 {
353 param = 11 + keysym - XK_F1;
354 if (keysym >= XK_F17)
355 param += 4;
356 else if (keysym >= XK_F15)
357 param += 3;
358 else if (keysym >= XK_F11)
359 param += 2;
360 else if (keysym >= XK_F6)
361 param += 1;
362 }
363 else
364 switch (keysym)
365 {
366 case XK_Find:
367 param = 1;
368 break;
369 case XK_Insert:
370 param = 2;
371 break;
372#ifdef DXK_Remove
373 case DXK_Remove:
374#endif
375 case XK_Execute:
376 param = 3;
377 break;
378 case XK_Select:
379 param = 4;
380 break;
381#ifndef UNSHIFTED_SCROLLKEYS
382 case XK_Prior:
383 param = 5;
384 break;
385 case XK_Next:
386 param = 6;
387 break;
388 case XK_Home:
389 param = 7;
390 break;
391 case XK_End:
392 param = 8;
393 break;
394#endif
395 case XK_Help:
396 param = 28;
397 break;
398 case XK_Menu:
399 param = 29;
400 break;
401 }
402 return param;
403}
404
405void ecb_cold
340rxvt_term::key_press (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
341{ 407{
342 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
343 KeySym keysym; 409 KeySym keysym;
344 int valid_keysym; 410 int valid_keysym;
… …
357 */ 423 */
358 shft = ev.state & ShiftMask; 424 shft = ev.state & ShiftMask;
359 ctrl = ev.state & ControlMask; 425 ctrl = ev.state & ControlMask;
360 meta = ev.state & ModMetaMask; 426 meta = ev.state & ModMetaMask;
361 427
362 if (numlock_state || (ev.state & ModNumLockMask))
363 {
364 numlock_state = (ev.state & ModNumLockMask);
365 PrivMode ((!numlock_state), PrivMode_aplKP);
366 }
367
368 kbuf[0] = 0; 428 kbuf[0] = 0;
369 429
370#ifdef USE_XIM 430#if USE_XIM
371 if (Input_Context) 431 if (Input_Context)
372 { 432 {
373 Status status_return; 433 Status status_return;
374 434
375#if 0 435#if 0
… …
446#ifdef PAGING_CONTEXT_LINES 506#ifdef PAGING_CONTEXT_LINES
447 lnsppg = nrow - PAGING_CONTEXT_LINES; 507 lnsppg = nrow - PAGING_CONTEXT_LINES;
448#else 508#else
449 lnsppg = nrow * 4 / 5; 509 lnsppg = nrow * 4 / 5;
450#endif 510#endif
511 max_it (lnsppg, 1);
512
451 if (keysym == XK_Prior) 513 if (keysym == XK_Prior)
452 { 514 {
453 scr_page (UP, lnsppg); 515 scr_page (UP, lnsppg);
454 return; 516 return;
455 } 517 }
… …
508 selection_request (ev.time); 570 selection_request (ev.time);
509 return; 571 return;
510#if TODO 572#if TODO
511 /* rxvt extras */ 573 /* rxvt extras */
512 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 574 case XK_KP_Add: /* Shift+KP_Add = bigger font */
513 change_font (FONT_UP);
514 return; 575 return;
515 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
516 change_font (FONT_DN);
517 return; 577 return;
518#endif 578#endif
519 } 579 }
520 } 580 }
521 } 581 }
522 582
523#if ENABLE_FRILLS || ISO_14755 583#if ENABLE_FRILLS || ISO_14755
524 // ISO 14755 support 584 // ISO 14755 support
525 if (shft && ctrl) 585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
526 { 586 {
527 int hv; 587 int hv;
528 588
529 if (iso14755buf & ISO_14755_51 589 if (iso14755buf & ISO_14755_51
530 && (keysym == XK_space || keysym == XK_KP_Space 590 && (keysym == XK_space || keysym == XK_KP_Space
… …
560 scr_overlay_off (); 620 scr_overlay_off ();
561# endif 621# endif
562 iso14755buf = 0; 622 iso14755buf = 0;
563 } 623 }
564 } 624 }
625 else if (option (Opt_iso14755) &&
565 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 626 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
566 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 627 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
567 if (!(iso14755buf & ISO_14755_STARTED)) 628 if (!(iso14755buf & ISO_14755_STARTED))
568 { 629 {
569 iso14755buf |= ISO_14755_STARTED; 630 iso14755buf |= ISO_14755_STARTED;
570# if ISO_14755 631# if ISO_14755
571 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 632 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
582 } 643 }
583#endif 644#endif
584 645
585 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 646 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
586 { 647 {
587 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 648 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
588 unsigned int newlen = 1; 649 unsigned int newlen = 1;
589 650
651 if (ev.state & ModNumLockMask)
652 kp = false;
653
590 switch (translate_keypad (keysym, kp)) 654 keysym = translate_keypad (keysym, kp);
655
656 switch (keysym)
657 {
658#ifndef NO_BACKSPACE_KEY
659 case XK_BackSpace:
660 if (priv_modes & PrivMode_HaveBackSpace)
661 {
662 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
663 ^ !!ctrl) ? '\b' : '\177';
664 kbuf[1] = '\0';
665 }
666 else
667 strcpy (kbuf, rs[Rs_backspace_key]);
668 break;
669#endif
670#ifndef NO_DELETE_KEY
671 case XK_Delete:
672 strcpy (kbuf, rs[Rs_delete_key]);
673 break;
674#endif
675 case XK_Tab:
676 if (shft)
677 strcpy (kbuf, "\033[Z");
678 else
679 {
680#ifdef CTRL_TAB_MAKES_META
681 if (ctrl)
682 meta = 1;
683#endif
684#ifdef MOD4_TAB_MAKES_META
685 if (ev.state & Mod4Mask)
686 meta = 1;
687#endif
688 newlen = 0;
689 }
690 break;
691
692 case XK_Up: /* "\033[A" */
693 case XK_Down: /* "\033[B" */
694 case XK_Right: /* "\033[C" */
695 case XK_Left: /* "\033[D" */
696 strcpy (kbuf, "\033[Z");
697 kbuf[2] = "DACB"[keysym - XK_Left];
698 /* do Shift first */
699 if (shft)
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 else if (ctrl)
702 {
703 kbuf[1] = 'O';
704 kbuf[2] = "dacb"[keysym - XK_Left];
705 }
706 else if (priv_modes & PrivMode_aplCUR)
707 kbuf[1] = 'O';
708 break;
709
710 case XK_KP_Enter:
711 /* allow shift to override */
712 if (kp)
713 {
714 strcpy (kbuf, "\033OM");
715 break;
716 }
717
718 /* FALLTHROUGH */
719
720 case XK_Return:
721 if (priv_modes & PrivMode_LFNL)
722 {
723 kbuf[0] = '\015';
724 kbuf[1] = '\012';
725 kbuf[2] = '\0';
726 }
727 else
728 {
729 kbuf[0] = '\015';
730 kbuf[1] = '\0';
731 }
732 break;
733
734 case XK_KP_F1: /* "\033OP" */
735 case XK_KP_F2: /* "\033OQ" */
736 case XK_KP_F3: /* "\033OR" */
737 case XK_KP_F4: /* "\033OS" */
738 strcpy (kbuf, "\033OP");
739 kbuf[2] += (keysym - XK_KP_F1);
740 break;
741
742 case XK_KP_Multiply: /* "\033Oj" : "*" */
743 case XK_KP_Add: /* "\033Ok" : "+" */
744 case XK_KP_Separator: /* "\033Ol" : "," */
745 case XK_KP_Subtract: /* "\033Om" : "-" */
746 case XK_KP_Decimal: /* "\033On" : "." */
747 case XK_KP_Divide: /* "\033Oo" : "/" */
748 case XK_KP_0: /* "\033Op" : "0" */
749 case XK_KP_1: /* "\033Oq" : "1" */
750 case XK_KP_2: /* "\033Or" : "2" */
751 case XK_KP_3: /* "\033Os" : "3" */
752 case XK_KP_4: /* "\033Ot" : "4" */
753 case XK_KP_5: /* "\033Ou" : "5" */
754 case XK_KP_6: /* "\033Ov" : "6" */
755 case XK_KP_7: /* "\033Ow" : "7" */
756 case XK_KP_8: /* "\033Ox" : "8" */
757 case XK_KP_9: /* "\033Oy" : "9" */
758 /* allow shift to override */
759 if (kp)
760 {
761 strcpy (kbuf, "\033Oj");
762 kbuf[2] += (keysym - XK_KP_Multiply);
763 }
764 else
765 {
766 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
767 kbuf[1] = '\0';
768 }
769 break;
770
771 default:
591 { 772 {
592#ifndef NO_BACKSPACE_KEY 773 int param = map_function_key (keysym);
593 case XK_BackSpace: 774 if (param > 0)
594 if (priv_modes & PrivMode_HaveBackSpace) 775 sprintf (kbuf,"\033[%d~", param);
595 {
596 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
597 ^ !!ctrl) ? '\b' : '\177';
598 kbuf[1] = '\0';
599 }
600 else 776 else
601 strcpy (kbuf, rs[Rs_backspace_key]);
602 break;
603#endif
604#ifndef NO_DELETE_KEY
605 case XK_Delete:
606 strcpy (kbuf, rs[Rs_delete_key]);
607 break;
608#endif
609 case XK_Tab:
610 if (shft)
611 strcpy (kbuf, "\033[Z");
612 else
613 {
614#ifdef CTRL_TAB_MAKES_META
615 if (ctrl)
616 meta = 1;
617#endif
618#ifdef MOD4_TAB_MAKES_META
619 if (ev.state & Mod4Mask)
620 meta = 1;
621#endif
622 newlen = 0;
623 }
624 break;
625
626 case XK_Up: /* "\033[A" */
627 case XK_Down: /* "\033[B" */
628 case XK_Right: /* "\033[C" */
629 case XK_Left: /* "\033[D" */
630 strcpy (kbuf, "\033[Z");
631 kbuf[2] = "DACB"[keysym - XK_Left];
632 /* do Shift first */
633 if (shft)
634 kbuf[2] = "dacb"[keysym - XK_Left];
635 else if (ctrl)
636 {
637 kbuf[1] = 'O';
638 kbuf[2] = "dacb"[keysym - XK_Left];
639 }
640 else if (priv_modes & PrivMode_aplCUR)
641 kbuf[1] = 'O';
642 break;
643
644#ifndef UNSHIFTED_SCROLLKEYS
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648 case XK_Next:
649 strcpy (kbuf, "\033[6~");
650 break;
651#endif
652 case XK_KP_Enter:
653 /* allow shift to override */
654 if (kp)
655 {
656 strcpy (kbuf, "\033OM");
657 break;
658 }
659
660 /* FALLTHROUGH */
661
662 case XK_Return:
663 if (priv_modes & PrivMode_LFNL)
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\012';
667 kbuf[2] = '\0';
668 }
669 else
670 {
671 kbuf[0] = '\015';
672 kbuf[1] = '\0';
673 }
674 break;
675
676 case XK_KP_F1: /* "\033OP" */
677 case XK_KP_F2: /* "\033OQ" */
678 case XK_KP_F3: /* "\033OR" */
679 case XK_KP_F4: /* "\033OS" */
680 strcpy (kbuf, "\033OP");
681 kbuf[2] += (keysym - XK_KP_F1);
682 break;
683
684 case XK_KP_Multiply: /* "\033Oj" : "*" */
685 case XK_KP_Add: /* "\033Ok" : "+" */
686 case XK_KP_Separator: /* "\033Ol" : "," */
687 case XK_KP_Subtract: /* "\033Om" : "-" */
688 case XK_KP_Decimal: /* "\033On" : "." */
689 case XK_KP_Divide: /* "\033Oo" : "/" */
690 case XK_KP_0: /* "\033Op" : "0" */
691 case XK_KP_1: /* "\033Oq" : "1" */
692 case XK_KP_2: /* "\033Or" : "2" */
693 case XK_KP_3: /* "\033Os" : "3" */
694 case XK_KP_4: /* "\033Ot" : "4" */
695 case XK_KP_5: /* "\033Ou" : "5" */
696 case XK_KP_6: /* "\033Ov" : "6" */
697 case XK_KP_7: /* "\033Ow" : "7" */
698 case XK_KP_8: /* "\033Ox" : "8" */
699 case XK_KP_9: /* "\033Oy" : "9" */
700 /* allow shift to override */
701 if (kp)
702 {
703 strcpy (kbuf, "\033Oj");
704 kbuf[2] += (keysym - XK_KP_Multiply);
705 }
706 else
707 {
708 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
709 kbuf[1] = '\0';
710 }
711 break;
712
713 case XK_Find:
714 strcpy (kbuf, "\033[1~");
715 break;
716
717 case XK_Insert:
718 strcpy (kbuf, "\033[2~");
719 break;
720#ifdef DXK_Remove /* support for DEC remove like key */
721 case DXK_Remove:
722 /* FALLTHROUGH */
723#endif
724 case XK_Execute:
725 strcpy (kbuf, "\033[3~");
726 break;
727 case XK_Select:
728 strcpy (kbuf, "\033[4~");
729 break;
730 case XK_End:
731 strcpy (kbuf, KS_END);
732 break;
733 case XK_Home:
734 strcpy (kbuf, KS_HOME);
735 break;
736
737#define FKEY(n, fkey) \
738 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
739
740 case XK_F1: /* "\033[11~" */
741 case XK_F2: /* "\033[12~" */
742 case XK_F3: /* "\033[13~" */
743 case XK_F4: /* "\033[14~" */
744 case XK_F5: /* "\033[15~" */
745 FKEY (11, XK_F1);
746 break;
747 case XK_F6: /* "\033[17~" */
748 case XK_F7: /* "\033[18~" */
749 case XK_F8: /* "\033[19~" */
750 case XK_F9: /* "\033[20~" */
751 case XK_F10: /* "\033[21~" */
752 FKEY (17, XK_F6);
753 break;
754 case XK_F11: /* "\033[23~" */
755 case XK_F12: /* "\033[24~" */
756 case XK_F13: /* "\033[25~" */
757 case XK_F14: /* "\033[26~" */
758 FKEY (23, XK_F11);
759 break;
760 case XK_F15: /* "\033[28~" */
761 case XK_F16: /* "\033[29~" */
762 FKEY (28, XK_F15);
763 break;
764 case XK_Help: /* "\033[28~" */
765 FKEY (28, XK_Help);
766 break;
767 case XK_Menu: /* "\033[29~" */
768 FKEY (29, XK_Menu);
769 break;
770 case XK_F17: /* "\033[31~" */
771 case XK_F18: /* "\033[32~" */
772 case XK_F19: /* "\033[33~" */
773 case XK_F20: /* "\033[34~" */
774 case XK_F21: /* "\033[35~" */
775 case XK_F22: /* "\033[36~" */
776 case XK_F23: /* "\033[37~" */
777 case XK_F24: /* "\033[38~" */
778 case XK_F25: /* "\033[39~" */
779 case XK_F26: /* "\033[40~" */
780 case XK_F27: /* "\033[41~" */
781 case XK_F28: /* "\033[42~" */
782 case XK_F29: /* "\033[43~" */
783 case XK_F30: /* "\033[44~" */
784 case XK_F31: /* "\033[45~" */
785 case XK_F32: /* "\033[46~" */
786 case XK_F33: /* "\033[47~" */
787 case XK_F34: /* "\033[48~" */
788 case XK_F35: /* "\033[49~" */
789 FKEY (31, XK_F17);
790 break;
791#undef FKEY
792 default:
793 newlen = 0; 777 newlen = 0;
794 break;
795 } 778 }
779 break;
780 }
796 781
797 if (newlen) 782 if (newlen)
798 len = strlen (kbuf); 783 len = strlen (kbuf);
799 784
785 if (len > 0)
786 {
800 /* 787 /*
788 * pass Shift/Control indicators for function keys ending with `~'
789 *
790 * eg,
791 * Prior = "ESC[5~"
792 * Shift+Prior = "ESC[5$"
793 * Ctrl+Prior = "ESC[5^"
794 * Ctrl+Shift+Prior = "ESC[5@"
795 */
796 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
797 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
798
799 /*
801 * Pass meta for all function keys, if 'meta' option set 800 * Pass meta for all function keys, if 'meta' option set
802 */ 801 */
803#ifdef META8_OPTION 802#ifdef META8_OPTION
804 if (meta && (meta_char == 0x80) && len > 0) 803 if (meta && (meta_char == 0x80))
805 kbuf[len - 1] |= 0x80; 804 kbuf[len - 1] |= 0x80;
806#endif 805#endif
806 }
807 807
808 } 808 }
809 else if (ctrl && keysym == XK_minus) 809 else if (ctrl && keysym == XK_minus)
810 { 810 {
811 len = 1; 811 len = 1;
… …
845 { 845 {
846 view_start = 0; 846 view_start = 0;
847 want_refresh = 1; 847 want_refresh = 1;
848 } 848 }
849 849
850 /*
851 * these modifications only affect the static keybuffer
852 * pass Shift/Control indicators for function keys ending with `~'
853 *
854 * eg,
855 * Prior = "ESC[5~"
856 * Shift+Prior = "ESC[5$"
857 * Ctrl+Prior = "ESC[5^"
858 * Ctrl+Shift+Prior = "ESC[5@"
859 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
860 */
861 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
862 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
863
864 /* escape prefix */ 850 /* escape prefix */
865 if (meta 851 if (meta
866#ifdef META8_OPTION 852#ifdef META8_OPTION
867 && meta_char == C0_ESC 853 && meta_char == C0_ESC
868#endif 854#endif
… …
873 } 859 }
874 860
875 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
876} 862}
877 863
878void 864void ecb_cold
879rxvt_term::key_release (XKeyEvent &ev) 865rxvt_term::key_release (XKeyEvent &ev)
880{ 866{
881#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
882 KeySym keysym; 868 KeySym keysym;
883 869
… …
903 commit_iso14755 (); 889 commit_iso14755 ();
904 890
905 return; 891 return;
906 } 892 }
907 893
908 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
909 if (i[0] == keysym) 895 if (i[0] == keysym)
910 { 896 {
911 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
912 commit_iso14755 (); 898 commit_iso14755 ();
913 899
… …
950 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
951 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
952#endif 938#endif
953} 939}
954 940
955#if defined (KEYSYM_RESOURCE)
956unsigned int
957rxvt_term::cmd_write (const char *str, unsigned int count)
958{
959 unsigned int n, s;
960
961 n = cmdbuf_ptr - cmdbuf_base;
962 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
963
964 if (n > 0 && s < count)
965 {
966 memmove (cmdbuf_base, cmdbuf_ptr,
967 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
968 cmdbuf_ptr = cmdbuf_base;
969 cmdbuf_endp -= n;
970 s += n;
971 }
972
973 if (count > s)
974 {
975 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
976 count = s;
977 }
978
979 for (; count--;)
980 *cmdbuf_endp++ = *str++;
981
982 cmd_parse ();
983
984 return 0;
985}
986#endif
987
988void 941void
989rxvt_term::flush () 942rxvt_term::flush ()
990{ 943{
991 flush_ev.stop (); 944 flush_ev.stop ();
992 945
993#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_BG_PIXMAP
994 if (bgPixmap.check_clearChanged ()) 947 if (bg_flags & BG_NEEDS_REFRESH)
995 { 948 {
996// scr_clear (true); This needs to be researched further! 949 bg_flags &= ~BG_NEEDS_REFRESH;
997 scr_touch (false); 950 scr_touch (false);
998 } 951 }
999#endif 952#endif
1000 953
1001 if (want_refresh) 954 if (want_refresh)
… …
1037 } 990 }
1038 while (row < end_row); 991 while (row < end_row);
1039 } 992 }
1040 993
1041 scr_refresh (); 994 scr_refresh ();
1042 scrollbar_show (1); 995 scrollBar.show (1);
1043#ifdef USE_XIM 996#if USE_XIM
1044 IMSendSpot (); 997 im_send_spot ();
1045#endif 998#endif
1046 } 999 }
1047 1000
1048 display->flush (); 1001 display->flush ();
1049} 1002}
1050 1003
1051/* checks wether a refresh is requested and starts the refresh timer */ 1004/* checks whether a refresh is requested and starts the refresh timer */
1052void 1005void
1053rxvt_term::refresh_check () 1006rxvt_term::refresh_check ()
1054{ 1007{
1055 if (want_refresh && !flush_ev.is_active ()) 1008 if (want_refresh && !flush_ev.is_active ())
1056 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1066 refresh_count = 0; 1019 refresh_count = 0;
1067 flush (); 1020 flush ();
1068} 1021}
1069 1022
1070#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1024void
1025rxvt_term::cursor_blink_reset ()
1026{
1027 if (hidden_cursor)
1028 {
1029 hidden_cursor = 0;
1030 want_refresh = 1;
1031 }
1032
1033 if (option (Opt_cursorBlink))
1034 cursor_blink_ev.again ();
1035 else
1036 cursor_blink_ev.stop ();
1037}
1038
1071void 1039void
1072rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1073{ 1041{
1074 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1075 want_refresh = 1; 1043 want_refresh = 1;
… …
1094 1062
1095#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1096void 1064void
1097rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1098{ 1066{
1099 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1100 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1101 { 1069 {
1102 want_refresh = 1; 1070 want_refresh = 1;
1103 refresh_check (); 1071 refresh_check ();
1104 } 1072 }
1105 else 1073 else
… …
1149 { 1117 {
1150 // this should really be sched_yield(), but the linux guys thought 1118 // this should really be sched_yield(), but the linux guys thought
1151 // that giving a process calling sched_yield () less cpu time than 1119 // that giving a process calling sched_yield () less cpu time than
1152 // ones with high nice levels is a useful thing to do. It surely is is 1120 // ones with high nice levels is a useful thing to do. It surely is is
1153 // allowed by the sus... as is returning ENOSYS. 1121 // allowed by the sus... as is returning ENOSYS.
1122 // since the linux guys additionally thought that breaking the only
1123 // known workaround against their unusable sched_yield hack is cool,
1124 // we just nanosleep a bit and hope for the best.
1154 1125
1155 struct timespec ts = { 0, 0 }; 1126 struct timespec ts = { 0, 1000 };
1156 nanosleep (&ts, 0); 1127 nanosleep (&ts, 0);
1157 1128
1158 w.stop (); 1129 w.stop ();
1159 } 1130 }
1160 1131
… …
1163 { 1134 {
1164 } 1135 }
1165} event_handler; 1136} event_handler;
1166#endif 1137#endif
1167 1138
1139/* make sure all the cmd data is at beginning of cmdbuf */
1140void
1141rxvt_term::cmdbuf_reify ()
1142{
1143 if (cmdbuf_ptr == cmdbuf_base)
1144 return;
1145
1146 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1147
1148 memmove (cmdbuf_base, cmdbuf_ptr, used);
1149 cmdbuf_ptr = cmdbuf_base;
1150 cmdbuf_endp = cmdbuf_ptr + used;
1151
1152}
1153
1154#if defined (KEYSYM_RESOURCE)
1155void
1156rxvt_term::cmdbuf_append (const char *str, size_t count)
1157{
1158 cmdbuf_reify ();
1159
1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1161
1162 if (count > avail)
1163 return;
1164
1165 memcpy (cmdbuf_endp, str, count);
1166 cmdbuf_endp += count;
1167
1168 cmd_parse ();
1169}
1170#endif
1171
1168bool 1172bool
1169rxvt_term::pty_fill () 1173rxvt_term::pty_fill ()
1170{ 1174{
1171 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1175 cmdbuf_reify ();
1172 1176
1173 if (CBUFSIZ == n) 1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1174 { 1178
1175 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1179 if (!avail)
1176 n = 0;
1177 } 1180 {
1178 1181 // normally this indicates a "too long" command sequence - just drop the data we have
1179 memmove (cmdbuf_base, cmdbuf_ptr, n);
1180 cmdbuf_ptr = cmdbuf_base; 1182 cmdbuf_ptr = cmdbuf_base;
1181 cmdbuf_endp = cmdbuf_ptr + n; 1183 cmdbuf_endp = cmdbuf_ptr;
1184 avail = CBUFSIZ;
1185 }
1182 1186
1183 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1187 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1184 1188
1185 if (r > 0) 1189 if (r > 0)
1186 { 1190 {
1187 cmdbuf_endp += r; 1191 cmdbuf_endp += r;
1188 return true; 1192 return true;
… …
1210{ 1214{
1211 make_current (); 1215 make_current ();
1212 1216
1213 if (revents & ev::READ) 1217 if (revents & ev::READ)
1214 // loop, but don't allow a single term to monopolize us 1218 // loop, but don't allow a single term to monopolize us
1215 while (pty_fill ()) 1219 for (int i = CBUFCNT; i-- && pty_fill (); )
1216 if (cmd_parse ()) 1220 cmd_parse ();
1217 break;
1218 1221
1219 if (revents & ev::WRITE) 1222 if (revents & ev::WRITE)
1220 pty_write (); 1223 pty_write ();
1221 1224
1222 refresh_check (); 1225 refresh_check ();
1223} 1226}
1224 1227
1225void 1228void ecb_cold
1226rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1227{ 1230{
1228 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1229 recolour_cursor (); 1232 recolour_cursor ();
1230 1233
… …
1235 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1236#endif 1239#endif
1237} 1240}
1238 1241
1239#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1240void 1243void ecb_cold
1241rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1242{ 1245{
1243 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1244 return; 1247 return;
1245 1248
… …
1247 XFlush (dpy); 1250 XFlush (dpy);
1248 1251
1249 hidden_pointer = 1; 1252 hidden_pointer = 1;
1250} 1253}
1251 1254
1252void 1255void ecb_cold
1253rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1254{ 1257{
1255 make_current (); 1258 make_current ();
1256 1259
1257 pointer_blank (); 1260 pointer_blank ();
… …
1263{ 1266{
1264 int button_number, key_state = 0; 1267 int button_number, key_state = 0;
1265 int x, y; 1268 int x, y;
1266 int code = 32; 1269 int code = 32;
1267 1270
1268 x = Pixel2Col (ev.x); 1271 x = Pixel2Col (ev.x) + 1;
1269 y = Pixel2Row (ev.y); 1272 y = Pixel2Row (ev.y) + 1;
1273
1270 if (ev.type == MotionNotify) 1274 if (ev.type == MotionNotify)
1271 { 1275 {
1272 if (x == mouse_row && y == mouse_col) 1276 if (x == mouse_row && y == mouse_col)
1273 return; 1277 return;
1278
1274 mouse_row = x; 1279 mouse_row = x;
1275 mouse_col = y; 1280 mouse_col = y;
1276 code += 32; 1281 code += 32;
1277 } 1282 }
1278 1283
… …
1281 else 1286 else
1282 { 1287 {
1283 button_number = MEvent.button - Button1; 1288 button_number = MEvent.button - Button1;
1284 /* add 0x3D for wheel events, like xterm does */ 1289 /* add 0x3D for wheel events, like xterm does */
1285 if (button_number >= 3) 1290 if (button_number >= 3)
1286 button_number += (64 - 3); 1291 button_number += 64 - 3;
1287 } 1292 }
1288 1293
1289 if (priv_modes & PrivMode_MouseX10) 1294 if (priv_modes & PrivMode_MouseX10)
1290 { 1295 {
1291 /* 1296 /*
… …
1323 fputc ('A', stderr); 1328 fputc ('A', stderr);
1324 if (key_state & 32) 1329 if (key_state & 32)
1325 fputc ('2', stderr); 1330 fputc ('2', stderr);
1326 fprintf (stderr, "]: <%d>, %d/%d\n", 1331 fprintf (stderr, "]: <%d>, %d/%d\n",
1327 button_number, 1332 button_number,
1328 x + 1, 1333 x,
1329 y + 1); 1334 y);
1330#endif 1335#endif
1331 1336
1337#if ENABLE_FRILLS
1338 if (priv_modes & PrivMode_ExtMouseRight)
1339 tt_printf ("\033[%d;%d;%dM",
1340 code + button_number + key_state,
1341 x,
1342 y);
1343 else if (priv_modes & PrivMode_ExtModeMouse)
1344 tt_printf ("\033[M%c%lc%lc",
1345 code + button_number + key_state,
1346 wint_t (32 + x),
1347 wint_t (32 + y));
1348 else
1349#endif
1332 tt_printf ("\033[M%c%c%c", 1350 tt_printf ("\033[M%c%c%c",
1333 (code + button_number + key_state), 1351 code + button_number + key_state,
1334 (32 + x + 1), 1352 32 + x,
1335 (32 + y + 1)); 1353 32 + y);
1336} 1354}
1337 1355
1338/*{{{ process an X event */ 1356/*{{{ process an X event */
1339void 1357void ecb_hot
1340rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1341{ 1359{
1342 make_current (); 1360 make_current ();
1343 1361
1344 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1442 && ev.xfocus.mode != NotifyGrab) 1460 && ev.xfocus.mode != NotifyGrab)
1443 focus_out (); 1461 focus_out ();
1444 break; 1462 break;
1445 1463
1446 case ConfigureNotify: 1464 case ConfigureNotify:
1447 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1448 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1449 szHint.width, szHint.height);*/
1450 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent)
1451 { 1466 {
1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453 ; 1468 ;
1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472#ifdef HAVE_BG_PIXMAP
1473 if (bg_window_position_sensitive ())
1474 want_position_change = true;
1475#endif
1476
1477 bool moved = false;
1478
1479 if (want_position_change)
1480 {
1481 int x, y;
1482
1483 if (ev.xconfigure.send_event)
1484 {
1485 x = ev.xconfigure.x;
1486 y = ev.xconfigure.y;
1487 }
1488 else
1489 get_window_origin (x, y);
1490
1491 if (x != parent_x || y != parent_y)
1492 {
1493 parent_x = x;
1494 parent_y = y;
1495 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1496 moved = true;
1497 }
1498
1499 if (!(bg_flags & BG_IS_VALID))
1500 moved = true;
1501 }
1454 1502
1455 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1456 { 1504 {
1457 seen_resize = 1; 1505 seen_resize = 1;
1458 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1459 } 1507 }
1460 else 1508 else
1461 { 1509 {
1462#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1463 if (bgPixmap.window_position_sensitive ())
1464 {
1465 if (mapped) 1511 if (moved)
1466 update_background (); 1512 update_background ();
1467 else
1468 bgPixmap.invalidate ();
1469 }
1470#endif 1513#endif
1471 } 1514 }
1472 1515
1473 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1474 } 1517 }
1475 break; 1518 break;
1476 1519
1477 case PropertyNotify: 1520 case PropertyNotify:
1478 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1521 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1479 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1480 && ev.xproperty.state == PropertyNewValue)
1481 selection_property (ev.xproperty.window, ev.xproperty.atom);
1482
1483 break; 1522 break;
1484 1523
1485 case SelectionClear: 1524 case SelectionClear:
1486 selection_clear (); 1525 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1487 break;
1488
1489 case SelectionNotify:
1490 if (selection_wait == Sel_normal)
1491 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1492 break; 1526 break;
1493 1527
1494 case SelectionRequest: 1528 case SelectionRequest:
1495 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1496 break; 1530 break;
1497 1531
1498 case MapNotify: 1532 case MapNotify:
1499#ifdef HAVE_BG_PIXMAP 1533#ifdef HAVE_BG_PIXMAP
1500 /* This is needed spcifically to fix the case of no window manager or a 1534 /* This is needed specifically to fix the case of no window manager or a
1501 * non-reparenting window manager. In those cases we never get first 1535 * non-reparenting window manager. In those cases we never get first
1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1536 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1503 * care of multiplicity of ConfigureNotify events arriwing while WM does 1537 * care of multiplicity of ConfigureNotify events arriving while WM does
1504 * reparenting. 1538 * reparenting.
1505 * We should not render background immidiately, as there could be several 1539 * We should not render background immediately, as there could be several
1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1540 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1507 * by scheduling background redraw as soon as we can, but giving a short 1541 * by scheduling background redraw as soon as we can, but giving a short
1508 * bit of time for ConfigureNotifies to arrive. 1542 * bit of time for ConfigureNotifies to arrive.
1509 * We should render background PRIOR to drawing any text, but AFTER all 1543 * We should render background PRIOR to drawing any text, but AFTER all
1510 * of ConfigureNotifys for the best results. 1544 * of ConfigureNotifys for the best results.
1511 */ 1545 */
1512 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1546 if (!(bg_flags & BG_IS_VALID))
1513 update_background_ev.start (0.025); 1547 update_background_ev.start (0.025);
1514#endif 1548#endif
1515 mapped = 1; 1549 mapped = 1;
1516#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1517 text_blink_ev.start (); 1551 text_blink_ev.start ();
… …
1532 if (ev.xany.window == vt) 1566 if (ev.xany.window == vt)
1533 { 1567 {
1534 do 1568 do
1535 { 1569 {
1536 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1537 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, false);
1538 } 1572 }
1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1540 1574
1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1575 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542 1576
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1577 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1544 { 1578 {
1545 scr_expose (ev.xexpose.x, ev.xexpose.y, 1579 scr_expose (ev.xexpose.x, ev.xexpose.y,
1546 ev.xexpose.width, ev.xexpose.height, False); 1580 ev.xexpose.width, ev.xexpose.height, false);
1547 } 1581 }
1548 1582
1549 want_refresh = 1; 1583 want_refresh = 1;
1550 } 1584 }
1551 else 1585 else
… …
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1591 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1592 ;
1559 1593
1560 if (scrollBar.state && ev.xany.window == scrollBar.win) 1594 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1595 {
1562 scrollBar.state = STATE_IDLE; 1596 scrollBar.state = SB_STATE_IDLE;
1563 scrollbar_show (0); 1597 scrollBar.show (0);
1564 } 1598 }
1565 } 1599 }
1566 break; 1600 break;
1567 1601
1568 case MotionNotify: 1602 case MotionNotify:
… …
1633 dist = int_bwidth - ev.xbutton.y; 1667 dist = int_bwidth - ev.xbutton.y;
1634 } 1668 }
1635 else 1669 else
1636 { 1670 {
1637 scroll_selection_dir = DN; 1671 scroll_selection_dir = DN;
1638 dist = ev.xbutton.y - (int_bwidth + height); 1672 dist = ev.xbutton.y - (int_bwidth + vt_height);
1639 } 1673 }
1640 1674
1641 scroll_selection_lines = Pixel2Height (dist) 1675 scroll_selection_lines = Pixel2Height (dist)
1642 / SELECTION_SCROLL_LINE_SPEEDUP 1676 / SELECTION_SCROLL_LINE_SPEEDUP
1643 + 1; 1677 + 1;
… …
1655#ifdef MOUSE_THRESHOLD 1689#ifdef MOUSE_THRESHOLD
1656 } 1690 }
1657#endif 1691#endif
1658 } 1692 }
1659 } 1693 }
1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1694 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1661 { 1695 {
1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1696 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1663 MotionNotify, &ev)) 1697 MotionNotify, &ev))
1664 ; 1698 ;
1665 1699
1666 XQueryPointer (dpy, scrollBar.win, 1700 XQueryPointer (dpy, scrollBar.win,
1667 &unused_root, &unused_child, 1701 &unused_root, &unused_child,
1668 &unused_root_x, &unused_root_y, 1702 &unused_root_x, &unused_root_y,
1669 &ev.xbutton.x, &ev.xbutton.y, 1703 &ev.xbutton.x, &ev.xbutton.y,
1670 &unused_mask); 1704 &unused_mask);
1671 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1705 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1672 scrollbar_size ()); 1706 scrollBar.size ());
1673 want_refresh = 1; 1707 want_refresh = 1;
1674 scrollbar_show (1); 1708 scrollBar.show (1);
1675 } 1709 }
1676 break; 1710 break;
1677 } 1711 }
1678 1712
1679#if defined(CURSOR_BLINK) 1713#if defined(CURSOR_BLINK)
1680 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1714 if (ev.type == KeyPress)
1681 {
1682 if (hidden_cursor)
1683 {
1684 hidden_cursor = 0;
1685 want_refresh = 1;
1686 }
1687
1688 cursor_blink_ev.again (); 1715 cursor_blink_reset ();
1689 }
1690#endif 1716#endif
1691 1717
1692#if defined(POINTER_BLANK) 1718#if defined(POINTER_BLANK)
1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1719 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 { 1720 {
… …
1704#endif 1730#endif
1705 1731
1706 refresh_check (); 1732 refresh_check ();
1707} 1733}
1708 1734
1709void 1735#if ENABLE_FRILLS
1736void ecb_cold
1737rxvt_term::set_urgency (bool enable)
1738{
1739 if (enable == urgency_hint)
1740 return;
1741
1742 if (XWMHints *h = XGetWMHints (dpy, parent))
1743 {
1744 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1745 XSetWMHints (dpy, parent, h);
1746 urgency_hint = enable;
1747 XFree (h);
1748 }
1749}
1750#endif
1751
1752void ecb_cold
1710rxvt_term::focus_in () 1753rxvt_term::focus_in ()
1711{ 1754{
1712 if (!focus) 1755 if (!focus)
1713 { 1756 {
1714 focus = 1; 1757 focus = 1;
1715 want_refresh = 1; 1758 want_refresh = 1;
1716 1759
1717 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1718
1719#if USE_XIM 1760#if USE_XIM
1720 if (Input_Context != NULL) 1761 if (Input_Context != NULL)
1721 { 1762 {
1722 IMSetPosition (); 1763 im_set_position ();
1723 XSetICFocus (Input_Context); 1764 XSetICFocus (Input_Context);
1724 } 1765 }
1725#endif 1766#endif
1726#if CURSOR_BLINK 1767#if CURSOR_BLINK
1727 if (option (Opt_cursorBlink)) 1768 if (option (Opt_cursorBlink))
… …
1734 scr_recolour (); 1775 scr_recolour ();
1735 } 1776 }
1736#endif 1777#endif
1737#if ENABLE_FRILLS 1778#if ENABLE_FRILLS
1738 if (option (Opt_urgentOnBell)) 1779 if (option (Opt_urgentOnBell))
1739 { 1780 set_urgency (0);
1740 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1741 {
1742 h->flags &= ~XUrgencyHint;
1743 XSetWMHints (dpy, parent[0], h);
1744 }
1745 }
1746#endif 1781#endif
1747 }
1748}
1749 1782
1750void 1783 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1784 }
1785}
1786
1787void ecb_cold
1751rxvt_term::focus_out () 1788rxvt_term::focus_out ()
1752{ 1789{
1753 if (focus) 1790 if (focus)
1754 { 1791 {
1755 focus = 0; 1792 focus = 0;
1756 want_refresh = 1; 1793 want_refresh = 1;
1757 1794
1758 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1795#if ENABLE_FRILLS
1759 1796 if (option (Opt_urgentOnBell))
1797 set_urgency (0);
1798#endif
1760#if ENABLE_FRILLS || ISO_14755 1799#if ENABLE_FRILLS || ISO_14755
1761 if (iso14755buf) 1800 if (iso14755buf)
1762 { 1801 {
1763 iso14755buf = 0; 1802 iso14755buf = 0;
1764# if ISO_14755 1803# if ISO_14755
… …
1781 { 1820 {
1782 pix_colors = pix_colors_unfocused; 1821 pix_colors = pix_colors_unfocused;
1783 scr_recolour (); 1822 scr_recolour ();
1784 } 1823 }
1785#endif 1824#endif
1786 }
1787}
1788 1825
1789void 1826 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1827 }
1828}
1829
1830void ecb_cold
1790rxvt_term::update_fade_color (unsigned int idx) 1831rxvt_term::update_fade_color (unsigned int idx)
1791{ 1832{
1792#if OFF_FOCUS_FADING 1833#if OFF_FOCUS_FADING
1793 if (rs[Rs_fade]) 1834 if (rs[Rs_fade])
1794 { 1835 {
… …
1798 } 1839 }
1799#endif 1840#endif
1800} 1841}
1801 1842
1802#if ENABLE_TRANSPARENCY || ENABLE_PERL 1843#if ENABLE_TRANSPARENCY || ENABLE_PERL
1803void 1844void ecb_hot
1804rxvt_term::rootwin_cb (XEvent &ev) 1845rxvt_term::rootwin_cb (XEvent &ev)
1805{ 1846{
1806 make_current (); 1847 make_current ();
1807 1848
1808 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1849 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1809 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1850 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1810 return; 1851 return;
1811 1852
1812# if ENABLE_TRANSPARENCY
1813 switch (ev.type) 1853 switch (ev.type)
1814 { 1854 {
1815 case PropertyNotify: 1855 case PropertyNotify:
1816 /* 1856 /*
1817 * if user used some Esetroot compatible prog to set the root bg, 1857 * if user used some Esetroot compatible prog to set the root bg,
1818 * use the property to determine the pixmap. We use it later on. 1858 * use the property to determine the pixmap. We use it later on.
1819 */ 1859 */
1820 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1860 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1821 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1861 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1822 { 1862 {
1863# if ENABLE_TRANSPARENCY
1823 bgPixmap.set_root_pixmap (); 1864 bg_set_root_pixmap ();
1824 update_background (); 1865 update_background ();
1866#endif
1867#if ENABLE_PERL
1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1869#endif
1825 } 1870 }
1826 1871
1827 break; 1872 break;
1828 } 1873 }
1829# endif
1830 1874
1831 refresh_check (); 1875 refresh_check ();
1832} 1876}
1833#endif 1877#endif
1834 1878
… …
1867 /* save the xbutton state (for ButtonRelease) */ 1911 /* save the xbutton state (for ButtonRelease) */
1868 MEvent.state = ev.state; 1912 MEvent.state = ev.state;
1869#ifdef MOUSE_REPORT_DOUBLECLICK 1913#ifdef MOUSE_REPORT_DOUBLECLICK
1870 if (ev.button == MEvent.button && clickintime) 1914 if (ev.button == MEvent.button && clickintime)
1871 { 1915 {
1872 /* same button, within alloted time */ 1916 /* same button, within allowed time */
1873 MEvent.clicks++; 1917 MEvent.clicks++;
1874 1918
1875 if (MEvent.clicks > 1) 1919 if (MEvent.clicks > 1)
1876 { 1920 {
1877 /* only report double clicks */ 1921 /* only report double clicks */
… …
1958 if (scrollBar.upButton (ev.y)) 2002 if (scrollBar.upButton (ev.y))
1959 direction = UP; /* up */ 2003 direction = UP; /* up */
1960 else if (scrollBar.dnButton (ev.y)) 2004 else if (scrollBar.dnButton (ev.y))
1961 direction = DN; /* down */ 2005 direction = DN; /* down */
1962 2006
1963 scrollBar.state = STATE_IDLE; 2007 scrollBar.state = SB_STATE_IDLE;
1964 /* 2008 /*
1965 * Rxvt-style scrollbar: 2009 * Rxvt-style scrollbar:
1966 * move up if mouse is above slider 2010 * move up if mouse is above slider
1967 * move dn if mouse is below slider 2011 * move dn if mouse is below slider
1968 * 2012 *
… …
2007 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2051 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2008#endif 2052#endif
2009 if (scr_page (direction, 1)) 2053 if (scr_page (direction, 1))
2010 { 2054 {
2011 if (direction == UP) 2055 if (direction == UP)
2012 scrollBar.state = STATE_UP; 2056 scrollBar.state = SB_STATE_UP;
2013 else 2057 else
2014 scrollBar.state = STATE_DOWN; 2058 scrollBar.state = SB_STATE_DOWN;
2015 } 2059 }
2016 } 2060 }
2017 else 2061 else
2018 switch (ev.button) 2062 switch (ev.button)
2019 { 2063 {
2020 case Button2: 2064 case Button2:
2021 switch (scrollBar.align) 2065 switch (scrollBar.align)
2022 { 2066 {
2023 case R_SB_ALIGN_TOP: 2067 case SB_ALIGN_TOP:
2024 csrO = 0; 2068 csrO = 0;
2025 break; 2069 break;
2026 case R_SB_ALIGN_CENTRE: 2070 case SB_ALIGN_CENTRE:
2027 csrO = (scrollBar.bot - scrollBar.top) / 2; 2071 csrO = (scrollBar.bot - scrollBar.top) / 2;
2028 break; 2072 break;
2029 case R_SB_ALIGN_BOTTOM: 2073 case SB_ALIGN_BOTTOM:
2030 csrO = scrollBar.bot - scrollBar.top; 2074 csrO = scrollBar.bot - scrollBar.top;
2031 break; 2075 break;
2032 } 2076 }
2033 2077
2034 if (scrollBar.style == R_SB_XTERM 2078 if (scrollBar.style == SB_STYLE_XTERM
2035 || scrollbar_above_slider (ev.y) 2079 || scrollBar.above_slider (ev.y)
2036 || scrollbar_below_slider (ev.y)) 2080 || scrollBar.below_slider (ev.y))
2037 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2081 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2038 2082
2039 scrollBar.state = STATE_MOTION; 2083 scrollBar.state = SB_STATE_MOTION;
2040 break; 2084 break;
2041 2085
2042 case Button1: 2086 case Button1:
2043 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2087 if (scrollBar.align == SB_ALIGN_CENTRE)
2044 csrO = ev.y - scrollBar.top; 2088 csrO = ev.y - scrollBar.top;
2045 /* FALLTHROUGH */ 2089 /* FALLTHROUGH */
2046 2090
2047 case Button3: 2091 case Button3:
2048 if (scrollBar.style != R_SB_XTERM) 2092 if (scrollBar.style != SB_STYLE_XTERM)
2049 { 2093 {
2050 if (scrollbar_above_slider (ev.y)) 2094 if (scrollBar.above_slider (ev.y))
2051# ifdef RXVT_SCROLL_FULL 2095# ifdef RXVT_SCROLL_FULL
2052 scr_page (UP, nrow - 1); 2096 scr_page (UP, nrow - 1);
2053# else 2097# else
2054 scr_page (UP, nrow / 4); 2098 scr_page (UP, nrow / 4);
2055# endif 2099# endif
2056 else if (scrollbar_below_slider (ev.y)) 2100 else if (scrollBar.below_slider (ev.y))
2057# ifdef RXVT_SCROLL_FULL 2101# ifdef RXVT_SCROLL_FULL
2058 scr_page (DN, nrow - 1); 2102 scr_page (DN, nrow - 1);
2059# else 2103# else
2060 scr_page (DN, nrow / 4); 2104 scr_page (DN, nrow / 4);
2061# endif 2105# endif
2062 else 2106 else
2063 scrollBar.state = STATE_MOTION; 2107 scrollBar.state = SB_STATE_MOTION;
2064 } 2108 }
2065 else 2109 else
2066 { 2110 {
2067 scr_page ((ev.button == Button1 ? DN : UP), 2111 scr_page ((ev.button == Button1 ? DN : UP),
2068 (nrow 2112 (nrow
2069 * scrollbar_position (ev.y) 2113 * scrollBar.position (ev.y)
2070 / scrollbar_size ())); 2114 / scrollBar.size ()));
2071 } 2115 }
2072 2116
2073 break; 2117 break;
2074 } 2118 }
2075 } 2119 }
… …
2085 2129
2086 csrO = 0; /* reset csr Offset */ 2130 csrO = 0; /* reset csr Offset */
2087 if (!bypass_keystate) 2131 if (!bypass_keystate)
2088 reportmode = !! (priv_modes & PrivMode_mouse_report); 2132 reportmode = !! (priv_modes & PrivMode_mouse_report);
2089 2133
2090 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2134 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2091 { 2135 {
2092 scrollBar.state = STATE_IDLE; 2136 scrollBar.state = SB_STATE_IDLE;
2093 scrollbar_show (0); 2137 scrollBar.show (0);
2094 } 2138 }
2095 2139
2096#ifdef SELECTION_SCROLLING 2140#ifdef SELECTION_SCROLLING
2097 sel_scroll_ev.stop(); 2141 sel_scroll_ev.stop();
2098#endif 2142#endif
… …
2147 case Button3: 2191 case Button3:
2148 selection_make (ev.time); 2192 selection_make (ev.time);
2149 break; 2193 break;
2150 2194
2151 case Button2: 2195 case Button2:
2152 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2196 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2197 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2154 break; 2198 break;
2155 2199
2156#ifdef MOUSE_WHEEL 2200#ifdef MOUSE_WHEEL
2157 case Button4: 2201 case Button4:
2158 case Button5: 2202 case Button5:
… …
2181 } 2225 }
2182 else 2226 else
2183# endif 2227# endif
2184 { 2228 {
2185 scr_page (v, i); 2229 scr_page (v, i);
2186 scrollbar_show (1); 2230 scrollBar.show (1);
2187 } 2231 }
2188 } 2232 }
2189 break; 2233 break;
2190#endif 2234#endif
2191 } 2235 }
2192 } 2236 }
2193} 2237}
2194 2238
2195/*}}} */ 2239/*}}} */
2196 2240
2197bool 2241void ecb_hot
2198rxvt_term::cmd_parse () 2242rxvt_term::cmd_parse ()
2199{ 2243{
2200 bool flag = false;
2201 wchar_t ch = NOCHAR; 2244 wchar_t ch = NOCHAR;
2202 char *seq_begin; // remember start of esc-sequence here 2245 char *seq_begin; // remember start of esc-sequence here
2203 2246
2204 for (;;) 2247 for (;;)
2205 { 2248 {
2206 if (ch == NOCHAR) 2249 if (ecb_unlikely (ch == NOCHAR))
2207 { 2250 {
2208 seq_begin = cmdbuf_ptr; 2251 seq_begin = cmdbuf_ptr;
2209 ch = next_char (); 2252 ch = next_char ();
2210 2253
2211 if (ch == NOCHAR) 2254 if (ch == NOCHAR)
2212 break; 2255 break;
2213 } 2256 }
2214 2257
2215 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2258 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2216 { 2259 {
2217 if (!seen_input) 2260 if (ecb_unlikely (!seen_input))
2218 { 2261 {
2219 seen_input = 1; 2262 seen_input = 1;
2220 // many badly-written programs (e.g. jed) contain a race condition: 2263 // many badly-written programs (e.g. jed) contain a race condition:
2221 // they first read the screensize and then install a SIGWINCH handler. 2264 // they first read the screensize and then install a SIGWINCH handler.
2222 // some window managers resize the window early, and these programs 2265 // some window managers resize the window early, and these programs
… …
2235 wchar_t *str = buf; 2278 wchar_t *str = buf;
2236 wchar_t *eol = str + min (ncol, UBUFSIZ); 2279 wchar_t *eol = str + min (ncol, UBUFSIZ);
2237 2280
2238 for (;;) 2281 for (;;)
2239 { 2282 {
2240 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2283 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2241 break; 2284 break;
2242 2285
2243 *str++ = ch; 2286 *str++ = ch;
2244 2287
2245 if (ch == C0_LF || str >= eol) 2288 if (ecb_unlikely (ch == C0_LF || str >= eol))
2246 { 2289 {
2247 if (ch == C0_LF) 2290 if (ch == C0_LF)
2248 nlines++; 2291 nlines++;
2249 2292
2250 refresh_count++; 2293 refresh_count++;
… …
2299 * What the heck we'll cheat and only refresh less than every page-full. 2342 * What the heck we'll cheat and only refresh less than every page-full.
2300 * if skipScroll is enabled. 2343 * if skipScroll is enabled.
2301 */ 2344 */
2302 if (refreshnow) 2345 if (refreshnow)
2303 { 2346 {
2304 flag = true;
2305 scr_refresh (); 2347 scr_refresh ();
2306 want_refresh = 1; 2348 want_refresh = 1;
2307 } 2349 }
2308
2309 } 2350 }
2310 else 2351 else
2311 { 2352 {
2312 try 2353 try
2313 { 2354 {
… …
2321 } 2362 }
2322 2363
2323 ch = NOCHAR; 2364 ch = NOCHAR;
2324 } 2365 }
2325 } 2366 }
2326
2327 return flag;
2328} 2367}
2329 2368
2330// read the next character 2369// read the next character
2331wchar_t 2370wchar_t ecb_hot
2332rxvt_term::next_char () NOTHROW 2371rxvt_term::next_char () NOTHROW
2333{ 2372{
2334 while (cmdbuf_ptr < cmdbuf_endp) 2373 while (cmdbuf_ptr < cmdbuf_endp)
2335 { 2374 {
2336 // assume 7-bit to be ascii ALWAYS 2375 // assume 7-bit to be ascii ALWAYS
2337 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2376 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2338 return *cmdbuf_ptr++; 2377 return *cmdbuf_ptr++;
2339 2378
2340 wchar_t wc; 2379 wchar_t wc;
2341 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2380 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2342 2381
… …
2346 cmdbuf_ptr = cmdbuf_endp; 2385 cmdbuf_ptr = cmdbuf_endp;
2347 break; 2386 break;
2348 } 2387 }
2349 2388
2350 if (len == (size_t)-1) 2389 if (len == (size_t)-1)
2390 {
2391 mbstate.reset (); // reset now undefined conversion state
2351 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2392 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2393 }
2352 2394
2353 // assume wchar == unicode 2395 // assume wchar == unicode
2354 cmdbuf_ptr += len; 2396 cmdbuf_ptr += len;
2355 return wc & UNICODE_MASK; 2397 return wc & UNICODE_MASK;
2356 } 2398 }
2357 2399
2358 return NOCHAR; 2400 return NOCHAR;
2359} 2401}
2360 2402
2361// read the next octet 2403// read the next octet
2362uint32_t 2404uint32_t ecb_hot
2363rxvt_term::next_octet () NOTHROW 2405rxvt_term::next_octet () NOTHROW
2364{ 2406{
2365 return cmdbuf_ptr < cmdbuf_endp 2407 return cmdbuf_ptr < cmdbuf_endp
2366 ? (unsigned char)*cmdbuf_ptr++ 2408 ? (unsigned char)*cmdbuf_ptr++
2367 : NOCHAR; 2409 : NOCHAR;
2368} 2410}
2369 2411
2370static class out_of_input out_of_input; 2412static class out_of_input out_of_input;
2371 2413
2372/* rxvt_cmd_getc () - Return next input character */ 2414wchar_t ecb_hot
2373/*
2374 * Return the next input character after first passing any keyboard input
2375 * to the command.
2376 */
2377wchar_t
2378rxvt_term::cmd_getc () THROW ((class out_of_input)) 2415rxvt_term::cmd_getc () THROW ((class out_of_input))
2379{ 2416{
2380 wchar_t c = next_char (); 2417 wchar_t c = next_char ();
2381 2418
2382 if (c == NOCHAR) 2419 if (c == NOCHAR)
2383 throw out_of_input; 2420 throw out_of_input;
2384 2421
2385 return c; 2422 return c;
2386} 2423}
2387 2424
2388uint32_t 2425uint32_t ecb_hot
2389rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2426rxvt_term::cmd_get8 () THROW ((class out_of_input))
2390{ 2427{
2391 uint32_t c = next_octet (); 2428 uint32_t c = next_octet ();
2392 2429
2393 if (c == NOCHAR) 2430 if (c == NOCHAR)
… …
2397} 2434}
2398 2435
2399/*{{{ print pipe */ 2436/*{{{ print pipe */
2400/*----------------------------------------------------------------------*/ 2437/*----------------------------------------------------------------------*/
2401#ifdef PRINTPIPE 2438#ifdef PRINTPIPE
2402FILE * 2439FILE * ecb_cold
2403rxvt_term::popen_printer () 2440rxvt_term::popen_printer ()
2404{ 2441{
2405 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2442 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2406 2443
2407 if (stream == NULL) 2444 if (stream == NULL)
2408 rxvt_warn ("can't open printer pipe, not printing.\n"); 2445 rxvt_warn ("can't open printer pipe, not printing.\n");
2409 2446
2410 return stream; 2447 return stream;
2411} 2448}
2412 2449
2413int 2450int ecb_cold
2414rxvt_term::pclose_printer (FILE *stream) 2451rxvt_term::pclose_printer (FILE *stream)
2415{ 2452{
2416 fflush (stream); 2453 fflush (stream);
2417 return pclose (stream); 2454 return pclose (stream);
2418} 2455}
2419 2456
2420/* 2457/*
2421 * simulate attached vt100 printer 2458 * simulate attached vt100 printer
2422 */ 2459 */
2423void 2460void ecb_cold
2424rxvt_term::process_print_pipe () 2461rxvt_term::process_print_pipe ()
2425{ 2462{
2426 int done; 2463 FILE *fd = popen_printer ();
2427 FILE *fd;
2428 2464
2429 if ((fd = popen_printer ()) == NULL) 2465 if (!fd)
2430 return; 2466 return;
2431 2467
2432 /* 2468 /*
2433 * Send all input to the printer until either ESC[4i or ESC[?4i 2469 * Send all input to the printer until either ESC[4i or ESC[?4i
2434 * is received. 2470 * is received.
2435 */ 2471 */
2436 for (done = 0; !done;) 2472 for (int done = 0; !done; )
2437 { 2473 {
2438 unsigned char buf[8]; 2474 unsigned char buf[8];
2439 unicode_t ch; 2475 unicode_t ch;
2440 unsigned int i, len; 2476 unsigned int i, len;
2441 2477
… …
2475 pclose_printer (fd); 2511 pclose_printer (fd);
2476} 2512}
2477#endif /* PRINTPIPE */ 2513#endif /* PRINTPIPE */
2478/*}}} */ 2514/*}}} */
2479 2515
2480/* *INDENT-OFF* */
2481enum { 2516enum {
2482 C1_40 = 0x40, 2517 C1_40 = 0x40,
2483 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2518 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2484 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2519 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2485 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2520 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2486 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2521 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2487}; 2522};
2488/* *INDENT-ON* */
2489 2523
2490/*{{{ process non-printing single characters */ 2524/*{{{ process non-printing single characters */
2491void 2525void ecb_hot
2492rxvt_term::process_nonprinting (unicode_t ch) 2526rxvt_term::process_nonprinting (unicode_t ch)
2493{ 2527{
2494 switch (ch) 2528 switch (ch)
2495 { 2529 {
2496 case C0_ESC: 2530 case C0_ESC:
… …
2542} 2576}
2543/*}}} */ 2577/*}}} */
2544 2578
2545 2579
2546/*{{{ process VT52 escape sequences */ 2580/*{{{ process VT52 escape sequences */
2547void 2581void ecb_cold
2548rxvt_term::process_escape_vt52 (unicode_t ch) 2582rxvt_term::process_escape_vt52 (unicode_t ch)
2549{ 2583{
2550 int row, col; 2584 int row, col;
2551 2585
2552 switch (ch) 2586 switch (ch)
… …
2586 break; 2620 break;
2587 case 'Z': /* identify the terminal type */ 2621 case 'Z': /* identify the terminal type */
2588 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2622 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2589 break; 2623 break;
2590 case '<': /* turn off VT52 mode */ 2624 case '<': /* turn off VT52 mode */
2591 PrivMode (0, PrivMode_vt52); 2625 priv_modes &= ~PrivMode_vt52;
2592 break; 2626 break;
2593 case 'F': /* use special graphics character set */ 2627 case 'F': /* use special graphics character set */
2594 case 'G': /* use regular character set */ 2628 case 'G': /* use regular character set */
2595 /* unimplemented */ 2629 /* unimplemented */
2596 break; 2630 break;
… …
2602} 2636}
2603/*}}} */ 2637/*}}} */
2604 2638
2605 2639
2606/*{{{ process escape sequences */ 2640/*{{{ process escape sequences */
2607void 2641void ecb_hot
2608rxvt_term::process_escape_seq () 2642rxvt_term::process_escape_seq ()
2609{ 2643{
2610 unicode_t ch = cmd_getc (); 2644 unicode_t ch = cmd_getc ();
2611 2645
2612 if (priv_modes & PrivMode_vt52) 2646 if (priv_modes & PrivMode_vt52)
… …
2615 return; 2649 return;
2616 } 2650 }
2617 2651
2618 switch (ch) 2652 switch (ch)
2619 { 2653 {
2620 /* case 1: do_tek_mode (); break; */
2621 case '#': 2654 case '#':
2622 if (cmd_getc () == '8') 2655 if (cmd_getc () == '8')
2623 scr_E (); 2656 scr_E ();
2624 break; 2657 break;
2625 case '(': 2658 case '(':
… …
2648#if !ENABLE_MINIMAL 2681#if !ENABLE_MINIMAL
2649 case '9': 2682 case '9':
2650 scr_forwardindex (); 2683 scr_forwardindex ();
2651 break; 2684 break;
2652#endif 2685#endif
2686 // DECPAM/DECPNM
2653 case '=': 2687 case '=':
2688 priv_modes |= PrivMode_aplKP;
2689 break;
2654 case '>': 2690 case '>':
2655 PrivMode ((ch == '='), PrivMode_aplKP); 2691 priv_modes &= ~PrivMode_aplKP;
2656 break; 2692 break;
2657 2693
2658 case C1_40: 2694 case C1_40:
2659 cmd_getc (); 2695 cmd_getc ();
2660 break; 2696 break;
… …
2664 2700
2665 /* 8.3.87: NEXT LINE */ 2701 /* 8.3.87: NEXT LINE */
2666 case C1_NEL: /* ESC E */ 2702 case C1_NEL: /* ESC E */
2667 { 2703 {
2668 wchar_t nlcr[] = { C0_LF, C0_CR }; 2704 wchar_t nlcr[] = { C0_LF, C0_CR };
2669 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2705 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2670 } 2706 }
2671 break; 2707 break;
2672 2708
2673 /* kidnapped escape sequence: Should be 8.3.48 */ 2709 /* kidnapped escape sequence: Should be 8.3.48 */
2674 case C1_ESA: /* ESC G */ 2710 case C1_ESA: /* ESC G */
2675 process_graphics (); 2711 // used by original rxvt for rob nations own graphics mode
2712 if (cmd_getc () == 'Q')
2713 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2676 break; 2714 break;
2677 2715
2678 /* 8.3.63: CHARACTER TABULATION SET */ 2716 /* 8.3.63: CHARACTER TABULATION SET */
2679 case C1_HTS: /* ESC H */ 2717 case C1_HTS: /* ESC H */
2680 scr_set_tab (1); 2718 scr_set_tab (1);
… …
2684 case C1_RI: /* ESC M */ 2722 case C1_RI: /* ESC M */
2685 scr_index (DN); 2723 scr_index (DN);
2686 break; 2724 break;
2687 2725
2688 /* 8.3.142: SINGLE-SHIFT TWO */ 2726 /* 8.3.142: SINGLE-SHIFT TWO */
2689 /*case C1_SS2: scr_single_shift (2); break; */ 2727 /* case C1_SS2: break; */
2690 2728
2691 /* 8.3.143: SINGLE-SHIFT THREE */ 2729 /* 8.3.143: SINGLE-SHIFT THREE */
2692 /*case C1_SS3: scr_single_shift (3); break; */ 2730 /* case C1_SS3: break; */
2693 2731
2694 /* 8.3.27: DEVICE CONTROL STRING */ 2732 /* 8.3.27: DEVICE CONTROL STRING */
2695 case C1_DCS: /* ESC P */ 2733 case C1_DCS: /* ESC P */
2696 process_dcs_seq (); 2734 process_dcs_seq ();
2697 break; 2735 break;
… …
2699 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2700 case C1_SCI: /* ESC Z */ 2738 case C1_SCI: /* ESC Z */
2701 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2739 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2702 break; /* steal obsolete ESC [ c */ 2740 break; /* steal obsolete ESC [ c */
2703 2741
2704 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2742 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2705 case C1_CSI: /* ESC [ */ 2743 case C1_CSI: /* ESC [ */
2706 process_csi_seq (); 2744 process_csi_seq ();
2707 break; 2745 break;
2708 2746
2709 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2747 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2710 case C1_OSC: /* ESC ] */ 2748 case C1_OSC: /* ESC ] */
2711 process_osc_seq (); 2749 process_osc_seq ();
2712 break; 2750 break;
2713 2751
2714 /* 8.3.106: RESET TO INITIAL STATE */ 2752 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2715 case 'c': 2753 case 'c':
2716 mbstate.reset (); 2754 mbstate.reset ();
2717 scr_poweron (); 2755 scr_poweron ();
2718 scrollbar_show (1); 2756 scrollBar.show (1);
2719 break; 2757 break;
2720 2758
2721 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2759 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2722 case 'n': 2760 case 'n':
2723 scr_charset_choose (2); 2761 scr_charset_choose (2);
… …
2730 } 2768 }
2731} 2769}
2732/*}}} */ 2770/*}}} */
2733 2771
2734/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2772/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2735/* *INDENT-OFF* */
2736enum { 2773enum {
2737 CSI_ICH = 0x40, 2774 CSI_ICH = 0x40,
2738 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2775 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2739 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2776 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2740 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2777 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2743 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2780 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2744 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2781 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2745 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2782 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2746}; 2783};
2747 2784
2748#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2785#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2749 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2786 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2750 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2787 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2751#define get_byte_array_bit(array, bit) \ 2788#define get_byte_array_bit(array, bit) \
2752 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2789 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2753 2790
2754const unsigned char csi_defaults[] = 2791static const unsigned char csi_defaults[] =
2755 { 2792 {
2756 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2793 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2757 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2794 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2758 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2795 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2759 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2796 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2760 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2797 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2761 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2798 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2762 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2799 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2763 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2800 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2764 }; 2801 };
2765/* *INDENT-ON* */
2766 2802
2767void 2803void ecb_hot
2768rxvt_term::process_csi_seq () 2804rxvt_term::process_csi_seq ()
2769{ 2805{
2770 unicode_t ch, priv, i; 2806 unicode_t ch, priv, i;
2771 unsigned int nargs, p; 2807 unsigned int nargs, p;
2772 int n, ndef; 2808 int n, ndef;
… …
2774 2810
2775 nargs = 0; 2811 nargs = 0;
2776 2812
2777 priv = 0; 2813 priv = 0;
2778 ch = cmd_getc (); 2814 ch = cmd_getc ();
2779 if (ch >= '<' && ch <= '?') 2815 if ((ch >= '<' && ch <= '?') || ch == '!')
2780 { 2816 {
2781 /* '<' '=' '>' '?' */ 2817 /* '<' '=' '>' '?' '!' */
2782 priv = ch; 2818 priv = ch;
2783 ch = cmd_getc (); 2819 ch = cmd_getc ();
2784 } 2820 }
2785 2821
2786 /* read any numerical arguments */ 2822 /* read any numerical arguments */
… …
2840 2876
2841 case '?': 2877 case '?':
2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2843 process_terminal_mode (ch, priv, nargs, arg); 2879 process_terminal_mode (ch, priv, nargs, arg);
2844 break; 2880 break;
2881
2882 case '!':
2883 if (ch == CSI_70)
2884 {
2885 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2886 scr_soft_reset ();
2887
2888 static const int pm_h[] = { 7, 25 };
2889 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2890
2891 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2892 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2845 } 2893 }
2894 break;
2895 }
2896
2846 return; 2897 return;
2847 } 2898 }
2848 2899
2849 switch (ch) 2900 switch (ch)
2850 { 2901 {
… …
2864 } 2915 }
2865 break; 2916 break;
2866#endif 2917#endif
2867 2918
2868 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2919 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2869 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2920 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2870 arg[0] = -arg[0]; 2921 arg[0] = -arg[0];
2871 /* FALLTHROUGH */ 2922 /* FALLTHROUGH */
2872 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2923 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2873 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2924 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2874 scr_gotorc (arg[0], 0, RELATIVE); 2925 scr_gotorc (arg[0], 0, RELATIVE);
2875 break; 2926 break;
2876 2927
2877 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2928 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2878 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2929 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3065 } 3116 }
3066} 3117}
3067/*}}} */ 3118/*}}} */
3068 3119
3069#if !ENABLE_MINIMAL 3120#if !ENABLE_MINIMAL
3070/* ARGSUSED */
3071void 3121void
3072rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3122rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3073{ 3123{
3074 int x, y; 3124 int x, y;
3075 XWindowAttributes wattr; 3125 XWindowAttributes wattr;
… …
3084 { 3134 {
3085 /* 3135 /*
3086 * commands 3136 * commands
3087 */ 3137 */
3088 case 1: /* deiconify window */ 3138 case 1: /* deiconify window */
3089 XMapWindow (dpy, parent[0]); 3139 XMapWindow (dpy, parent);
3090 break; 3140 break;
3091 case 2: /* iconify window */ 3141 case 2: /* iconify window */
3092 XIconifyWindow (dpy, parent[0], display->screen); 3142 XIconifyWindow (dpy, parent, display->screen);
3093 break; 3143 break;
3094 case 3: /* set position (pixels) */ 3144 case 3: /* set position (pixels) */
3095 XMoveWindow (dpy, parent[0], args[1], args[2]); 3145 XMoveWindow (dpy, parent, args[1], args[2]);
3096 break; 3146 break;
3097 case 4: /* set size (pixels) */ 3147 case 4: /* set size (pixels) */
3098 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3148 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3099 break; 3149 break;
3100 case 5: /* raise window */ 3150 case 5: /* raise window */
3101 XRaiseWindow (dpy, parent[0]); 3151 XRaiseWindow (dpy, parent);
3102 break; 3152 break;
3103 case 6: /* lower window */ 3153 case 6: /* lower window */
3104 XLowerWindow (dpy, parent[0]); 3154 XLowerWindow (dpy, parent);
3105 break; 3155 break;
3106 case 7: /* refresh window */ 3156 case 7: /* refresh window */
3107 scr_touch (true); 3157 scr_touch (true);
3108 break; 3158 break;
3109 case 8: /* set size (chars) */ 3159 case 8: /* set size (chars) */
… …
3112 break; 3162 break;
3113 3163
3114 //case 9: NYI, TODO, restore maximized window or maximize window 3164 //case 9: NYI, TODO, restore maximized window or maximize window
3115 default: 3165 default:
3116 if (args[0] >= 24) /* set height (chars) */ 3166 if (args[0] >= 24) /* set height (chars) */
3117 set_widthheight ((unsigned int)width, 3167 set_widthheight ((unsigned int)vt_width,
3118 (unsigned int) (args[1] * fheight)); 3168 (unsigned int) (args[1] * fheight));
3119 break; 3169 break;
3120 3170
3121 /* 3171 /*
3122 * reports - some output format copied from XTerm 3172 * reports - some output format copied from XTerm
3123 */ 3173 */
3124 case 11: /* report window state */ 3174 case 11: /* report window state */
3125 XGetWindowAttributes (dpy, parent[0], &wattr); 3175 XGetWindowAttributes (dpy, parent, &wattr);
3126 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3176 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3127 break; 3177 break;
3128 case 13: /* report window position */ 3178 case 13: /* report window position */
3129 XGetWindowAttributes (dpy, parent[0], &wattr); 3179 XGetWindowAttributes (dpy, parent, &wattr);
3130 XTranslateCoordinates (dpy, parent[0], wattr.root, 3180 XTranslateCoordinates (dpy, parent, wattr.root,
3131 -wattr.border_width, -wattr.border_width, 3181 -wattr.border_width, -wattr.border_width,
3132 &x, &y, &wdummy); 3182 &x, &y, &wdummy);
3133 tt_printf ("\033[3;%d;%dt", x, y); 3183 tt_printf ("\033[3;%d;%dt", x, y);
3134 break; 3184 break;
3135 case 14: /* report window size (pixels) */ 3185 case 14: /* report window size (pixels) */
3136 XGetWindowAttributes (dpy, parent[0], &wattr); 3186 XGetWindowAttributes (dpy, parent, &wattr);
3137 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3187 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3138 break; 3188 break;
3139 case 18: /* report text area size (chars) */ 3189 case 18: /* report text area size (chars) */
3140 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3190 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3141 break; 3191 break;
… …
3143 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3193 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3144 break; 3194 break;
3145 case 20: /* report icon label */ 3195 case 20: /* report icon label */
3146 { 3196 {
3147 char *s; 3197 char *s;
3148 XGetIconName (dpy, parent[0], &s); 3198 XGetIconName (dpy, parent, &s);
3149 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3199 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3150 XFree (s); 3200 XFree (s);
3151 } 3201 }
3152 break; 3202 break;
3153 case 21: /* report window title */ 3203 case 21: /* report window title */
3154 { 3204 {
3155 char *s; 3205 char *s;
3156 XFetchName (dpy, parent[0], &s); 3206 XFetchName (dpy, parent, &s);
3157 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3207 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3158 XFree (s); 3208 XFree (s);
3159 } 3209 }
3160 break; 3210 break;
3161 } 3211 }
… …
3217 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3267 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3218 */ 3268 */
3219void 3269void
3220rxvt_term::process_dcs_seq () 3270rxvt_term::process_dcs_seq ()
3221{ 3271{
3222 char *s;
3223 unicode_t eh;
3224
3225 /* 3272 /*
3226 * Not handled yet 3273 * Not handled yet
3227 */ 3274 */
3275
3276 unicode_t eh;
3228 s = get_to_st (eh); 3277 char *s = get_to_st (eh);
3229 if (s) 3278 if (s)
3230 free (s); 3279 free (s);
3231 3280
3232 return; 3281 return;
3233} 3282}
… …
3237 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3286 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3238 */ 3287 */
3239void 3288void
3240rxvt_term::process_osc_seq () 3289rxvt_term::process_osc_seq ()
3241{ 3290{
3242 unicode_t ch, eh;
3243 int arg; 3291 int arg;
3244 3292
3245 ch = cmd_getc (); 3293 unicode_t ch = cmd_getc ();
3246 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3294 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3247 arg = arg * 10 + (ch - '0'); 3295 arg = arg * 10 + (ch - '0');
3248 3296
3249 if (ch == ';') 3297 if (ch == ';')
3250 { 3298 {
3299 unicode_t eh;
3251 char *s = get_to_st (eh); 3300 char *s = get_to_st (eh);
3252 3301
3253 if (s) 3302 if (s)
3254 { 3303 {
3255 process_xterm_seq (arg, s, eh); 3304 process_xterm_seq (arg, s, eh);
… …
3279 3328
3280/* 3329/*
3281 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3330 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3282 */ 3331 */
3283void 3332void
3284rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3333rxvt_term::process_xterm_seq (int op, char *str, char resp)
3285{ 3334{
3286 int color; 3335 int color;
3287 char *buf, *name; 3336 char *buf, *name;
3288 bool query = str[0] == '?' && !str[1]; 3337 bool query = str[0] == '?' && !str[1];
3289 int saveop = op; 3338 int saveop = op;
… …
3316 unsigned long bytes_after; 3365 unsigned long bytes_after;
3317 unsigned char *value = 0; 3366 unsigned char *value = 0;
3318 const char *str = ""; 3367 const char *str = "";
3319 3368
3320 if (prop 3369 if (prop
3321 && XGetWindowProperty (dpy, parent[0], 3370 && XGetWindowProperty (dpy, parent,
3322 prop, 0, 1<<16, 0, AnyPropertyType, 3371 prop, 0, 1<<16, 0, AnyPropertyType,
3323 &actual_type, &actual_format, 3372 &actual_type, &actual_format,
3324 &nitems, &bytes_after, &value) == Success 3373 &nitems, &bytes_after, &value) == Success
3325 && actual_type != None 3374 && actual_type != None
3326 && actual_format == 8) 3375 && actual_format == 8)
… …
3330 3379
3331 XFree (value); 3380 XFree (value);
3332 } 3381 }
3333 else 3382 else
3334 { 3383 {
3335 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3384 char *eq = strchr (str, '=');
3336 3385
3337 if (eq) 3386 if (eq)
3338 { 3387 {
3339 *eq = 0; 3388 *eq = 0;
3340 set_utf8_property (display->atom (str), eq + 1); 3389 set_utf8_property (display->atom (str), eq + 1);
3341 } 3390 }
3342 else 3391 else
3343 XDeleteProperty (dpy, parent[0], 3392 XDeleteProperty (dpy, parent,
3344 display->atom (str)); 3393 display->atom (str));
3345 } 3394 }
3346 break; 3395 break;
3347 3396
3348 case XTerm_Color: 3397 case XTerm_Color:
… …
3380 process_color_seq (op, Color_pointer_fg, str, resp); 3429 process_color_seq (op, Color_pointer_fg, str, resp);
3381 break; 3430 break;
3382 case XTerm_Color_pointer_bg: 3431 case XTerm_Color_pointer_bg:
3383 process_color_seq (op, Color_pointer_bg, str, resp); 3432 process_color_seq (op, Color_pointer_bg, str, resp);
3384 break; 3433 break;
3434#ifdef OPTION_HC
3435 case XTerm_Color_HC:
3436 process_color_seq (op, Color_HC, str, resp);
3437 break;
3438 case XTerm_Color_HTC:
3439 process_color_seq (op, Color_HTC, str, resp);
3440 break;
3441#endif
3385#ifndef NO_BOLD_UNDERLINE_REVERSE 3442#ifndef NO_BOLD_UNDERLINE_REVERSE
3386 case XTerm_Color_RV:
3387 process_color_seq (op, Color_RV, str, resp);
3388 break;
3389 case Rxvt_Color_BD:
3390 case URxvt_Color_BD: 3443 case URxvt_Color_BD:
3391 process_color_seq (op, Color_BD, str, resp); 3444 process_color_seq (op, Color_BD, str, resp);
3392 break; 3445 break;
3393 case Rxvt_Color_UL:
3394 case URxvt_Color_UL: 3446 case URxvt_Color_UL:
3395 process_color_seq (op, Color_UL, str, resp); 3447 process_color_seq (op, Color_UL, str, resp);
3396 break; 3448 break;
3397 case URxvt_Color_IT: 3449 case URxvt_Color_IT:
3398 process_color_seq (op, Color_IT, str, resp); 3450 process_color_seq (op, Color_IT, str, resp);
3399 break; 3451 break;
3400#endif 3452#endif
3453 case URxvt_Color_border:
3454 process_color_seq (op, Color_border, str, resp);
3455 break;
3401#if ENABLE_TRANSPARENCY 3456#if ENABLE_TRANSPARENCY
3402 case URxvt_Color_tint: 3457 case URxvt_Color_tint:
3403 process_color_seq (op, Color_tint, str, resp); 3458 process_color_seq (op, Color_tint, str, resp);
3404 { 3459 {
3405 bool changed = false; 3460 bool changed = false;
3406 3461
3407 if (ISSET_PIXCOLOR (Color_tint)) 3462 if (ISSET_PIXCOLOR (Color_tint))
3408 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3463 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3409 else
3410 changed = bgPixmap.unset_tint ();
3411 3464
3412 if (changed) 3465 if (changed)
3413 update_background (); 3466 update_background ();
3414 } 3467 }
3415 3468
… …
3419#if BG_IMAGE_FROM_FILE 3472#if BG_IMAGE_FROM_FILE
3420 case Rxvt_Pixmap: 3473 case Rxvt_Pixmap:
3421 if (!strcmp (str, "?")) 3474 if (!strcmp (str, "?"))
3422 { 3475 {
3423 char str[256]; 3476 char str[256];
3477 int h_scale = fimage.h_scale;
3478 int v_scale = fimage.v_scale;
3479 int h_align = fimage.h_align;
3480 int v_align = fimage.v_align;
3424 3481
3425 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3482 sprintf (str, "[%dx%d+%d+%d]",
3426 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3483 h_scale, v_scale,
3427 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3484 h_align, v_align);
3428 process_xterm_seq (XTerm_title, str, CHAR_ST); 3485 process_xterm_seq (XTerm_title, str, CHAR_ST);
3429 } 3486 }
3430 else 3487 else
3431 { 3488 {
3432 int changed = 0; 3489 bool changed = false;
3433 3490
3434 if (*str != ';') 3491 if (*str != ';')
3435 { 3492 {
3436 /* reset to default scaling :*/ 3493 try
3437 bgPixmap.unset_geometry (); 3494 {
3438 if (bgPixmap.set_file (str)) /* change pixmap */ 3495 fimage.set_file_geometry (this, str);
3439 changed++; 3496 changed = true;
3440 str = strchr (str, ';'); 3497 }
3441 if (str == NULL) 3498 catch (const class rxvt_failure_exception &e)
3442 bgPixmap.set_defaultGeometry (); 3499 {
3500 }
3443 } 3501 }
3444 3502 else
3445 while (str)
3446 { 3503 {
3447 str++; 3504 str++;
3448 if (bgPixmap.set_geometry (str)) 3505 if (fimage.set_geometry (str, true))
3449 changed++; 3506 changed = true;
3450 str = strchr (str, ';');
3451 } 3507 }
3452 3508
3453 if (changed) 3509 if (changed)
3510 {
3511 if (bg_window_position_sensitive ())
3512 {
3513 int x, y;
3514 get_window_origin (x, y);
3515 parent_x = x;
3516 parent_y = y;
3517 }
3454 update_background (); 3518 update_background ();
3519 }
3455 } 3520 }
3456 break; 3521 break;
3457#endif 3522#endif
3458 3523
3459 case XTerm_logfile: 3524 case XTerm_logfile:
… …
3529 break; 3594 break;
3530#endif 3595#endif
3531 3596
3532#if ENABLE_PERL 3597#if ENABLE_PERL
3533 case URxvt_perl: 3598 case URxvt_perl:
3534 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3599 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3535 ; // no responses yet
3536 break; 3600 break;
3537#endif 3601#endif
3538 } 3602 }
3539} 3603}
3540/*----------------------------------------------------------------------*/ 3604/*----------------------------------------------------------------------*/
… …
3547 * 's' = save 3611 * 's' = save
3548 * 'r' = restore 3612 * 'r' = restore
3549 * 't' = toggle 3613 * 't' = toggle
3550 * so no need for fancy checking 3614 * so no need for fancy checking
3551 */ 3615 */
3552int 3616int ecb_cold
3553rxvt_term::privcases (int mode, unsigned long bit) 3617rxvt_term::privcases (int mode, unsigned long bit)
3554{ 3618{
3555 int state; 3619 int state;
3556 3620
3557 if (mode == 's') 3621 if (mode == 's')
3558 { 3622 {
3559 SavedModes |= (priv_modes & bit); 3623 if (priv_modes & bit)
3624 SavedModes |= bit;
3625 else
3626 SavedModes &= ~bit;
3560 return -1; 3627 return -1;
3561 } 3628 }
3562 else 3629 else
3563 { 3630 {
3564 if (mode == 'r') 3631 if (mode == 'r')
3565 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3632 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3566 else 3633 else
3567 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3634 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3568 PrivMode (state, bit); 3635
3636 if (state)
3637 priv_modes |= bit;
3638 else
3639 priv_modes &= ~bit;
3569 } 3640 }
3570 3641
3571 return state; 3642 return state;
3572} 3643}
3573 3644
3574/* we're not using priv _yet_ */ 3645/* we're not using priv _yet_ */
3575void 3646void
3576rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3647rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3577{ 3648{
3578 unsigned int i, j; 3649 unsigned int i, j;
3579 int state; 3650 int state;
3580 3651
3581 static const struct 3652 static const struct
3582 { 3653 {
3583 const int argval; 3654 const int argval;
3584 const unsigned long bit; 3655 const unsigned long bit;
3585 } argtopriv[] = { 3656 } argtopriv[] = {
3586 { 1, PrivMode_aplCUR }, 3657 { 1, PrivMode_aplCUR }, // DECCKM
3587 { 2, PrivMode_vt52 }, 3658 { 2, PrivMode_vt52 }, // DECANM
3588 { 3, PrivMode_132 }, 3659 { 3, PrivMode_132 }, // DECCOLM
3589 { 4, PrivMode_smoothScroll }, 3660 { 4, PrivMode_smoothScroll }, // DECSCLM
3590 { 5, PrivMode_rVideo }, 3661 { 5, PrivMode_rVideo }, // DECSCNM
3591 { 6, PrivMode_relOrigin }, 3662 { 6, PrivMode_relOrigin }, // DECOM
3592 { 7, PrivMode_Autowrap }, 3663 { 7, PrivMode_Autowrap }, // DECAWM
3593 // 8, bi-directional support mode 3664 // 8, auto-repeat keys // DECARM
3594 { 9, PrivMode_MouseX10 }, 3665 { 9, PrivMode_MouseX10 },
3595 // 18, 19 printing-related 3666 // 18 end FF to printer after print screen
3667 // 19 Print screen prints full screen/scroll region
3596 { 25, PrivMode_VisibleCursor }, 3668 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3597#ifdef scrollBar_esc 3669#ifdef scrollBar_esc
3598 { scrollBar_esc, PrivMode_scrollBar }, 3670 { scrollBar_esc, PrivMode_scrollBar },
3599#endif 3671#endif
3600 { 35, PrivMode_ShiftKeys }, // rxvt extension 3672 { 35, PrivMode_ShiftKeys }, // rxvt extension
3673 // 38, tektronix mode // DECTEK
3601 { 40, PrivMode_132OK }, 3674 { 40, PrivMode_132OK },
3602 // 41 xterm more fixes NYI 3675 // 41 xterm more fixes NYI
3603 // 45 margin bell NYI 3676 // 45 margin bell NYI
3604 // 46 start logging 3677 // 46 start logging
3605 { 47, PrivMode_Screen }, 3678 { 47, PrivMode_Screen },
3606 { 66, PrivMode_aplKP }, 3679 { 66, PrivMode_aplKP }, // DECNKM
3607#ifndef NO_BACKSPACE_KEY 3680#ifndef NO_BACKSPACE_KEY
3608 { 67, PrivMode_BackSpace }, 3681 { 67, PrivMode_BackSpace }, // DECBKM
3609#endif 3682#endif
3610 { 1000, PrivMode_MouseX11 }, 3683 { 1000, PrivMode_MouseX11 },
3611 { 1002, PrivMode_MouseBtnEvent }, 3684 { 1002, PrivMode_MouseBtnEvent },
3612 { 1003, PrivMode_MouseAnyEvent }, 3685 { 1003, PrivMode_MouseAnyEvent },
3686#if ENABLE_FRILLS
3687 { 1005, PrivMode_ExtModeMouse },
3688#endif
3613 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3689 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3614 { 1011, PrivMode_Keypress }, // rxvt extension 3690 { 1011, PrivMode_Keypress }, // rxvt extension
3691#if ENABLE_FRILLS
3692 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3693#endif
3615 // 1035 enable modifiers for alt, numlock NYI 3694 // 1035 enable modifiers for alt, numlock NYI
3616 // 1036 send ESC for meta keys NYI 3695 // 1036 send ESC for meta keys NYI
3617 // 1037 send DEL for keypad delete NYI 3696 // 1037 send DEL for keypad delete NYI
3618 { 1047, PrivMode_Screen }, 3697 { 1047, PrivMode_Screen },
3619 // 1048 save and restore cursor 3698 // 1048 save and restore cursor, implemented in code
3620 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3699 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3621 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3700 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3622 { 2004, PrivMode_BracketPaste }, 3701 { 2004, PrivMode_BracketPaste },
3623 }; 3702 };
3624 3703
… …
3634 for (i = 0; i < nargs; i++) 3713 for (i = 0; i < nargs; i++)
3635 { 3714 {
3636 state = -1; 3715 state = -1;
3637 3716
3638 /* basic handling */ 3717 /* basic handling */
3639 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3718 for (j = 0; j < ecb_array_length (argtopriv); j++)
3640 if (argtopriv[j].argval == arg[i]) 3719 if (argtopriv[j].argval == arg[i])
3641 { 3720 {
3642 state = privcases (mode, argtopriv[j].bit); 3721 state = privcases (mode, argtopriv[j].bit);
3643 break; 3722 break;
3644 } 3723 }
… …
3652 3731
3653 scr_touch (true); 3732 scr_touch (true);
3654 break; 3733 break;
3655#endif 3734#endif
3656 case 1048: /* alternative cursor save */ 3735 case 1048: /* alternative cursor save */
3657 case 1049:
3658 if (option (Opt_secondaryScreen)) 3736 if (option (Opt_secondaryScreen))
3659 if (mode == 0) 3737 if (mode == 0)
3660 scr_cursor (RESTORE); 3738 scr_cursor (RESTORE);
3661 else if (mode == 1) 3739 else if (mode == 1)
3662 scr_cursor (SAVE); 3740 scr_cursor (SAVE);
… …
3671 case 2: /* VT52 mode */ 3749 case 2: /* VT52 mode */
3672 /* oddball mode. should be set regardless of set/reset 3750 /* oddball mode. should be set regardless of set/reset
3673 * parameter. Return from VT52 mode with an ESC < from 3751 * parameter. Return from VT52 mode with an ESC < from
3674 * within VT52 mode 3752 * within VT52 mode
3675 */ 3753 */
3676 PrivMode (1, PrivMode_vt52); 3754 priv_modes |= PrivMode_vt52;
3677 break; 3755 break;
3678 case 3: /* 80/132 */ 3756 case 3: /* 80/132 */
3679 if (priv_modes & PrivMode_132OK) 3757 if (priv_modes & PrivMode_132OK)
3680 {
3681 scr_poweron ();
3682 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3758 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3683 }
3684 break; 3759 break;
3685 case 4: /* smooth scrolling */ 3760 case 4: /* smooth scrolling */
3686 set_option (Opt_jumpScroll, !state); 3761 set_option (Opt_jumpScroll, !state);
3687 break; 3762 break;
3688 case 5: /* reverse video */ 3763 case 5: /* reverse video */
… …
3699 if (state) /* orthogonal */ 3774 if (state) /* orthogonal */
3700 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3775 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3701 break; 3776 break;
3702#ifdef scrollBar_esc 3777#ifdef scrollBar_esc
3703 case scrollBar_esc: 3778 case scrollBar_esc:
3704 if (scrollbar_mapping (state)) 3779 scrollBar.map (state);
3705 {
3706 resize_all_windows (0, 0, 0); 3780 resize_all_windows (0, 0, 0);
3707 scr_touch (true); 3781 scr_touch (true);
3708 }
3709 break; 3782 break;
3710#endif 3783#endif
3711 case 25: /* visible/invisible cursor */ 3784 case 25: /* visible/invisible cursor */
3712 scr_cursor_visible (state); 3785 scr_cursor_visible (state);
3713 break; 3786 break;
… …
3726 case 1003: 3799 case 1003:
3727 if (state) 3800 if (state)
3728 { 3801 {
3729 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3802 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3730 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3803 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3804 mouse_row = mouse_col = 0;
3731 vt_emask_mouse = PointerMotionMask; 3805 vt_emask_mouse = PointerMotionMask;
3732 } 3806 }
3733 else 3807 else
3734 vt_emask_mouse = NoEventMask; 3808 vt_emask_mouse = NoEventMask;
3809
3735 vt_select_input (); 3810 vt_select_input ();
3736 break; 3811 break;
3737 case 1010: /* scroll to bottom on TTY output inhibit */ 3812 case 1010: /* scroll to bottom on TTY output inhibit */
3738 set_option (Opt_scrollTtyOutput, !state); 3813 set_option (Opt_scrollTtyOutput, !state);
3739 break; 3814 break;
3740 case 1011: /* scroll to bottom on key press */ 3815 case 1011: /* scroll to bottom on key press */
3741 set_option (Opt_scrollTtyKeypress, state); 3816 set_option (Opt_scrollTtyKeypress, state);
3742 break; 3817 break;
3743 case 1047: /* secondary screen w/ clearing last */ 3818 case 1047: /* secondary screen w/ clearing last */
3744 if (option (Opt_secondaryScreen)) 3819 if (option (Opt_secondaryScreen))
3745 if (current_screen != PRIMARY) 3820 if (!state)
3746 scr_erase_screen (2); 3821 scr_erase_screen (2);
3822
3747 scr_change_screen (state); 3823 scr_change_screen (state);
3748 break; 3824 break;
3749 case 1049: /* secondary screen w/ clearing first */ 3825 case 1049: /* secondary screen w/ clearing first */
3826 if (option (Opt_secondaryScreen))
3827 if (state)
3828 scr_cursor (SAVE);
3829
3750 scr_change_screen (state); 3830 scr_change_screen (state);
3831
3751 if (option (Opt_secondaryScreen)) 3832 if (option (Opt_secondaryScreen))
3752 if (current_screen != PRIMARY) 3833 if (state)
3753 scr_erase_screen (2); 3834 scr_erase_screen (2);
3835 else
3836 scr_cursor (RESTORE);
3754 break; 3837 break;
3755 default: 3838 default:
3756 break; 3839 break;
3757 } 3840 }
3758 } 3841 }
3759} 3842}
3760/*}}} */ 3843/*}}} */
3761 3844
3762/*{{{ process sgr sequences */ 3845/*{{{ process sgr sequences */
3763void 3846void ecb_hot
3764rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3847rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3765{ 3848{
3766 unsigned int i; 3849 unsigned int i;
3767 short rendset; 3850 short rendset;
3768 int rendstyle; 3851 int rendstyle;
… …
3911 } 3994 }
3912 } 3995 }
3913} 3996}
3914/*}}} */ 3997/*}}} */
3915 3998
3916/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3917void
3918rxvt_term::process_graphics ()
3919{
3920 unicode_t ch, cmd = cmd_getc ();
3921
3922 if (cmd == 'Q')
3923 {
3924 /* query graphics */
3925 tt_printf ("\033G0\012"); /* no graphics */
3926 return;
3927 }
3928 /* swallow other graphics sequences until terminating ':' */
3929 do
3930 ch = cmd_getc ();
3931 while (ch != ':');
3932}
3933/*}}} */
3934
3935/* ------------------------------------------------------------------------- */ 3999/* ------------------------------------------------------------------------- */
3936 4000
3937/* 4001/*
3938 * Send printf () formatted output to the command. 4002 * Send printf () formatted output to the command.
3939 * Only use for small amounts of data. 4003 * Only use for small amounts of data.
… …
3952 4016
3953/* ---------------------------------------------------------------------- */ 4017/* ---------------------------------------------------------------------- */
3954/* Write data to the pty as typed by the user, pasted with the mouse, 4018/* Write data to the pty as typed by the user, pasted with the mouse,
3955 * or generated by us in response to a query ESC sequence. 4019 * or generated by us in response to a query ESC sequence.
3956 */ 4020 */
3957const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4021static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3958 4022
3959void 4023void
3960rxvt_term::tt_write (const char *data, unsigned int len) 4024rxvt_term::tt_write (const char *data, unsigned int len)
3961{ 4025{
3962 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4026 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3967 4031
3968 if (v_buflen == 0) 4032 if (v_buflen == 0)
3969 { 4033 {
3970 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4034 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3971 4035
4036 max_it (written, 0);
4037
3972 if ((unsigned int)written == len) 4038 if (written == len)
3973 return; 4039 return;
3974 4040
3975 data += written; 4041 data += written;
3976 len -= written; 4042 len -= written;
3977 } 4043 }
3978 4044
3979 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4045 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3980 4046
3981 memcpy (v_buffer + v_buflen, data, len); 4047 memcpy (v_buffer + v_buflen, data, len);
3982 v_buflen += len; 4048 v_buflen += len;
3983 4049
3984 pty_ev.set (ev::READ | ev::WRITE); 4050 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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