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

Diff Legend

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