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

Diff Legend

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