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.202 by root, Sat Mar 12 23:35:14 2005 UTC vs.
Revision 1.431 by root, Tue Feb 24 11:51:51 2009 UTC

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

Diff Legend

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