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.303 by root, Tue Jan 31 21:47:56 2006 UTC vs.
Revision 1.524 by root, Tue Aug 14 20:32:48 2012 UTC

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

Diff Legend

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