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

Diff Legend

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