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

Diff Legend

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