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.210 by root, Tue Dec 20 20:58:31 2005 UTC vs.
Revision 1.431 by root, Tue Feb 24 11:51:51 2009 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-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
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.
… …
43 * along with this program; if not, write to the Free Software 44 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 45 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 46 *----------------------------------------------------------------------*/
46 47
47/*{{{ includes: */ 48/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 49#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 50#include "rxvt.h"
51#include "rxvtperl.h"
50#include "version.h" 52#include "version.h"
51#include "command.h" 53#include "command.h"
52 54
53#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 56# include "keyboard.h"
55#endif 57#endif
56 58
57#include <csignal> 59#include <csignal>
58 60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64
59/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
60 66
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 68
66#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
67 70
68#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
93 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
94 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
95 98
96 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
97 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
98 XK_ISO_Lock, 0x21eb,
99 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
100 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
101 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
102 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
103 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
135rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
136{ 138{
137 x = Pixel2Col (x); 139 x = Pixel2Col (x);
138 y = Pixel2Row (y); 140 y = Pixel2Row (y);
139 141
140 if (x < 0 || x >= ncol 142 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= nrow) 143 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 144 return;
143 145
144 for (;;) 146 for (;;)
145 { 147 {
146 const line_t &l = save[y + saveLines - view_start]; 148 const line_t &l = ROW(y + view_start);
147 149
148 text_t t = l.t[x]; 150 text_t t = l.t[x];
149 151
150 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
151 { 153 {
152 iso14755_51 (l.t[x], l.r[x]); 154 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
154 break; 156 break;
155 } 157 }
156 158
157 x--; 159 x--;
158 } 160 }
159
160} 161}
161#endif
162 162
163#if ENABLE_OVERLAY
164void 163void
165rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
166{ 165{
167 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
168 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
169 wchar_t *chr, *alloc, ch2, *fname; 168 wchar_t *chr, *alloc, ch2, *fname;
170 int len; 169 int len;
171 170
172 fname = rxvt_utf8towcs (f->name); 171 fname = rxvt_utf8towcs (f->name);
173 172
174#if ENABLE_COMBINING 173# if ENABLE_COMBINING
175 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
176 { 175 {
177 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
178 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
179 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
180 } 179 }
181 else 180 else
182#endif 181# endif
183 { 182 {
184 ch2 = ch; 183 ch2 = ch;
185 184
186 alloc = 0; 185 alloc = 0;
187 chr = &ch2; 186 chr = &ch2;
188 len = 1; 187 len = 1;
189 } 188 }
190 189
190 char attr[80]; // plenty
191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
191 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
192 203
193 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
194 214
195 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
196 216
197 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
198 { 218 {
… …
201 ch = *chr++; 221 ch = *chr++;
202 222
203 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
204 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
205 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
206#if !UNICODE3 226# if !UNICODE_3
207 if (ch >= 0x10000) 227 if (ch >= 0x10000)
208 ch = 0xfffd; 228 ch = 0xfffd;
209#endif 229# endif
210 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
211 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
212 } 234 }
213 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
241 scr_overlay_set (0, len , attr);
214 scr_overlay_set (0, len, fname); 242 scr_overlay_set (0, len + 1, fname);
215 243
216 free (fname); 244 free (fname);
217 245
218#if ENABLE_COMBINING 246# if ENABLE_COMBINING
219 if (alloc) 247 if (alloc)
220 delete [] alloc; 248 delete [] alloc;
221#endif 249# endif
222} 250}
223#endif 251#endif
224 252
225void 253void
226rxvt_term::commit_iso14755 () 254rxvt_term::commit_iso14755 ()
… …
243 mb[0] = ch[0]; 271 mb[0] = ch[0];
244 len = 1; 272 len = 1;
245 } 273 }
246 274
247 if (len > 0) 275 if (len > 0)
248 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
249 else 277 else
250 scr_bell (); 278 scr_bell ();
251 } 279 }
252 280
253 iso14755buf = 0; 281 iso14755buf = 0;
254} 282}
255 283
256int 284static int
257rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
258{ 286{
259 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
260 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
261 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
262 { 290 {
… …
270 298
271 return -1; 299 return -1;
272} 300}
273#endif 301#endif
274 302
275/*{{{ Convert the keypress event into a string */ 303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
339static inline int
340map_function_key (KeySym keysym)
341{
342 int param = 0;
343
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
345 {
346 param = 11 + keysym - XK_F1;
347 if (keysym >= XK_F17)
348 param += 4;
349 else if (keysym >= XK_F15)
350 param += 3;
351 else if (keysym >= XK_F11)
352 param += 2;
353 else if (keysym >= XK_F6)
354 param += 1;
355 }
356 else
357 switch (keysym)
358 {
359 case XK_Find:
360 param = 1;
361 break;
362 case XK_Insert:
363 param = 2;
364 break;
365#ifdef DXK_Remove
366 case DXK_Remove:
367#endif
368 case XK_Execute:
369 param = 3;
370 break;
371 case XK_Select:
372 param = 4;
373 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior:
376 param = 5;
377 break;
378 case XK_Next:
379 param = 6;
380 break;
381 case XK_Home:
382 param = 7;
383 break;
384 case XK_End:
385 param = 8;
386 break;
387#endif
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
276void 398void
277rxvt_term::lookup_key (XKeyEvent &ev) 399rxvt_term::key_press (XKeyEvent &ev)
278{ 400{
279 int ctrl, meta, shft, len; 401 int ctrl, meta, shft, len;
280 unsigned int newlen;
281 KeySym keysym; 402 KeySym keysym;
282#ifdef DEBUG_CMD
283 static int debug_key = 1; /* accessible by a debugger only */
284#endif
285 int valid_keysym; 403 int valid_keysym;
286 unsigned char kbuf[KBUFSZ]; 404 char kbuf[KBUFSZ];
405
406#if ISO_14755
407 if (iso14755buf & ISO_14755_52)
408 return;
409#endif
287 410
288 /* 411 /*
289 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 412 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
290 * escape sequence to toggle the Keypad. 413 * escape sequence to toggle the Keypad.
291 * 414 *
… …
296 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
297 420
298 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
299 { 422 {
300 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
301 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
302 } 425 }
303 426
304 kbuf[0] = 0; 427 kbuf[0] = 0;
305 428
306#ifdef USE_XIM 429#ifdef USE_XIM
… …
309 Status status_return; 432 Status status_return;
310 433
311#if 0 434#if 0
312#ifdef X_HAVE_UTF8_STRING 435#ifdef X_HAVE_UTF8_STRING
313 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 436 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
314 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 437 len = Xutf8LookupString (Input_Context, &ev, kbuf,
315 KBUFSZ, &keysym, &status_return); 438 KBUFSZ, &keysym, &status_return);
316 else 439 else
317#endif 440#endif
318#endif 441#endif
319 { 442 {
… …
356 || status_return == XLookupBoth; 479 || status_return == XLookupBoth;
357 } 480 }
358 else 481 else
359#endif 482#endif
360 { 483 {
361 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
362 valid_keysym = keysym != NoSymbol; 485 valid_keysym = keysym != NoSymbol;
363 } 486 }
364 487
365 if (valid_keysym) 488 if (valid_keysym)
366 { 489 {
… …
418 scr_move_to (0, 1); 541 scr_move_to (0, 1);
419 return; 542 return;
420 } 543 }
421 else if (keysym == XK_End) 544 else if (keysym == XK_End)
422 { 545 {
423 scr_move_to (1, 0); 546 scr_move_to (1, 1);
424 return; 547 return;
425 } 548 }
426 } 549 }
427#endif 550#endif
428 } 551 }
… …
439 { 562 {
440 switch (keysym) 563 switch (keysym)
441 { 564 {
442 /* normal XTerm key bindings */ 565 /* normal XTerm key bindings */
443 case XK_Insert: /* Shift+Insert = paste mouse selection */ 566 case XK_Insert: /* Shift+Insert = paste mouse selection */
444 selection_request (ev.time, 0, 0); 567 selection_request (ev.time);
445 return; 568 return;
446#if TODO 569#if TODO
447 /* rxvt extras */ 570 /* rxvt extras */
448 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 571 case XK_KP_Add: /* Shift+KP_Add = bigger font */
449 change_font (FONT_UP); 572 change_font (FONT_UP);
… …
468 { 591 {
469 commit_iso14755 (); 592 commit_iso14755 ();
470 iso14755buf = ISO_14755_51; 593 iso14755buf = ISO_14755_51;
471# if ISO_14755 594# if ISO_14755
472 iso14755_51 (0); 595 iso14755_51 (0);
596# endif
597 return;
598 }
599 else if (keysym == XK_BackSpace)
600 {
601 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
602# if ISO_14755
603 iso14755_51 (iso14755buf & ISO_14755_MASK);
473# endif 604# endif
474 return; 605 return;
475 } 606 }
476 else if ((hv = hex_keyval (ev)) >= 0) 607 else if ((hv = hex_keyval (ev)) >= 0)
477 { 608 {
… …
482# endif 613# endif
483 return; 614 return;
484 } 615 }
485 else 616 else
486 { 617 {
487# if ENABLE_OVERLAY 618# if ISO_14755
488 scr_overlay_off (); 619 scr_overlay_off ();
489# endif 620# endif
490 iso14755buf = 0; 621 iso14755buf = 0;
491 } 622 }
492 } 623 }
493 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
494 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
495 if (!(iso14755buf & ISO_14755_STARTED)) 626 if (!(iso14755buf & ISO_14755_STARTED))
496 { 627 {
497 iso14755buf |= ISO_14755_STARTED; 628 iso14755buf |= ISO_14755_STARTED;
498# if ENABLE_OVERLAY 629# if ISO_14755
499 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
500 scr_overlay_set (0, 0, "ISO 14755 mode"); 631 scr_overlay_set (0, 0, "ISO 14755 mode");
501# endif 632# endif
502 } 633 }
503#endif 634#endif
504 635
505#ifdef PRINTPIPE 636#ifdef PRINTPIPE
506 if (keysym == XK_Print) 637 if (keysym == XK_Print)
507 { 638 {
508 scr_printscreen (ctrl | shft); 639 scr_printscreen (ctrl | shft);
509 return; 640 return;
510 } 641 }
511#endif 642#endif
512 643
513 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
514 { 645 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1;
648
649 switch (translate_keypad (keysym, kp))
515 { 650 {
651#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace)
654 {
655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
656 ^ !!ctrl) ? '\b' : '\177';
657 kbuf[1] = '\0';
658 }
659 else
660 strcpy (kbuf, rs[Rs_backspace_key]);
661 break;
662#endif
663#ifndef NO_DELETE_KEY
664 case XK_Delete:
665 strcpy (kbuf, rs[Rs_delete_key]);
666 break;
667#endif
668 case XK_Tab:
669 if (shft)
670 strcpy (kbuf, "\033[Z");
671 else
672 {
673#ifdef CTRL_TAB_MAKES_META
674 if (ctrl)
675 meta = 1;
676#endif
677#ifdef MOD4_TAB_MAKES_META
678 if (ev.state & Mod4Mask)
679 meta = 1;
680#endif
516 newlen = 1; 681 newlen = 0;
517 switch (keysym) 682 }
683 break;
684
685 case XK_Up: /* "\033[A" */
686 case XK_Down: /* "\033[B" */
687 case XK_Right: /* "\033[C" */
688 case XK_Left: /* "\033[D" */
689 strcpy (kbuf, "\033[Z");
690 kbuf[2] = "DACB"[keysym - XK_Left];
691 /* do Shift first */
692 if (shft)
693 kbuf[2] = "dacb"[keysym - XK_Left];
694 else if (ctrl)
695 {
696 kbuf[1] = 'O';
697 kbuf[2] = "dacb"[keysym - XK_Left];
698 }
699 else if (priv_modes & PrivMode_aplCUR)
700 kbuf[1] = 'O';
701 break;
702
703 case XK_KP_Enter:
704 /* allow shift to override */
705 if (kp)
706 {
707 strcpy (kbuf, "\033OM");
708 break;
709 }
710
711 /* FALLTHROUGH */
712
713 case XK_Return:
714 if (priv_modes & PrivMode_LFNL)
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\012';
718 kbuf[2] = '\0';
719 }
720 else
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\0';
724 }
725 break;
726
727 case XK_KP_F1: /* "\033OP" */
728 case XK_KP_F2: /* "\033OQ" */
729 case XK_KP_F3: /* "\033OR" */
730 case XK_KP_F4: /* "\033OS" */
731 strcpy (kbuf, "\033OP");
732 kbuf[2] += (keysym - XK_KP_F1);
733 break;
734
735 case XK_KP_Multiply: /* "\033Oj" : "*" */
736 case XK_KP_Add: /* "\033Ok" : "+" */
737 case XK_KP_Separator: /* "\033Ol" : "," */
738 case XK_KP_Subtract: /* "\033Om" : "-" */
739 case XK_KP_Decimal: /* "\033On" : "." */
740 case XK_KP_Divide: /* "\033Oo" : "/" */
741 case XK_KP_0: /* "\033Op" : "0" */
742 case XK_KP_1: /* "\033Oq" : "1" */
743 case XK_KP_2: /* "\033Or" : "2" */
744 case XK_KP_3: /* "\033Os" : "3" */
745 case XK_KP_4: /* "\033Ot" : "4" */
746 case XK_KP_5: /* "\033Ou" : "5" */
747 case XK_KP_6: /* "\033Ov" : "6" */
748 case XK_KP_7: /* "\033Ow" : "7" */
749 case XK_KP_8: /* "\033Ox" : "8" */
750 case XK_KP_9: /* "\033Oy" : "9" */
751 /* allow shift to override */
752 if (kp)
753 {
754 strcpy (kbuf, "\033Oj");
755 kbuf[2] += (keysym - XK_KP_Multiply);
756 }
757 else
758 {
759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
760 kbuf[1] = '\0';
761 }
762 break;
763
764 default:
518 { 765 {
519#ifndef NO_BACKSPACE_KEY 766 int param = map_function_key (keysym);
520 case XK_BackSpace: 767 if (param > 0)
521 if (priv_modes & PrivMode_HaveBackSpace) 768 sprintf (kbuf,"\033[%d~", param);
522 {
523 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
524 ^ !!ctrl) ? '\b' : '\177';
525 kbuf[1] = '\0';
526 }
527 else 769 else
528 strcpy (kbuf, key_backspace);
529 break;
530#endif
531#ifndef NO_DELETE_KEY
532# ifdef XK_KP_Prior
533 case XK_KP_Delete:
534 /* allow shift to override */
535 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
536 {
537 strcpy (kbuf, "\033On");
538 break;
539 }
540 /* FALLTHROUGH */
541# endif
542 case XK_Delete:
543 strcpy (kbuf, key_delete);
544 break;
545#endif
546 case XK_Tab:
547 if (shft)
548 strcpy (kbuf, "\033[Z");
549 else
550 {
551#ifdef CTRL_TAB_MAKES_META
552 if (ctrl)
553 meta = 1;
554#endif
555#ifdef MOD4_TAB_MAKES_META
556 if (ev.state & Mod4Mask)
557 meta = 1;
558#endif
559 newlen = 0;
560 }
561 break;
562
563#ifdef XK_KP_Left
564 case XK_KP_Up: /* \033Ox or standard */
565 case XK_KP_Down: /* \033Or or standard */
566 case XK_KP_Right: /* \033Ov or standard */
567 case XK_KP_Left: /* \033Ot or standard */
568 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
569 {
570 strcpy (kbuf, "\033OZ");
571 kbuf[2] = "txvr"[keysym - XK_KP_Left];
572 break;
573 }
574 else
575 /* translate to std. cursor key */
576 keysym = XK_Left + (keysym - XK_KP_Left);
577 /* FALLTHROUGH */
578#endif
579 case XK_Up: /* "\033[A" */
580 case XK_Down: /* "\033[B" */
581 case XK_Right: /* "\033[C" */
582 case XK_Left: /* "\033[D" */
583 strcpy (kbuf, "\033[Z");
584 kbuf[2] = "DACB"[keysym - XK_Left];
585 /* do Shift first */
586 if (shft)
587 kbuf[2] = "dacb"[keysym - XK_Left];
588 else if (ctrl)
589 {
590 kbuf[1] = 'O';
591 kbuf[2] = "dacb"[keysym - XK_Left];
592 }
593 else if (priv_modes & PrivMode_aplCUR)
594 kbuf[1] = 'O';
595 break;
596
597#ifndef UNSHIFTED_SCROLLKEYS
598# ifdef XK_KP_Prior
599 case XK_KP_Prior:
600 /* allow shift to override */
601 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
602 {
603 strcpy (kbuf, "\033Oy");
604 break;
605 }
606 /* FALLTHROUGH */
607# endif
608 case XK_Prior:
609 strcpy (kbuf, "\033[5~");
610 break;
611# ifdef XK_KP_Next
612 case XK_KP_Next:
613 /* allow shift to override */
614 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
615 {
616 strcpy (kbuf, "\033Os");
617 break;
618 }
619 /* FALLTHROUGH */
620# endif
621 case XK_Next:
622 strcpy (kbuf, "\033[6~");
623 break;
624#endif
625 case XK_KP_Enter:
626 /* allow shift to override */
627 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
628 {
629 strcpy (kbuf, "\033OM");
630 break;
631 }
632
633 /* FALLTHROUGH */
634
635 case XK_Return:
636 if (priv_modes & PrivMode_LFNL)
637 {
638 kbuf[0] = '\015';
639 kbuf[1] = '\012';
640 kbuf[2] = '\0';
641 }
642 else
643 {
644 kbuf[0] = '\015';
645 kbuf[1] = '\0';
646 }
647 break;
648
649#ifdef XK_KP_Begin
650 case XK_KP_Begin:
651 strcpy (kbuf, "\033Ou");
652 break;
653
654#endif
655 case XK_KP_F1: /* "\033OP" */
656 case XK_KP_F2: /* "\033OQ" */
657 case XK_KP_F3: /* "\033OR" */
658 case XK_KP_F4: /* "\033OS" */
659 strcpy (kbuf, "\033OP");
660 kbuf[2] += (keysym - XK_KP_F1);
661 break;
662
663 case XK_KP_Multiply: /* "\033Oj" : "*" */
664 case XK_KP_Add: /* "\033Ok" : "+" */
665 case XK_KP_Separator: /* "\033Ol" : "," */
666 case XK_KP_Subtract: /* "\033Om" : "-" */
667 case XK_KP_Decimal: /* "\033On" : "." */
668 case XK_KP_Divide: /* "\033Oo" : "/" */
669 case XK_KP_0: /* "\033Op" : "0" */
670 case XK_KP_1: /* "\033Oq" : "1" */
671 case XK_KP_2: /* "\033Or" : "2" */
672 case XK_KP_3: /* "\033Os" : "3" */
673 case XK_KP_4: /* "\033Ot" : "4" */
674 case XK_KP_5: /* "\033Ou" : "5" */
675 case XK_KP_6: /* "\033Ov" : "6" */
676 case XK_KP_7: /* "\033Ow" : "7" */
677 case XK_KP_8: /* "\033Ox" : "8" */
678 case XK_KP_9: /* "\033Oy" : "9" */
679 /* allow shift to override */
680 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
681 {
682 strcpy (kbuf, "\033Oj");
683 kbuf[2] += (keysym - XK_KP_Multiply);
684 }
685 else
686 {
687 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
688 kbuf[1] = '\0';
689 }
690 break;
691
692 case XK_Find:
693 strcpy (kbuf, "\033[1~");
694 break;
695
696#ifdef XK_KP_End
697 case XK_KP_Insert:
698 /* allow shift to override */
699 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
700 {
701 strcpy (kbuf, "\033Op");
702 break;
703 }
704 /* FALLTHROUGH */
705#endif
706 case XK_Insert:
707 strcpy (kbuf, "\033[2~");
708 break;
709#ifdef DXK_Remove /* support for DEC remove like key */
710 case DXK_Remove:
711 /* FALLTHROUGH */
712#endif
713 case XK_Execute:
714 strcpy (kbuf, "\033[3~");
715 break;
716 case XK_Select:
717 strcpy (kbuf, "\033[4~");
718 break;
719#ifdef XK_KP_End
720 case XK_KP_End:
721 /* allow shift to override */
722 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
723 {
724 strcpy (kbuf, "\033Oq");
725 break;
726 }
727 /* FALLTHROUGH */
728#endif
729 case XK_End:
730 strcpy (kbuf, KS_END);
731 break;
732#ifdef XK_KP_Home
733 case XK_KP_Home:
734 /* allow shift to override */
735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
736 {
737 strcpy (kbuf, "\033Ow");
738 break;
739 }
740 /* FALLTHROUGH */
741#endif
742 case XK_Home:
743 strcpy (kbuf, KS_HOME);
744 break;
745
746#define FKEY(n, fkey) \
747 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
748
749 case XK_F1: /* "\033[11~" */
750 case XK_F2: /* "\033[12~" */
751 case XK_F3: /* "\033[13~" */
752 case XK_F4: /* "\033[14~" */
753 case XK_F5: /* "\033[15~" */
754 FKEY (11, XK_F1);
755 break;
756 case XK_F6: /* "\033[17~" */
757 case XK_F7: /* "\033[18~" */
758 case XK_F8: /* "\033[19~" */
759 case XK_F9: /* "\033[20~" */
760 case XK_F10: /* "\033[21~" */
761 FKEY (17, XK_F6);
762 break;
763 case XK_F11: /* "\033[23~" */
764 case XK_F12: /* "\033[24~" */
765 case XK_F13: /* "\033[25~" */
766 case XK_F14: /* "\033[26~" */
767 FKEY (23, XK_F11);
768 break;
769 case XK_F15: /* "\033[28~" */
770 case XK_F16: /* "\033[29~" */
771 FKEY (28, XK_F15);
772 break;
773 case XK_Help: /* "\033[28~" */
774 FKEY (28, XK_Help);
775 break;
776 case XK_Menu: /* "\033[29~" */
777 FKEY (29, XK_Menu);
778 break;
779 case XK_F17: /* "\033[31~" */
780 case XK_F18: /* "\033[32~" */
781 case XK_F19: /* "\033[33~" */
782 case XK_F20: /* "\033[34~" */
783 case XK_F21: /* "\033[35~" */
784 case XK_F22: /* "\033[36~" */
785 case XK_F23: /* "\033[37~" */
786 case XK_F24: /* "\033[38~" */
787 case XK_F25: /* "\033[39~" */
788 case XK_F26: /* "\033[40~" */
789 case XK_F27: /* "\033[41~" */
790 case XK_F28: /* "\033[42~" */
791 case XK_F29: /* "\033[43~" */
792 case XK_F30: /* "\033[44~" */
793 case XK_F31: /* "\033[45~" */
794 case XK_F32: /* "\033[46~" */
795 case XK_F33: /* "\033[47~" */
796 case XK_F34: /* "\033[48~" */
797 case XK_F35: /* "\033[49~" */
798 FKEY (31, XK_F17);
799 break;
800#undef FKEY
801 default:
802 newlen = 0; 770 newlen = 0;
803 break;
804 } 771 }
805 772 break;
806 if (newlen)
807 len = strlen (kbuf);
808 } 773 }
774
775 if (newlen)
776 len = strlen (kbuf);
809 777
810 /* 778 /*
811 * Pass meta for all function keys, if 'meta' option set 779 * Pass meta for all function keys, if 'meta' option set
812 */ 780 */
813#ifdef META8_OPTION 781#ifdef META8_OPTION
… …
830 { 798 {
831#ifdef META8_OPTION 799#ifdef META8_OPTION
832 /* set 8-bit on */ 800 /* set 8-bit on */
833 if (meta && (meta_char == 0x80)) 801 if (meta && (meta_char == 0x80))
834 { 802 {
835 unsigned char *ch; 803 char *ch;
836 804
837 for (ch = kbuf; ch < kbuf + len; ch++) 805 for (ch = kbuf; ch < kbuf + len; ch++)
838 *ch |= 0x80; 806 *ch |= 0x80;
839 807
840 meta = 0; 808 meta = 0;
… …
842#endif 810#endif
843 /* nil */ ; 811 /* nil */ ;
844 } 812 }
845 } 813 }
846 814
815 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
816 return;
817
847 if (len <= 0) 818 if (len <= 0)
848 return; /* not mapped */ 819 return; /* not mapped */
849 820
850 if (options & Opt_scrollTtyKeypress) 821 if (option (Opt_scrollTtyKeypress))
851 if (view_start) 822 if (view_start)
852 { 823 {
853 view_start = 0; 824 view_start = 0;
854 want_refresh = 1; 825 want_refresh = 1;
855 } 826 }
… …
873#ifdef META8_OPTION 844#ifdef META8_OPTION
874 && meta_char == C0_ESC 845 && meta_char == C0_ESC
875#endif 846#endif
876 ) 847 )
877 { 848 {
878 const unsigned char ch = C0_ESC; 849 const char ch = C0_ESC;
879 tt_write (&ch, 1); 850 tt_write (&ch, 1);
880 } 851 }
881 852
882#if defined(DEBUG_CMD)
883 /* Display keyboard buffer contents */
884 unsigned char *p;
885 int i;
886
887 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
888 for (i = 0, p = kbuf; i < len; i++, p++)
889 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
890 fprintf (stderr, "'\n");
891#endif /* DEBUG_CMD */
892 tt_write (kbuf, (unsigned int)len); 853 tt_write (kbuf, (unsigned int)len);
893} 854}
894/*}}} */
895 855
856void
857rxvt_term::key_release (XKeyEvent &ev)
858{
859#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
860 KeySym keysym;
861
862 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
863#endif
864
865#if ENABLE_FRILLS || ISO_14755
866 // ISO 14755 support
867 if (iso14755buf)
868 if (iso14755buf & ISO_14755_52)
869 {
870# if ISO_14755
871 scr_overlay_off ();
872# endif
873# if ISO_14755
874 // iso14755 part 5.2 handling: release time
875 // first: controls
876 if ((ev.state & ControlMask)
877 && ((keysym >= 0x40 && keysym <= 0x5f)
878 || (keysym >= 0x61 && keysym <= 0x7f)))
879 {
880 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
881 commit_iso14755 ();
882
883 return;
884 }
885
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
887 if (i[0] == keysym)
888 {
889 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 ();
891
892 return;
893 }
894
895 scr_bell ();
896# endif
897 iso14755buf = 0;
898
899 return;
900 }
901 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
902 {
903# if ISO_14755
904 scr_overlay_off ();
905# endif
906 if (iso14755buf & ISO_14755_51)
907 commit_iso14755 ();
908#if ISO_14755
909 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
910 {
911 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
912
913 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
914 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
915 }
916# endif
917 else
918 iso14755buf = 0;
919 }
920#endif
921
922 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
923 return;
924
925#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
926 if (!(ev.state & ControlMask))
927 slip_wheel_ev.stop ();
928 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0;
930#endif
931}
932
896#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 933#if defined (KEYSYM_RESOURCE)
897/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
898/* attempt to `write' count to the input buffer */
899unsigned int 934unsigned int
900rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 935rxvt_term::cmd_write (const char *str, unsigned int count)
901{ 936{
902 unsigned int n, s; 937 unsigned int n, s;
903 938
904 n = cmdbuf_ptr - cmdbuf_base; 939 n = cmdbuf_ptr - cmdbuf_base;
905 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 940 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
931void 966void
932rxvt_term::flush () 967rxvt_term::flush ()
933{ 968{
934 flush_ev.stop (); 969 flush_ev.stop ();
935 970
936#ifdef TRANSPARENT 971#ifdef HAVE_BG_PIXMAP
937 if (want_full_refresh) 972 if (bgPixmap.check_clearChanged ())
938 { 973 {
939 want_full_refresh = 0; 974// scr_clear (true); This needs to be researched further!
940 scr_clear ();
941 scr_touch (false); 975 scr_touch (false);
942 } 976 }
943#endif 977#endif
944 978
945 if (want_refresh) 979 if (want_refresh)
946 { 980 {
981 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
982 {
983 int row = view_start;
984 int end_row = row + nrow;
985
986 while (row > top_row && ROW (row - 1).is_longer ())
987 --row;
988
989 do
990 {
991 int start_row = row;
992 line_t *l;
993
994 do
995 {
996 l = &ROW (row++);
997
998 if (!(l->f & LINE_FILTERED))
999 {
1000 // line not filtered, mark it as filtered
1001 l->f |= LINE_FILTERED;
1002 while (l->is_longer ())
1003 {
1004 l = &ROW (row++);
1005 l->f |= LINE_FILTERED;
1006 }
1007
1008 // and filter it
1009 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1010
1011 break;
1012 }
1013 }
1014 while (l->is_longer () && row < end_row);
1015 }
1016 while (row < end_row);
1017 }
1018
947 scr_refresh (refresh_type); 1019 scr_refresh ();
948 scrollbar_show (1); 1020 scrollBar.show (1);
949#ifdef USE_XIM 1021#ifdef USE_XIM
950 IMSendSpot (); 1022 IMSendSpot ();
951#endif 1023#endif
952 } 1024 }
953 1025
954 display->flush (); 1026 display->flush ();
955} 1027}
956 1028
1029/* checks wether a refresh is requested and starts the refresh timer */
957void 1030void
958rxvt_term::check_cb (check_watcher &w) 1031rxvt_term::refresh_check ()
959{ 1032{
960 SET_R (this); 1033 if (want_refresh && !flush_ev.is_active ())
961 SET_LOCALE (locale); 1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
962 1035
963 display->flush (); 1036 display->flush ();
964
965 if (want_refresh && !flush_ev.active)
966 flush_ev.start (NOW + 0.01);
967} 1037}
968 1038
969void 1039void
970rxvt_term::flush_cb (time_watcher &w) 1040rxvt_term::flush_cb (ev::timer &w, int revents)
971{ 1041{
972 SET_R (this); 1042 make_current ();
973 SET_LOCALE (locale);
974 1043
975 refresh_limit = 1;
976 refresh_count = 0; 1044 refresh_count = 0;
977 flush (); 1045 flush ();
978} 1046}
979 1047
980#ifdef CURSOR_BLINK 1048#ifdef CURSOR_BLINK
981void 1049void
982rxvt_term::cursor_blink_cb (time_watcher &w) 1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
983{ 1051{
984 hidden_cursor = !hidden_cursor; 1052 hidden_cursor = !hidden_cursor;
985 want_refresh = 1; 1053 want_refresh = 1;
986 1054 refresh_check ();
987 w.start (w.at + BLINK_INTERVAL);
988} 1055}
989#endif 1056#endif
990 1057
991#ifdef TEXT_BLINK 1058#ifdef TEXT_BLINK
992void 1059void
993rxvt_term::text_blink_cb (time_watcher &w) 1060rxvt_term::text_blink_cb (ev::timer &w, int revents)
994{ 1061{
995 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1062 if (scr_refresh_rend (RS_Blink, RS_Blink))
996 { 1063 {
997 hidden_text = !hidden_text; 1064 hidden_text = !hidden_text;
998 want_refresh = 1; 1065 want_refresh = 1;
999 w.start (w.at + TEXT_BLINK_INTERVAL); 1066 refresh_check ();
1000 } 1067 }
1068 else
1069 w.stop ();
1001} 1070}
1002#endif 1071#endif
1003 1072
1004#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1005void 1074void
1006rxvt_term::cont_scroll_cb (time_watcher &w) 1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1007{ 1076{
1008 if ((scrollbar_isUp() || scrollbar_isDn()) && 1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1009 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1010 { 1079 {
1011 refresh_type |= SMOOTH_REFRESH;
1012 want_refresh = 1; 1080 want_refresh = 1;
1013 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1081 refresh_check ();
1014 } 1082 }
1083 else
1084 w.stop ();
1015} 1085}
1016#endif 1086#endif
1017 1087
1018#ifdef SELECTION_SCROLLING 1088#ifdef SELECTION_SCROLLING
1019void 1089void
1020rxvt_term::sel_scroll_cb (time_watcher &w) 1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1021{ 1091{
1022 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1092 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1023 { 1093 {
1024 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1094 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1025 refresh_type |= SMOOTH_REFRESH;
1026 want_refresh = 1; 1095 want_refresh = 1;
1027 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1028 } 1097 }
1098 else
1099 w.stop ();
1029} 1100}
1030#endif 1101#endif
1031 1102
1032#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1033void 1104void
1034rxvt_term::slip_wheel_cb (time_watcher &w) 1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1035{ 1106{
1036 if (mouse_slip_wheel_speed == 0 1107 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1037 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1038 : scr_page (UP, mouse_slip_wheel_speed))
1039 { 1108 {
1040 if (view_start == nsaved ||
1041 view_start == 0)
1042 mouse_slip_wheel_speed = 0;
1043
1044 refresh_type |= SMOOTH_REFRESH;
1045 want_refresh = 1; 1109 want_refresh = 1;
1046 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1110 refresh_check ();
1111 }
1112
1113 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1047 } 1114 {
1115 mouse_slip_wheel_speed = 0;
1116 w.stop ();
1117 }
1048} 1118}
1119#endif
1120
1121#if LINUX_YIELD_HACK
1122static struct event_handler
1123{
1124 ev::prepare yield_ev;
1125
1126 void yield_cb (ev::prepare &w, int revents)
1127 {
1128 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best.
1135
1136 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0);
1138
1139 w.stop ();
1140 }
1141
1142 event_handler ()
1143 : yield_ev (this, &event_handler::yield_cb)
1144 {
1145 }
1146} event_handler;
1049#endif 1147#endif
1050 1148
1051bool 1149bool
1052rxvt_term::pty_fill () 1150rxvt_term::pty_fill ()
1053{ 1151{
1054 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1152 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1055 1153
1056 if (CBUFSIZ == n) 1154 if (CBUFSIZ == n)
1057 { 1155 {
1058 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1156 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1059 n = 0; 1157 n = 0;
1060 } 1158 }
1061 1159
1062 memmove (cmdbuf_base, cmdbuf_ptr, n); 1160 memmove (cmdbuf_base, cmdbuf_ptr, n);
1063 cmdbuf_ptr = cmdbuf_base; 1161 cmdbuf_ptr = cmdbuf_base;
1064 cmdbuf_endp = cmdbuf_ptr + n; 1162 cmdbuf_endp = cmdbuf_ptr + n;
1065 1163
1066 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1164 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1067 1165
1068 if (n > 0) 1166 if (r > 0)
1069 { 1167 {
1070 cmdbuf_endp += n; 1168 cmdbuf_endp += r;
1071 return true; 1169 return true;
1072 } 1170 }
1073 else if (n < 0 && errno != EAGAIN) 1171 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1172 {
1173#if LINUX_YIELD_HACK
1174 if (display->is_local)
1175 event_handler.yield_ev.start ();
1176#endif
1177 }
1178 else
1179 {
1180 pty_ev.stop ();
1181
1182 if (!option (Opt_hold))
1074 destroy (); 1183 destroy ();
1075 1184 }
1185
1076 return false; 1186 return false;
1077} 1187}
1078 1188
1079void 1189void
1080rxvt_term::pty_cb (io_watcher &w, short revents) 1190rxvt_term::pty_cb (ev::io &w, int revents)
1081{ 1191{
1082 SET_R (this); 1192 make_current ();
1083 SET_LOCALE (locale);
1084 1193
1085 if (revents & EVENT_READ) 1194 if (revents & ev::READ)
1086 // loop, but don't allow a single term to monopolize us 1195 // loop, but don't allow a single term to monopolize us
1087 while (pty_fill ()) 1196 for (int i = CBUFCNT; i-- && pty_fill (); )
1088 if (cmd_parse ()) 1197 cmd_parse ();
1089 break;
1090 1198
1091 if (revents & EVENT_WRITE) 1199 if (revents & ev::WRITE)
1092 pty_write (); 1200 pty_write ();
1201
1202 refresh_check ();
1093} 1203}
1094 1204
1095void 1205void
1096rxvt_term::pointer_unblank () 1206rxvt_term::pointer_unblank ()
1097{ 1207{
1098 XDefineCursor (display->display, vt, TermWin_cursor); 1208 XDefineCursor (dpy, vt, TermWin_cursor);
1099 recolour_cursor (); 1209 recolour_cursor ();
1100 1210
1101#ifdef POINTER_BLANK 1211#ifdef POINTER_BLANK
1102 hidden_pointer = 0; 1212 hidden_pointer = 0;
1103 1213
1104 if (options & Opt_pointerBlank) 1214 if (option (Opt_pointerBlank))
1105 pointer_ev.start (NOW + pointerBlankDelay); 1215 pointer_ev.start (pointerBlankDelay);
1106#endif 1216#endif
1107} 1217}
1108 1218
1109#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1110void 1220void
1111rxvt_term::pointer_blank () 1221rxvt_term::pointer_blank ()
1112{ 1222{
1113 if (! (options & Opt_pointerBlank)) 1223 if (!option (Opt_pointerBlank))
1114 return; 1224 return;
1115 1225
1116 XDefineCursor (display->display, vt, display->blank_cursor); 1226 XDefineCursor (dpy, vt, display->blank_cursor);
1117 XFlush (display->display); 1227 XFlush (dpy);
1118 1228
1119 hidden_pointer = 1; 1229 hidden_pointer = 1;
1120} 1230}
1121 1231
1122void 1232void
1123rxvt_term::pointer_cb (time_watcher &w) 1233rxvt_term::pointer_cb (ev::timer &w, int revents)
1124{ 1234{
1125 SET_R (this); 1235 make_current ();
1126 SET_LOCALE (locale);
1127 1236
1128 pointer_blank (); 1237 pointer_blank ();
1129} 1238}
1130#endif 1239#endif
1131 1240
1132void 1241void
1133rxvt_term::mouse_report (XButtonEvent &ev) 1242rxvt_term::mouse_report (XButtonEvent &ev)
1134{ 1243{
1135 int button_number, key_state = 0; 1244 int button_number, key_state = 0;
1136 int x, y; 1245 int x, y;
1246 int code = 32;
1137 1247
1138 x = ev.x; 1248 x = Pixel2Col (ev.x);
1139 y = ev.y; 1249 y = Pixel2Row (ev.y);
1140 pixel_position (&x, &y); 1250 if (ev.type == MotionNotify)
1251 {
1252 if (x == mouse_row && y == mouse_col)
1253 return;
1254 mouse_row = x;
1255 mouse_col = y;
1256 code += 32;
1257 }
1141 1258
1142 if (MEvent.button == AnyButton) 1259 if (MEvent.button == AnyButton)
1143 button_number = 3; 1260 button_number = 3;
1144 else 1261 else
1145 { 1262 {
… …
1191 x + 1, 1308 x + 1,
1192 y + 1); 1309 y + 1);
1193#endif 1310#endif
1194 1311
1195 tt_printf ("\033[M%c%c%c", 1312 tt_printf ("\033[M%c%c%c",
1196 (32 + button_number + key_state), 1313 (code + button_number + key_state),
1197 (32 + x + 1), 1314 (32 + x + 1),
1198 (32 + y + 1)); 1315 (32 + y + 1));
1199} 1316}
1200 1317
1201#ifdef USING_W11LIB
1202void
1203rxvt_W11_process_x_event (XEvent *ev)
1204{
1205 rxvt_t *r = rxvt_get_r ();
1206
1207 x_cb (*ev);
1208}
1209#endif
1210
1211/*{{{ process an X event */ 1318/*{{{ process an X event */
1212void 1319void
1213rxvt_term::x_cb (XEvent &ev) 1320rxvt_term::x_cb (XEvent &ev)
1214{ 1321{
1215 dDisp; 1322 make_current ();
1216 1323
1217 SET_R (this); 1324 dLocal (Display *, dpy);
1218 SET_LOCALE (locale);
1219 1325
1220#if defined(CURSOR_BLINK) 1326 if (ev.xany.window == vt
1221 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1327 && SHOULD_INVOKE (HOOK_X_EVENT)
1222 { 1328 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1223 if (hidden_cursor) 1329 return;
1224 {
1225 hidden_cursor = 0;
1226 want_refresh = 1;
1227 }
1228 1330
1229 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1331 // for XQueryPointer
1230 }
1231#endif
1232
1233#if defined(POINTER_BLANK)
1234 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1235 {
1236 if (ev.type == MotionNotify
1237 || ev.type == ButtonPress
1238 || ev.type == ButtonRelease)
1239 if (hidden_pointer)
1240 pointer_unblank ();
1241
1242 if (ev.type == KeyPress && hidden_pointer == 0)
1243 pointer_blank ();
1244 }
1245#endif
1246
1247 Window unused_root, unused_child; 1332 Window unused_root, unused_child;
1248 int unused_root_x, unused_root_y; 1333 int unused_root_x, unused_root_y;
1249 unsigned int unused_mask; 1334 unsigned int unused_mask;
1250 1335
1251 switch (ev.type) 1336 switch (ev.type)
1252 { 1337 {
1253 case KeyPress: 1338 case KeyPress:
1254#if ISO_14755 1339 key_press (ev.xkey);
1255 if (!(iso14755buf & ISO_14755_52))
1256#endif
1257 lookup_key (ev.xkey);
1258
1259 break; 1340 break;
1260 1341
1261 case KeyRelease: 1342 case KeyRelease:
1262 { 1343 key_release (ev.xkey);
1263#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1264 KeySym ks;
1265
1266 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1267#endif
1268
1269#if ENABLE_FRILLS || ISO_14755
1270 // ISO 14755 support
1271 if (iso14755buf)
1272 if (iso14755buf & ISO_14755_52)
1273 {
1274# if ENABLE_OVERLAY
1275 scr_overlay_off ();
1276# endif
1277# if ISO_14755
1278 // iso14755 part 5.2 handling: release time
1279 // first: controls
1280 if ((ev.xkey.state & ControlMask)
1281 && ((ks >= 0x40 && ks <= 0x5f)
1282 || (ks >= 0x61 && ks <= 0x7f)))
1283 {
1284 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1285 commit_iso14755 ();
1286 return; // case-break;
1287 }
1288
1289 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1290 if (i[0] == ks)
1291 {
1292 iso14755buf = ISO_14755_51 | i[1];
1293 commit_iso14755 ();
1294 return; // case-break;
1295 }
1296
1297 scr_bell ();
1298# endif
1299 iso14755buf = 0;
1300 break;
1301 }
1302 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1303 {
1304# if ENABLE_OVERLAY
1305 scr_overlay_off ();
1306# endif
1307 if (iso14755buf & ISO_14755_51)
1308 commit_iso14755 ();
1309#if ISO_14755
1310 else if (iso14755buf & ISO_14755_STARTED)
1311 {
1312 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1313
1314 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1315 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1316 }
1317# endif
1318 else
1319 iso14755buf = 0;
1320 }
1321#endif
1322
1323#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1324 if (!(ev.xkey.state & ControlMask))
1325 slip_wheel_ev.stop ();
1326 else if (ks == XK_Control_L || ks == XK_Control_R)
1327 mouse_slip_wheel_speed = 0;
1328#endif
1329 break; 1344 break;
1330 }
1331 1345
1332 case ButtonPress: 1346 case ButtonPress:
1333 button_press (ev.xbutton); 1347 button_press (ev.xbutton);
1334 break; 1348 break;
1335 1349
… …
1337 button_release (ev.xbutton); 1351 button_release (ev.xbutton);
1338 break; 1352 break;
1339 1353
1340 case ClientMessage: 1354 case ClientMessage:
1341 if (ev.xclient.format == 32 1355 if (ev.xclient.format == 32
1342 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1356 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1343 { 1357 {
1358 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1359 {
1360 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1361 {
1344 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1362 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1363 {
1364 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1345 destroy (); 1365 destroy ();
1366 }
1346#if ENABLE_EWMH 1367#if ENABLE_EWMH
1347 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1368 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1348 XSendEvent (disp, ev.xclient.window = display->root, 1369 XSendEvent (dpy, ev.xclient.window = display->root,
1349 False, SubstructureRedirectMask | SubstructureNotifyMask, 1370 False, SubstructureRedirectMask | SubstructureNotifyMask,
1350 &ev); 1371 &ev);
1372#endif
1373 }
1374 }
1375#if ENABLE_XEMBED
1376 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1377 {
1378 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1379 focus_in ();
1380 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1381 focus_out ();
1382 }
1351#endif 1383#endif
1352 } 1384 }
1353#if ENABLE_XEMBED
1354 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1355 {
1356 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1357 focus_in ();
1358 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1359 focus_out ();
1360 }
1361#endif
1362#ifdef OFFIX_DND
1363 /* OffiX Dnd (drag 'n' drop) protocol */
1364 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1365 && (ev.xclient.data.l[0] == DndFile
1366 || ev.xclient.data.l[0] == DndDir
1367 || ev.xclient.data.l[0] == DndLink))
1368 {
1369 /* Get Dnd data */
1370 Atom ActualType;
1371 int ActualFormat;
1372 unsigned char *data;
1373 unsigned long Size, RemainingBytes;
1374
1375 XGetWindowProperty (disp, display->root,
1376 xa[XA_DNDSELECTION],
1377 0L, 1000000L,
1378 False, AnyPropertyType,
1379 &ActualType, &ActualFormat,
1380 &Size, &RemainingBytes,
1381 &data);
1382 set_string_property (XA_CUT_BUFFER0, data);
1383 XFree (data);
1384 selection_paste (display->root, XA_CUT_BUFFER0, true);
1385 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1386 }
1387#endif /* OFFIX_DND */
1388 break;
1389
1390 case MappingNotify:
1391 XRefreshKeyboardMapping (&ev.xmapping);
1392 break; 1385 break;
1393 1386
1394 /* 1387 /*
1395 * XXX: this is not the _current_ arrangement 1388 * XXX: this is not the _current_ arrangement
1396 * Here's my conclusion: 1389 * Here's my conclusion:
… …
1415 break; 1408 break;
1416 } 1409 }
1417 break; 1410 break;
1418 1411
1419 case FocusIn: 1412 case FocusIn:
1413 if (ev.xfocus.detail != NotifyInferior
1414 && ev.xfocus.detail != NotifyPointer
1415 && ev.xfocus.mode != NotifyGrab)
1420 focus_in (); 1416 focus_in ();
1421 break; 1417 break;
1422 1418
1423 case FocusOut: 1419 case FocusOut:
1420 if (ev.xfocus.detail != NotifyInferior
1421 && ev.xfocus.detail != NotifyPointer
1422 && ev.xfocus.mode != NotifyGrab)
1424 focus_out (); 1423 focus_out ();
1425 break; 1424 break;
1426 1425
1427 case ConfigureNotify: 1426 case ConfigureNotify:
1427 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1428 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1429 szHint.width, szHint.height);*/
1428 if (ev.xconfigure.window == parent[0]) 1430 if (ev.xconfigure.window == parent[0])
1429 { 1431 {
1430 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1432 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ; 1433 ;
1432 1434
1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1435 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1436 {
1435 seen_resize = 1; 1437 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1438 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1439 }
1438 1440 else
1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1441 {
1440 if (options & Opt_transparent) 1442#ifdef HAVE_BG_PIXMAP
1441 check_our_parents (); 1443 if (bgPixmap.window_position_sensitive ())
1444 {
1445 if (mapped)
1446 update_background ();
1447 else
1448 bgPixmap.invalidate ();
1449 }
1442#endif 1450#endif
1451 }
1452
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1443 } 1454 }
1444 break; 1455 break;
1445 1456
1446 case PropertyNotify: 1457 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1447 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1448 && ev.xproperty.state == PropertyNewValue) 1460 && ev.xproperty.state == PropertyNewValue)
1449 selection_property (ev.xproperty.window, ev.xproperty.atom); 1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1450 1462
1451 break; 1463 break;
1452 1464
1453 case SelectionClear: 1465 case SelectionClear:
1454 selection_clear (); 1466 selection_clear ();
… …
1459 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1460 break; 1472 break;
1461 1473
1462 case SelectionRequest: 1474 case SelectionRequest:
1463 selection_send (ev.xselectionrequest); 1475 selection_send (ev.xselectionrequest);
1476 break;
1477
1478 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a
1481 * non-reparenting window manager. In those cases we never get first
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does
1484 * reparenting.
1485 * We should not render background immidiately, as there could be several
1486 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1487 * by scheduling background redraw as soon as we can, but giving a short
1488 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results.
1491 */
1492 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1493 update_background_ev.start (0.025);
1494#endif
1495 mapped = 1;
1496#ifdef TEXT_BLINK
1497 text_blink_ev.start ();
1498#endif
1499 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 break; 1500 break;
1465 1501
1466 case UnmapNotify: 1502 case UnmapNotify:
1467 mapped = 0; 1503 mapped = 0;
1468#ifdef TEXT_BLINK 1504#ifdef TEXT_BLINK
1469 text_blink_ev.stop (); 1505 text_blink_ev.stop ();
1470#endif 1506#endif
1507 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1471 break; 1508 break;
1472
1473 case MapNotify:
1474 mapped = 1;
1475#ifdef TEXT_BLINK
1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1477#endif
1478 break;
1479
1480#ifdef TRANSPARENT
1481 case ReparentNotify:
1482 rootwin_cb (ev);
1483 break;
1484#endif /* TRANSPARENT */
1485 1509
1486 case GraphicsExpose: 1510 case GraphicsExpose:
1487 case Expose: 1511 case Expose:
1488 if (ev.xany.window == vt) 1512 if (ev.xany.window == vt)
1489 { 1513 {
1490 do 1514 do
1515 {
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1516 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1517 ev.xexpose.width, ev.xexpose.height, False);
1518 }
1493 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1519 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1494 1520
1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1496 1522
1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1523 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1524 {
1498 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1499 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1527 }
1500 1528
1501 scr_refresh (refresh_type); 1529 want_refresh = 1;
1502 } 1530 }
1503 else 1531 else
1504 { 1532 {
1505 XEvent unused_event; 1533 XEvent unused_event;
1506 1534
1507 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1508 ; 1536 ;
1509 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1537 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1510 ; 1538 ;
1511 1539
1512 if (isScrollbarWindow (ev.xany.window)) 1540 if (scrollBar.state && ev.xany.window == scrollBar.win)
1513 { 1541 {
1514 scrollBar.setIdle (); 1542 scrollBar.state = STATE_IDLE;
1515 scrollbar_show (0); 1543 scrollBar.show (0);
1516 } 1544 }
1517#ifdef MENUBAR
1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1519 menubar_expose ();
1520#endif
1521
1522#ifdef TRANSPARENT
1523 if (am_transparent && ev.xany.window == parent[0])
1524 XClearWindow (disp, ev.xany.window);
1525#endif
1526 } 1545 }
1527 break; 1546 break;
1528 1547
1529 case MotionNotify: 1548 case MotionNotify:
1530#ifdef POINTER_BLANK 1549#ifdef POINTER_BLANK
1531 if (hidden_pointer) 1550 if (hidden_pointer)
1532 pointer_unblank (); 1551 pointer_unblank ();
1533#endif 1552#endif
1534#if MENUBAR 1553 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1535 if (isMenuBarWindow (ev.xany.window)) 1554 || priv_modes & PrivMode_MouseAnyEvent)
1536 {
1537 menubar_control (ev.xbutton); 1555 mouse_report (ev.xbutton);
1538 break;
1539 }
1540#endif
1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1556 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1542 break; 1557 break;
1543 1558
1544 if (ev.xany.window == vt) 1559 if (ev.xany.window == vt)
1545 { 1560 {
1561 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1562 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1563 ; // nop
1546 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1564 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1547 { 1565 {
1548 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1549 ; 1567 ;
1550 1568
1551 XQueryPointer (disp, vt, 1569 XQueryPointer (dpy, vt,
1552 &unused_root, &unused_child, 1570 &unused_root, &unused_child,
1553 &unused_root_x, &unused_root_y, 1571 &unused_root_x, &unused_root_y,
1554 &ev.xbutton.x, &ev.xbutton.y, 1572 &ev.xbutton.x, &ev.xbutton.y,
1555 &ev.xbutton.state); 1573 &ev.xbutton.state);
1556#ifdef MOUSE_THRESHOLD 1574#ifdef MOUSE_THRESHOLD
… …
1576 int dist; 1594 int dist;
1577 1595
1578 /* don't clobber the current delay if we are 1596 /* don't clobber the current delay if we are
1579 * already in the middle of scrolling. 1597 * already in the middle of scrolling.
1580 */ 1598 */
1581 if (!sel_scroll_ev.active) 1599 if (!sel_scroll_ev.is_active ())
1582 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1600 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1583 1601
1584 /* save the event params so we can highlight 1602 /* save the event params so we can highlight
1585 * the selection in the pending-scroll loop 1603 * the selection in the pending-scroll loop
1586 */ 1604 */
1587 selection_save_x = ev.xbutton.x; 1605 selection_save_x = ev.xbutton.x;
… …
1601 } 1619 }
1602 1620
1603 scroll_selection_lines = Pixel2Height (dist) 1621 scroll_selection_lines = Pixel2Height (dist)
1604 / SELECTION_SCROLL_LINE_SPEEDUP 1622 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1; 1623 + 1;
1606 MIN_IT (scroll_selection_lines, 1624 min_it (scroll_selection_lines,
1607 SELECTION_SCROLL_MAX_LINES); 1625 SELECTION_SCROLL_MAX_LINES);
1608 } 1626 }
1609 else 1627 else
1610 { 1628 {
1611 /* we are within the text window, so we 1629 /* we are within the text window, so we
1612 * shouldn't be scrolling 1630 * shouldn't be scrolling
1613 */ 1631 */
1614 if (sel_scroll_ev.active)
1615 sel_scroll_ev.stop(); 1632 sel_scroll_ev.stop();
1616 } 1633 }
1617#endif 1634#endif
1618#ifdef MOUSE_THRESHOLD 1635#ifdef MOUSE_THRESHOLD
1619 } 1636 }
1620#endif 1637#endif
1621 } 1638 }
1622 } 1639 }
1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1640 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1624 { 1641 {
1625 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1642 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1626 MotionNotify, &ev)) 1643 MotionNotify, &ev))
1627 ; 1644 ;
1628 1645
1629 XQueryPointer (disp, scrollBar.win, 1646 XQueryPointer (dpy, scrollBar.win,
1630 &unused_root, &unused_child, 1647 &unused_root, &unused_child,
1631 &unused_root_x, &unused_root_y, 1648 &unused_root_x, &unused_root_y,
1632 &ev.xbutton.x, &ev.xbutton.y, 1649 &ev.xbutton.x, &ev.xbutton.y,
1633 &unused_mask); 1650 &unused_mask);
1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1651 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1635 scrollbar_size ()); 1652 scrollBar.size ());
1636 scr_refresh (refresh_type);
1637 refresh_limit = 0; 1653 want_refresh = 1;
1638 scrollbar_show (1); 1654 scrollBar.show (1);
1639 } 1655 }
1640 break; 1656 break;
1641 } 1657 }
1658
1659#if defined(CURSOR_BLINK)
1660 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1661 {
1662 if (hidden_cursor)
1663 {
1664 hidden_cursor = 0;
1665 want_refresh = 1;
1666 }
1667
1668 cursor_blink_ev.again ();
1669 }
1670#endif
1671
1672#if defined(POINTER_BLANK)
1673 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1674 {
1675 if (ev.type == MotionNotify
1676 || ev.type == ButtonPress
1677 || ev.type == ButtonRelease)
1678 if (hidden_pointer)
1679 pointer_unblank ();
1680
1681 if (ev.type == KeyPress && hidden_pointer == 0)
1682 pointer_blank ();
1683 }
1684#endif
1685
1686 refresh_check ();
1642} 1687}
1688
1689#if ENABLE_FRILLS
1690void
1691rxvt_term::set_urgency (bool enable)
1692{
1693 if (enable == urgency_hint)
1694 return;
1695
1696 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1697 {
1698 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1699 XSetWMHints (dpy, parent[0], h);
1700 urgency_hint = enable;
1701 }
1702}
1703#endif
1643 1704
1644void 1705void
1645rxvt_term::focus_in () 1706rxvt_term::focus_in ()
1646{ 1707{
1647 if (!focus) 1708 if (!focus)
1648 { 1709 {
1649 focus = 1; 1710 focus = 1;
1650 want_refresh = 1; 1711 want_refresh = 1;
1712
1651#if USE_XIM 1713#if USE_XIM
1652 if (Input_Context != NULL) 1714 if (Input_Context != NULL)
1653 { 1715 {
1654 IMSetStatusPosition (); 1716 IMSetPosition ();
1655 XSetICFocus (Input_Context); 1717 XSetICFocus (Input_Context);
1656 } 1718 }
1657#endif 1719#endif
1658#if CURSOR_BLINK 1720#if CURSOR_BLINK
1659 if (options & Opt_cursorBlink) 1721 if (option (Opt_cursorBlink))
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1722 cursor_blink_ev.again ();
1661#endif 1723#endif
1662#if OFF_FOCUS_FADING 1724#if OFF_FOCUS_FADING
1663 if (rs[Rs_fade]) 1725 if (rs[Rs_fade])
1664 { 1726 {
1665 pix_colors = pix_colors_focused; 1727 pix_colors = pix_colors_focused;
1666 scr_recolour (); 1728 scr_recolour ();
1667 } 1729 }
1668#endif 1730#endif
1731#if ENABLE_FRILLS
1732 if (option (Opt_urgentOnBell))
1733 set_urgency (0);
1734#endif
1735
1736 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1669 } 1737 }
1670} 1738}
1671 1739
1672void 1740void
1673rxvt_term::focus_out () 1741rxvt_term::focus_out ()
… …
1675 if (focus) 1743 if (focus)
1676 { 1744 {
1677 focus = 0; 1745 focus = 0;
1678 want_refresh = 1; 1746 want_refresh = 1;
1679 1747
1748#if ENABLE_FRILLS
1749 if (option (Opt_urgentOnBell))
1750 set_urgency (0);
1751#endif
1680#if ENABLE_FRILLS || ISO_14755 1752#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf)
1754 {
1681 iso14755buf = 0; 1755 iso14755buf = 0;
1682#endif 1756# if ISO_14755
1683#if ENABLE_OVERLAY
1684 scr_overlay_off (); 1757 scr_overlay_off ();
1758# endif
1759 }
1685#endif 1760#endif
1686#if USE_XIM 1761#if USE_XIM
1687 if (Input_Context != NULL) 1762 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context); 1763 XUnsetICFocus (Input_Context);
1689#endif 1764#endif
1690#if CURSOR_BLINK 1765#if CURSOR_BLINK
1691 if (options & Opt_cursorBlink) 1766 if (option (Opt_cursorBlink))
1692 cursor_blink_ev.stop (); 1767 cursor_blink_ev.stop ();
1768
1693 hidden_cursor = 0; 1769 hidden_cursor = 0;
1694#endif 1770#endif
1695#if OFF_FOCUS_FADING 1771#if OFF_FOCUS_FADING
1696 if (rs[Rs_fade]) 1772 if (rs[Rs_fade])
1697 { 1773 {
1698 pix_colors = pix_colors_unfocused; 1774 pix_colors = pix_colors_unfocused;
1699 scr_recolour (); 1775 scr_recolour ();
1700 } 1776 }
1701#endif 1777#endif
1778
1779 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1780 }
1781}
1782
1783void
1784rxvt_term::update_fade_color (unsigned int idx)
1785{
1786#if OFF_FOCUS_FADING
1787 if (rs[Rs_fade])
1702 } 1788 {
1789 rgba c;
1790 pix_colors [Color_fade].get (c);
1791 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1792 }
1793#endif
1703} 1794}
1704 1795
1705#if TRANSPARENT 1796#if ENABLE_TRANSPARENCY || ENABLE_PERL
1706void 1797void
1707rxvt_term::rootwin_cb (XEvent &ev) 1798rxvt_term::rootwin_cb (XEvent &ev)
1708{ 1799{
1709 SET_R (this); 1800 make_current ();
1710 SET_LOCALE (locale);
1711 1801
1802 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1803 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1804 return;
1805
1806# if ENABLE_TRANSPARENCY
1712 switch (ev.type) 1807 switch (ev.type)
1713 { 1808 {
1714 case PropertyNotify: 1809 case PropertyNotify:
1715 /* 1810 /*
1716 * if user used some Esetroot compatible prog to set the root bg, 1811 * if user used some Esetroot compatible prog to set the root bg,
1717 * use the property to determine the pixmap. We use it later on. 1812 * use the property to determine the pixmap. We use it later on.
1718 */ 1813 */
1719 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1814 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1720 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1815 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1721 return; 1816 {
1817 bgPixmap.set_root_pixmap ();
1818 update_background ();
1819 }
1722 1820
1723 /* FALLTHROUGH */
1724 case ReparentNotify:
1725 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1726 want_refresh = want_full_refresh = 1;
1727 break; 1821 break;
1728 } 1822 }
1823# endif
1824
1825 refresh_check ();
1729} 1826}
1730#endif 1827#endif
1731 1828
1732void 1829void
1733rxvt_term::button_press (XButtonEvent &ev) 1830rxvt_term::button_press (XButtonEvent &ev)
1734{ 1831{
1735 int reportmode = 0, clickintime; 1832 int reportmode = 0, clickintime;
1736 1833
1737 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1834 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1835
1738 if (!bypass_keystate) 1836 if (!bypass_keystate)
1739 reportmode = !! (priv_modes & PrivMode_mouse_report); 1837 reportmode = !! (priv_modes & PrivMode_mouse_report);
1740 1838
1741 /* 1839 /*
1742 * VT window processing of button press 1840 * VT window processing of button press
1743 */ 1841 */
1744 if (ev.window == vt) 1842 if (ev.window == vt)
1745 { 1843 {
1844 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1845 return;
1846
1746#if ISO_14755 1847#if ISO_14755
1747 // 5.4 1848 // 5.4
1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1849 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1749 { 1850 {
1750 iso14755_54 (ev.x, ev.y); 1851 iso14755_54 (ev.x, ev.y);
… …
1762#ifdef MOUSE_REPORT_DOUBLECLICK 1863#ifdef MOUSE_REPORT_DOUBLECLICK
1763 if (ev.button == MEvent.button && clickintime) 1864 if (ev.button == MEvent.button && clickintime)
1764 { 1865 {
1765 /* same button, within alloted time */ 1866 /* same button, within alloted time */
1766 MEvent.clicks++; 1867 MEvent.clicks++;
1868
1767 if (MEvent.clicks > 1) 1869 if (MEvent.clicks > 1)
1768 { 1870 {
1769 /* only report double clicks */ 1871 /* only report double clicks */
1770 MEvent.clicks = 2; 1872 MEvent.clicks = 2;
1771 mouse_report (ev); 1873 mouse_report (ev);
… …
1783 mouse_report (ev); 1885 mouse_report (ev);
1784 } 1886 }
1785#else 1887#else
1786 MEvent.button = ev.button; 1888 MEvent.button = ev.button;
1787 mouse_report (ev); 1889 mouse_report (ev);
1788#endif /* MOUSE_REPORT_DOUBLECLICK */ 1890#endif /* MOUSE_REPORT_DOUBLECLICK */
1789 1891
1790 } 1892 }
1791 else 1893 else
1792 { 1894 {
1793 if (ev.button != MEvent.button) 1895 if (ev.button != MEvent.button)
… …
1803#else 1905#else
1804 selection.rect = false; 1906 selection.rect = false;
1805#endif 1907#endif
1806 1908
1807 /* allow shift+left click to extend selection */ 1909 /* allow shift+left click to extend selection */
1808 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1910 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1809 { 1911 {
1810 if (MEvent.button == Button1 && clickintime) 1912 if (MEvent.button == Button1 && clickintime)
1811 selection_rotate (ev.x, ev.y); 1913 selection_rotate (ev.x, ev.y);
1812 else 1914 else
1813 selection_extend (ev.x, ev.y, 1); 1915 selection_extend (ev.x, ev.y, 1);
… …
1841 } 1943 }
1842 1944
1843 /* 1945 /*
1844 * Scrollbar window processing of button press 1946 * Scrollbar window processing of button press
1845 */ 1947 */
1846 if (isScrollbarWindow (ev.window)) 1948 if (scrollBar.state && ev.window == scrollBar.win)
1847 { 1949 {
1848 scrollBar.setIdle (); 1950 page_dirn direction = NO_DIR;
1951
1952 if (scrollBar.upButton (ev.y))
1953 direction = UP; /* up */
1954 else if (scrollBar.dnButton (ev.y))
1955 direction = DN; /* down */
1956
1957 scrollBar.state = STATE_IDLE;
1849 /* 1958 /*
1850 * Rxvt-style scrollbar: 1959 * Rxvt-style scrollbar:
1851 * move up if mouse is above slider 1960 * move up if mouse is above slider
1852 * move dn if mouse is below slider 1961 * move dn if mouse is below slider
1853 * 1962 *
… …
1862 /* 1971 /*
1863 * Mouse report disabled scrollbar: 1972 * Mouse report disabled scrollbar:
1864 * arrow buttons - send up/down 1973 * arrow buttons - send up/down
1865 * click on scrollbar - send pageup/down 1974 * click on scrollbar - send pageup/down
1866 */ 1975 */
1867 if ((scrollBar.style == R_SB_NEXT 1976 if (direction == UP)
1868 && scrollbarnext_upButton (ev.y))
1869 || (scrollBar.style == R_SB_RXVT
1870 && scrollbarrxvt_upButton (ev.y)))
1871 tt_printf ("\033[A"); 1977 tt_printf ("\033[A");
1872 else if ((scrollBar.style == R_SB_NEXT 1978 else if (direction == DN)
1873 && scrollbarnext_dnButton (ev.y))
1874 || (scrollBar.style == R_SB_RXVT
1875 && scrollbarrxvt_dnButton (ev.y)))
1876 tt_printf ("\033[B"); 1979 tt_printf ("\033[B");
1877 else 1980 else
1878 switch (ev.button) 1981 switch (ev.button)
1879 { 1982 {
1880 case Button2: 1983 case Button2:
… …
1887 tt_printf ("\033[5~"); 1990 tt_printf ("\033[5~");
1888 break; 1991 break;
1889 } 1992 }
1890 } 1993 }
1891 else 1994 else
1892#endif /* NO_SCROLLBAR_REPORT */ 1995#endif /* NO_SCROLLBAR_REPORT */
1893
1894 {
1895 char upordown = 0;
1896
1897 if (scrollBar.style == R_SB_NEXT)
1898 { 1996 {
1899 if (scrollbarnext_upButton (ev.y)) 1997 if (direction != NO_DIR)
1900 upordown = -1; /* up */
1901 else if (scrollbarnext_dnButton (ev.y))
1902 upordown = 1; /* down */
1903 }
1904 else if (scrollBar.style == R_SB_RXVT)
1905 {
1906 if (scrollbarrxvt_upButton (ev.y))
1907 upordown = -1; /* up */
1908 else if (scrollbarrxvt_dnButton (ev.y))
1909 upordown = 1; /* down */
1910 }
1911 if (upordown)
1912 { 1998 {
1913#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1999#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2000 if (!cont_scroll_ev.is_active ())
1914 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2001 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1915#endif 2002#endif
1916 if (scr_page (upordown < 0 ? UP : DN, 1)) 2003 if (scr_page (direction, 1))
1917 { 2004 {
1918 if (upordown < 0) 2005 if (direction == UP)
1919 scrollBar.setUp (); 2006 scrollBar.state = STATE_UP;
1920 else 2007 else
1921 scrollBar.setDn (); 2008 scrollBar.state = STATE_DOWN;
1922 } 2009 }
1923 } 2010 }
1924 else 2011 else
1925 switch (ev.button) 2012 switch (ev.button)
1926 { 2013 {
1927 case Button2: 2014 case Button2:
1928 switch (scrollbar_align) 2015 switch (scrollBar.align)
1929 { 2016 {
1930 case R_SB_ALIGN_TOP: 2017 case R_SB_ALIGN_TOP:
1931 csrO = 0; 2018 csrO = 0;
1932 break; 2019 break;
1933 case R_SB_ALIGN_CENTRE: 2020 case R_SB_ALIGN_CENTRE:
… …
1939 } 2026 }
1940 2027
1941 if (scrollBar.style == R_SB_XTERM 2028 if (scrollBar.style == R_SB_XTERM
1942 || scrollbar_above_slider (ev.y) 2029 || scrollbar_above_slider (ev.y)
1943 || scrollbar_below_slider (ev.y)) 2030 || scrollbar_below_slider (ev.y))
1944 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2031 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
1945 2032
1946 scrollBar.setMotion (); 2033 scrollBar.state = STATE_MOTION;
1947 break; 2034 break;
1948 2035
1949 case Button1: 2036 case Button1:
1950 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2037 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1951 csrO = ev.y - scrollBar.top; 2038 csrO = ev.y - scrollBar.top;
1952 /* FALLTHROUGH */ 2039 /* FALLTHROUGH */
1953 2040
1954 case Button3: 2041 case Button3:
1955 if (scrollBar.style != R_SB_XTERM) 2042 if (scrollBar.style != R_SB_XTERM)
… …
1965 scr_page (DN, nrow - 1); 2052 scr_page (DN, nrow - 1);
1966# else 2053# else
1967 scr_page (DN, nrow / 4); 2054 scr_page (DN, nrow / 4);
1968# endif 2055# endif
1969 else 2056 else
1970 scrollBar.setMotion (); 2057 scrollBar.state = STATE_MOTION;
1971 } 2058 }
1972 else 2059 else
1973 { 2060 {
1974 scr_page ((ev.button == Button1 ? DN : UP), 2061 scr_page ((ev.button == Button1 ? DN : UP),
1975 (nrow 2062 (nrow
1976 * scrollbar_position (ev.y) 2063 * scrollbar_position (ev.y)
1977 / scrollbar_size ())); 2064 / scrollBar.size ()));
1978 } 2065 }
1979 2066
1980 break; 2067 break;
1981 } 2068 }
1982 } 2069 }
2070
1983 return; 2071 return;
1984 } 2072 }
1985#if MENUBAR
1986 /*
1987 * Menubar window processing of button press
1988 */
1989 if (isMenuBarWindow (ev.window))
1990 menubar_control (ev);
1991#endif
1992} 2073}
1993 2074
1994void 2075void
1995rxvt_term::button_release (XButtonEvent &ev) 2076rxvt_term::button_release (XButtonEvent &ev)
1996{ 2077{
… …
1998 2079
1999 csrO = 0; /* reset csr Offset */ 2080 csrO = 0; /* reset csr Offset */
2000 if (!bypass_keystate) 2081 if (!bypass_keystate)
2001 reportmode = !! (priv_modes & PrivMode_mouse_report); 2082 reportmode = !! (priv_modes & PrivMode_mouse_report);
2002 2083
2003 if (scrollbar_isUpDn ()) 2084 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2004 { 2085 {
2005 scrollBar.setIdle (); 2086 scrollBar.state = STATE_IDLE;
2006 scrollbar_show (0); 2087 scrollBar.show (0);
2007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2008 refresh_type &= ~SMOOTH_REFRESH;
2009#endif
2010 } 2088 }
2011 2089
2012#ifdef SELECTION_SCROLLING 2090#ifdef SELECTION_SCROLLING
2013 if (sel_scroll_ev.active)
2014 sel_scroll_ev.stop(); 2091 sel_scroll_ev.stop();
2015#endif 2092#endif
2016 2093
2017 if (ev.window == vt) 2094 if (ev.window == vt)
2018 { 2095 {
2096 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2097 return;
2098
2019#if ISO_14755 2099#if ISO_14755
2020 // 5.4 2100 // 5.4
2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2101 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2022 return; 2102 return;
2023#endif 2103#endif
2104
2024 if (reportmode) 2105 if (reportmode)
2025 { 2106 {
2026 /* mouse report from vt window */ 2107 /* mouse report from vt window */
2027 /* don't report release of wheel "buttons" */ 2108 /* don't report release of wheel "buttons" */
2028 if (ev.button >= 4) 2109 if (ev.button >= 4)
… …
2039 mouse_report (ev); 2120 mouse_report (ev);
2040 } 2121 }
2041#else /* MOUSE_REPORT_DOUBLECLICK */ 2122#else /* MOUSE_REPORT_DOUBLECLICK */
2042 MEvent.button = AnyButton; 2123 MEvent.button = AnyButton;
2043 mouse_report (ev); 2124 mouse_report (ev);
2044#endif /* MOUSE_REPORT_DOUBLECLICK */ 2125#endif /* MOUSE_REPORT_DOUBLECLICK */
2045 return; 2126 return;
2046 } 2127 }
2047 2128
2048 /* 2129 /*
2049 * dumb hack to compensate for the failure of click-and-drag 2130 * dumb hack to compensate for the failure of click-and-drag
… …
2058 { 2139 {
2059 case Button1: 2140 case Button1:
2060 case Button3: 2141 case Button3:
2061 selection_make (ev.time); 2142 selection_make (ev.time);
2062 break; 2143 break;
2144
2063 case Button2: 2145 case Button2:
2064 selection_request (ev.time, ev.x, ev.y); 2146 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2147 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2065 break; 2148 break;
2149
2066#ifdef MOUSE_WHEEL 2150#ifdef MOUSE_WHEEL
2067 case Button4: 2151 case Button4:
2068 case Button5: 2152 case Button5:
2069 { 2153 {
2070 int i; 2154 int i;
… …
2072 2156
2073 v = ev.button == Button4 ? UP : DN; 2157 v = ev.button == Button4 ? UP : DN;
2074 2158
2075 if (ev.state & ShiftMask) 2159 if (ev.state & ShiftMask)
2076 i = 1; 2160 i = 1;
2077 else if (options & Opt_mouseWheelScrollPage) 2161 else if (option (Opt_mouseWheelScrollPage))
2078 i = nrow - 1; 2162 i = nrow - 1;
2079 else 2163 else
2080 i = 5; 2164 i = 5;
2081 2165
2082# ifdef MOUSE_SLIP_WHEELING 2166# ifdef MOUSE_SLIP_WHEELING
… …
2084 { 2168 {
2085 mouse_slip_wheel_speed += v ? -1 : 1; 2169 mouse_slip_wheel_speed += v ? -1 : 1;
2086 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2170 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2087 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2171 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2088 2172
2089 if (slip_wheel_ev.at < NOW) 2173 if (!slip_wheel_ev.is_active ())
2090 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2174 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2091
2092 slip_wheel_ev.start ();
2093 } 2175 }
2094 else 2176 else
2177# endif
2095 { 2178 {
2096# endif
2097# ifdef JUMP_MOUSE_WHEEL
2098 scr_page (v, i); 2179 scr_page (v, i);
2099 scr_refresh (SMOOTH_REFRESH);
2100 scrollbar_show (1); 2180 scrollBar.show (1);
2101# else
2102 while (i--)
2103 {
2104 scr_page (v, 1);
2105 scr_refresh (SMOOTH_REFRESH);
2106 scrollbar_show (1);
2107 }
2108# endif
2109# ifdef MOUSE_SLIP_WHEELING
2110 } 2181 }
2111#endif
2112 } 2182 }
2113 break; 2183 break;
2114#endif 2184#endif
2115 } 2185 }
2116 } 2186 }
2117#ifdef MENUBAR
2118 else if (isMenuBarWindow (ev.window))
2119 menubar_control (ev);
2120#endif
2121} 2187}
2122
2123#ifdef TRANSPARENT
2124#if TINTING
2125/* taken from aterm-0.4.2 */
2126
2127typedef uint32_t RUINT32T;
2128
2129void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2130{
2131 int sh_r, sh_g, sh_b;
2132 RUINT32T mask_r, mask_g, mask_b;
2133 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2134 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2135 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2136 int i;
2137
2138 Visual *visual = display->visual;
2139
2140 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2141
2142 /* for convenience */
2143 mask_r = visual->red_mask;
2144 mask_g = visual->green_mask;
2145 mask_b = visual->blue_mask;
2146
2147 /* boring lookup table pre-initialization */
2148 switch (srcImage->bits_per_pixel) {
2149 case 15:
2150 if ((mask_r != 0x7c00) ||
2151 (mask_g != 0x03e0) ||
2152 (mask_b != 0x001f))
2153 return;
2154 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2155 lookup_r = lookup;
2156 lookup_g = lookup+32;
2157 lookup_b = lookup+32+32;
2158 sh_r = 10;
2159 sh_g = 5;
2160 sh_b = 0;
2161 break;
2162 case 16:
2163 if ((mask_r != 0xf800) ||
2164 (mask_g != 0x07e0) ||
2165 (mask_b != 0x001f))
2166 return;
2167 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2168 lookup_r = lookup;
2169 lookup_g = lookup+32;
2170 lookup_b = lookup+32+64;
2171 sh_r = 11;
2172 sh_g = 5;
2173 sh_b = 0;
2174 break;
2175 case 24:
2176 if ((mask_r != 0xff0000) ||
2177 (mask_g != 0x00ff00) ||
2178 (mask_b != 0x0000ff))
2179 return;
2180 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2181 lookup_r = lookup;
2182 lookup_g = lookup+256;
2183 lookup_b = lookup+256+256;
2184 sh_r = 16;
2185 sh_g = 8;
2186 sh_b = 0;
2187 break;
2188 case 32:
2189 if ((mask_r != 0xff0000) ||
2190 (mask_g != 0x00ff00) ||
2191 (mask_b != 0x0000ff))
2192 return;
2193 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2194 lookup_r = lookup;
2195 lookup_g = lookup+256;
2196 lookup_b = lookup+256+256;
2197 sh_r = 16;
2198 sh_g = 8;
2199 sh_b = 0;
2200 break;
2201 default:
2202 return; /* we do not support this color depth */
2203 }
2204
2205 /* prepare limits for color transformation (each channel is handled separately) */
2206 if (shade < 0) {
2207 shade = -shade;
2208 if (shade < 0) shade = 0;
2209 if (shade > 100) shade = 100;
2210
2211 lower_lim_r = 65535-rm;
2212 lower_lim_g = 65535-gm;
2213 lower_lim_b = 65535-bm;
2214
2215 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2216 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2217 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2218
2219 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2220 } else {
2221 if (shade < 0) shade = 0;
2222 if (shade > 100) shade = 100;
2223
2224 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2225
2226 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2227 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2228 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2229 }
2230
2231 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2232 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2233 {
2234 unsigned int tmp;
2235
2236 tmp = lower_lim_r;
2237 lower_lim_r = lower_lim_b;
2238 lower_lim_b = tmp;
2239
2240 tmp = upper_lim_r;
2241 upper_lim_r = upper_lim_b;
2242 upper_lim_b = tmp;
2243 }
2244
2245 /* fill our lookup tables */
2246 for (i = 0; i <= mask_r>>sh_r; i++)
2247 {
2248 RUINT32T tmp;
2249 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2250 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2251 lookup_r[i] = (tmp/65535)<<sh_r;
2252 }
2253 for (i = 0; i <= mask_g>>sh_g; i++)
2254 {
2255 RUINT32T tmp;
2256 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2257 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2258 lookup_g[i] = (tmp/65535)<<sh_g;
2259 }
2260 for (i = 0; i <= mask_b>>sh_b; i++)
2261 {
2262 RUINT32T tmp;
2263 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2264 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2265 lookup_b[i] = (tmp/65535)<<sh_b;
2266 }
2267
2268 /* apply table to input image (replacing colors by newly calculated ones) */
2269 switch (srcImage->bits_per_pixel)
2270 {
2271 case 15:
2272 {
2273 unsigned short *p1, *pf, *p, *pl;
2274 p1 = (unsigned short *) srcImage->data;
2275 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2276 while (p1 < pf)
2277 {
2278 p = p1;
2279 pl = p1 + srcImage->width;
2280 for (; p < pl; p++)
2281 {
2282 *p = lookup_r[(*p & 0x7c00)>>10] |
2283 lookup_g[(*p & 0x03e0)>> 5] |
2284 lookup_b[(*p & 0x001f)];
2285 }
2286 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2287 }
2288 break;
2289 }
2290 case 16:
2291 {
2292 unsigned short *p1, *pf, *p, *pl;
2293 p1 = (unsigned short *) srcImage->data;
2294 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2295 while (p1 < pf)
2296 {
2297 p = p1;
2298 pl = p1 + srcImage->width;
2299 for (; p < pl; p++)
2300 {
2301 *p = lookup_r[(*p & 0xf800)>>11] |
2302 lookup_g[(*p & 0x07e0)>> 5] |
2303 lookup_b[(*p & 0x001f)];
2304 }
2305 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2306 }
2307 break;
2308 }
2309 case 24:
2310 {
2311 unsigned char *p1, *pf, *p, *pl;
2312 p1 = (unsigned char *) srcImage->data;
2313 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2314 while (p1 < pf)
2315 {
2316 p = p1;
2317 pl = p1 + srcImage->width * 3;
2318 for (; p < pl; p += 3)
2319 {
2320 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2321 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2322 p[2] = lookup_r[(p[2] & 0x0000ff)];
2323 }
2324 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2325 }
2326 break;
2327 }
2328 case 32:
2329 {
2330 RUINT32T *p1, *pf, *p, *pl;
2331 p1 = (RUINT32T *) srcImage->data;
2332 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2333
2334 while (p1 < pf)
2335 {
2336 p = p1;
2337 pl = p1 + srcImage->width;
2338 for (; p < pl; p++)
2339 {
2340 *p = lookup_r[(*p & 0xff0000)>>16] |
2341 lookup_g[(*p & 0x00ff00)>> 8] |
2342 lookup_b[(*p & 0x0000ff)] |
2343 (*p & ~0xffffff);
2344 }
2345 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2346 }
2347 break;
2348 }
2349 }
2350
2351 free (lookup);
2352}
2353#endif
2354
2355/*
2356 * Check our parents are still who we think they are.
2357 * Do transparency updates if required
2358 */
2359int
2360rxvt_term::check_our_parents ()
2361{
2362 int i, pchanged, aformat, have_pixmap, rootdepth;
2363 unsigned long nitems, bytes_after;
2364 Atom atype;
2365 unsigned char *prop = NULL;
2366 Window root, oldp, *list;
2367 Pixmap rootpixmap = None;
2368 XWindowAttributes wattr, wrootattr;
2369 dDisp;
2370
2371 pchanged = 0;
2372
2373 if (!(options & Opt_transparent))
2374 return pchanged; /* Don't try any more */
2375
2376 XGetWindowAttributes (disp, display->root, &wrootattr);
2377 rootdepth = wrootattr.depth;
2378
2379 XGetWindowAttributes (disp, parent[0], &wattr);
2380
2381 if (rootdepth != wattr.depth)
2382 {
2383 if (am_transparent)
2384 {
2385 pchanged = 1;
2386 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2387 am_transparent = am_pixmap_trans = 0;
2388 }
2389
2390 return pchanged; /* Don't try any more */
2391 }
2392
2393 /* Get all X ops out of the queue so that our information is up-to-date. */
2394 XSync (disp, False);
2395
2396 /*
2397 * Make the frame window set by the window manager have
2398 * the root background. Some window managers put multiple nested frame
2399 * windows for each client, so we have to take care about that.
2400 */
2401 i = (xa[XA_XROOTPMAP_ID]
2402 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2403 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2404 &nitems, &bytes_after, &prop) == Success);
2405
2406 if (!i || prop == NULL)
2407 i = (xa[XA_ESETROOT_PMAP_ID]
2408 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2409 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2410 &nitems, &bytes_after, &prop) == Success);
2411
2412 if (!i || prop == NULL
2413#if TINTING
2414 || !rs[Rs_color + Color_tint]
2415#endif
2416 )
2417 have_pixmap = 0;
2418 else
2419 {
2420 have_pixmap = 1;
2421 rootpixmap = *(Pixmap *)prop;
2422 XFree (prop);
2423 }
2424
2425 if (have_pixmap)
2426 {
2427 /*
2428 * Copy display->root pixmap transparency
2429 */
2430 int sx, sy, nx, ny;
2431 unsigned int nw, nh;
2432 Window cr;
2433 XImage *image;
2434 GC gc;
2435 XGCValues gcvalue;
2436
2437 XTranslateCoordinates (disp, parent[0], display->root,
2438 0, 0, &sx, &sy, &cr);
2439 nw = (unsigned int)szHint.width;
2440 nh = (unsigned int)szHint.height;
2441 nx = ny = 0;
2442
2443 if (sx < 0)
2444 {
2445 nw += sx;
2446 nx = -sx;
2447 sx = 0;
2448 }
2449
2450 if (sy < 0)
2451 {
2452 nh += sy;
2453 ny = -sy;
2454 sy = 0;
2455 }
2456
2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2459
2460 XSync (disp, False);
2461 allowedxerror = -1;
2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2463
2464 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2465 /* XXX: may need a delay here? */
2466 allowedxerror = 0;
2467
2468 if (image == NULL)
2469 {
2470 if (am_transparent && am_pixmap_trans)
2471 {
2472 pchanged = 1;
2473 if (pixmap != None)
2474 {
2475 XFreePixmap (disp, pixmap);
2476 pixmap = None;
2477 }
2478 }
2479
2480 am_pixmap_trans = 0;
2481 }
2482 else
2483 {
2484 if (pixmap != None)
2485 XFreePixmap (disp, pixmap);
2486
2487#if TINTING
2488 if (ISSET_PIXCOLOR (Color_tint))
2489 {
2490 unsigned short rm, gm, bm;
2491 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2492
2493 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2494
2495 ShadeXImage (display, image, shade, rm, gm, bm);
2496 }
2497#endif
2498
2499 pixmap = XCreatePixmap (disp, vt,
2500 szHint.width, szHint.height, image->depth);
2501 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2502 XPutImage (disp, pixmap, gc, image, 0, 0,
2503 nx, ny, image->width, image->height);
2504 XFreeGC (disp, gc);
2505 XDestroyImage (image);
2506 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2507 XClearWindow (disp, parent[0]);
2508
2509 if (!am_transparent || !am_pixmap_trans)
2510 pchanged = 1;
2511
2512 am_transparent = am_pixmap_trans = 1;
2513 }
2514 }
2515
2516 if (am_pixmap_trans)
2517 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2518 else
2519 {
2520 unsigned int n;
2521 /*
2522 * InheritPixmap transparency
2523 */
2524 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2525 {
2526 oldp = parent[i];
2527 XQueryTree (disp, parent[i - 1], &root,
2528 &parent[i], &list, &n);
2529 XFree (list);
2530
2531 if (parent[i] == display->root)
2532 {
2533 if (oldp != None)
2534 pchanged = 1;
2535
2536 break;
2537 }
2538
2539 if (oldp != parent[i])
2540 pchanged = 1;
2541 }
2542
2543 n = 0;
2544
2545 if (pchanged)
2546 {
2547 for (; n < (unsigned int)i; n++)
2548 {
2549 XGetWindowAttributes (disp, parent[n], &wattr);
2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2551 {
2552 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2553 break;
2554 }
2555 }
2556 }
2557
2558 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2559 {
2560 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2561 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2562 am_transparent = 0;
2563 /* XXX: also turn off Opt_transparent? */
2564 }
2565 else
2566 {
2567#if WAIT_FOR_WM
2568 /* wait (an arbitrary period) for the WM to do its thing
2569 * needed for fvwm2.2.2 (and before?) */
2570 sleep (1);
2571#endif
2572 for (n = 0; n < (unsigned int)i; n++)
2573 {
2574 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2575 XClearWindow (disp, parent[n]);
2576 }
2577
2578 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2579 am_transparent = 1;
2580 }
2581
2582 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2583 parent[i] = None;
2584 }
2585
2586 if (scrollBar.win)
2587 {
2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2589 scrollBar.setIdle ();
2590 scrollbar_show (0);
2591 }
2592
2593 if (am_transparent)
2594 {
2595 want_refresh = want_full_refresh = 1;
2596 if (am_pixmap_trans)
2597 flush ();
2598 }
2599
2600 return pchanged;
2601}
2602#endif
2603 2188
2604/*}}} */ 2189/*}}} */
2605 2190
2606bool 2191void
2607rxvt_term::cmd_parse () 2192rxvt_term::cmd_parse ()
2608{ 2193{
2609 bool flag = false;
2610 unicode_t ch = NOCHAR; 2194 wchar_t ch = NOCHAR;
2611 unsigned char *seq_begin; // remember start of esc-sequence here 2195 char *seq_begin; // remember start of esc-sequence here
2612 2196
2613 for (;;) 2197 for (;;)
2614 { 2198 {
2615 if (ch == NOCHAR) 2199 if (expect_false (ch == NOCHAR))
2616 { 2200 {
2617 seq_begin = cmdbuf_ptr; 2201 seq_begin = cmdbuf_ptr;
2618 ch = next_char (); 2202 ch = next_char ();
2619 }
2620 2203
2621 if (ch == NOCHAR) // TODO: improve 2204 if (ch == NOCHAR)
2622 break; 2205 break;
2206 }
2623 2207
2624 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2208 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2625 { 2209 {
2626 if (!seen_input) 2210 if (expect_false (!seen_input))
2627 { 2211 {
2628 seen_input = 1; 2212 seen_input = 1;
2629 // many badly-written programs (e.g. jed) contain a race condition: 2213 // many badly-written programs (e.g. jed) contain a race condition:
2630 // they first read the screensize and then install a SIGWINCH handler. 2214 // they first read the screensize and then install a SIGWINCH handler.
2631 // some window managers resize the window early, and these programs 2215 // some window managers resize the window early, and these programs
… …
2636 if (seen_resize && cmd_pid) 2220 if (seen_resize && cmd_pid)
2637 kill (-cmd_pid, SIGWINCH); 2221 kill (-cmd_pid, SIGWINCH);
2638 } 2222 }
2639 2223
2640 /* Read a text string from the input buffer */ 2224 /* Read a text string from the input buffer */
2641 unicode_t buf[UBUFSIZ]; 2225 wchar_t buf[UBUFSIZ];
2642 bool refreshnow = false; 2226 bool refreshnow = false;
2643 int nlines = 0; 2227 int nlines = 0;
2644 unicode_t *str = buf; 2228 wchar_t *str = buf;
2645 unicode_t *eol = str + min (ncol, UBUFSIZ); 2229 wchar_t *eol = str + min (ncol, UBUFSIZ);
2646 2230
2647 for (;;) 2231 for (;;)
2648 { 2232 {
2649 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2233 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2650 break; 2234 break;
2651 2235
2652 *str++ = ch; 2236 *str++ = ch;
2653 2237
2654 if (ch == C0_LF || str >= eol) 2238 if (expect_false (ch == C0_LF || str >= eol))
2655 { 2239 {
2656 if (ch == C0_LF) 2240 if (ch == C0_LF)
2657 nlines++; 2241 nlines++;
2658 2242
2659 refresh_count++; 2243 refresh_count++;
2660 2244
2661 if (!(options & Opt_jumpScroll) 2245 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2662 || (refresh_count >= refresh_limit * (nrow - 1)))
2663 { 2246 {
2247 refresh_count = 0;
2248
2249 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2250 {
2664 refreshnow = true; 2251 refreshnow = true;
2665 ch = NOCHAR; 2252 ch = NOCHAR;
2666 break; 2253 break;
2254 }
2667 } 2255 }
2668 2256
2669 // scr_add_lines only works for nlines <= nrow - 1. 2257 // scr_add_lines only works for nlines <= nrow - 1.
2670 if (nlines >= nrow - 1) 2258 if (nlines >= nrow - 1)
2671 { 2259 {
2260 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2261 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2672 scr_add_lines (buf, nlines, str - buf); 2262 scr_add_lines (buf, str - buf, nlines);
2263
2673 nlines = 0; 2264 nlines = 0;
2674 str = buf; 2265 str = buf;
2675 eol = str + min (ncol, UBUFSIZ); 2266 eol = str + min (ncol, UBUFSIZ);
2676 } 2267 }
2677 2268
… …
2690 2281
2691 seq_begin = cmdbuf_ptr; 2282 seq_begin = cmdbuf_ptr;
2692 ch = next_char (); 2283 ch = next_char ();
2693 } 2284 }
2694 2285
2286 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2287 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2695 scr_add_lines (buf, nlines, str - buf); 2288 scr_add_lines (buf, str - buf, nlines);
2696 2289
2697 /* 2290 /*
2698 * If there have been a lot of new lines, then update the screen 2291 * If there have been a lot of new lines, then update the screen
2699 * What the heck I'll cheat and only refresh less than every page-full. 2292 * What the heck we'll cheat and only refresh less than every page-full.
2700 * the number of pages between refreshes is refresh_limit, which 2293 * if skipScroll is enabled.
2701 * is incremented here because we must be doing flat-out scrolling.
2702 */ 2294 */
2703 if (refreshnow) 2295 if (refreshnow)
2704 { 2296 {
2705 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2706 refresh_limit++;
2707 else
2708 {
2709 flag = true;
2710 scr_refresh (refresh_type); 2297 scr_refresh ();
2711 } 2298 want_refresh = 1;
2712 } 2299 }
2713
2714 } 2300 }
2715 else 2301 else
2716 { 2302 {
2717 try 2303 try
2718 { 2304 {
… …
2726 } 2312 }
2727 2313
2728 ch = NOCHAR; 2314 ch = NOCHAR;
2729 } 2315 }
2730 } 2316 }
2731
2732 return flag;
2733}
2734
2735// read the next octet
2736unicode_t
2737rxvt_term::next_octet ()
2738{
2739 return cmdbuf_ptr < cmdbuf_endp
2740 ? *cmdbuf_ptr++
2741 : NOCHAR;
2742} 2317}
2743 2318
2744// read the next character 2319// read the next character
2745unicode_t 2320wchar_t
2746rxvt_term::next_char () 2321rxvt_term::next_char () NOTHROW
2747{ 2322{
2748 while (cmdbuf_ptr < cmdbuf_endp) 2323 while (cmdbuf_ptr < cmdbuf_endp)
2749 { 2324 {
2750 // assume 7-bit to be ascii ALWAYS 2325 // assume 7-bit to be ascii ALWAYS
2751 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2326 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2752 return *cmdbuf_ptr++; 2327 return *cmdbuf_ptr++;
2753 2328
2754 wchar_t wc; 2329 wchar_t wc;
2755 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2330 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2756 2331
2757 if (len == (size_t)-2) 2332 if (len == (size_t)-2)
2758 { 2333 {
2759 // the mbstate stores incomplete sequences. didn't know this :/ 2334 // the mbstate stores incomplete sequences. didn't know this :/
2760 cmdbuf_ptr = cmdbuf_endp; 2335 cmdbuf_ptr = cmdbuf_endp;
2761 break; 2336 break;
2762 } 2337 }
2763 2338
2764 if (len == (size_t)-1) 2339 if (len == (size_t)-1)
2340 {
2341 mbstate.reset (); // reset now undefined conversion state
2765 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2342 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2343 }
2766 2344
2767 // assume wchar == unicode 2345 // assume wchar == unicode
2768 cmdbuf_ptr += len; 2346 cmdbuf_ptr += len;
2769 return wc & UNICODE_MASK; 2347 return wc & UNICODE_MASK;
2770 } 2348 }
2771 2349
2772 return NOCHAR; 2350 return NOCHAR;
2773} 2351}
2352
2353// read the next octet
2354uint32_t
2355rxvt_term::next_octet () NOTHROW
2356{
2357 return cmdbuf_ptr < cmdbuf_endp
2358 ? (unsigned char)*cmdbuf_ptr++
2359 : NOCHAR;
2360}
2361
2362static class out_of_input out_of_input;
2774 2363
2775/* rxvt_cmd_getc () - Return next input character */ 2364/* rxvt_cmd_getc () - Return next input character */
2776/* 2365/*
2777 * Return the next input character after first passing any keyboard input 2366 * Return the next input character after first passing any keyboard input
2778 * to the command. 2367 * to the command.
2779 */ 2368 */
2780unicode_t 2369wchar_t
2781rxvt_term::cmd_getc () 2370rxvt_term::cmd_getc () THROW ((class out_of_input))
2782{ 2371{
2783 unicode_t c = next_char (); 2372 wchar_t c = next_char ();
2784 2373
2785 if (c == NOCHAR) 2374 if (c == NOCHAR)
2786 throw out_of_input; 2375 throw out_of_input;
2787 2376
2788 return c; 2377 return c;
2789} 2378}
2790 2379
2791unicode_t 2380uint32_t
2792rxvt_term::cmd_get8 () 2381rxvt_term::cmd_get8 () THROW ((class out_of_input))
2793{ 2382{
2794 unicode_t c = next_octet (); 2383 uint32_t c = next_octet ();
2795 2384
2796 if (c == NOCHAR) 2385 if (c == NOCHAR)
2797 throw out_of_input; 2386 throw out_of_input;
2798 2387
2799 return c; 2388 return c;
… …
2803/*----------------------------------------------------------------------*/ 2392/*----------------------------------------------------------------------*/
2804#ifdef PRINTPIPE 2393#ifdef PRINTPIPE
2805FILE * 2394FILE *
2806rxvt_term::popen_printer () 2395rxvt_term::popen_printer ()
2807{ 2396{
2808 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2397 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2809 2398
2810 if (stream == NULL) 2399 if (stream == NULL)
2811 rxvt_warn ("can't open printer pipe, not printing.\n"); 2400 rxvt_warn ("can't open printer pipe, not printing.\n");
2812 2401
2813 return stream; 2402 return stream;
… …
2824 * simulate attached vt100 printer 2413 * simulate attached vt100 printer
2825 */ 2414 */
2826void 2415void
2827rxvt_term::process_print_pipe () 2416rxvt_term::process_print_pipe ()
2828{ 2417{
2829 int done; 2418 FILE *fd = popen_printer ();
2830 FILE *fd;
2831 2419
2832 if ((fd = popen_printer ()) == NULL) 2420 if (!fd)
2833 return; 2421 return;
2834 2422
2835 /* 2423 /*
2836 * Send all input to the printer until either ESC[4i or ESC[?4i 2424 * Send all input to the printer until either ESC[4i or ESC[?4i
2837 * is received. 2425 * is received.
2838 */ 2426 */
2839 for (done = 0; !done;) 2427 for (int done = 0; !done; )
2840 { 2428 {
2841 unsigned char buf[8]; 2429 unsigned char buf[8];
2842 unicode_t ch; 2430 unicode_t ch;
2843 unsigned int i, len; 2431 unsigned int i, len;
2844 2432
… …
2863 { 2451 {
2864 if ((buf[len++] = cmd_getc ()) == 'i') 2452 if ((buf[len++] = cmd_getc ()) == 'i')
2865 break; /* done = 1 */ 2453 break; /* done = 1 */
2866 } 2454 }
2867 } 2455 }
2868 2456
2869 for (i = 0; i < len; i++) 2457 for (i = 0; i < len; i++)
2870 if (putc (buf[i], fd) == EOF) 2458 if (putc (buf[i], fd) == EOF)
2871 { 2459 {
2872 done = 1; 2460 done = 1;
2873 break; 2461 break;
… …
2875 } 2463 }
2876 } 2464 }
2877 2465
2878 pclose_printer (fd); 2466 pclose_printer (fd);
2879} 2467}
2880#endif /* PRINTPIPE */ 2468#endif /* PRINTPIPE */
2881/*}}} */ 2469/*}}} */
2882 2470
2883/* *INDENT-OFF* */ 2471/* *INDENT-OFF* */
2884enum { 2472enum {
2885 C1_40 = 0x40, 2473 C1_40 = 0x40,
… …
2899 case C0_ESC: 2487 case C0_ESC:
2900 process_escape_seq (); 2488 process_escape_seq ();
2901 break; 2489 break;
2902 case C0_ENQ: /* terminal Status */ 2490 case C0_ENQ: /* terminal Status */
2903 if (rs[Rs_answerbackstring]) 2491 if (rs[Rs_answerbackstring])
2904 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2492 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2905 (unsigned int)strlen (rs[Rs_answerbackstring]));
2906 else 2493 else
2907 tt_write ((unsigned char *)VT100_ANS, 2494 tt_write (VT100_ANS, strlen (VT100_ANS));
2908 (unsigned int)strlen (VT100_ANS));
2909 break; 2495 break;
2910 case C0_BEL: /* bell */ 2496 case C0_BEL: /* bell */
2911 scr_bell (); 2497 scr_bell ();
2912 break; 2498 break;
2913 case C0_BS: /* backspace */ 2499 case C0_BS: /* backspace */
… …
2937 process_dcs_seq (); 2523 process_dcs_seq ();
2938 break; 2524 break;
2939 case 0x9b: /* CSI */ 2525 case 0x9b: /* CSI */
2940 process_csi_seq (); 2526 process_csi_seq ();
2941 break; 2527 break;
2942 case 0x9d: /* CSI */ 2528 case 0x9d: /* OSC */
2943 process_osc_seq (); 2529 process_osc_seq ();
2944 break; 2530 break;
2945#endif 2531#endif
2946 } 2532 }
2947} 2533}
… …
2991 break; 2577 break;
2992 case 'Z': /* identify the terminal type */ 2578 case 'Z': /* identify the terminal type */
2993 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2579 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2994 break; 2580 break;
2995 case '<': /* turn off VT52 mode */ 2581 case '<': /* turn off VT52 mode */
2996 PrivMode (0, PrivMode_vt52); 2582 set_privmode (PrivMode_vt52, 0);
2997 break; 2583 break;
2998 case 'F': /* use special graphics character set */ 2584 case 'F': /* use special graphics character set */
2999 case 'G': /* use regular character set */ 2585 case 'G': /* use regular character set */
3000 /* unimplemented */ 2586 /* unimplemented */
3001 break; 2587 break;
… …
3037 scr_charset_set (2, (unsigned int)cmd_getc ()); 2623 scr_charset_set (2, (unsigned int)cmd_getc ());
3038 break; 2624 break;
3039 case '+': 2625 case '+':
3040 scr_charset_set (3, (unsigned int)cmd_getc ()); 2626 scr_charset_set (3, (unsigned int)cmd_getc ());
3041 break; 2627 break;
3042#if ENABLE_FRILLS 2628#if !ENABLE_MINIMAL
3043 case '6': 2629 case '6':
3044 scr_backindex (); 2630 scr_backindex ();
3045 break; 2631 break;
3046#endif 2632#endif
3047 case '7': 2633 case '7':
3048 scr_cursor (SAVE); 2634 scr_cursor (SAVE);
3049 break; 2635 break;
3050 case '8': 2636 case '8':
3051 scr_cursor (RESTORE); 2637 scr_cursor (RESTORE);
3052 break; 2638 break;
3053#if ENABLE_FRILLS 2639#if !ENABLE_MINIMAL
3054 case '9': 2640 case '9':
3055 scr_forwardindex (); 2641 scr_forwardindex ();
3056 break; 2642 break;
3057#endif 2643#endif
3058 case '=': 2644 case '=':
3059 case '>': 2645 case '>':
3060 PrivMode ((ch == '='), PrivMode_aplKP); 2646 set_privmode (PrivMode_aplKP, ch == '=');
3061 break; 2647 break;
3062 2648
3063 case C1_40: 2649 case C1_40:
3064 cmd_getc (); 2650 cmd_getc ();
3065 break; 2651 break;
… …
3068 break; 2654 break;
3069 2655
3070 /* 8.3.87: NEXT LINE */ 2656 /* 8.3.87: NEXT LINE */
3071 case C1_NEL: /* ESC E */ 2657 case C1_NEL: /* ESC E */
3072 { 2658 {
3073 unicode_t nlcr[] = { C0_LF, C0_CR }; 2659 wchar_t nlcr[] = { C0_LF, C0_CR };
3074 scr_add_lines (nlcr, 1, 2); 2660 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3075 } 2661 }
3076 break; 2662 break;
3077 2663
3078 /* kidnapped escape sequence: Should be 8.3.48 */ 2664 /* kidnapped escape sequence: Should be 8.3.48 */
3079 case C1_ESA: /* ESC G */ 2665 case C1_ESA: /* ESC G */
… …
3101 process_dcs_seq (); 2687 process_dcs_seq ();
3102 break; 2688 break;
3103 2689
3104 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2690 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3105 case C1_SCI: /* ESC Z */ 2691 case C1_SCI: /* ESC Z */
3106 tt_write ((const unsigned char *)ESCZ_ANSWER, 2692 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3107 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3108 break; /* steal obsolete ESC [ c */ 2693 break; /* steal obsolete ESC [ c */
3109 2694
3110 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2695 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3111 case C1_CSI: /* ESC [ */ 2696 case C1_CSI: /* ESC [ */
3112 process_csi_seq (); 2697 process_csi_seq ();
3113 break; 2698 break;
3114 2699
3115 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2700 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3116 case C1_OSC: /* ESC ] */ 2701 case C1_OSC: /* ESC ] */
3117 process_osc_seq (); 2702 process_osc_seq ();
3118 break; 2703 break;
3119 2704
3120 /* 8.3.106: RESET TO INITIAL STATE */ 2705 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3121 case 'c': 2706 case 'c':
3122 mbstate.reset (); 2707 mbstate.reset ();
3123 scr_poweron (); 2708 scr_poweron ();
3124 scrollbar_show (1); 2709 scrollBar.show (1);
3125 break; 2710 break;
3126 2711
3127 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2712 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3128 case 'n': 2713 case 'n':
3129 scr_charset_choose (2); 2714 scr_charset_choose (2);
… …
3174rxvt_term::process_csi_seq () 2759rxvt_term::process_csi_seq ()
3175{ 2760{
3176 unicode_t ch, priv, i; 2761 unicode_t ch, priv, i;
3177 unsigned int nargs, p; 2762 unsigned int nargs, p;
3178 int n, ndef; 2763 int n, ndef;
3179 int arg[ESC_ARGS]; 2764 int arg[ESC_ARGS] = { };
3180 2765
3181 for (nargs = ESC_ARGS; nargs > 0;) 2766 nargs = 0;
3182 arg[--nargs] = 0;
3183 2767
3184 priv = 0; 2768 priv = 0;
3185 ch = cmd_getc (); 2769 ch = cmd_getc ();
3186 if (ch >= '<' && ch <= '?') 2770 if ((ch >= '<' && ch <= '?') || ch == '!')
2771 {
3187 { /* '<' '=' '>' '?' */ 2772 /* '<' '=' '>' '?' '!' */
3188 priv = ch; 2773 priv = ch;
3189 ch = cmd_getc (); 2774 ch = cmd_getc ();
3190 } 2775 }
3191 2776
3192 /* read any numerical arguments */ 2777 /* read any numerical arguments */
… …
3221 ndef = get_byte_array_bit (csi_defaults, i); 2806 ndef = get_byte_array_bit (csi_defaults, i);
3222 for (p = 0; p < nargs; p++) 2807 for (p = 0; p < nargs; p++)
3223 if (arg[p] == -1) 2808 if (arg[p] == -1)
3224 arg[p] = ndef; 2809 arg[p] = ndef;
3225 2810
3226#ifdef DEBUG_CMD
3227 fprintf (stderr, "CSI ");
3228 for (p = 0; p < nargs; p++)
3229 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3230 fprintf (stderr, "%c\n", ch);
3231#endif
3232
3233 /* 2811 /*
3234 * private mode handling 2812 * private mode handling
3235 */ 2813 */
3236 if (priv) 2814 if (priv)
3237 { 2815 {
3238 switch (priv) 2816 switch (priv)
3239 { 2817 {
3240 case '>': 2818 case '>':
3241 if (ch == CSI_DA) /* secondary device attributes */ 2819 if (ch == CSI_DA) /* secondary device attributes */
3242 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2820 {
2821 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2822 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2823 //
2824 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2825 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2826 // versions.
2827 //
2828 tt_printf ("\033[>%d;95;0c", 'U');
2829 }
3243 break; 2830 break;
2831
3244 case '?': 2832 case '?':
3245 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2833 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3246 process_terminal_mode (ch, priv, nargs, arg); 2834 process_terminal_mode (ch, priv, nargs, arg);
3247 break; 2835 break;
2836
2837 case '!':
2838 if (ch == CSI_70)
2839 {
2840 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2841 scr_soft_reset ();
2842
2843 static const int pm_h[] = { 7, 25 };
2844 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2845
2846 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2847 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
3248 } 2848 }
2849 break;
2850 }
2851
3249 return; 2852 return;
3250 } 2853 }
3251 2854
3252 switch (ch) 2855 switch (ch)
3253 { 2856 {
… …
3356 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2959 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3357 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 2960 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3358 break; 2961 break;
3359 2962
3360 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2963 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3361 tt_write ((const unsigned char *)VT100_ANS, 2964 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3362 (unsigned int) (sizeof (VT100_ANS) - 1));
3363 break; 2965 break;
3364 2966
3365 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2967 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3366 process_sgr_mode (nargs, arg); 2968 process_sgr_mode (nargs, arg);
3367 break; 2969 break;
… …
3374 break; 2976 break;
3375 case 6: /* CPR requested */ 2977 case 6: /* CPR requested */
3376 scr_report_position (); 2978 scr_report_position ();
3377 break; 2979 break;
3378 case 7: /* unofficial extension */ 2980 case 7: /* unofficial extension */
3379 if (options & Opt_insecure) 2981 if (option (Opt_insecure))
3380 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2982 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3381 break; 2983 break;
3382 case 8: /* unofficial extension */ 2984 case 8: /* unofficial extension */
3383 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2985 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3384 break; 2986 break;
… …
3451 break; 3053 break;
3452 case CSI_75: 3054 case CSI_75:
3453 scr_cursor (RESTORE); 3055 scr_cursor (RESTORE);
3454 break; 3056 break;
3455 3057
3456#if ENABLE_FRILLS 3058#if !ENABLE_MINIMAL
3457 case CSI_74: 3059 case CSI_74:
3458 process_window_ops (arg, nargs); 3060 process_window_ops (arg, nargs);
3459 break; 3061 break;
3460#endif 3062#endif
3461 3063
… …
3468 break; 3070 break;
3469 } 3071 }
3470} 3072}
3471/*}}} */ 3073/*}}} */
3472 3074
3473#if ENABLE_FRILLS 3075#if !ENABLE_MINIMAL
3474/* ARGSUSED */ 3076/* ARGSUSED */
3475void 3077void
3476rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3078rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3477{ 3079{
3478 int x, y; 3080 int x, y;
3479 XWindowAttributes wattr; 3081 XWindowAttributes wattr;
3480 Window wdummy; 3082 Window wdummy;
3481 dDisp; 3083
3084 dLocal (Display *, dpy);
3482 3085
3483 if (nargs == 0) 3086 if (nargs == 0)
3484 return; 3087 return;
3485 3088
3486 switch (args[0]) 3089 switch (args[0])
3487 { 3090 {
3488 /* 3091 /*
3489 * commands 3092 * commands
3490 */ 3093 */
3491 case 1: /* deiconify window */ 3094 case 1: /* deiconify window */
3492 XMapWindow (disp, parent[0]); 3095 XMapWindow (dpy, parent[0]);
3493 break; 3096 break;
3494 case 2: /* iconify window */ 3097 case 2: /* iconify window */
3495 XIconifyWindow (disp, parent[0], display->screen); 3098 XIconifyWindow (dpy, parent[0], display->screen);
3496 break; 3099 break;
3497 case 3: /* set position (pixels) */ 3100 case 3: /* set position (pixels) */
3498 XMoveWindow (disp, parent[0], args[1], args[2]); 3101 XMoveWindow (dpy, parent[0], args[1], args[2]);
3499 break; 3102 break;
3500 case 4: /* set size (pixels) */ 3103 case 4: /* set size (pixels) */
3501 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3104 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3502 break; 3105 break;
3503 case 5: /* raise window */ 3106 case 5: /* raise window */
3504 XRaiseWindow (disp, parent[0]); 3107 XRaiseWindow (dpy, parent[0]);
3505 break; 3108 break;
3506 case 6: /* lower window */ 3109 case 6: /* lower window */
3507 XLowerWindow (disp, parent[0]); 3110 XLowerWindow (dpy, parent[0]);
3508 break; 3111 break;
3509 case 7: /* refresh window */ 3112 case 7: /* refresh window */
3510 scr_touch (true); 3113 scr_touch (true);
3511 break; 3114 break;
3512 case 8: /* set size (chars) */ 3115 case 8: /* set size (chars) */
… …
3519 if (args[0] >= 24) /* set height (chars) */ 3122 if (args[0] >= 24) /* set height (chars) */
3520 set_widthheight ((unsigned int)width, 3123 set_widthheight ((unsigned int)width,
3521 (unsigned int) (args[1] * fheight)); 3124 (unsigned int) (args[1] * fheight));
3522 break; 3125 break;
3523 3126
3524
3525 /* 3127 /*
3526 * reports - some output format copied from XTerm 3128 * reports - some output format copied from XTerm
3527 */ 3129 */
3528 case 11: /* report window state */ 3130 case 11: /* report window state */
3529 XGetWindowAttributes (disp, parent[0], &wattr); 3131 XGetWindowAttributes (dpy, parent[0], &wattr);
3530 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3132 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3531 break; 3133 break;
3532 case 13: /* report window position */ 3134 case 13: /* report window position */
3533 XGetWindowAttributes (disp, parent[0], &wattr); 3135 XGetWindowAttributes (dpy, parent[0], &wattr);
3534 XTranslateCoordinates (disp, parent[0], wattr.root, 3136 XTranslateCoordinates (dpy, parent[0], wattr.root,
3535 -wattr.border_width, -wattr.border_width, 3137 -wattr.border_width, -wattr.border_width,
3536 &x, &y, &wdummy); 3138 &x, &y, &wdummy);
3537 tt_printf ("\033[3;%d;%dt", x, y); 3139 tt_printf ("\033[3;%d;%dt", x, y);
3538 break; 3140 break;
3539 case 14: /* report window size (pixels) */ 3141 case 14: /* report window size (pixels) */
3540 XGetWindowAttributes (disp, parent[0], &wattr); 3142 XGetWindowAttributes (dpy, parent[0], &wattr);
3541 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3143 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3542 break; 3144 break;
3543 case 18: /* report text area size (chars) */ 3145 case 18: /* report text area size (chars) */
3544 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3146 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3545 break; 3147 break;
… …
3547 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3149 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3548 break; 3150 break;
3549 case 20: /* report icon label */ 3151 case 20: /* report icon label */
3550 { 3152 {
3551 char *s; 3153 char *s;
3552 XGetIconName (disp, parent[0], &s); 3154 XGetIconName (dpy, parent[0], &s);
3553 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3155 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3554 XFree (s); 3156 XFree (s);
3555 } 3157 }
3556 break; 3158 break;
3557 case 21: /* report window title */ 3159 case 21: /* report window title */
3558 { 3160 {
3559 char *s; 3161 char *s;
3560 XFetchName (disp, parent[0], &s); 3162 XFetchName (dpy, parent[0], &s);
3561 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3163 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3562 XFree (s); 3164 XFree (s);
3563 } 3165 }
3564 break; 3166 break;
3565 } 3167 }
3566} 3168}
… …
3569/*----------------------------------------------------------------------*/ 3171/*----------------------------------------------------------------------*/
3570/* 3172/*
3571 * get input up until STRING TERMINATOR (or BEL) 3173 * get input up until STRING TERMINATOR (or BEL)
3572 * ends_how is terminator used. returned input must be free()'d 3174 * ends_how is terminator used. returned input must be free()'d
3573 */ 3175 */
3574unsigned char * 3176char *
3575rxvt_term::get_to_st (unicode_t &ends_how) 3177rxvt_term::get_to_st (unicode_t &ends_how)
3576{ 3178{
3577 unicode_t ch; 3179 unicode_t ch;
3578 bool seen_esc = false; 3180 bool seen_esc = false;
3579 unsigned int n = 0; 3181 unsigned int n = 0;
… …
3593 seen_esc = true; 3195 seen_esc = true;
3594 continue; 3196 continue;
3595 } 3197 }
3596 else if (ch == C0_BEL || ch == CHAR_ST) 3198 else if (ch == C0_BEL || ch == CHAR_ST)
3597 break; 3199 break;
3200 else if (ch == C0_SYN)
3201 ch = cmd_get8 ();
3598 else if (ch < 0x20) 3202 else if (ch < 0x20)
3599 return NULL; /* other control character - exit */ 3203 return NULL; /* other control character - exit */
3600 3204
3601 seen_esc = false; 3205 seen_esc = false;
3602 3206
3603 if (n >= STRING_MAX - 1) 3207 if (n >= STRING_MAX - 1)
3604 // stop at some sane length 3208 // stop at some sane length
3605 return NULL; 3209 return NULL;
3606 3210
3607 if (ch == C0_SYN)
3608 string[n++] = cmd_get8 ();
3609 else
3610 string[n++] = ch; 3211 string[n++] = ch;
3611 } 3212 }
3612 3213
3613 string[n++] = '\0'; 3214 string[n++] = '\0';
3614 3215
3615 ends_how = (ch == 0x5c ? C0_ESC : ch); 3216 ends_how = (ch == 0x5c ? C0_ESC : ch);
3616 3217
3617 return (unsigned char *)rxvt_wcstombs (string); 3218 return rxvt_wcstombs (string);
3618} 3219}
3619 3220
3620/*----------------------------------------------------------------------*/ 3221/*----------------------------------------------------------------------*/
3621/* 3222/*
3622 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3223 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3623 */ 3224 */
3624void 3225void
3625rxvt_term::process_dcs_seq () 3226rxvt_term::process_dcs_seq ()
3626{ 3227{
3627 unsigned char *s; 3228 char *s;
3628 unicode_t eh; 3229 unicode_t eh;
3629 3230
3630 /* 3231 /*
3631 * Not handled yet 3232 * Not handled yet
3632 */ 3233 */
… …
3651 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3252 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3652 arg = arg * 10 + (ch - '0'); 3253 arg = arg * 10 + (ch - '0');
3653 3254
3654 if (ch == ';') 3255 if (ch == ';')
3655 { 3256 {
3656 unsigned char *s = get_to_st (eh); 3257 char *s = get_to_st (eh);
3657 3258
3658 if (s) 3259 if (s)
3659 { 3260 {
3660 process_xterm_seq (arg, (char *)s, eh); 3261 process_xterm_seq (arg, s, eh);
3661 free (s); 3262 free (s);
3662 } 3263 }
3663 } 3264 }
3664} 3265}
3665 3266
3666void 3267void
3667rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3268rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3668{ 3269{
3669 if (str[0] == '?' && !str[1]) 3270 if (str[0] == '?' && !str[1])
3670 { 3271 {
3671 unsigned short r, g, b; 3272 rgba c;
3672 pix_colors_focused[color].get (display, r, g, b); 3273 pix_colors_focused[color].get (c);
3274
3275#if XFT
3276 if (c.a != rgba::MAX_CC)
3277 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3278 else
3279#endif
3673 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3280 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3674 } 3281 }
3675 else 3282 else
3676 set_window_color (color, str); 3283 set_window_color (color, str);
3677} 3284}
3678 3285
3679/* 3286/*
3680 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3287 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3681 */ 3288 */
3682void 3289void
3683rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3290rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3684{ 3291{
3685 int changed = 0;
3686 int color; 3292 int color;
3687 char *buf, *name; 3293 char *buf, *name;
3688 bool query = str[0] == '?' && !str[1]; 3294 bool query = str[0] == '?' && !str[1];
3689 int saveop = op; 3295 int saveop = op;
3690 dDisp; 3296
3297 dLocal (Display *, dpy);
3691 3298
3692 assert (str != NULL); 3299 assert (str != NULL);
3300
3301 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3302 return;
3303
3693 switch (op) 3304 switch (op)
3694 { 3305 {
3695 case XTerm_name: 3306 case XTerm_name:
3696 set_title (str); 3307 set_title (str);
3697 /* FALLTHROUGH */ 3308 /* FALLTHROUGH */
… …
3711 unsigned long bytes_after; 3322 unsigned long bytes_after;
3712 unsigned char *value = 0; 3323 unsigned char *value = 0;
3713 const char *str = ""; 3324 const char *str = "";
3714 3325
3715 if (prop 3326 if (prop
3716 && XGetWindowProperty (disp, parent[0], 3327 && XGetWindowProperty (dpy, parent[0],
3717 prop, 0, 1<<16, 0, AnyPropertyType, 3328 prop, 0, 1<<16, 0, AnyPropertyType,
3718 &actual_type, &actual_format, 3329 &actual_type, &actual_format,
3719 &nitems, &bytes_after, &value) == Success 3330 &nitems, &bytes_after, &value) == Success
3720 && actual_type != None 3331 && actual_type != None
3721 && actual_format == 8) 3332 && actual_format == 8)
3722 str = (const char *)(value); 3333 str = (const char *)(value);
3723 3334
3724 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3335 tt_printf ("\033]%d;%s%c", op, str, resp);
3725 3336
3726 XFree (value); 3337 XFree (value);
3727 } 3338 }
3728 else 3339 else
3729 { 3340 {
… …
3733 { 3344 {
3734 *eq = 0; 3345 *eq = 0;
3735 set_utf8_property (display->atom (str), eq + 1); 3346 set_utf8_property (display->atom (str), eq + 1);
3736 } 3347 }
3737 else 3348 else
3738 XDeleteProperty (disp, parent[0], 3349 XDeleteProperty (dpy, parent[0],
3739 display->atom (str)); 3350 display->atom (str));
3740 } 3351 }
3741 break; 3352 break;
3742 3353
3743 case XTerm_Color: 3354 case XTerm_Color:
… …
3745 { 3356 {
3746 if ((name = strchr (buf, ';')) == NULL) 3357 if ((name = strchr (buf, ';')) == NULL)
3747 break; 3358 break;
3748 3359
3749 *name++ = '\0'; 3360 *name++ = '\0';
3750 color = atoi (buf); 3361 color = atoi (buf) + minCOLOR;
3751 3362
3752 if (color < 0 || color >= TOTAL_COLORS) 3363 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3753 break; 3364 break;
3754 3365
3755 if ((buf = strchr (name, ';')) != NULL) 3366 if ((buf = strchr (name, ';')) != NULL)
3756 *buf++ = '\0'; 3367 *buf++ = '\0';
3757 3368
3758 if (name[0] == '?' && !name[1]) 3369 process_color_seq (op, color, name, resp);
3759 {
3760 unsigned short r, g, b;
3761 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3762 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3763 }
3764 else
3765 set_window_color (color + minCOLOR, name);
3766 } 3370 }
3767 break; 3371 break;
3372 case Rxvt_restoreFG:
3768 case XTerm_Color00: 3373 case XTerm_Color00:
3769 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3374 process_color_seq (op, Color_fg, str, resp);
3770 break; 3375 break;
3376 case Rxvt_restoreBG:
3771 case XTerm_Color01: 3377 case XTerm_Color01:
3772 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3378 process_color_seq (op, Color_bg, str, resp);
3773 break; 3379 break;
3774#ifndef NO_CURSORCOLOR 3380#ifndef NO_CURSORCOLOR
3775 case XTerm_Color_cursor: 3381 case XTerm_Color_cursor:
3776 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3382 process_color_seq (op, Color_cursor, str, resp);
3777 break; 3383 break;
3778#endif 3384#endif
3779 case XTerm_Color_pointer_fg: 3385 case XTerm_Color_pointer_fg:
3780 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3386 process_color_seq (op, Color_pointer_fg, str, resp);
3781 break; 3387 break;
3782 case XTerm_Color_pointer_bg: 3388 case XTerm_Color_pointer_bg:
3783 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3389 process_color_seq (op, Color_pointer_bg, str, resp);
3784 break; 3390 break;
3785#ifndef NO_BOLD_UNDERLINE_REVERSE 3391#ifndef NO_BOLD_UNDERLINE_REVERSE
3786 case XTerm_Color_BD:
3787 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3788 break;
3789 case XTerm_Color_UL:
3790 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3791 break;
3792 case XTerm_Color_RV: 3392 case XTerm_Color_RV:
3793 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3393 process_color_seq (op, Color_RV, str, resp);
3394 break;
3395 case Rxvt_Color_BD:
3396 case URxvt_Color_BD:
3397 process_color_seq (op, Color_BD, str, resp);
3398 break;
3399 case Rxvt_Color_UL:
3400 case URxvt_Color_UL:
3401 process_color_seq (op, Color_UL, str, resp);
3794 break; 3402 break;
3795 case URxvt_Color_IT: 3403 case URxvt_Color_IT:
3796 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3404 process_color_seq (op, Color_IT, str, resp);
3797 break; 3405 break;
3798#endif 3406#endif
3799#if TRANSPARENT && TINTING 3407 case URxvt_Color_border:
3408 process_color_seq (op, Color_border, str, resp);
3409 break;
3410#if ENABLE_TRANSPARENCY
3800 case URxvt_Color_tint: 3411 case URxvt_Color_tint:
3801 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3412 process_color_seq (op, Color_tint, str, resp);
3802 check_our_parents (); 3413 {
3803 if (am_transparent) 3414 bool changed = false;
3804 want_full_refresh = want_refresh = 1;
3805 break;
3806#endif
3807 3415
3416 if (ISSET_PIXCOLOR (Color_tint))
3417 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3418 else
3419 changed = bgPixmap.unset_tint ();
3420
3421 if (changed)
3422 update_background ();
3423 }
3424
3425 break;
3426#endif
3427
3428#if BG_IMAGE_FROM_FILE
3808 case XTerm_Pixmap: 3429 case Rxvt_Pixmap:
3809 if (*str != ';') 3430 if (!strcmp (str, "?"))
3810 { 3431 {
3811#if XPM_BACKGROUND 3432 char str[256];
3812 scale_pixmap (""); /* reset to default scaling */ 3433
3813 set_bgPixmap (str); /* change pixmap */ 3434 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3814#endif 3435 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3815 scr_touch (true); 3436 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3437 process_xterm_seq (XTerm_title, str, CHAR_ST);
3816 } 3438 }
3817 while ((str = strchr (str, ';')) != NULL) 3439 else
3818 { 3440 {
3441 int changed = 0;
3442
3443 if (*str != ';')
3444 {
3445 /* reset to default scaling :*/
3446 bgPixmap.unset_geometry ();
3447 if (bgPixmap.set_file (str)) /* change pixmap */
3448 changed++;
3449 str = strchr (str, ';');
3450 if (str == NULL)
3451 bgPixmap.set_defaultGeometry ();
3452 }
3453
3454 while (str)
3455 {
3819 str++; 3456 str++;
3820#if XPM_BACKGROUND 3457 if (bgPixmap.set_geometry (str))
3821 changed += scale_pixmap (str); 3458 changed++;
3822#endif 3459 str = strchr (str, ';');
3460 }
3461
3462 if (changed)
3463 update_background ();
3823 } 3464 }
3824
3825 if (changed)
3826 {
3827#ifdef XPM_BACKGROUND
3828 resize_pixmap ();
3829#endif
3830 scr_touch (true);
3831 }
3832 break; 3465 break;
3833 3466#endif
3834 case XTerm_restoreFG:
3835 set_window_color (Color_fg, str);
3836 break;
3837 case XTerm_restoreBG:
3838 set_window_color (Color_bg, str);
3839 break;
3840 3467
3841 case XTerm_logfile: 3468 case XTerm_logfile:
3842 // TODO, when secure mode? 3469 // TODO, when secure mode?
3843 break; 3470 break;
3844 3471
3845#ifdef MENUBAR
3846 case URxvt_Menu:
3847 if (options & Opt_insecure)
3848 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3849 break;
3850#endif
3851#if 0 3472#if 0
3852 case XTerm_dumpscreen: /* no error notices */ 3473 case Rxvt_dumpscreen: /* no error notices */
3853 { 3474 {
3854 int fd; 3475 int fd;
3855 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3476 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3856 { 3477 {
3857 scr_dump (fd); 3478 scr_dump (fd);
… …
3868 case URxvt_italicFont: 3489 case URxvt_italicFont:
3869 case URxvt_boldItalicFont: 3490 case URxvt_boldItalicFont:
3870#endif 3491#endif
3871 if (query) 3492 if (query)
3872 tt_printf ("\33]%d;%-.250s%c", saveop, 3493 tt_printf ("\33]%d;%-.250s%c", saveop,
3873 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3494 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3874 ? fontset[op - URxvt_font]->fontdesc : "", 3495 ? fontset[op - URxvt_font]->fontdesc : "",
3875 resp); 3496 resp);
3876 else 3497 else
3877 { 3498 {
3878 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3499 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3881 allocated.push_back ((void *)res); 3502 allocated.push_back ((void *)res);
3882 set_fonts (); 3503 set_fonts ();
3883 } 3504 }
3884 break; 3505 break;
3885 3506
3886#if ENABLE_FRILLS 3507 case URxvt_version:
3508 if (query)
3509 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3510 op,
3511 rs[Rs_name], VERSION[0], VERSION[2],
3512 resp);
3513 break;
3514
3515#if !ENABLE_MINIMAL
3887 case URxvt_locale: 3516 case URxvt_locale:
3888 if (query) 3517 if (query)
3889 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3518 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3890 else 3519 else
3891 { 3520 {
3892 set_locale (str); 3521 set_locale (str);
3893 pty.set_utf8_mode (enc_utf8); 3522 pty->set_utf8_mode (enc_utf8);
3894 init_xlocale (); 3523 init_xlocale ();
3895 } 3524 }
3896 break; 3525 break;
3897 3526
3898 case URxvt_view_up: 3527 case URxvt_view_up:
3899 case URxvt_view_down: 3528 case URxvt_view_down:
3529 {
3900 int lines = atoi (str); 3530 int lines = atoi (str);
3901 3531
3902 if (lines) 3532 if (lines)
3903 scr_page (op == URxvt_view_up ? UP : DN, lines); 3533 scr_page (op == URxvt_view_up ? UP : DN, lines);
3904 else 3534 else
3905 {
3906 scr_erase_savelines (); 3535 scr_erase_savelines ();
3907 } 3536 }
3908 3537
3538 break;
3539#endif
3540
3541#if ENABLE_PERL
3542 case URxvt_perl:
3543 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3909 break; 3544 break;
3910#endif 3545#endif
3911 } 3546 }
3912} 3547}
3913/*----------------------------------------------------------------------*/ 3548/*----------------------------------------------------------------------*/
… …
3936 { 3571 {
3937 if (mode == 'r') 3572 if (mode == 'r')
3938 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3573 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3939 else 3574 else
3940 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3575 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3941 PrivMode (state, bit); 3576 set_privmode (bit, state);
3942 } 3577 }
3943 3578
3944 return state; 3579 return state;
3945} 3580}
3946 3581
3947/* we're not using priv _yet_ */ 3582/* we're not using priv _yet_ */
3948void 3583void
3949rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3584rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3950{ 3585{
3951 unsigned int i, j; 3586 unsigned int i, j;
3952 int state; 3587 int state;
3953 3588
3954 static const struct 3589 static const struct
3955 { 3590 {
3956 const int argval; 3591 const int argval;
3957 const unsigned long bit; 3592 const unsigned long bit;
3958 }
3959
3960 argtopriv[] = { 3593 } argtopriv[] = {
3961 { 1, PrivMode_aplCUR }, 3594 { 1, PrivMode_aplCUR }, // DECCKM
3962 { 2, PrivMode_vt52 }, 3595 { 2, PrivMode_vt52 },
3963 { 3, PrivMode_132 }, 3596 { 3, PrivMode_132 }, // DECCOLM
3964 { 4, PrivMode_smoothScroll }, 3597 { 4, PrivMode_smoothScroll }, // DECSCLM
3965 { 5, PrivMode_rVideo }, 3598 { 5, PrivMode_rVideo }, // DECSCNM
3966 { 6, PrivMode_relOrigin }, 3599 { 6, PrivMode_relOrigin }, // DECOM
3967 { 7, PrivMode_Autowrap }, 3600 { 7, PrivMode_Autowrap }, // DECAWM
3968 // 8, bi-directional support mode 3601 // 8, auto-repeat keys // DECARM
3969 { 9, PrivMode_MouseX10 }, 3602 { 9, PrivMode_MouseX10 },
3970#ifdef menuBar_esc 3603 // 18 end FF to printer after print screen
3971 { menuBar_esc, PrivMode_menuBar }, 3604 // 19 Print screen prints full screen/scorll region
3972#endif
3973 // 18, 19 printing-related
3974 { 25, PrivMode_VisibleCursor }, 3605 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3975#ifdef scrollBar_esc 3606#ifdef scrollBar_esc
3976 { scrollBar_esc, PrivMode_scrollBar }, 3607 { scrollBar_esc, PrivMode_scrollBar },
3977#endif 3608#endif
3978 { 35, PrivMode_ShiftKeys }, // rxvt extension 3609 { 35, PrivMode_ShiftKeys }, // rxvt extension
3610 // 38, tektronix mode // DECTEK
3979 { 40, PrivMode_132OK }, 3611 { 40, PrivMode_132OK },
3980 // 41 xterm more fixes NYI 3612 // 41 xterm more fixes NYI
3981 // 45 margin bell NYI 3613 // 45 margin bell NYI
3982 // 46 start logging 3614 // 46 start logging
3983 { 47, PrivMode_Screen }, 3615 { 47, PrivMode_Screen },
3984 { 66, PrivMode_aplKP }, 3616 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3985#ifndef NO_BACKSPACE_KEY 3617#ifndef NO_BACKSPACE_KEY
3986 { 67, PrivMode_BackSpace }, 3618 { 67, PrivMode_BackSpace }, // DECBKM
3987#endif 3619#endif
3988 { 1000, PrivMode_MouseX11 }, 3620 { 1000, PrivMode_MouseX11 },
3989 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3621 { 1002, PrivMode_MouseBtnEvent },
3990 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3622 { 1003, PrivMode_MouseAnyEvent },
3991 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3992 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3623 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3993 { 1011, PrivMode_Keypress }, // rxvt extension 3624 { 1011, PrivMode_Keypress }, // rxvt extension
3994 // 1035 enable modifiers for alt, numlock NYI 3625 // 1035 enable modifiers for alt, numlock NYI
3995 // 1036 send ESC for meta keys NYI 3626 // 1036 send ESC for meta keys NYI
3996 // 1037 send DEL for keypad delete NYI 3627 // 1037 send DEL for keypad delete NYI
3997 { 1047, PrivMode_Screen }, 3628 { 1047, PrivMode_Screen },
3998 // 1048 save and restore cursor 3629 // 1048 save and restore cursor
3999 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3630 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4000 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3631 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3632 { 2004, PrivMode_BracketPaste },
4001 }; 3633 };
4002 3634
4003 if (nargs == 0) 3635 if (nargs == 0)
4004 return; 3636 return;
4005 3637
… …
4022 } 3654 }
4023 3655
4024 /* extra handling for values with state unkept */ 3656 /* extra handling for values with state unkept */
4025 switch (arg[i]) 3657 switch (arg[i])
4026 { 3658 {
3659#if ENABLE_STYLES
3660 case 1021:
3661 set_option (Opt_intensityStyles, mode);
3662
3663 scr_touch (true);
3664 break;
3665#endif
4027 case 1048: /* alternative cursor save */ 3666 case 1048: /* alternative cursor save */
4028 case 1049:
4029 if (options & Opt_secondaryScreen) 3667 if (option (Opt_secondaryScreen))
4030 if (mode == 0) 3668 if (mode == 0)
4031 scr_cursor (RESTORE); 3669 scr_cursor (RESTORE);
4032 else if (mode == 1) 3670 else if (mode == 1)
4033 scr_cursor (SAVE); 3671 scr_cursor (SAVE);
4034 break; 3672 break;
… …
4042 case 2: /* VT52 mode */ 3680 case 2: /* VT52 mode */
4043 /* oddball mode. should be set regardless of set/reset 3681 /* oddball mode. should be set regardless of set/reset
4044 * parameter. Return from VT52 mode with an ESC < from 3682 * parameter. Return from VT52 mode with an ESC < from
4045 * within VT52 mode 3683 * within VT52 mode
4046 */ 3684 */
4047 PrivMode (1, PrivMode_vt52); 3685 set_privmode (PrivMode_vt52, 1);
4048 break; 3686 break;
4049 case 3: /* 80/132 */ 3687 case 3: /* 80/132 */
4050 if (priv_modes & PrivMode_132OK) 3688 if (priv_modes & PrivMode_132OK)
4051 set_widthheight (((state ? 132 : 80) * fwidth), height); 3689 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4052 break; 3690 break;
4053 case 4: /* smooth scrolling */ 3691 case 4: /* smooth scrolling */
4054 if (state)
4055 options &= ~Opt_jumpScroll;
4056 else
4057 options |= Opt_jumpScroll; 3692 set_option (Opt_jumpScroll, !state);
4058 break; 3693 break;
4059 case 5: /* reverse video */ 3694 case 5: /* reverse video */
4060 scr_rvideo_mode (state); 3695 scr_rvideo_mode (state);
4061 break; 3696 break;
4062 case 6: /* relative/absolute origins */ 3697 case 6: /* relative/absolute origins */
… …
4066 scr_autowrap (state); 3701 scr_autowrap (state);
4067 break; 3702 break;
4068 /* case 8: - auto repeat, can't do on a per window basis */ 3703 /* case 8: - auto repeat, can't do on a per window basis */
4069 case 9: /* X10 mouse reporting */ 3704 case 9: /* X10 mouse reporting */
4070 if (state) /* orthogonal */ 3705 if (state) /* orthogonal */
4071 priv_modes &= ~PrivMode_MouseX11; 3706 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4072 break; 3707 break;
4073#ifdef menuBar_esc
4074 case menuBar_esc:
4075#ifdef MENUBAR
4076 map_menuBar (state);
4077#endif
4078 break;
4079#endif
4080#ifdef scrollBar_esc 3708#ifdef scrollBar_esc
4081 case scrollBar_esc: 3709 case scrollBar_esc:
4082 if (scrollbar_mapping (state)) 3710 if (scrollBar.map (state))
4083 { 3711 {
4084 resize_all_windows (0, 0, 0); 3712 resize_all_windows (0, 0, 0);
4085 scr_touch (true); 3713 scr_touch (true);
4086 } 3714 }
4087 break; 3715 break;
… …
4096 break; 3724 break;
4097 /* case 66: - application key pad */ 3725 /* case 66: - application key pad */
4098 /* case 67: - backspace key */ 3726 /* case 67: - backspace key */
4099 case 1000: /* X11 mouse reporting */ 3727 case 1000: /* X11 mouse reporting */
4100 if (state) /* orthogonal */ 3728 if (state) /* orthogonal */
4101 priv_modes &= ~PrivMode_MouseX10; 3729 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4102 break; 3730 break;
4103#if 0
4104 case 1001: 3731 case 1002:
4105 break; /* X11 mouse highlighting */ 3732 case 1003:
4106#endif 3733 if (state)
3734 {
3735 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3736 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3737 vt_emask_mouse = PointerMotionMask;
3738 }
3739 else
3740 vt_emask_mouse = NoEventMask;
3741
3742 vt_select_input ();
3743 break;
4107 case 1010: /* scroll to bottom on TTY output inhibit */ 3744 case 1010: /* scroll to bottom on TTY output inhibit */
4108 if (state)
4109 options &= ~Opt_scrollTtyOutput;
4110 else
4111 options |= Opt_scrollTtyOutput; 3745 set_option (Opt_scrollTtyOutput, !state);
4112 break; 3746 break;
4113 case 1011: /* scroll to bottom on key press */ 3747 case 1011: /* scroll to bottom on key press */
4114 if (state)
4115 options |= Opt_scrollTtyKeypress; 3748 set_option (Opt_scrollTtyKeypress, state);
4116 else
4117 options &= ~Opt_scrollTtyKeypress;
4118 break; 3749 break;
4119 case 1047: /* secondary screen w/ clearing last */ 3750 case 1047: /* secondary screen w/ clearing last */
4120 if (options & Opt_secondaryScreen) 3751 if (option (Opt_secondaryScreen))
4121 if (current_screen != PRIMARY) 3752 if (!state)
4122 scr_erase_screen (2); 3753 scr_erase_screen (2);
3754
4123 scr_change_screen (state); 3755 scr_change_screen (state);
4124 break; 3756 break;
4125 case 1049: /* secondary screen w/ clearing first */ 3757 case 1049: /* secondary screen w/ clearing first */
3758 if (option (Opt_secondaryScreen))
3759 if (state)
3760 scr_cursor (SAVE);
3761
4126 scr_change_screen (state); 3762 scr_change_screen (state);
3763
4127 if (options & Opt_secondaryScreen) 3764 if (option (Opt_secondaryScreen))
4128 if (current_screen != PRIMARY) 3765 if (state)
4129 scr_erase_screen (2); 3766 scr_erase_screen (2);
3767 else
3768 scr_cursor (RESTORE);
4130 break; 3769 break;
4131 default: 3770 default:
4132 break; 3771 break;
4133 } 3772 }
4134 } 3773 }
… …
4260 scr_color (Color_bg, Color_bg); 3899 scr_color (Color_bg, Color_bg);
4261 break; 3900 break;
4262 3901
4263 //case 50: // not variable spacing 3902 //case 50: // not variable spacing
4264 3903
4265#ifndef NO_BRIGHTCOLOR 3904#if !ENABLE_MINIMAL
4266 case 90: 3905 case 90:
4267 case 91: /* set bright fg color */ 3906 case 91: /* set bright fg color */
4268 case 92: 3907 case 92:
4269 case 93: 3908 case 93:
4270 case 94: 3909 case 94:
… …
4282 case 106: 3921 case 106:
4283 case 107: 3922 case 107:
4284 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3923 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4285 break; 3924 break;
4286#endif 3925#endif
4287
4288 } 3926 }
4289 } 3927 }
4290} 3928}
4291/*}}} */ 3929/*}}} */
4292 3930
… …
4295rxvt_term::process_graphics () 3933rxvt_term::process_graphics ()
4296{ 3934{
4297 unicode_t ch, cmd = cmd_getc (); 3935 unicode_t ch, cmd = cmd_getc ();
4298 3936
4299 if (cmd == 'Q') 3937 if (cmd == 'Q')
3938 {
4300 { /* query graphics */ 3939 /* query graphics */
4301 tt_printf ("\033G0\012"); /* no graphics */ 3940 tt_printf ("\033G0\012"); /* no graphics */
4302 return; 3941 return;
4303 } 3942 }
4304 /* swallow other graphics sequences until terminating ':' */ 3943 /* swallow other graphics sequences until terminating ':' */
4305 do 3944 do
… …
4316 */ 3955 */
4317void 3956void
4318rxvt_term::tt_printf (const char *fmt,...) 3957rxvt_term::tt_printf (const char *fmt,...)
4319{ 3958{
4320 va_list arg_ptr; 3959 va_list arg_ptr;
4321 unsigned char buf[256]; 3960 char buf[256];
4322 3961
4323 va_start (arg_ptr, fmt); 3962 va_start (arg_ptr, fmt);
4324 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3963 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4325 va_end (arg_ptr); 3964 va_end (arg_ptr);
4326 tt_write (buf, strlen (buf)); 3965 tt_write (buf, strlen (buf));
… …
4331 * or generated by us in response to a query ESC sequence. 3970 * or generated by us in response to a query ESC sequence.
4332 */ 3971 */
4333const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3972const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4334 3973
4335void 3974void
4336rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3975rxvt_term::tt_write (const char *data, unsigned int len)
4337{ 3976{
3977 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3978 return;
3979
3980 if (pty->pty < 0)
3981 return;
3982
4338 if (v_buflen == 0) 3983 if (v_buflen == 0)
4339 { 3984 {
4340 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3985 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4341 3986
4342 if ((unsigned int)written == len) 3987 if ((unsigned int)written == len)
4343 return; 3988 return;
4344 3989
4345 data += written; 3990 data += written;
4346 len -= written; 3991 len -= written;
4347 } 3992 }
4348 3993
4349 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 3994 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4350 3995
4351 memcpy (v_buffer + v_buflen, data, len); 3996 memcpy (v_buffer + v_buflen, data, len);
4352 v_buflen += len; 3997 v_buflen += len;
4353 3998
4354 pty_ev.set (EVENT_READ | EVENT_WRITE); 3999 pty_ev.set (ev::READ | ev::WRITE);
4355} 4000}
4356 4001
4357void rxvt_term::pty_write () 4002void rxvt_term::pty_write ()
4358{ 4003{
4359 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4004 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4360 4005
4361 if (written > 0) 4006 if (written > 0)
4362 { 4007 {
4363 v_buflen -= written; 4008 v_buflen -= written;
4364 4009
4365 if (v_buflen == 0) 4010 if (v_buflen == 0)
4366 { 4011 {
4367 free (v_buffer); 4012 free (v_buffer);
4368 v_buffer = 0; 4013 v_buffer = 0;
4369 v_buflen = 0;
4370 4014
4371 pty_ev.set (EVENT_READ); 4015 pty_ev.set (ev::READ);
4372 return; 4016 return;
4373 } 4017 }
4374 4018
4375 memmove (v_buffer, v_buffer + written, v_buflen); 4019 memmove (v_buffer, v_buffer + written, v_buflen);
4376 } 4020 }
4377 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4021 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4378 // original code just ignores this... 4022 pty_ev.set (ev::READ);
4379 destroy ();
4380} 4023}
4381 4024
4382/*----------------------- end-of-file (C source) -----------------------*/ 4025/*----------------------- end-of-file (C source) -----------------------*/
4383 4026

Diff Legend

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