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

Diff Legend

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