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

Diff Legend

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