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.93 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.490 by sf-exg, Sat Jul 9 18:23:48 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 im_send_spot ();
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 // don't understand this, so commented it out 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, 1560 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1187 Expose, 1561 ;
1188 &unused_event)) ; 1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1189 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1563 ;
1190 GraphicsExpose, 1564
1191 &unused_event)) ; 1565 if (scrollBar.state && ev.xany.window == scrollBar.win)
1192 if (isScrollbarWindow (ev.xany.window))
1193 { 1566 {
1194 scrollBar.setIdle (); 1567 scrollBar.state = STATE_IDLE;
1195 scrollbar_show (0); 1568 scrollBar.show (0);
1196 } 1569 }
1197#ifdef MENUBAR
1198 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1199 menubar_expose ();
1200#endif
1201 } 1570 }
1202 break; 1571 break;
1203 1572
1204 case MotionNotify: 1573 case MotionNotify:
1205#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1206 if (hidden_pointer) 1575 if (hidden_pointer)
1207 pointer_unblank (); 1576 pointer_unblank ();
1208#endif 1577#endif
1209#if MENUBAR 1578 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1210 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)
1211 { 1585 {
1212 menubar_control (ev.xbutton); 1586 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1213 break; 1587 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1214 } 1588 ; // nop
1215#endif
1216 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1217 break;
1218
1219 if (ev.xany.window == TermWin.vt)
1220 {
1221 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1589 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1222 { 1590 {
1223 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1591 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1224 ; 1592 ;
1225 1593
1226 XQueryPointer (display->display, TermWin.vt, 1594 XQueryPointer (dpy, vt,
1227 &unused_root, &unused_child, 1595 &unused_root, &unused_child,
1228 &unused_root_x, &unused_root_y, 1596 &unused_root_x, &unused_root_y,
1229 & (ev.xbutton.x), & (ev.xbutton.y), 1597 &ev.xbutton.x, &ev.xbutton.y,
1230 &unused_mask); 1598 &ev.xbutton.state);
1231#ifdef MOUSE_THRESHOLD 1599#ifdef MOUSE_THRESHOLD
1232 /* deal with a `jumpy' mouse */ 1600 /* deal with a `jumpy' mouse */
1233 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1601 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1234 { 1602 {
1235#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
1236 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1612 selection_extend (ev.xbutton.x, ev.xbutton.y,
1237 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1613 ev.xbutton.state & Button3Mask ? 2 : 0);
1614
1238#ifdef SELECTION_SCROLLING 1615#ifdef SELECTION_SCROLLING
1239 if (ev.xbutton.y < TermWin.int_bwidth 1616 if (ev.xbutton.y < int_bwidth
1240 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1617 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1241 { 1618 {
1242 int dist; 1619 int dist;
1243
1244 pending_scroll_selection=1;
1245 1620
1246 /* don't clobber the current delay if we are 1621 /* don't clobber the current delay if we are
1247 * already in the middle of scrolling. 1622 * already in the middle of scrolling.
1248 */ 1623 */
1249 if (scroll_selection_delay<=0) 1624 if (!sel_scroll_ev.is_active ())
1250 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1625 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1251 1626
1252 /* save the event params so we can highlight 1627 /* save the event params so we can highlight
1253 * the selection in the pending-scroll loop 1628 * the selection in the pending-scroll loop
1254 */ 1629 */
1255 selection_save_x=ev.xbutton.x; 1630 selection_save_x = ev.xbutton.x;
1256 selection_save_y=ev.xbutton.y; 1631 selection_save_y = ev.xbutton.y;
1257 selection_save_state=
1258 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1632 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1259 1633
1260 /* calc number of lines to scroll */ 1634 /* calc number of lines to scroll */
1261 if (ev.xbutton.y<TermWin.int_bwidth) 1635 if (ev.xbutton.y < int_bwidth)
1262 { 1636 {
1263 scroll_selection_dir = UP; 1637 scroll_selection_dir = UP;
1264 dist = TermWin.int_bwidth - ev.xbutton.y; 1638 dist = int_bwidth - ev.xbutton.y;
1265 } 1639 }
1266 else 1640 else
1267 { 1641 {
1268 scroll_selection_dir = DN; 1642 scroll_selection_dir = DN;
1269 dist = ev.xbutton.y - 1643 dist = ev.xbutton.y - (int_bwidth + height);
1270 (TermWin.int_bwidth + TermWin.height);
1271 } 1644 }
1645
1272 scroll_selection_lines= (Pixel2Height (dist)/ 1646 scroll_selection_lines = Pixel2Height (dist)
1273 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1647 / SELECTION_SCROLL_LINE_SPEEDUP
1648 + 1;
1274 MIN_IT (scroll_selection_lines, 1649 min_it (scroll_selection_lines,
1275 SELECTION_SCROLL_MAX_LINES); 1650 SELECTION_SCROLL_MAX_LINES);
1276 } 1651 }
1277 else 1652 else
1278 { 1653 {
1279 /* we are within the text window, so we 1654 /* we are within the text window, so we
1280 * shouldn't be scrolling 1655 * shouldn't be scrolling
1281 */ 1656 */
1282 pending_scroll_selection = 0; 1657 sel_scroll_ev.stop();
1283 } 1658 }
1284#endif 1659#endif
1285#ifdef MOUSE_THRESHOLD 1660#ifdef MOUSE_THRESHOLD
1286
1287 } 1661 }
1288#endif 1662#endif
1289
1290 } 1663 }
1291 } 1664 }
1292 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1665 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1293 { 1666 {
1294 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1295 MotionNotify, &ev)) ; 1668 MotionNotify, &ev))
1669 ;
1670
1296 XQueryPointer (display->display, scrollBar.win, 1671 XQueryPointer (dpy, scrollBar.win,
1297 &unused_root, &unused_child, 1672 &unused_root, &unused_child,
1298 &unused_root_x, &unused_root_y, 1673 &unused_root_x, &unused_root_y,
1299 & (ev.xbutton.x), & (ev.xbutton.y), 1674 &ev.xbutton.x, &ev.xbutton.y,
1300 &unused_mask); 1675 &unused_mask);
1301 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1302 scrollbar_size ()); 1677 scrollBar.size ());
1303 scr_refresh (refresh_type);
1304 refresh_limit = 0; 1678 want_refresh = 1;
1305 scrollbar_show (1); 1679 scrollBar.show (1);
1306 } 1680 }
1307 break; 1681 break;
1308 } 1682 }
1309}
1310 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 im_set_position ();
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
1311void 1822void
1312rxvt_term::rootwin_cb (XEvent &ev) 1823rxvt_term::rootwin_cb (XEvent &ev)
1313{ 1824{
1314 SET_R (this); 1825 make_current ();
1315 SET_LOCALE (locale);
1316 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
1317 switch (ev.type) 1832 switch (ev.type)
1318 { 1833 {
1319 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 */
1320 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])
1321 { 1841 {
1322 if (ev.xproperty.state == PropertyNewValue) 1842 bg_set_root_pixmap ();
1323 selection_property (ev.xproperty.window, ev.xproperty.atom); 1843 update_background ();
1324 break;
1325 } 1844 }
1326#ifdef TRANSPARENT
1327 else
1328 {
1329 /*
1330 * if user used some Esetroot compatible prog to set the root bg,
1331 * use the property to determine the pixmap. We use it later on.
1332 */
1333 if (xa[XA_XROOTPMAPID] == 0)
1334 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1335 1845
1336 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1337 return;
1338 }
1339
1340 /* FALLTHROUGH */
1341 case ReparentNotify:
1342 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1343 want_full_refresh = 1;
1344 break; 1846 break;
1847 }
1345#endif 1848# endif
1346 } 1849
1850 refresh_check ();
1347} 1851}
1852#endif
1348 1853
1349void 1854void
1350rxvt_term::button_press (XButtonEvent &ev) 1855rxvt_term::button_press (XButtonEvent &ev)
1351{ 1856{
1352 int reportmode = 0, clickintime; 1857 int reportmode = 0, clickintime;
1353 1858
1354 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1859 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1860
1355 if (!bypass_keystate) 1861 if (!bypass_keystate)
1356 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1862 reportmode = !! (priv_modes & PrivMode_mouse_report);
1863
1357 /* 1864 /*
1358 * VT window processing of button press 1865 * VT window processing of button press
1359 */ 1866 */
1360 if (ev.window == TermWin.vt) 1867 if (ev.window == vt)
1361 { 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
1362 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1881 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1882
1363 if (reportmode) 1883 if (reportmode)
1364 { 1884 {
1365 /* mouse report from vt window */ 1885 /* mouse report from vt window */
1366 /* save the xbutton state (for ButtonRelease) */ 1886 /* save the xbutton state (for ButtonRelease) */
1367 MEvent.state = ev.state; 1887 MEvent.state = ev.state;
1368#ifdef MOUSE_REPORT_DOUBLECLICK 1888#ifdef MOUSE_REPORT_DOUBLECLICK
1369 if (ev.button == MEvent.button && clickintime) 1889 if (ev.button == MEvent.button && clickintime)
1370 { 1890 {
1371 /* same button, within alloted time */ 1891 /* same button, within allowed time */
1372 MEvent.clicks++; 1892 MEvent.clicks++;
1893
1373 if (MEvent.clicks > 1) 1894 if (MEvent.clicks > 1)
1374 { 1895 {
1375 /* only report double clicks */ 1896 /* only report double clicks */
1376 MEvent.clicks = 2; 1897 MEvent.clicks = 2;
1377 mouse_report (ev); 1898 mouse_report (ev);
… …
1389 mouse_report (ev); 1910 mouse_report (ev);
1390 } 1911 }
1391#else 1912#else
1392 MEvent.button = ev.button; 1913 MEvent.button = ev.button;
1393 mouse_report (ev); 1914 mouse_report (ev);
1394#endif /* MOUSE_REPORT_DOUBLECLICK */ 1915#endif /* MOUSE_REPORT_DOUBLECLICK */
1395 1916
1396 } 1917 }
1397 else 1918 else
1398 { 1919 {
1399 if (ev.button != MEvent.button) 1920 if (ev.button != MEvent.button)
1400 MEvent.clicks = 0; 1921 MEvent.clicks = 0;
1922
1401 switch (ev.button) 1923 switch (ev.button)
1402 { 1924 {
1403 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
1404 /* allow shift+left click to extend selection */ 1934 /* allow shift+left click to extend selection */
1405 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1935 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1406 { 1936 {
1407 if (MEvent.button == Button1 && clickintime) 1937 if (MEvent.button == Button1 && clickintime)
1408 selection_rotate (ev.x, ev.y); 1938 selection_rotate (ev.x, ev.y);
1409 else 1939 else
1410 selection_extend (ev.x, ev.y, 1); 1940 selection_extend (ev.x, ev.y, 1);
… …
1425 case Button3: 1955 case Button3:
1426 if (MEvent.button == Button3 && clickintime) 1956 if (MEvent.button == Button3 && clickintime)
1427 selection_rotate (ev.x, ev.y); 1957 selection_rotate (ev.x, ev.y);
1428 else 1958 else
1429 selection_extend (ev.x, ev.y, 1); 1959 selection_extend (ev.x, ev.y, 1);
1960
1430 MEvent.button = Button3; 1961 MEvent.button = Button3;
1431 break; 1962 break;
1432 } 1963 }
1433 } 1964 }
1965
1434 MEvent.time = ev.time; 1966 MEvent.time = ev.time;
1435 return; 1967 return;
1436 } 1968 }
1437 1969
1438 /* 1970 /*
1439 * Scrollbar window processing of button press 1971 * Scrollbar window processing of button press
1440 */ 1972 */
1441 if (isScrollbarWindow (ev.window)) 1973 if (scrollBar.state && ev.window == scrollBar.win)
1442 { 1974 {
1443 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;
1444 /* 1983 /*
1445 * Rxvt-style scrollbar: 1984 * Rxvt-style scrollbar:
1446 * move up if mouse is above slider 1985 * move up if mouse is above slider
1447 * move dn if mouse is below slider 1986 * move dn if mouse is below slider
1448 * 1987 *
… …
1457 /* 1996 /*
1458 * Mouse report disabled scrollbar: 1997 * Mouse report disabled scrollbar:
1459 * arrow buttons - send up/down 1998 * arrow buttons - send up/down
1460 * click on scrollbar - send pageup/down 1999 * click on scrollbar - send pageup/down
1461 */ 2000 */
1462 if ((scrollBar.style == R_SB_NEXT 2001 if (direction == UP)
1463 && scrollbarnext_upButton (ev.y))
1464 || (scrollBar.style == R_SB_RXVT
1465 && scrollbarrxvt_upButton (ev.y)))
1466 tt_printf ("\033[A"); 2002 tt_printf ("\033[A");
1467 else if ((scrollBar.style == R_SB_NEXT 2003 else if (direction == DN)
1468 && scrollbarnext_dnButton (ev.y))
1469 || (scrollBar.style == R_SB_RXVT
1470 && scrollbarrxvt_dnButton (ev.y)))
1471 tt_printf ("\033[B"); 2004 tt_printf ("\033[B");
1472 else 2005 else
1473 switch (ev.button) 2006 switch (ev.button)
1474 { 2007 {
1475 case Button2: 2008 case Button2:
… …
1482 tt_printf ("\033[5~"); 2015 tt_printf ("\033[5~");
1483 break; 2016 break;
1484 } 2017 }
1485 } 2018 }
1486 else 2019 else
1487#endif /* NO_SCROLLBAR_REPORT */ 2020#endif /* NO_SCROLLBAR_REPORT */
1488
1489 {
1490 char upordown = 0;
1491
1492 if (scrollBar.style == R_SB_NEXT)
1493 { 2021 {
1494 if (scrollbarnext_upButton (ev.y)) 2022 if (direction != NO_DIR)
1495 upordown = -1; /* up */
1496 else if (scrollbarnext_dnButton (ev.y))
1497 upordown = 1; /* down */
1498 }
1499 else if (scrollBar.style == R_SB_RXVT)
1500 {
1501 if (scrollbarrxvt_upButton (ev.y))
1502 upordown = -1; /* up */
1503 else if (scrollbarrxvt_dnButton (ev.y))
1504 upordown = 1; /* down */
1505 }
1506 if (upordown)
1507 { 2023 {
1508#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2024#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1509 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2025 if (!cont_scroll_ev.is_active ())
2026 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1510#endif 2027#endif
1511 if (scr_page (upordown < 0 ? UP : DN, 1)) 2028 if (scr_page (direction, 1))
1512 { 2029 {
1513 if (upordown < 0) 2030 if (direction == UP)
1514 scrollBar.setUp (); 2031 scrollBar.state = STATE_UP;
1515 else 2032 else
1516 scrollBar.setDn (); 2033 scrollBar.state = STATE_DOWN;
1517 } 2034 }
1518 } 2035 }
1519 else 2036 else
1520 switch (ev.button) 2037 switch (ev.button)
1521 { 2038 {
1522 case Button2: 2039 case Button2:
1523 switch (scrollbar_align) 2040 switch (scrollBar.align)
1524 { 2041 {
1525 case R_SB_ALIGN_TOP: 2042 case R_SB_ALIGN_TOP:
1526 csrO = 0; 2043 csrO = 0;
1527 break; 2044 break;
1528 case R_SB_ALIGN_CENTRE: 2045 case R_SB_ALIGN_CENTRE:
… …
1530 break; 2047 break;
1531 case R_SB_ALIGN_BOTTOM: 2048 case R_SB_ALIGN_BOTTOM:
1532 csrO = scrollBar.bot - scrollBar.top; 2049 csrO = scrollBar.bot - scrollBar.top;
1533 break; 2050 break;
1534 } 2051 }
2052
1535 if (scrollBar.style == R_SB_XTERM 2053 if (scrollBar.style == R_SB_XTERM
1536 || scrollbar_above_slider (ev.y) 2054 || scrollbar_above_slider (ev.y)
1537 || scrollbar_below_slider (ev.y)) 2055 || scrollbar_below_slider (ev.y))
1538 scr_move_to ( scrollbar_position (ev.y) - csrO, 2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
1539 scrollbar_size ()); 2057
1540 scrollBar.setMotion (); 2058 scrollBar.state = STATE_MOTION;
1541 break; 2059 break;
1542 2060
1543 case Button1: 2061 case Button1:
1544 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2062 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1545 csrO = ev.y - scrollBar.top; 2063 csrO = ev.y - scrollBar.top;
1546 /* FALLTHROUGH */ 2064 /* FALLTHROUGH */
1547 2065
1548 case Button3: 2066 case Button3:
1549 if (scrollBar.style != R_SB_XTERM) 2067 if (scrollBar.style != R_SB_XTERM)
1550 { 2068 {
1551 if (scrollbar_above_slider (ev.y)) 2069 if (scrollbar_above_slider (ev.y))
1552# ifdef RXVT_SCROLL_FULL 2070# ifdef RXVT_SCROLL_FULL
1553 scr_page (UP, TermWin.nrow - 1); 2071 scr_page (UP, nrow - 1);
1554# else 2072# else
1555 scr_page (UP, TermWin.nrow / 4); 2073 scr_page (UP, nrow / 4);
1556# endif 2074# endif
1557 else if (scrollbar_below_slider (ev.y)) 2075 else if (scrollbar_below_slider (ev.y))
1558# ifdef RXVT_SCROLL_FULL 2076# ifdef RXVT_SCROLL_FULL
1559 scr_page (DN, TermWin.nrow - 1); 2077 scr_page (DN, nrow - 1);
1560# else 2078# else
1561 scr_page (DN, TermWin.nrow / 4); 2079 scr_page (DN, nrow / 4);
1562# endif 2080# endif
1563 else 2081 else
1564 scrollBar.setMotion (); 2082 scrollBar.state = STATE_MOTION;
1565 } 2083 }
1566 else 2084 else
1567 { 2085 {
1568 scr_page ((ev.button == Button1 ? DN : UP), 2086 scr_page ((ev.button == Button1 ? DN : UP),
1569 (TermWin.nrow 2087 (nrow
1570 * scrollbar_position (ev.y) 2088 * scrollbar_position (ev.y)
1571 / scrollbar_size ())); 2089 / scrollBar.size ()));
1572 } 2090 }
2091
1573 break; 2092 break;
1574 } 2093 }
1575 } 2094 }
2095
1576 return; 2096 return;
1577 } 2097 }
1578#if MENUBAR
1579 /*
1580 * Menubar window processing of button press
1581 */
1582 if (isMenuBarWindow (ev.window))
1583 menubar_control (ev);
1584#endif
1585} 2098}
1586 2099
1587void 2100void
1588rxvt_term::button_release (XButtonEvent &ev) 2101rxvt_term::button_release (XButtonEvent &ev)
1589{ 2102{
1590 int reportmode = 0; 2103 int reportmode = 0;
1591 2104
1592 csrO = 0; /* reset csr Offset */ 2105 csrO = 0; /* reset csr Offset */
1593 if (!bypass_keystate) 2106 if (!bypass_keystate)
1594 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2107 reportmode = !! (priv_modes & PrivMode_mouse_report);
1595 2108
1596 if (scrollbar_isUpDn ()) 2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1597 { 2110 {
1598 scrollBar.setIdle (); 2111 scrollBar.state = STATE_IDLE;
1599 scrollbar_show (0); 2112 scrollBar.show (0);
1600#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1601 refresh_type &= ~SMOOTH_REFRESH;
1602#endif
1603
1604 } 2113 }
2114
1605#ifdef SELECTION_SCROLLING 2115#ifdef SELECTION_SCROLLING
1606 pending_scroll_selection=0; 2116 sel_scroll_ev.stop();
1607#endif 2117#endif
2118
1608 if (ev.window == TermWin.vt) 2119 if (ev.window == vt)
1609 { 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
1610 if (reportmode) 2130 if (reportmode)
1611 { 2131 {
1612 /* mouse report from vt window */ 2132 /* mouse report from vt window */
1613 /* don't report release of wheel "buttons" */ 2133 /* don't report release of wheel "buttons" */
1614 if (ev.button >= 4) 2134 if (ev.button >= 4)
… …
1625 mouse_report (ev); 2145 mouse_report (ev);
1626 } 2146 }
1627#else /* MOUSE_REPORT_DOUBLECLICK */ 2147#else /* MOUSE_REPORT_DOUBLECLICK */
1628 MEvent.button = AnyButton; 2148 MEvent.button = AnyButton;
1629 mouse_report (ev); 2149 mouse_report (ev);
1630#endif /* MOUSE_REPORT_DOUBLECLICK */ 2150#endif /* MOUSE_REPORT_DOUBLECLICK */
1631 return; 2151 return;
1632 } 2152 }
2153
1633 /* 2154 /*
1634 * dumb hack to compensate for the failure of click-and-drag 2155 * dumb hack to compensate for the failure of click-and-drag
1635 * when overriding mouse reporting 2156 * when overriding mouse reporting
1636 */ 2157 */
1637 if (PrivateModes & PrivMode_mouse_report 2158 if (priv_modes & PrivMode_mouse_report
1638 && bypass_keystate 2159 && bypass_keystate
1639 && ev.button == Button1 && MEvent.clicks <= 1) 2160 && ev.button == Button1 && MEvent.clicks <= 1)
1640 selection_extend (ev.x, ev.y, 0); 2161 selection_extend (ev.x, ev.y, 0);
1641 2162
1642 switch (ev.button) 2163 switch (ev.button)
1643 { 2164 {
1644 case Button1: 2165 case Button1:
1645 case Button3: 2166 case Button3:
1646 selection_make (ev.time); 2167 selection_make (ev.time);
1647 break; 2168 break;
2169
1648 case Button2: 2170 case Button2:
1649 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);
1650 break; 2173 break;
2174
1651#ifdef MOUSE_WHEEL 2175#ifdef MOUSE_WHEEL
1652 case Button4: 2176 case Button4:
1653 case Button5: 2177 case Button5:
1654 { 2178 {
1655 int i; 2179 int i;
1656 page_dirn v; 2180 page_dirn v;
1657 2181
1658 v = (ev.button == Button4) ? UP : DN; 2182 v = ev.button == Button4 ? UP : DN;
2183
1659 if (ev.state & ShiftMask) 2184 if (ev.state & ShiftMask)
1660 i = 1; 2185 i = 1;
1661 else if ((Options & Opt_mouseWheelScrollPage)) 2186 else if (option (Opt_mouseWheelScrollPage))
1662 i = TermWin.nrow - 1; 2187 i = nrow - 1;
1663 else 2188 else
1664 i = 5; 2189 i = 5;
2190
1665# ifdef MOUSE_SLIP_WHEELING 2191# ifdef MOUSE_SLIP_WHEELING
1666 if (ev.state & ControlMask) 2192 if (ev.state & ControlMask)
1667 { 2193 {
1668 mouse_slip_wheel_speed += (v ? -1 : 1); 2194 mouse_slip_wheel_speed += v ? -1 : 1;
1669 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);
1670 } 2200 }
2201 else
1671# endif 2202# endif
1672# ifdef JUMP_MOUSE_WHEEL
1673 scr_page (v, i);
1674 scr_refresh (SMOOTH_REFRESH);
1675 scrollbar_show (1);
1676# else
1677 while (i--)
1678 { 2203 {
1679 scr_page (v, 1); 2204 scr_page (v, i);
1680 scr_refresh (SMOOTH_REFRESH);
1681 scrollbar_show (1); 2205 scrollBar.show (1);
1682 } 2206 }
1683# endif
1684
1685 } 2207 }
1686 break; 2208 break;
1687#endif 2209#endif
1688
1689 }
1690 }
1691#ifdef MENUBAR
1692 else if (isMenuBarWindow (ev.window))
1693 menubar_control (ev);
1694#endif
1695}
1696
1697#ifdef TRANSPARENT
1698#if TINTING
1699/* shading taken from eterm-0.9.2 */
1700/* RGB 15 */
1701
1702static void
1703shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1704{
1705 unsigned char *ptr;
1706 int x, y;
1707
1708 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1709 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1710 /* No saturation */
1711 for (y = h; --y >= 0;) {
1712 for (x = -w; x < 0; x++) {
1713 int r, g, b;
1714
1715 b = ((uint16_t *) ptr)[x];
1716 r = (b & 0x7c00) * rm;
1717 g = (b & 0x3e0) * gm;
1718 b = (b & 0x1f) * bm;
1719 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1720 | ((g >> 8) & 0x3e0)
1721 | ((b >> 8) & 0x1f);
1722 }
1723 ptr += bpl;
1724 }
1725 } else {
1726 for (y = h; --y >= 0;) {
1727 for (x = -w; x < 0; x++) {
1728 int r, g, b;
1729
1730 b = ((uint16_t *) ptr)[x];
1731 r = (b & 0x7c00) * rm;
1732 g = (b & 0x3e0) * gm;
1733 b = (b & 0x1f) * bm;
1734 r |= (!(r >> 15) - 1);
1735 g |= (!(g >> 10) - 1);
1736 b |= (!(b >> 5) - 1);
1737 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1738 | ((g >> 8) & 0x3e0)
1739 | ((b >> 8) & 0x1f);
1740 }
1741 ptr += bpl;
1742 }
1743 }
1744}
1745
1746/* RGB 16 */
1747static void
1748shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1749{
1750 unsigned char *ptr;
1751 int x, y;
1752
1753 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1754 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1755 /* No saturation */
1756 for (y = h; --y >= 0;) {
1757 for (x = -w; x < 0; x++) {
1758 int r, g, b;
1759
1760 b = ((uint16_t *) ptr)[x];
1761 r = (b & 0xf800) * rm;
1762 g = (b & 0x7e0) * gm;
1763 b = (b & 0x1f) * bm;
1764 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1765 | ((g >> 8) & 0x7e0)
1766 | ((b >> 8) & 0x1f);
1767 }
1768 ptr += bpl;
1769 }
1770 } else {
1771 for (y = h; --y >= 0;) {
1772 for (x = -w; x < 0; x++) {
1773 int r, g, b;
1774
1775 b = ((uint16_t *) ptr)[x];
1776 r = (b & 0xf800) * rm;
1777 g = (b & 0x7e0) * gm;
1778 b = (b & 0x1f) * bm;
1779 r |= (!(r >> 16) - 1);
1780 g |= (!(g >> 11) - 1);
1781 b |= (!(b >> 5) - 1);
1782 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1783 | ((g >> 8) & 0x7e0)
1784 | ((b >> 8) & 0x1f);
1785 }
1786 ptr += bpl;
1787 }
1788 }
1789}
1790
1791/* RGB 24 */
1792static void
1793shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1794{
1795 unsigned char *ptr;
1796 int x, y;
1797
1798 ptr = (unsigned char *)data + (w * 3);
1799 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1800 /* No saturation */
1801 for (y = h; --y >= 0;) {
1802 for (x = -(w * 3); x < 0; x += 3) {
1803 int r, g, b;
1804
1805 if (byteorder.big_endian()) {
1806 r = (ptr[x + 0] * rm) >> 8;
1807 g = (ptr[x + 1] * gm) >> 8;
1808 b = (ptr[x + 2] * bm) >> 8;
1809 ptr[x + 0] = r;
1810 ptr[x + 1] = g;
1811 ptr[x + 2] = b;
1812 } else {
1813 r = (ptr[x + 2] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 0] * bm) >> 8;
1816 ptr[x + 2] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 0] = b;
1819 }
1820 }
1821 ptr += bpl;
1822 }
1823 } else {
1824 for (y = h; --y >= 0;) {
1825 for (x = -(w * 3); x < 0; x += 3) {
1826 int r, g, b;
1827
1828 if (byteorder.big_endian()) {
1829 r = (ptr[x + 0] * rm) >> 8;
1830 g = (ptr[x + 1] * gm) >> 8;
1831 b = (ptr[x + 2] * bm) >> 8;
1832
1833 r |= (!(r >> 8) - 1);
1834 g |= (!(g >> 8) - 1);
1835 b |= (!(b >> 8) - 1);
1836
1837 ptr[x + 0] = r;
1838 ptr[x + 1] = g;
1839 ptr[x + 2] = b;
1840 } else {
1841 r = (ptr[x + 2] * rm) >> 8;
1842 g = (ptr[x + 1] * gm) >> 8;
1843 b = (ptr[x + 0] * bm) >> 8;
1844
1845 r |= (!(r >> 8) - 1);
1846 g |= (!(g >> 8) - 1);
1847 b |= (!(b >> 8) - 1);
1848
1849 ptr[x + 2] = r;
1850 ptr[x + 1] = g;
1851 ptr[x + 0] = b;
1852 }
1853 }
1854 ptr += bpl;
1855 }
1856 }
1857}
1858
1859/* RGB 32 */
1860static void
1861shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1862{
1863 unsigned char *ptr;
1864 int x, y;
1865
1866 ptr = (unsigned char *)data + (w * 4);
1867 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1868 /* No saturation */
1869 for (y = h; --y >= 0;) {
1870 if (byteorder.big_endian()) {
1871 for (x = -(w * 4); x < 0; x += 4) {
1872 int r, g, b;
1873
1874 r = (ptr[x + 1] * rm) >> 8;
1875 g = (ptr[x + 2] * gm) >> 8;
1876 b = (ptr[x + 3] * bm) >> 8;
1877 ptr[x + 1] = r;
1878 ptr[x + 2] = g;
1879 ptr[x + 3] = b;
1880 }
1881 } else {
1882 for (x = -(w * 4); x < 0; x += 4) {
1883 int r, g, b;
1884
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888 ptr[x + 2] = r;
1889 ptr[x + 1] = g;
1890 ptr[x + 0] = b;
1891 }
1892 }
1893 ptr += bpl;
1894 }
1895 } else {
1896 for (y = h; --y >= 0;) {
1897 for (x = -(w * 4); x < 0; x += 4) {
1898 int r, g, b;
1899
1900 if (byteorder.big_endian()) {
1901 r = (ptr[x + 1] * rm) >> 8;
1902 g = (ptr[x + 2] * gm) >> 8;
1903 b = (ptr[x + 3] * bm) >> 8;
1904
1905 r |= (!(r >> 8) - 1);
1906 g |= (!(g >> 8) - 1);
1907 b |= (!(b >> 8) - 1);
1908
1909 ptr[x + 1] = r;
1910 ptr[x + 2] = g;
1911 ptr[x + 3] = b;
1912 } else {
1913 r = (ptr[x + 2] * rm) >> 8;
1914 g = (ptr[x + 1] * gm) >> 8;
1915 b = (ptr[x + 0] * bm) >> 8;
1916
1917 r |= (!(r >> 8) - 1);
1918 g |= (!(g >> 8) - 1);
1919 b |= (!(b >> 8) - 1);
1920
1921 ptr[x + 2] = r;
1922 ptr[x + 1] = g;
1923 ptr[x + 0] = b;
1924 }
1925 }
1926 ptr += bpl;
1927 }
1928 }
1929}
1930
1931#endif
1932
1933/*
1934 * Check our parents are still who we think they are.
1935 * Do transparency updates if required
1936 */
1937int
1938rxvt_term::check_our_parents ()
1939{
1940 int i, pchanged, aformat, have_pixmap, rootdepth;
1941 unsigned long nitems, bytes_after;
1942 Atom atype;
1943 unsigned char *prop = NULL;
1944 Window root, oldp, *list;
1945 Pixmap rootpixmap = None;
1946 XWindowAttributes wattr, wrootattr;
1947
1948 pchanged = 0;
1949
1950 if (!(Options & Opt_transparent))
1951 return pchanged; /* Don't try any more */
1952
1953 XGetWindowAttributes (display->display, display->root, &wrootattr);
1954 rootdepth = wrootattr.depth;
1955
1956 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1957
1958 if (rootdepth != wattr.depth)
1959 {
1960 if (am_transparent)
1961 { 2210 }
1962 pchanged = 1;
1963 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1964 am_transparent = am_pixmap_trans = 0;
1965 }
1966
1967 return pchanged; /* Don't try any more */
1968 }
1969
1970 /* Get all X ops out of the queue so that our information is up-to-date. */
1971 XSync (display->display, False);
1972
1973 /*
1974 * Make the frame window set by the window manager have
1975 * the root background. Some window managers put multiple nested frame
1976 * windows for each client, so we have to take care about that.
1977 */
1978 i = (xa[XA_XROOTPMAPID]
1979 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1980 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1981 &nitems, &bytes_after, &prop) == Success);
1982
1983 if (!i || prop == NULL)
1984 i = (xa[XA_XSETROOTID]
1985 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1986 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1987 &nitems, &bytes_after, &prop) == Success);
1988
1989 if (!i || prop == NULL)
1990 have_pixmap = 0;
1991 else
1992 { 2211 }
1993 have_pixmap = 1;
1994 rootpixmap = *(Pixmap *)prop;
1995 XFree (prop);
1996 }
1997
1998 if (have_pixmap)
1999 {
2000 /*
2001 * Copy display->root pixmap transparency
2002 */
2003 int sx, sy, nx, ny;
2004 unsigned int nw, nh;
2005 Window cr;
2006 XImage *image;
2007 GC gc;
2008 XGCValues gcvalue;
2009
2010 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2011 0, 0, &sx, &sy, &cr);
2012 nw = (unsigned int)szHint.width;
2013 nh = (unsigned int)szHint.height;
2014 nx = ny = 0;
2015
2016 if (sx < 0)
2017 {
2018 nw += sx;
2019 nx = -sx;
2020 sx = 0;
2021 }
2022
2023 if (sy < 0)
2024 {
2025 nh += sy;
2026 ny = -sy;
2027 sy = 0;
2028 }
2029
2030 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2031 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2032 allowedxerror = -1;
2033 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2034
2035 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2036 /* XXX: may need a delay here? */
2037 allowedxerror = 0;
2038
2039 if (image == NULL)
2040 {
2041 if (am_transparent && am_pixmap_trans)
2042 {
2043 pchanged = 1;
2044 if (TermWin.pixmap != None)
2045 {
2046 XFreePixmap (display->display, TermWin.pixmap);
2047 TermWin.pixmap = None;
2048 }
2049 }
2050
2051 am_pixmap_trans = 0;
2052 }
2053 else
2054 {
2055 if (TermWin.pixmap != None)
2056 XFreePixmap (display->display, TermWin.pixmap);
2057
2058#if TINTING
2059 if (ISSET_PIXCOLOR (Color_tint))
2060 {
2061 unsigned short shade, rm, gm, bm;
2062
2063 PixColors[Color_tint].get (display, rm, gm, bm);
2064
2065 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...
2066
2067 /* Determine bitshift and bitmask values */
2068 switch (image->bits_per_pixel)
2069 {
2070 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2074 }
2075 }
2076#endif
2077
2078 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2079 szHint.width, szHint.height, image->depth);
2080 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2081 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2082 nx, ny, image->width, image->height);
2083 XFreeGC (display->display, gc);
2084 XDestroyImage (image);
2085 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2086 TermWin.pixmap);
2087
2088 if (!am_transparent || !am_pixmap_trans)
2089 pchanged = 1;
2090
2091 am_transparent = am_pixmap_trans = 1;
2092 }
2093 }
2094
2095 if (!am_pixmap_trans)
2096 {
2097 unsigned int n;
2098 /*
2099 * InheritPixmap transparency
2100 */
2101 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2102 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2103 {
2104 oldp = TermWin.parent[i];
2105 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2106 &TermWin.parent[i], &list, &n);
2107 XFree (list);
2108 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2109
2110 if (TermWin.parent[i] == display->root)
2111 {
2112 if (oldp != None)
2113 pchanged = 1;
2114
2115 break;
2116 }
2117
2118 if (oldp != TermWin.parent[i])
2119 pchanged = 1;
2120 }
2121
2122 n = 0;
2123
2124 if (pchanged)
2125 {
2126 for (; n < (unsigned int)i; n++)
2127 {
2128 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2129 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2130 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2131 {
2132 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2133 break;
2134 }
2135 }
2136 }
2137
2138 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2139 {
2140 D_X ((stderr, "InheritPixmap Turning off"));
2141 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]);
2142 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
2143 am_transparent = 0;
2144 /* XXX: also turn off Opt_transparent? */
2145 }
2146 else
2147 {
2148#if WAIT_FOR_WM
2149 /* wait (an arbitrary period) for the WM to do its thing
2150 * needed for fvwm2.2.2 (and before?) */
2151 sleep (1);
2152#endif
2153 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2154 for (n = 0; n < (unsigned int)i; n++)
2155 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2156
2157 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2158 am_transparent = 1;
2159 }
2160
2161 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2162 TermWin.parent[i] = None;
2163 }
2164
2165 return pchanged;
2166} 2212}
2167#endif
2168 2213
2169/*}}} */ 2214/*}}} */
2170 2215
2171bool 2216void
2172rxvt_term::cmd_parse () 2217rxvt_term::cmd_parse ()
2173{ 2218{
2174 bool flag = false;
2175 unicode_t ch = NOCHAR; 2219 wchar_t ch = NOCHAR;
2176 unsigned char *seq_begin; // remember start of esc-sequence here 2220 char *seq_begin; // remember start of esc-sequence here
2177 2221
2178 for (;;) 2222 for (;;)
2179 { 2223 {
2180 if (ch == NOCHAR) 2224 if (ecb_unlikely (ch == NOCHAR))
2181 { 2225 {
2182 seq_begin = cmdbuf_ptr; 2226 seq_begin = cmdbuf_ptr;
2183 ch = next_char (); 2227 ch = next_char ();
2184 }
2185 2228
2186 if (ch == NOCHAR) // TODO: improve 2229 if (ch == NOCHAR)
2187 break; 2230 break;
2231 }
2188 2232
2189 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2233 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2234 {
2235 if (ecb_unlikely (!seen_input))
2190 { 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
2191 /* Read a text string from the input buffer */ 2249 /* Read a text string from the input buffer */
2192 unicode_t buf[UBUFSIZ]; 2250 wchar_t buf[UBUFSIZ];
2193 bool refreshnow = false; 2251 bool refreshnow = false;
2194 int nlines = 0; 2252 int nlines = 0;
2195 unicode_t *str = buf; 2253 wchar_t *str = buf;
2196 2254 wchar_t *eol = str + min (ncol, UBUFSIZ);
2197 *str++ = ch;
2198 2255
2199 for (;;) 2256 for (;;)
2200 { 2257 {
2258 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2259 break;
2260
2261 *str++ = ch;
2262
2263 if (ecb_unlikely (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
2201 seq_begin = cmdbuf_ptr; 2307 seq_begin = cmdbuf_ptr;
2202 ch = next_char (); 2308 ch = next_char ();
2203
2204 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2205 break;
2206
2207 *str++ = ch;
2208
2209 if (ch == C0_LF)
2210 {
2211 nlines++;
2212 refresh_count++;
2213
2214 if (! (Options & Opt_jumpScroll)
2215 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
2216 {
2217 refreshnow = true;
2218 flag = true;
2219 ch = NOCHAR;
2220 break;
2221 }
2222
2223 // scr_add_lines only works for nlines < TermWin.nrow - 1.
2224 if (nlines >= TermWin.nrow - 1)
2225 {
2226 scr_add_lines (buf, nlines, str - buf);
2227 nlines = 0;
2228 str = buf;
2229 }
2230 }
2231
2232 if (str >= buf + UBUFSIZ)
2233 {
2234 ch = NOCHAR;
2235 break;
2236 }
2237 } 2309 }
2238 2310
2311 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2312 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2239 scr_add_lines (buf, nlines, str - buf); 2313 scr_add_lines (buf, str - buf, nlines);
2240 2314
2241 /* 2315 /*
2242 * 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
2243 * 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.
2244 * the number of pages between refreshes is refresh_limit, which 2318 * if skipScroll is enabled.
2245 * is incremented here because we must be doing flat-out scrolling.
2246 *
2247 * refreshing should be correct for small scrolls, because of the
2248 * time-out
2249 */ 2319 */
2250 if (refreshnow) 2320 if (refreshnow)
2251 { 2321 {
2252 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2253 refresh_limit++;
2254 else
2255 scr_refresh (refresh_type); 2322 scr_refresh ();
2323 want_refresh = 1;
2256 } 2324 }
2257
2258 } 2325 }
2259 else 2326 else
2260 { 2327 {
2261 try 2328 try
2262 { 2329 {
… …
2270 } 2337 }
2271 2338
2272 ch = NOCHAR; 2339 ch = NOCHAR;
2273 } 2340 }
2274 } 2341 }
2275
2276 return flag;
2277} 2342}
2278 2343
2279// read the next character 2344// read the next character
2280unicode_t 2345wchar_t
2281rxvt_term::next_char () 2346rxvt_term::next_char () NOTHROW
2282{ 2347{
2283 while (cmdbuf_ptr < cmdbuf_endp) 2348 while (cmdbuf_ptr < cmdbuf_endp)
2284 { 2349 {
2285 // assume 7-bit to be ascii ALWAYS 2350 // assume 7-bit to be ascii ALWAYS
2286 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2351 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2287 return *cmdbuf_ptr++; 2352 return *cmdbuf_ptr++;
2288 2353
2289 wchar_t wc; 2354 wchar_t wc;
2290 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);
2291 2356
2292 if (len == (size_t)-2) 2357 if (len == (size_t)-2)
2293 { 2358 {
2294 // the mbstate stores incomplete sequences. didn't know this :/ 2359 // the mbstate stores incomplete sequences. didn't know this :/
2295 cmdbuf_ptr = cmdbuf_endp; 2360 cmdbuf_ptr = cmdbuf_endp;
2296 break; 2361 break;
2297 } 2362 }
2298 2363
2299 if (len == (size_t)-1) 2364 if (len == (size_t)-1)
2365 {
2366 mbstate.reset (); // reset now undefined conversion state
2300 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 }
2301 2369
2302 // assume wchar == unicode 2370 // assume wchar == unicode
2303 cmdbuf_ptr += len; 2371 cmdbuf_ptr += len;
2304 return wc; 2372 return wc & UNICODE_MASK;
2305 } 2373 }
2306 2374
2307 return NOCHAR; 2375 return NOCHAR;
2308} 2376}
2309 2377
2310/* rxvt_cmd_getc () - Return next input character */ 2378// read the next octet
2311/* 2379uint32_t
2312 * Return the next input character after first passing any keyboard input 2380rxvt_term::next_octet () NOTHROW
2313 * to the command.
2314 */
2315unicode_t
2316rxvt_term::cmd_getc ()
2317{ 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{
2318 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 ();
2319 2404
2320 if (c == NOCHAR) 2405 if (c == NOCHAR)
2321 throw out_of_input; 2406 throw out_of_input;
2322 2407
2323 return c; 2408 return c;
… …
2327/*----------------------------------------------------------------------*/ 2412/*----------------------------------------------------------------------*/
2328#ifdef PRINTPIPE 2413#ifdef PRINTPIPE
2329FILE * 2414FILE *
2330rxvt_term::popen_printer () 2415rxvt_term::popen_printer ()
2331{ 2416{
2332 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2417 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2333 2418
2334 if (stream == NULL) 2419 if (stream == NULL)
2335 rxvt_warn ("can't open printer pipe, not printing.\n"); 2420 rxvt_warn ("can't open printer pipe, not printing.\n");
2336 2421
2337 return stream; 2422 return stream;
… …
2348 * simulate attached vt100 printer 2433 * simulate attached vt100 printer
2349 */ 2434 */
2350void 2435void
2351rxvt_term::process_print_pipe () 2436rxvt_term::process_print_pipe ()
2352{ 2437{
2353 int done; 2438 FILE *fd = popen_printer ();
2354 FILE *fd;
2355 2439
2356 if ((fd = popen_printer ()) == NULL) 2440 if (!fd)
2357 return; 2441 return;
2358 2442
2359 /* 2443 /*
2360 * 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
2361 * is received. 2445 * is received.
2362 */ 2446 */
2363 for (done = 0; !done;) 2447 for (int done = 0; !done; )
2364 { 2448 {
2365 unsigned char buf[8]; 2449 unsigned char buf[8];
2366 unicode_t ch; 2450 unicode_t ch;
2367 unsigned int i, len; 2451 unsigned int i, len;
2368 2452
… …
2387 { 2471 {
2388 if ((buf[len++] = cmd_getc ()) == 'i') 2472 if ((buf[len++] = cmd_getc ()) == 'i')
2389 break; /* done = 1 */ 2473 break; /* done = 1 */
2390 } 2474 }
2391 } 2475 }
2392 2476
2393 for (i = 0; i < len; i++) 2477 for (i = 0; i < len; i++)
2394 if (putc (buf[i], fd) == EOF) 2478 if (putc (buf[i], fd) == EOF)
2395 { 2479 {
2396 done = 1; 2480 done = 1;
2397 break; 2481 break;
… …
2399 } 2483 }
2400 } 2484 }
2401 2485
2402 pclose_printer (fd); 2486 pclose_printer (fd);
2403} 2487}
2404#endif /* PRINTPIPE */ 2488#endif /* PRINTPIPE */
2405/*}}} */ 2489/*}}} */
2406 2490
2407/* *INDENT-OFF* */
2408enum { 2491enum {
2409 C1_40 = 0x40, 2492 C1_40 = 0x40,
2410 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,
2411 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,
2412 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,
2413 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,
2414}; 2497};
2415/* *INDENT-ON* */
2416 2498
2417/*{{{ process non-printing single characters */ 2499/*{{{ process non-printing single characters */
2418void 2500void
2419rxvt_term::process_nonprinting (unicode_t ch) 2501rxvt_term::process_nonprinting (unicode_t ch)
2420{ 2502{
… …
2423 case C0_ESC: 2505 case C0_ESC:
2424 process_escape_seq (); 2506 process_escape_seq ();
2425 break; 2507 break;
2426 case C0_ENQ: /* terminal Status */ 2508 case C0_ENQ: /* terminal Status */
2427 if (rs[Rs_answerbackstring]) 2509 if (rs[Rs_answerbackstring])
2428 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2510 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2429 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2430 else 2511 else
2431 tt_write ((unsigned char *)VT100_ANS, 2512 tt_write (VT100_ANS, strlen (VT100_ANS));
2432 (unsigned int)STRLEN (VT100_ANS));
2433 break; 2513 break;
2434 case C0_BEL: /* bell */ 2514 case C0_BEL: /* bell */
2435 scr_bell (); 2515 scr_bell ();
2436 break; 2516 break;
2437 case C0_BS: /* backspace */ 2517 case C0_BS: /* backspace */
… …
2453 break; 2533 break;
2454 case C0_SI: /* shift in - acs */ 2534 case C0_SI: /* shift in - acs */
2455 scr_charset_choose (0); 2535 scr_charset_choose (0);
2456 break; 2536 break;
2457 2537
2538#ifdef EIGHT_BIT_CONTROLS
2458 // 8-bit controls 2539 // 8-bit controls
2459 case 0x90: /* DCS */ 2540 case 0x90: /* DCS */
2460 process_dcs_seq (); 2541 process_dcs_seq ();
2461 break; 2542 break;
2462 case 0x9b: /* CSI */ 2543 case 0x9b: /* CSI */
2463 process_csi_seq (); 2544 process_csi_seq ();
2464 break; 2545 break;
2465 case 0x9d: /* CSI */ 2546 case 0x9d: /* OSC */
2466 process_osc_seq (); 2547 process_osc_seq ();
2467 break; 2548 break;
2549#endif
2468 } 2550 }
2469} 2551}
2470/*}}} */ 2552/*}}} */
2471 2553
2472 2554
… …
2513 break; 2595 break;
2514 case 'Z': /* identify the terminal type */ 2596 case 'Z': /* identify the terminal type */
2515 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2597 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2516 break; 2598 break;
2517 case '<': /* turn off VT52 mode */ 2599 case '<': /* turn off VT52 mode */
2518 PrivMode (0, PrivMode_vt52); 2600 set_privmode (PrivMode_vt52, 0);
2519 break; 2601 break;
2520 case 'F': /* use special graphics character set */ 2602 case 'F': /* use special graphics character set */
2521 case 'G': /* use regular character set */ 2603 case 'G': /* use regular character set */
2522 /* unimplemented */ 2604 /* unimplemented */
2523 break; 2605 break;
… …
2534void 2616void
2535rxvt_term::process_escape_seq () 2617rxvt_term::process_escape_seq ()
2536{ 2618{
2537 unicode_t ch = cmd_getc (); 2619 unicode_t ch = cmd_getc ();
2538 2620
2539 if (PrivateModes & PrivMode_vt52) 2621 if (priv_modes & PrivMode_vt52)
2540 { 2622 {
2541 process_escape_vt52 (ch); 2623 process_escape_vt52 (ch);
2542 return; 2624 return;
2543 } 2625 }
2544 2626
2545 switch (ch) 2627 switch (ch)
2546 { 2628 {
2547 /* case 1: do_tek_mode (); break; */
2548 case '#': 2629 case '#':
2549 if (cmd_getc () == '8') 2630 if (cmd_getc () == '8')
2550 scr_E (); 2631 scr_E ();
2551 break; 2632 break;
2552 case '(': 2633 case '(':
… …
2559 scr_charset_set (2, (unsigned int)cmd_getc ()); 2640 scr_charset_set (2, (unsigned int)cmd_getc ());
2560 break; 2641 break;
2561 case '+': 2642 case '+':
2562 scr_charset_set (3, (unsigned int)cmd_getc ()); 2643 scr_charset_set (3, (unsigned int)cmd_getc ());
2563 break; 2644 break;
2564#ifndef NO_FRILLS 2645#if !ENABLE_MINIMAL
2565 case '6': 2646 case '6':
2566 scr_backindex (); 2647 scr_backindex ();
2567 break; 2648 break;
2568#endif 2649#endif
2569 case '7': 2650 case '7':
2570 scr_cursor (SAVE); 2651 scr_cursor (SAVE);
2571 break; 2652 break;
2572 case '8': 2653 case '8':
2573 scr_cursor (RESTORE); 2654 scr_cursor (RESTORE);
2574 break; 2655 break;
2575#ifndef NO_FRILLS 2656#if !ENABLE_MINIMAL
2576 case '9': 2657 case '9':
2577 scr_forwardindex (); 2658 scr_forwardindex ();
2578 break; 2659 break;
2579#endif 2660#endif
2661 // DECPAM/DECPNM
2580 case '=': 2662 case '=':
2581 case '>': 2663 case '>':
2582 PrivMode ((ch == '='), PrivMode_aplKP); 2664 set_privmode (PrivMode_aplKP, ch == '=');
2583 break; 2665 break;
2584 2666
2585 case C1_40: 2667 case C1_40:
2586 cmd_getc (); 2668 cmd_getc ();
2587 break; 2669 break;
… …
2590 break; 2672 break;
2591 2673
2592 /* 8.3.87: NEXT LINE */ 2674 /* 8.3.87: NEXT LINE */
2593 case C1_NEL: /* ESC E */ 2675 case C1_NEL: /* ESC E */
2594 { 2676 {
2595 unicode_t nlcr[] = { C0_LF, C0_CR }; 2677 wchar_t nlcr[] = { C0_LF, C0_CR };
2596 scr_add_lines (nlcr, 1, 2); 2678 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2597 } 2679 }
2598 break; 2680 break;
2599 2681
2600 /* kidnapped escape sequence: Should be 8.3.48 */ 2682 /* kidnapped escape sequence: Should be 8.3.48 */
2601 case C1_ESA: /* ESC G */ 2683 case C1_ESA: /* ESC G */
2602 process_graphics (); 2684 // used by original rxvt for rob nations own graphics mode
2685 if (cmd_getc () == 'Q')
2686 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2603 break; 2687 break;
2604 2688
2605 /* 8.3.63: CHARACTER TABULATION SET */ 2689 /* 8.3.63: CHARACTER TABULATION SET */
2606 case C1_HTS: /* ESC H */ 2690 case C1_HTS: /* ESC H */
2607 scr_set_tab (1); 2691 scr_set_tab (1);
… …
2611 case C1_RI: /* ESC M */ 2695 case C1_RI: /* ESC M */
2612 scr_index (DN); 2696 scr_index (DN);
2613 break; 2697 break;
2614 2698
2615 /* 8.3.142: SINGLE-SHIFT TWO */ 2699 /* 8.3.142: SINGLE-SHIFT TWO */
2616 /*case C1_SS2: scr_single_shift (2); break; */ 2700 /* case C1_SS2: break; */
2617 2701
2618 /* 8.3.143: SINGLE-SHIFT THREE */ 2702 /* 8.3.143: SINGLE-SHIFT THREE */
2619 /*case C1_SS3: scr_single_shift (3); break; */ 2703 /* case C1_SS3: break; */
2620 2704
2621 /* 8.3.27: DEVICE CONTROL STRING */ 2705 /* 8.3.27: DEVICE CONTROL STRING */
2622 case C1_DCS: /* ESC P */ 2706 case C1_DCS: /* ESC P */
2623 process_dcs_seq (); 2707 process_dcs_seq ();
2624 break; 2708 break;
2625 2709
2626 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2710 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2627 case C1_SCI: /* ESC Z */ 2711 case C1_SCI: /* ESC Z */
2628 tt_write ((const unsigned char *)ESCZ_ANSWER, 2712 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2629 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2630 break; /* steal obsolete ESC [ c */ 2713 break; /* steal obsolete ESC [ c */
2631 2714
2632 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2715 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2633 case C1_CSI: /* ESC [ */ 2716 case C1_CSI: /* ESC [ */
2634 process_csi_seq (); 2717 process_csi_seq ();
2635 break; 2718 break;
2636 2719
2637 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2720 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2638 case C1_OSC: /* ESC ] */ 2721 case C1_OSC: /* ESC ] */
2639 process_osc_seq (); 2722 process_osc_seq ();
2640 break; 2723 break;
2641 2724
2642 /* 8.3.106: RESET TO INITIAL STATE */ 2725 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2643 case 'c': 2726 case 'c':
2644 mbstate.reset (); 2727 mbstate.reset ();
2645 scr_poweron (); 2728 scr_poweron ();
2646 scrollbar_show (1); 2729 scrollBar.show (1);
2647 break; 2730 break;
2648 2731
2649 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2732 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2650 case 'n': 2733 case 'n':
2651 scr_charset_choose (2); 2734 scr_charset_choose (2);
… …
2658 } 2741 }
2659} 2742}
2660/*}}} */ 2743/*}}} */
2661 2744
2662/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2745/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2663/* *INDENT-OFF* */
2664enum { 2746enum {
2665 CSI_ICH = 0x40, 2747 CSI_ICH = 0x40,
2666 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2748 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2667 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2749 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2668 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2750 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2669 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2751 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2670 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2752 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2671 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2753 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2672 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2754 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2673 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2755 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2674}; 2756};
2675 2757
2676#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2758#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2677 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2759 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2678 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2760 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2679#define get_byte_array_bit(array, bit) \ 2761#define get_byte_array_bit(array, bit) \
2680 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2762 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2681 2763
2682const unsigned char csi_defaults[] = 2764static const unsigned char csi_defaults[] =
2683 { 2765 {
2684 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2766 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2685 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2767 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2686 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2768 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2687 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2769 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2688 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2770 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2689 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2771 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2690 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2772 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2691 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2773 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2692 }; 2774 };
2693/* *INDENT-ON* */
2694 2775
2695void 2776void
2696rxvt_term::process_csi_seq () 2777rxvt_term::process_csi_seq ()
2697{ 2778{
2698 unicode_t ch, priv, i; 2779 unicode_t ch, priv, i;
2699 unsigned int nargs, p; 2780 unsigned int nargs, p;
2700 int n, ndef; 2781 int n, ndef;
2701 int arg[ESC_ARGS]; 2782 int arg[ESC_ARGS] = { };
2702 2783
2703 for (nargs = ESC_ARGS; nargs > 0;) 2784 nargs = 0;
2704 arg[--nargs] = 0;
2705 2785
2706 priv = 0; 2786 priv = 0;
2707 ch = cmd_getc (); 2787 ch = cmd_getc ();
2708 if (ch >= '<' && ch <= '?') 2788 if ((ch >= '<' && ch <= '?') || ch == '!')
2789 {
2709 { /* '<' '=' '>' '?' */ 2790 /* '<' '=' '>' '?' '!' */
2710 priv = ch; 2791 priv = ch;
2711 ch = cmd_getc (); 2792 ch = cmd_getc ();
2712 } 2793 }
2713 2794
2714 /* read any numerical arguments */ 2795 /* read any numerical arguments */
… …
2743 ndef = get_byte_array_bit (csi_defaults, i); 2824 ndef = get_byte_array_bit (csi_defaults, i);
2744 for (p = 0; p < nargs; p++) 2825 for (p = 0; p < nargs; p++)
2745 if (arg[p] == -1) 2826 if (arg[p] == -1)
2746 arg[p] = ndef; 2827 arg[p] = ndef;
2747 2828
2748#ifdef DEBUG_CMD
2749 fprintf (stderr, "CSI ");
2750 for (p = 0; p < nargs; p++)
2751 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2752 fprintf (stderr, "%c\n", ch);
2753#endif
2754
2755 /* 2829 /*
2756 * private mode handling 2830 * private mode handling
2757 */ 2831 */
2758 if (priv) 2832 if (priv)
2759 { 2833 {
2760 switch (priv) 2834 switch (priv)
2761 { 2835 {
2762 case '>': 2836 case '>':
2763 if (ch == CSI_DA) /* secondary device attributes */ 2837 if (ch == CSI_DA) /* secondary device attributes */
2838 {
2839 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2840 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2841 //
2842 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2843 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2844 // versions.
2845 //
2764 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2846 tt_printf ("\033[>%d;95;0c", 'U');
2847 }
2765 break; 2848 break;
2849
2766 case '?': 2850 case '?':
2767 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2851 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2768 process_terminal_mode (ch, priv, nargs, arg); 2852 process_terminal_mode (ch, priv, nargs, arg);
2769 break; 2853 break;
2854
2855 case '!':
2856 if (ch == CSI_70)
2857 {
2858 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2859 scr_soft_reset ();
2860
2861 static const int pm_h[] = { 7, 25 };
2862 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2863
2864 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2865 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2770 } 2866 }
2867 break;
2868 }
2869
2771 return; 2870 return;
2772 } 2871 }
2773 2872
2774 switch (ch) 2873 switch (ch)
2775 { 2874 {
… …
2874 2973
2875 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2974 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2876 arg[0] = -arg[0]; 2975 arg[0] = -arg[0];
2877 /* FALLTHROUGH */ 2976 /* FALLTHROUGH */
2878 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2977 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2879 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2978 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2880 break; 2979 break;
2881 2980
2882 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2981 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2883 tt_write ((const unsigned char *)VT100_ANS, 2982 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2884 (unsigned int) (sizeof (VT100_ANS) - 1));
2885 break; 2983 break;
2886 2984
2887 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2985 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2888 process_sgr_mode (nargs, arg); 2986 process_sgr_mode (nargs, arg);
2889 break; 2987 break;
… …
2896 break; 2994 break;
2897 case 6: /* CPR requested */ 2995 case 6: /* CPR requested */
2898 scr_report_position (); 2996 scr_report_position ();
2899 break; 2997 break;
2900 case 7: /* unofficial extension */ 2998 case 7: /* unofficial extension */
2901 if (Options & Opt_insecure) 2999 if (option (Opt_insecure))
2902 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3000 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2903 break; 3001 break;
2904 case 8: /* unofficial extension */ 3002 case 8: /* unofficial extension */
2905 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3003 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2906 break; 3004 break;
2907 } 3005 }
… …
2943 break; 3041 break;
2944 3042
2945 case CSI_RM: /* 8.3.107: RESET MODE */ 3043 case CSI_RM: /* 8.3.107: RESET MODE */
2946 if (arg[0] == 4) 3044 if (arg[0] == 4)
2947 scr_insert_mode (0); 3045 scr_insert_mode (0);
3046 else if (arg[0] == 20)
3047 priv_modes &= ~PrivMode_LFNL;
2948 break; 3048 break;
2949 3049
2950 case CSI_SM: /* 8.3.126: SET MODE */ 3050 case CSI_SM: /* 8.3.126: SET MODE */
2951 if (arg[0] == 4) 3051 if (arg[0] == 4)
2952 scr_insert_mode (1); 3052 scr_insert_mode (1);
3053 else if (arg[0] == 20)
3054 priv_modes |= PrivMode_LFNL;
2953 break; 3055 break;
2954 3056
2955 /* 3057 /*
2956 * PRIVATE USE beyond this point. All CSI_7? sequences here 3058 * PRIVATE USE beyond this point. All CSI_7? sequences here
2957 */ 3059 */
… …
2969 break; 3071 break;
2970 case CSI_75: 3072 case CSI_75:
2971 scr_cursor (RESTORE); 3073 scr_cursor (RESTORE);
2972 break; 3074 break;
2973 3075
2974#ifndef NO_FRILLS 3076#if !ENABLE_MINIMAL
2975 case CSI_74: 3077 case CSI_74:
2976 process_window_ops (arg, nargs); 3078 process_window_ops (arg, nargs);
2977 break; 3079 break;
2978#endif 3080#endif
2979 3081
… …
2986 break; 3088 break;
2987 } 3089 }
2988} 3090}
2989/*}}} */ 3091/*}}} */
2990 3092
2991#ifndef NO_FRILLS 3093#if !ENABLE_MINIMAL
2992/* ARGSUSED */
2993void 3094void
2994rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3095rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2995{ 3096{
2996 int x, y; 3097 int x, y;
2997 XWindowAttributes wattr; 3098 XWindowAttributes wattr;
2998 Window wdummy; 3099 Window wdummy;
3100
3101 dLocal (Display *, dpy);
2999 3102
3000 if (nargs == 0) 3103 if (nargs == 0)
3001 return; 3104 return;
3002 3105
3003 switch (args[0]) 3106 switch (args[0])
3004 { 3107 {
3005 /* 3108 /*
3006 * commands 3109 * commands
3007 */ 3110 */
3008 case 1: /* deiconify window */ 3111 case 1: /* deiconify window */
3009 XMapWindow (display->display, TermWin.parent[0]); 3112 XMapWindow (dpy, parent);
3010 break; 3113 break;
3011 case 2: /* iconify window */ 3114 case 2: /* iconify window */
3012 XIconifyWindow (display->display, TermWin.parent[0], 3115 XIconifyWindow (dpy, parent, display->screen);
3013 DefaultScreen (display->display));
3014 break; 3116 break;
3015 case 3: /* set position (pixels) */ 3117 case 3: /* set position (pixels) */
3016 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3118 XMoveWindow (dpy, parent, args[1], args[2]);
3017 break; 3119 break;
3018 case 4: /* set size (pixels) */ 3120 case 4: /* set size (pixels) */
3019 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3121 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3020 break; 3122 break;
3021 case 5: /* raise window */ 3123 case 5: /* raise window */
3022 XRaiseWindow (display->display, TermWin.parent[0]); 3124 XRaiseWindow (dpy, parent);
3023 break; 3125 break;
3024 case 6: /* lower window */ 3126 case 6: /* lower window */
3025 XLowerWindow (display->display, TermWin.parent[0]); 3127 XLowerWindow (dpy, parent);
3026 break; 3128 break;
3027 case 7: /* refresh window */ 3129 case 7: /* refresh window */
3028 scr_touch (true); 3130 scr_touch (true);
3029 break; 3131 break;
3030 case 8: /* set size (chars) */ 3132 case 8: /* set size (chars) */
3031 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3133 set_widthheight ((unsigned int) (args[2] * fwidth),
3032 (unsigned int) (args[1] * TermWin.fheight)); 3134 (unsigned int) (args[1] * fheight));
3033 break; 3135 break;
3034 3136
3035 //case 9: NYI, TODO, restore maximized window or maximize window 3137 //case 9: NYI, TODO, restore maximized window or maximize window
3036 default: 3138 default:
3037 if (args[0] >= 24) /* set height (chars) */ 3139 if (args[0] >= 24) /* set height (chars) */
3038 set_widthheight ((unsigned int)TermWin.width, 3140 set_widthheight ((unsigned int)width,
3039 (unsigned int) (args[1] * TermWin.fheight)); 3141 (unsigned int) (args[1] * fheight));
3040 break; 3142 break;
3041
3042 3143
3043 /* 3144 /*
3044 * reports - some output format copied from XTerm 3145 * reports - some output format copied from XTerm
3045 */ 3146 */
3046 case 11: /* report window state */ 3147 case 11: /* report window state */
3047 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3148 XGetWindowAttributes (dpy, parent, &wattr);
3048 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3149 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3049 break; 3150 break;
3050 case 13: /* report window position */ 3151 case 13: /* report window position */
3051 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3152 XGetWindowAttributes (dpy, parent, &wattr);
3052 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3153 XTranslateCoordinates (dpy, parent, wattr.root,
3053 -wattr.border_width, -wattr.border_width, 3154 -wattr.border_width, -wattr.border_width,
3054 &x, &y, &wdummy); 3155 &x, &y, &wdummy);
3055 tt_printf ("\033[3;%d;%dt", x, y); 3156 tt_printf ("\033[3;%d;%dt", x, y);
3056 break; 3157 break;
3057 case 14: /* report window size (pixels) */ 3158 case 14: /* report window size (pixels) */
3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3159 XGetWindowAttributes (dpy, parent, &wattr);
3059 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3160 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3060 break; 3161 break;
3061 case 18: /* report text area size (chars) */ 3162 case 18: /* report text area size (chars) */
3062 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3163 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3063 break; 3164 break;
3064 case 19: /* report window size (chars) */ 3165 case 19: /* report window size (chars) */
3065 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3166 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3066 break; 3167 break;
3067 case 20: /* report icon label */ 3168 case 20: /* report icon label */
3068 if (Options & Opt_insecure)
3069 { 3169 {
3070 char *s; 3170 char *s;
3071 XGetIconName (display->display, TermWin.parent[0], &s); 3171 XGetIconName (dpy, parent, &s);
3072 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3172 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3173 XFree (s);
3073 } 3174 }
3074 break; 3175 break;
3075 case 21: /* report window title */ 3176 case 21: /* report window title */
3076 if (Options & Opt_insecure)
3077 { 3177 {
3078 char *s; 3178 char *s;
3079 XFetchName (display->display, TermWin.parent[0], &s); 3179 XFetchName (dpy, parent, &s);
3080 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3180 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3181 XFree (s);
3081 } 3182 }
3082 break; 3183 break;
3083 } 3184 }
3084} 3185}
3085#endif 3186#endif
3086 3187
3087/*----------------------------------------------------------------------*/ 3188/*----------------------------------------------------------------------*/
3088/* 3189/*
3089 * get input up until STRING TERMINATOR (or BEL) 3190 * get input up until STRING TERMINATOR (or BEL)
3090 * ends_how is terminator used. returned input must be free()'d 3191 * ends_how is terminator used. returned input must be free()'d
3091 */ 3192 */
3092unsigned char * 3193char *
3093rxvt_term::get_to_st (unicode_t &ends_how) 3194rxvt_term::get_to_st (unicode_t &ends_how)
3094{ 3195{
3095 int seen_esc = 0; /* seen escape? */ 3196 unicode_t ch;
3197 bool seen_esc = false;
3096 unsigned int n = 0; 3198 unsigned int n = 0;
3097 unsigned char *s;
3098 unicode_t ch;
3099 unsigned char string[STRING_MAX]; 3199 wchar_t string[STRING_MAX];
3100 3200
3101 while ((ch = cmd_getc ())) 3201 while ((ch = cmd_getc ()) != NOCHAR)
3102 { 3202 {
3103 if (ch == C0_BEL || ch == CHAR_ST)
3104 break;
3105
3106 if (seen_esc) 3203 if (seen_esc)
3204 {
3107 if (ch == 0x5c) /* 7bit ST */ 3205 if (ch == 0x5c) /* 7bit ST */
3108 break; 3206 break;
3109 else 3207 else
3110 return NULL; 3208 return NULL;
3111 3209 }
3112 if (ch == C0_ESC) 3210 else if (ch == C0_ESC)
3113 { 3211 {
3114 seen_esc = 1; 3212 seen_esc = true;
3115 continue; 3213 continue;
3116 } 3214 }
3215 else if (ch == C0_BEL || ch == CHAR_ST)
3216 break;
3117 else if (ch == C0_HT) 3217 else if (ch == C0_SYN)
3118 ch = ' '; /* translate '\t' to space */ 3218 ch = cmd_get8 ();
3119 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR)) 3219 else if (ch < 0x20)
3120 return NULL; /* other control character - exit */ 3220 return NULL; /* other control character - exit */
3121 3221
3122 if (n >= sizeof (string) - 1) 3222 seen_esc = false;
3223
3224 if (n >= STRING_MAX - 1)
3123 // stop at some sane length 3225 // stop at some sane length
3124 return NULL; 3226 return NULL;
3125 3227
3126 string[n++] = ch; 3228 string[n++] = ch;
3127 seen_esc = 0;
3128 } 3229 }
3129 3230
3130 string[n++] = '\0'; 3231 string[n++] = '\0';
3131 3232
3132 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3133 return NULL;
3134
3135 ends_how = (ch == 0x5c ? C0_ESC : ch); 3233 ends_how = (ch == 0x5c ? C0_ESC : ch);
3136 STRNCPY (s, string, n); 3234
3137 return s; 3235 return rxvt_wcstombs (string);
3138} 3236}
3139 3237
3140/*----------------------------------------------------------------------*/ 3238/*----------------------------------------------------------------------*/
3141/* 3239/*
3142 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3240 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3143 */ 3241 */
3144void 3242void
3145rxvt_term::process_dcs_seq () 3243rxvt_term::process_dcs_seq ()
3146{ 3244{
3147 unsigned char *s;
3148 unicode_t eh;
3149
3150 /* 3245 /*
3151 * Not handled yet 3246 * Not handled yet
3152 */ 3247 */
3248
3249 unicode_t eh;
3153 s = get_to_st (eh); 3250 char *s = get_to_st (eh);
3154 if (s) 3251 if (s)
3155 free (s); 3252 free (s);
3156 3253
3157 return; 3254 return;
3158} 3255}
… …
3162 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3259 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3163 */ 3260 */
3164void 3261void
3165rxvt_term::process_osc_seq () 3262rxvt_term::process_osc_seq ()
3166{ 3263{
3167 unicode_t ch, eh;
3168 int arg; 3264 int arg;
3169 3265
3170 ch = cmd_getc (); 3266 unicode_t ch = cmd_getc ();
3171 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3267 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3172 arg = arg * 10 + (ch - '0'); 3268 arg = arg * 10 + (ch - '0');
3173 3269
3174 if (ch == ';') 3270 if (ch == ';')
3175 { 3271 {
3272 unicode_t eh;
3176 unsigned char *s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3177 3274
3178 if (s) 3275 if (s)
3179 { 3276 {
3180 process_xterm_seq (arg, (char *)s, eh); 3277 process_xterm_seq (arg, s, eh);
3181 free (s); 3278 free (s);
3182 } 3279 }
3183 } 3280 }
3184} 3281}
3185 3282
3186void 3283void
3187rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3284rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3188{ 3285{
3189 if (str[0] == '?' && !str[1]) 3286 if (str[0] == '?' && !str[1])
3190 { 3287 {
3191 if (Options & Opt_insecure) 3288 rgba c;
3192 { 3289 pix_colors_focused[color].get (c);
3193 unsigned short r, g, b; 3290
3194 PixColors[color].get (display, r, g, b); 3291#if XFT
3292 if (c.a != rgba::MAX_CC)
3293 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3294 else
3295#endif
3195 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3296 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3196 }
3197 } 3297 }
3198 else 3298 else
3199 set_window_color (color, str); 3299 set_window_color (color, str);
3200} 3300}
3201 3301
3202/* 3302/*
3203 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3303 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3204 * 0 = change iconName/title
3205 * 1 = change iconName
3206 * 2 = change title
3207 * 4 = change color
3208 * 10 = change fg color
3209 * 11 = change bg color
3210 * 12 = change text color
3211 * 13 = change mouse foreground color
3212 * 17 = change highlight character colour
3213 * 18 = change bold character color
3214 * 19 = change underlined character color
3215 * 46 = change logfile (not implemented)
3216 * 50 = change font
3217 *
3218 * rxvt extensions:
3219 * 20 = bg pixmap
3220 * 39 = change default fg color
3221 * 49 = change default bg color
3222 * 55 = dump scrollback buffer and all of screen
3223 * 701 = change locale
3224 * 702 = find font
3225 * 703 = menu
3226 */ 3304 */
3227void 3305void
3228rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3306rxvt_term::process_xterm_seq (int op, char *str, char resp)
3229{ 3307{
3230 int changed = 0;
3231 int color; 3308 int color;
3232 char *buf, *name; 3309 char *buf, *name;
3233 bool query = str[0] == '?' && !str[1]; 3310 bool query = str[0] == '?' && !str[1];
3311 int saveop = op;
3312
3313 dLocal (Display *, dpy);
3234 3314
3235 assert (str != NULL); 3315 assert (str != NULL);
3316
3317 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3318 return;
3319
3236 switch (op) 3320 switch (op)
3237 { 3321 {
3238 case XTerm_name: 3322 case XTerm_name:
3239 set_title (str); 3323 set_title (str);
3240 /* FALLTHROUGH */ 3324 /* FALLTHROUGH */
… …
3245 set_title (str); 3329 set_title (str);
3246 break; 3330 break;
3247 case XTerm_property: 3331 case XTerm_property:
3248 if (str[0] == '?') 3332 if (str[0] == '?')
3249 { 3333 {
3250 Atom prop = XInternAtom (display->display, str + 1, True); 3334 Atom prop = display->atom (str + 1);
3251 Atom actual_type; 3335 Atom actual_type;
3252 int actual_format; 3336 int actual_format;
3253 unsigned long nitems; 3337 unsigned long nitems;
3254 unsigned long bytes_after; 3338 unsigned long bytes_after;
3255 unsigned char *value = 0; 3339 unsigned char *value = 0;
3256 const char *str = ""; 3340 const char *str = "";
3257 3341
3258 if (prop 3342 if (prop
3259 && XGetWindowProperty (display->display, TermWin.parent[0], 3343 && XGetWindowProperty (dpy, parent,
3260 prop, 0, 1<<16, 0, AnyPropertyType, 3344 prop, 0, 1<<16, 0, AnyPropertyType,
3261 &actual_type, &actual_format, 3345 &actual_type, &actual_format,
3262 &nitems, &bytes_after, &value) == Success 3346 &nitems, &bytes_after, &value) == Success
3263 && actual_type != None 3347 && actual_type != None
3264 && actual_format == 8) 3348 && actual_format == 8)
3265 str = (const char *)(value); 3349 str = (const char *)(value);
3266 3350
3267 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3351 tt_printf ("\033]%d;%s%c", op, str, resp);
3268 3352
3269 XFree (value); 3353 XFree (value);
3270 } 3354 }
3271 else 3355 else
3272 { 3356 {
3273 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3357 char *eq = strchr (str, '=');
3274 3358
3275 if (eq) 3359 if (eq)
3276 { 3360 {
3277 *eq = 0; 3361 *eq = 0;
3278 XChangeProperty (display->display, TermWin.parent[0], 3362 set_utf8_property (display->atom (str), eq + 1);
3279 display->atom (str), XA_STRING, 8,
3280 PropModeReplace, (unsigned char *)eq + 1,
3281 strlen (eq + 1));
3282 } 3363 }
3283 else 3364 else
3284 XDeleteProperty (display->display, TermWin.parent[0], 3365 XDeleteProperty (dpy, parent,
3285 display->atom (str)); 3366 display->atom (str));
3286 } 3367 }
3287 break; 3368 break;
3288 3369
3289 case XTerm_Color: 3370 case XTerm_Color:
3290 for (buf = (char *)str; buf && *buf;) 3371 for (buf = (char *)str; buf && *buf;)
3291 { 3372 {
3292 if ((name = STRCHR (buf, ';')) == NULL) 3373 if ((name = strchr (buf, ';')) == NULL)
3293 break; 3374 break;
3294 3375
3295 *name++ = '\0'; 3376 *name++ = '\0';
3296 color = atoi (buf); 3377 color = atoi (buf) + minCOLOR;
3297 3378
3298 if (color < 0 || color >= TOTAL_COLORS) 3379 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3299 break; 3380 break;
3300 3381
3301 if ((buf = STRCHR (name, ';')) != NULL) 3382 if ((buf = strchr (name, ';')) != NULL)
3302 *buf++ = '\0'; 3383 *buf++ = '\0';
3303 3384
3304 if (name[0] == '?' && !name[1]) 3385 process_color_seq (op, color, name, resp);
3386 }
3387 break;
3388 case Rxvt_restoreFG:
3389 case XTerm_Color00:
3390 process_color_seq (op, Color_fg, str, resp);
3391 break;
3392 case Rxvt_restoreBG:
3393 case XTerm_Color01:
3394 process_color_seq (op, Color_bg, str, resp);
3395 break;
3396#ifndef NO_CURSORCOLOR
3397 case XTerm_Color_cursor:
3398 process_color_seq (op, Color_cursor, str, resp);
3399 break;
3400#endif
3401 case XTerm_Color_pointer_fg:
3402 process_color_seq (op, Color_pointer_fg, str, resp);
3403 break;
3404 case XTerm_Color_pointer_bg:
3405 process_color_seq (op, Color_pointer_bg, str, resp);
3406 break;
3407#ifdef OPTION_HC
3408 case XTerm_Color_HC:
3409 process_color_seq (op, Color_HC, str, resp);
3410 break;
3411 case XTerm_Color_HTC:
3412 process_color_seq (op, Color_HTC, str, resp);
3413 break;
3414#endif
3415#ifndef NO_BOLD_UNDERLINE_REVERSE
3416 case URxvt_Color_BD:
3417 process_color_seq (op, Color_BD, str, resp);
3418 break;
3419 case URxvt_Color_UL:
3420 process_color_seq (op, Color_UL, str, resp);
3421 break;
3422 case URxvt_Color_IT:
3423 process_color_seq (op, Color_IT, str, resp);
3424 break;
3425#endif
3426 case URxvt_Color_border:
3427 process_color_seq (op, Color_border, str, resp);
3428 break;
3429#if ENABLE_TRANSPARENCY
3430 case URxvt_Color_tint:
3431 process_color_seq (op, Color_tint, str, resp);
3432 {
3433 bool changed = false;
3434
3435 if (ISSET_PIXCOLOR (Color_tint))
3436 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3437
3438 if (changed)
3439 update_background ();
3440 }
3441
3442 break;
3443#endif
3444
3445#if BG_IMAGE_FROM_FILE
3446 case Rxvt_Pixmap:
3447 if (!strcmp (str, "?"))
3448 {
3449 char str[256];
3450
3451 sprintf (str, "[%dx%d+%d+%d]",
3452 min (h_scale, 32767), min (v_scale, 32767),
3453 min (h_align, 32767), min (v_align, 32767));
3454 process_xterm_seq (XTerm_title, str, CHAR_ST);
3455 }
3456 else
3457 {
3458 int changed = 0;
3459
3460 if (*str != ';')
3305 { 3461 {
3306 if (Options & Opt_insecure) 3462 if (bg_set_file (str)) /* change pixmap */
3307 { 3463 {
3308 unsigned short r, g, b; 3464 changed++;
3309 PixColors[color + minCOLOR].get (display, r, g, b); 3465 str = strchr (str, ';');
3310 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3466 if (str == NULL)
3467 bg_set_default_geometry ();
3468 else
3469 bg_set_geometry (str+1);
3311 } 3470 }
3312 } 3471 }
3313 else 3472 else
3314 set_window_color (color + minCOLOR, name); 3473 {
3474 str++;
3475 if (bg_set_geometry (str, true))
3476 changed++;
3477 }
3478
3479 if (changed)
3480 {
3481 if (bg_window_position_sensitive ())
3482 {
3483 int x, y;
3484 get_window_origin (x, y);
3485 bg_set_position (x, y);
3486 }
3487 update_background ();
3488 }
3315 } 3489 }
3316 break; 3490 break;
3317 case XTerm_Color00:
3318 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3319 break;
3320 case XTerm_Color01:
3321 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3322 break;
3323#ifndef NO_CURSORCOLOR
3324 case XTerm_Color_cursor:
3325 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3326 break;
3327#endif 3491#endif
3328 case XTerm_Color_pointer_fg:
3329 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3330 break;
3331 case XTerm_Color_pointer_bg:
3332 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3333 break;
3334#ifndef NO_BOLD_UNDERLINE_REVERSE
3335 case XTerm_Color_BD:
3336 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3337 break;
3338 case XTerm_Color_UL:
3339 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3340 break;
3341 case XTerm_Color_RV:
3342 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3343 break;
3344#endif
3345
3346 case XTerm_Pixmap:
3347 if (*str != ';')
3348 {
3349#if XPM_BACKGROUND
3350 scale_pixmap (""); /* reset to default scaling */
3351 set_bgPixmap (str); /* change pixmap */
3352#endif
3353 scr_touch (true);
3354 }
3355 while ((str = STRCHR (str, ';')) != NULL)
3356 {
3357 str++;
3358#if XPM_BACKGROUND
3359 changed += scale_pixmap (str);
3360#endif
3361
3362 }
3363 if (changed)
3364 {
3365#ifdef XPM_BACKGROUND
3366 resize_pixmap ();
3367#endif
3368 scr_touch (true);
3369 }
3370 break;
3371
3372 case XTerm_restoreFG:
3373 set_window_color (Color_fg, str);
3374 break;
3375 case XTerm_restoreBG:
3376 set_window_color (Color_bg, str);
3377 break;
3378 3492
3379 case XTerm_logfile: 3493 case XTerm_logfile:
3380 // TODO, when secure mode? 3494 // TODO, when secure mode?
3381 break; 3495 break;
3382 3496
3383 case XTerm_font:
3384 if (query)
3385 {
3386 if (Options & Opt_insecure)
3387 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3388 TermWin.fontset->fontdesc
3389 ? TermWin.fontset->fontdesc
3390 : "",
3391 resp);
3392 }
3393 else
3394 change_font (str);
3395 break;
3396
3397#ifndef NO_FRILLS
3398 case XTerm_locale:
3399 if (query)
3400 {
3401 if (Options & Opt_insecure)
3402 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3403 }
3404 else
3405 {
3406 set_locale (str);
3407# ifdef USE_XIM
3408 im_cb ();
3409# endif
3410 }
3411 break;
3412
3413 case XTerm_findfont:
3414 if (Options & Opt_insecure)
3415 {
3416 int fid = TermWin.fontset->find_font (atoi (str));
3417 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3418 fid, (*TermWin.fontset)[fid]->name, resp);
3419 }
3420 break;
3421#endif
3422
3423#ifdef MENUBAR
3424 case XTerm_Menu:
3425 if (Options & Opt_insecure)
3426 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3427 break;
3428#endif
3429#if 0 3497#if 0
3430 case XTerm_dumpscreen: /* no error notices */ 3498 case Rxvt_dumpscreen: /* no error notices */
3431 { 3499 {
3432 int fd; 3500 int fd;
3433 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3501 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3434 { 3502 {
3435 scr_dump (fd); 3503 scr_dump (fd);
3436 close (fd); 3504 close (fd);
3437 } 3505 }
3438 } 3506 }
3507 break;
3508#endif
3509 case XTerm_font:
3510 op = URxvt_font;
3511 case URxvt_font:
3512#if ENABLE_STYLES
3513 case URxvt_boldFont:
3514 case URxvt_italicFont:
3515 case URxvt_boldItalicFont:
3516#endif
3517 if (query)
3518 tt_printf ("\33]%d;%-.250s%c", saveop,
3519 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3520 ? fontset[op - URxvt_font]->fontdesc : "",
3521 resp);
3522 else
3523 {
3524 const char *&res = rs[Rs_font + (op - URxvt_font)];
3525
3526 res = strdup (str);
3527 allocated.push_back ((void *)res);
3528 set_fonts ();
3529 }
3530 break;
3531
3532 case URxvt_version:
3533 if (query)
3534 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3535 op,
3536 rs[Rs_name], VERSION[0], VERSION[2],
3537 resp);
3538 break;
3539
3540#if !ENABLE_MINIMAL
3541 case URxvt_locale:
3542 if (query)
3543 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3544 else
3545 {
3546 set_locale (str);
3547 pty->set_utf8_mode (enc_utf8);
3548 init_xlocale ();
3549 }
3550 break;
3551
3552 case URxvt_view_up:
3553 case URxvt_view_down:
3554 {
3555 int lines = atoi (str);
3556
3557 if (lines)
3558 scr_page (op == URxvt_view_up ? UP : DN, lines);
3559 else
3560 scr_erase_savelines ();
3561 }
3562
3563 break;
3564#endif
3565
3566#if ENABLE_PERL
3567 case URxvt_perl:
3568 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3439 break; 3569 break;
3440#endif 3570#endif
3441 } 3571 }
3442} 3572}
3443/*----------------------------------------------------------------------*/ 3573/*----------------------------------------------------------------------*/
… …
3457{ 3587{
3458 int state; 3588 int state;
3459 3589
3460 if (mode == 's') 3590 if (mode == 's')
3461 { 3591 {
3462 SavedModes |= (PrivateModes & bit); 3592 SavedModes |= (priv_modes & bit);
3463 return -1; 3593 return -1;
3464 } 3594 }
3465 else 3595 else
3466 { 3596 {
3467 if (mode == 'r') 3597 if (mode == 'r')
3468 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3598 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3469 else 3599 else
3470 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3600 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3471 PrivMode (state, bit); 3601
3602 set_privmode (bit, state);
3472 } 3603 }
3473 3604
3474 return state; 3605 return state;
3475} 3606}
3476 3607
3477/* we're not using priv _yet_ */ 3608/* we're not using priv _yet_ */
3478void 3609void
3479rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3610rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3480{ 3611{
3481 unsigned int i, j; 3612 unsigned int i, j;
3482 int state; 3613 int state;
3483 3614
3484 static const struct 3615 static const struct
3485 { 3616 {
3486 const int argval; 3617 const int argval;
3487 const unsigned long bit; 3618 const unsigned long bit;
3488 }
3489
3490 argtopriv[] = { 3619 } argtopriv[] = {
3491 { 1, PrivMode_aplCUR }, 3620 { 1, PrivMode_aplCUR }, // DECCKM
3492 { 2, PrivMode_vt52 }, 3621 { 2, PrivMode_vt52 }, // DECANM
3493 { 3, PrivMode_132 }, 3622 { 3, PrivMode_132 }, // DECCOLM
3494 { 4, PrivMode_smoothScroll }, 3623 { 4, PrivMode_smoothScroll }, // DECSCLM
3495 { 5, PrivMode_rVideo }, 3624 { 5, PrivMode_rVideo }, // DECSCNM
3496 { 6, PrivMode_relOrigin }, 3625 { 6, PrivMode_relOrigin }, // DECOM
3497 { 7, PrivMode_Autowrap }, 3626 { 7, PrivMode_Autowrap }, // DECAWM
3627 // 8, auto-repeat keys // DECARM
3498 { 9, PrivMode_MouseX10 }, 3628 { 9, PrivMode_MouseX10 },
3499#ifdef menuBar_esc 3629 // 18 end FF to printer after print screen
3500 { menuBar_esc, PrivMode_menuBar }, 3630 // 19 Print screen prints full screen/scroll region
3501#endif 3631 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3502#ifdef scrollBar_esc 3632#ifdef scrollBar_esc
3503 { scrollBar_esc, PrivMode_scrollBar }, 3633 { scrollBar_esc, PrivMode_scrollBar },
3504#endif 3634#endif
3505 // 18, 19 printing-related
3506 { 25, PrivMode_VisibleCursor },
3507 // 30 show scrollbar rxvt. extension
3508 { 35, PrivMode_ShiftKeys }, // rxvt extension 3635 { 35, PrivMode_ShiftKeys }, // rxvt extension
3636 // 38, tektronix mode // DECTEK
3509 { 40, PrivMode_132OK }, 3637 { 40, PrivMode_132OK },
3510 // 41 xterm more fixes NYI 3638 // 41 xterm more fixes NYI
3511 // 45 margin bell NYI 3639 // 45 margin bell NYI
3512 // 46 start logging 3640 // 46 start logging
3513 { 47, PrivMode_Screen }, 3641 { 47, PrivMode_Screen },
3514 { 66, PrivMode_aplKP }, 3642 { 66, PrivMode_aplKP }, // DECNKM
3515#ifndef NO_BACKSPACE_KEY 3643#ifndef NO_BACKSPACE_KEY
3516 { 67, PrivMode_BackSpace }, 3644 { 67, PrivMode_BackSpace }, // DECBKM
3517#endif 3645#endif
3518 { 1000, PrivMode_MouseX11 }, 3646 { 1000, PrivMode_MouseX11 },
3519 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3647 { 1002, PrivMode_MouseBtnEvent },
3520 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3648 { 1003, PrivMode_MouseAnyEvent },
3521 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3649#if ENABLE_FRILLS
3650 { 1005, PrivMode_ExtModeMouse },
3651#endif
3522 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3652 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3523 { 1011, PrivMode_Keypress }, // rxvt extension 3653 { 1011, PrivMode_Keypress }, // rxvt extension
3654#if ENABLE_FRILLS
3655 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3656#endif
3524 // 1035 enable modifiers for alt, numlock NYI 3657 // 1035 enable modifiers for alt, numlock NYI
3525 // 1036 send ESC for meta keys NYI 3658 // 1036 send ESC for meta keys NYI
3526 // 1037 send DEL for keypad delete NYI 3659 // 1037 send DEL for keypad delete NYI
3527 { 1047, PrivMode_Screen }, 3660 { 1047, PrivMode_Screen },
3528 // 1048 save and restore cursor 3661 // 1048 save and restore cursor, implemented in code
3529 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3662 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3530 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3663 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3664 { 2004, PrivMode_BracketPaste },
3531 }; 3665 };
3532 3666
3533 if (nargs == 0) 3667 if (nargs == 0)
3534 return; 3668 return;
3535 3669
… …
3542 for (i = 0; i < nargs; i++) 3676 for (i = 0; i < nargs; i++)
3543 { 3677 {
3544 state = -1; 3678 state = -1;
3545 3679
3546 /* basic handling */ 3680 /* basic handling */
3547 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3681 for (j = 0; j < ecb_array_length (argtopriv); j++)
3548 if (argtopriv[j].argval == arg[i]) 3682 if (argtopriv[j].argval == arg[i])
3549 { 3683 {
3550 state = privcases (mode, argtopriv[j].bit); 3684 state = privcases (mode, argtopriv[j].bit);
3551 break; 3685 break;
3552 } 3686 }
3553 3687
3554 /* extra handling for values with state unkept */ 3688 /* extra handling for values with state unkept */
3555 switch (arg[i]) 3689 switch (arg[i])
3556 { 3690 {
3691#if ENABLE_STYLES
3692 case 1021:
3693 set_option (Opt_intensityStyles, mode);
3694
3695 scr_touch (true);
3696 break;
3697#endif
3557 case 1048: /* alternative cursor save */ 3698 case 1048: /* alternative cursor save */
3558 if (Options & Opt_secondaryScreen) 3699 if (option (Opt_secondaryScreen))
3559 if (mode == 0) 3700 if (mode == 0)
3560 scr_cursor (RESTORE); 3701 scr_cursor (RESTORE);
3561 else if (mode == 1) 3702 else if (mode == 1)
3562 scr_cursor (SAVE); 3703 scr_cursor (SAVE);
3563 break; 3704 break;
… …
3571 case 2: /* VT52 mode */ 3712 case 2: /* VT52 mode */
3572 /* oddball mode. should be set regardless of set/reset 3713 /* oddball mode. should be set regardless of set/reset
3573 * parameter. Return from VT52 mode with an ESC < from 3714 * parameter. Return from VT52 mode with an ESC < from
3574 * within VT52 mode 3715 * within VT52 mode
3575 */ 3716 */
3576 PrivMode (1, PrivMode_vt52); 3717 set_privmode (PrivMode_vt52, 1);
3577 break; 3718 break;
3578 case 3: /* 80/132 */ 3719 case 3: /* 80/132 */
3579 if (PrivateModes & PrivMode_132OK) 3720 if (priv_modes & PrivMode_132OK)
3580 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3721 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3581 break; 3722 break;
3582 case 4: /* smooth scrolling */ 3723 case 4: /* smooth scrolling */
3583 if (state) 3724 set_option (Opt_jumpScroll, !state);
3584 Options &= ~Opt_jumpScroll;
3585 else
3586 Options |= Opt_jumpScroll;
3587 break; 3725 break;
3588 case 5: /* reverse video */ 3726 case 5: /* reverse video */
3589 scr_rvideo_mode (state); 3727 scr_rvideo_mode (state);
3590 break; 3728 break;
3591 case 6: /* relative/absolute origins */ 3729 case 6: /* relative/absolute origins */
… …
3595 scr_autowrap (state); 3733 scr_autowrap (state);
3596 break; 3734 break;
3597 /* case 8: - auto repeat, can't do on a per window basis */ 3735 /* case 8: - auto repeat, can't do on a per window basis */
3598 case 9: /* X10 mouse reporting */ 3736 case 9: /* X10 mouse reporting */
3599 if (state) /* orthogonal */ 3737 if (state) /* orthogonal */
3600 PrivateModes &= ~PrivMode_MouseX11; 3738 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3601 break; 3739 break;
3602#ifdef menuBar_esc
3603 case menuBar_esc:
3604#ifdef MENUBAR
3605 map_menuBar (state);
3606#endif
3607 break;
3608#endif
3609#ifdef scrollBar_esc 3740#ifdef scrollBar_esc
3610 case scrollBar_esc: 3741 case scrollBar_esc:
3611 if (scrollbar_mapping (state)) 3742 if (scrollBar.map (state))
3612 { 3743 {
3613 resize_all_windows (0, 0, 0); 3744 resize_all_windows (0, 0, 0);
3614 scr_touch (true); 3745 scr_touch (true);
3615 } 3746 }
3616 break; 3747 break;
… …
3625 break; 3756 break;
3626 /* case 66: - application key pad */ 3757 /* case 66: - application key pad */
3627 /* case 67: - backspace key */ 3758 /* case 67: - backspace key */
3628 case 1000: /* X11 mouse reporting */ 3759 case 1000: /* X11 mouse reporting */
3629 if (state) /* orthogonal */ 3760 if (state) /* orthogonal */
3630 PrivateModes &= ~PrivMode_MouseX10; 3761 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3631 break; 3762 break;
3632#if 0
3633 case 1001: 3763 case 1002:
3634 break; /* X11 mouse highlighting */ 3764 case 1003:
3635#endif 3765 if (state)
3766 {
3767 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3768 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3769 mouse_row = mouse_col = 0;
3770 vt_emask_mouse = PointerMotionMask;
3771 }
3772 else
3773 vt_emask_mouse = NoEventMask;
3774
3775 vt_select_input ();
3776 break;
3636 case 1010: /* scroll to bottom on TTY output inhibit */ 3777 case 1010: /* scroll to bottom on TTY output inhibit */
3637 if (state)
3638 Options &= ~Opt_scrollTtyOutput;
3639 else
3640 Options |= Opt_scrollTtyOutput; 3778 set_option (Opt_scrollTtyOutput, !state);
3641 break; 3779 break;
3642 case 1011: /* scroll to bottom on key press */ 3780 case 1011: /* scroll to bottom on key press */
3643 if (state)
3644 Options |= Opt_scrollTtyKeypress; 3781 set_option (Opt_scrollTtyKeypress, state);
3645 else
3646 Options &= ~Opt_scrollTtyKeypress;
3647 break; 3782 break;
3648 case 1047: /* secondary screen w/ clearing last */ 3783 case 1047: /* secondary screen w/ clearing last */
3649 if (Options & Opt_secondaryScreen) 3784 if (option (Opt_secondaryScreen))
3650 if (current_screen != PRIMARY) 3785 if (!state)
3651 scr_erase_screen (2); 3786 scr_erase_screen (2);
3787
3652 scr_change_screen (state); 3788 scr_change_screen (state);
3653 break; 3789 break;
3654 case 1049: /* secondary screen w/ clearing first */ 3790 case 1049: /* secondary screen w/ clearing first */
3791 if (option (Opt_secondaryScreen))
3792 if (state)
3793 scr_cursor (SAVE);
3794
3655 scr_change_screen (state); 3795 scr_change_screen (state);
3796
3656 if (Options & Opt_secondaryScreen) 3797 if (option (Opt_secondaryScreen))
3657 if (current_screen != PRIMARY) 3798 if (state)
3658 scr_erase_screen (2); 3799 scr_erase_screen (2);
3800 else
3801 scr_cursor (RESTORE);
3659 break; 3802 break;
3660 default: 3803 default:
3661 break; 3804 break;
3662 } 3805 }
3663 } 3806 }
… …
3687 rendset = 0, rendstyle = ~RS_None; 3830 rendset = 0, rendstyle = ~RS_None;
3688 break; 3831 break;
3689 case 1: 3832 case 1:
3690 rendset = 1, rendstyle = RS_Bold; 3833 rendset = 1, rendstyle = RS_Bold;
3691 break; 3834 break;
3835 //case 2: // low intensity
3836 case 3:
3837 rendset = 1, rendstyle = RS_Italic;
3838 break;
3692 case 4: 3839 case 4:
3693 rendset = 1, rendstyle = RS_Uline; 3840 rendset = 1, rendstyle = RS_Uline;
3694 break; 3841 break;
3695 case 5: 3842 case 5: // slowly blinking
3843 case 6: // rapidly blinking
3696 rendset = 1, rendstyle = RS_Blink; 3844 rendset = 1, rendstyle = RS_Blink;
3697 break; 3845 break;
3698 //case 6: // scoansi light background 3846 //case 6: // scoansi light background
3699 case 7: 3847 case 7:
3700 rendset = 1, rendstyle = RS_RVid; 3848 rendset = 1, rendstyle = RS_RVid;
3701 break; 3849 break;
3702 case 8: 3850 case 8:
3703 // invisible. NYI 3851 // invisible. NYI
3704 break; 3852 break;
3853 //case 9: // crossed out
3705 //case 10: // scoansi acs off 3854 //case 10: // scoansi acs off, primary font
3706 //case 11: // scoansi acs on 3855 //case 11: // scoansi acs on, first alt font
3707 //case 12: // scoansi acs on, |0x80 3856 //case 12: // scoansi acs on, |0x80, second alt font
3708 case 21: // disable bold, blink and invis (some terminals use this) 3857 //...
3858 //case 19: // ninth alt font
3859 //case 20: // gothic
3860 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3709 rendset = 0, rendstyle = RS_Bold | RS_Blink; 3861 rendset = 0, rendstyle = RS_Bold;
3710 break; 3862 break;
3711 case 22: 3863 case 22: // normal intensity
3712 rendset = 0, rendstyle = RS_Bold; 3864 rendset = 0, rendstyle = RS_Bold;
3865 break;
3866 case 23: // disable italic
3867 rendset = 0, rendstyle = RS_Italic;
3713 break; 3868 break;
3714 case 24: 3869 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 3870 rendset = 0, rendstyle = RS_Uline;
3716 break; 3871 break;
3717 case 25: 3872 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 3873 rendset = 0, rendstyle = RS_Blink;
3719 break; 3874 break;
3875 case 26: // variable spacing (iso 8613)
3876 rendset = 0, rendstyle = RS_Blink;
3877 break;
3720 case 27: 3878 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 3879 rendset = 0, rendstyle = RS_RVid;
3722 break; 3880 break;
3723 case 28:
3724 // visible. NYI 3881 //case 28: // visible. NYI
3725 break; 3882 //case 29: // not crossed-out
3726 } 3883 }
3727 3884
3728 if (rendset != -1) 3885 if (rendset != -1)
3729 { 3886 {
3730 scr_rendition (rendset, rendstyle); 3887 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 3898 case 35:
3742 case 36: 3899 case 36:
3743 case 37: 3900 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3901 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 3902 break;
3746#ifdef TTY_256COLOR 3903 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 3904 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 3905 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3906 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 3907 i += 2;
3752 } 3908 }
3753 break; 3909 break;
3754#endif
3755 case 39: /* default fg */ 3910 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 3911 scr_color (Color_fg, Color_fg);
3757 break; 3912 break;
3758 3913
3759 case 40: 3914 case 40:
… …
3764 case 45: 3919 case 45:
3765 case 46: 3920 case 46:
3766 case 47: 3921 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3922 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 3923 break;
3769#ifdef TTY_256COLOR 3924 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 3925 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 3926 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3927 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 3928 i += 2;
3775 } 3929 }
3776 break; 3930 break;
3777#endif
3778 case 49: /* default bg */ 3931 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 3932 scr_color (Color_bg, Color_bg);
3780 break; 3933 break;
3781 3934
3782#ifndef NO_BRIGHTCOLOR 3935 //case 50: // not variable spacing
3936
3937#if !ENABLE_MINIMAL
3783 case 90: 3938 case 90:
3784 case 91: /* set bright fg color */ 3939 case 91: /* set bright fg color */
3785 case 92: 3940 case 92:
3786 case 93: 3941 case 93:
3787 case 94: 3942 case 94:
3788 case 95: 3943 case 95:
3789 case 96: 3944 case 96:
3790 case 97: 3945 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3946 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 3947 break;
3794 case 100: 3948 case 100:
3795 case 101: /* set bright bg color */ 3949 case 101: /* set bright bg color */
3796 case 102: 3950 case 102:
3797 case 103: 3951 case 103:
3798 case 104: 3952 case 104:
3799 case 105: 3953 case 105:
3800 case 106: 3954 case 106:
3801 case 107: 3955 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3956 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 3957 break;
3805#endif 3958#endif
3806
3807 } 3959 }
3808 } 3960 }
3809}
3810/*}}} */
3811
3812/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3813void
3814rxvt_term::process_graphics ()
3815{
3816 unicode_t ch, cmd = cmd_getc ();
3817
3818 if (cmd == 'Q')
3819 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */
3821 return;
3822 }
3823 /* swallow other graphics sequences until terminating ':' */
3824 do
3825 ch = cmd_getc ();
3826 while (ch != ':');
3827} 3961}
3828/*}}} */ 3962/*}}} */
3829 3963
3830/* ------------------------------------------------------------------------- */ 3964/* ------------------------------------------------------------------------- */
3831 3965
… …
3835 */ 3969 */
3836void 3970void
3837rxvt_term::tt_printf (const char *fmt,...) 3971rxvt_term::tt_printf (const char *fmt,...)
3838{ 3972{
3839 va_list arg_ptr; 3973 va_list arg_ptr;
3840 unsigned char buf[256]; 3974 char buf[256];
3841 3975
3842 va_start (arg_ptr, fmt); 3976 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3977 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 3978 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 3979 tt_write (buf, strlen (buf));
3846} 3980}
3847 3981
3848/* ---------------------------------------------------------------------- */ 3982/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 3983/* Write data to the pty as typed by the user, pasted with the mouse,
3850 * or generated by us in response to a query ESC sequence. 3984 * or generated by us in response to a query ESC sequence.
3851 */ 3985 */
3852void 3986static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3854{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3856 3987
3857 if (len) 3988void
3989rxvt_term::tt_write (const char *data, unsigned int len)
3990{
3991 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3992 return;
3993
3994 if (pty->pty < 0)
3995 return;
3996
3997 if (v_buflen == 0)
3998 {
3999 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4000
4001 max_it (written, 0);
4002
4003 if (written == len)
4004 return;
4005
4006 data += written;
4007 len -= written;
3858 { 4008 }
4009
4010 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4011
4012 memcpy (v_buffer + v_buflen, data, len);
4013 v_buflen += len;
4014
4015 pty_ev.set (ev::READ | ev::WRITE);
4016}
4017
4018void rxvt_term::pty_write ()
4019{
4020 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4021
4022 if (written > 0)
4023 {
4024 v_buflen -= written;
4025
3859 if (v_buflen == 0) 4026 if (v_buflen == 0)
3860 { 4027 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3862
3863 if ((unsigned int)written == len)
3864 return;
3865
3866 data += written;
3867 len -= written;
3868 }
3869
3870
3871 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3872
3873 memcpy (v_buffer + v_buflen, data, len);
3874 v_buflen += len;
3875 }
3876
3877 for (;;)
3878 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3880
3881 if (written > 0)
3882 {
3883 v_buflen -= written;
3884
3885 if (v_buflen == 0)
3886 {
3887 free (v_buffer); 4028 free (v_buffer);
3888 v_buffer = 0; 4029 v_buffer = 0;
3889 v_buflen = 0;
3890 4030
3891 pty_ev.set (EVENT_READ); 4031 pty_ev.set (ev::READ);
3892 return;
3893 }
3894
3895 memmove (v_buffer, v_buffer + written, v_buflen);
3896 }
3897 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3898 // original code just ignores this...
3899 destroy ();
3900 else
3901 {
3902 pty_ev.set (EVENT_READ | EVENT_WRITE);
3903 return; 4032 return;
3904 } 4033 }
4034
4035 memmove (v_buffer, v_buffer + written, v_buflen);
3905 } 4036 }
4037 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4038 pty_ev.set (ev::READ);
3906} 4039}
3907 4040
3908/*----------------------- end-of-file (C source) -----------------------*/ 4041/*----------------------- end-of-file (C source) -----------------------*/
3909 4042

Diff Legend

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