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

Diff Legend

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