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

Diff Legend

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