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

Diff Legend

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