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

Diff Legend

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