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

Diff Legend

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