ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.38 by pcg, Mon Feb 9 07:11:49 2004 UTC vs.
Revision 1.446 by root, Fri Apr 2 19:27:38 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 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height);*/
1438 if (ev.xconfigure.window == parent[0])
1295 { 1439 {
1296 TermWin.focus = 1; 1440 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 } 1441 ;
1308 break;
1309 1442
1310 case FocusOut: 1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1311 if (TermWin.focus)
1312 { 1444 {
1313 TermWin.focus = 0; 1445 seen_resize = 1;
1314 want_refresh = 1; 1446 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 } 1447 }
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 1448 else
1348 { 1449 {
1349 D_SIZE((stderr, "Size: Not resizing")); 1450#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ())
1452 {
1453 if (mapped)
1454 update_background ();
1455 else
1456 bgPixmap.invalidate ();
1457 }
1458#endif
1350 } 1459 }
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 1460
1461 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1361 } 1462 }
1362 break; 1463 break;
1363 1464
1465 case PropertyNotify:
1466 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1467 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1468 && ev.xproperty.state == PropertyNewValue)
1469 selection_property (ev.xproperty.window, ev.xproperty.atom);
1470
1471 break;
1472
1364 case SelectionClear: 1473 case SelectionClear:
1365 selection_clear (); 1474 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1366 break; 1475 break;
1367 1476
1368 case SelectionNotify: 1477 case SelectionNotify:
1369 if (selection_wait == Sel_normal) 1478 if (selection_wait == Sel_normal)
1370 selection_paste (ev.xselection.requestor, 1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1371 ev.xselection.property, True);
1372 break; 1480 break;
1373 1481
1374 case SelectionRequest: 1482 case SelectionRequest:
1375 selection_send (ev.xselectionrequest); 1483 selection_send (ev.xselectionrequest);
1376 break; 1484 break;
1377 1485
1486 case MapNotify:
1487#ifdef HAVE_BG_PIXMAP
1488 /* This is needed spcifically to fix the case of no window manager or a
1489 * non-reparenting window manager. In those cases we never get first
1490 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1491 * care of multiplicity of ConfigureNotify events arriwing while WM does
1492 * reparenting.
1493 * We should not render background immidiately, as there could be several
1494 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1495 * by scheduling background redraw as soon as we can, but giving a short
1496 * bit of time for ConfigureNotifies to arrive.
1497 * We should render background PRIOR to drawing any text, but AFTER all
1498 * of ConfigureNotifys for the best results.
1499 */
1500 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1501 update_background_ev.start (0.025);
1502#endif
1503 mapped = 1;
1504#ifdef TEXT_BLINK
1505 text_blink_ev.start ();
1506#endif
1507 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1508 break;
1509
1378 case UnmapNotify: 1510 case UnmapNotify:
1379 TermWin.mapped = 0; 1511 mapped = 0;
1380#ifdef TEXT_BLINK 1512#ifdef TEXT_BLINK
1381 text_blink_ev.stop (); 1513 text_blink_ev.stop ();
1382#endif 1514#endif
1515 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1383 break; 1516 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 1517
1404 case GraphicsExpose: 1518 case GraphicsExpose:
1405 case Expose: 1519 case Expose:
1406 if (ev.xany.window == TermWin.vt) 1520 if (ev.xany.window == vt)
1407 { 1521 {
1408#ifdef NO_SLOW_LINK_SUPPORT 1522 do
1523 {
1409 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1410 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1411#else 1526 }
1412 // don't understand this, so commented it out 1527 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1528
1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1530
1531 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1532 {
1413 scr_expose (ev.xexpose.x, ev.xexpose.y, 1533 scr_expose (ev.xexpose.x, ev.xexpose.y,
1414 ev.xexpose.width, ev.xexpose.height, False); 1534 ev.xexpose.width, ev.xexpose.height, False);
1415 //scr_expose (ev.xexpose.x, 0, 1535 }
1416 // ev.xexpose.width, TermWin.height, False); 1536
1417#endif
1418 want_refresh = 1; 1537 want_refresh = 1;
1419 } 1538 }
1420 else 1539 else
1421 { 1540 {
1422 XEvent unused_event; 1541 XEvent unused_event;
1423 1542
1424 while (XCheckTypedWindowEvent(display->display, ev.xany.window, 1543 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1425 Expose, 1544 ;
1426 &unused_event)) ; 1545 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1427 while (XCheckTypedWindowEvent(display->display, ev.xany.window, 1546 ;
1428 GraphicsExpose, 1547
1429 &unused_event)) ; 1548 if (scrollBar.state && ev.xany.window == scrollBar.win)
1430 if (isScrollbarWindow(ev.xany.window))
1431 { 1549 {
1432 scrollBar.setIdle(); 1550 scrollBar.state = STATE_IDLE;
1433 scrollbar_show (0); 1551 scrollBar.show (0);
1434 } 1552 }
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 } 1553 }
1444 break; 1554 break;
1445 1555
1446 case MotionNotify: 1556 case MotionNotify:
1447#ifdef POINTER_BLANK 1557#ifdef POINTER_BLANK
1448 if (hidden_pointer) 1558 if (hidden_pointer)
1449 pointer_unblank (); 1559 pointer_unblank ();
1450#endif 1560#endif
1451#if MENUBAR 1561 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1452 if (isMenuBarWindow(ev.xany.window)) 1562 || priv_modes & PrivMode_MouseAnyEvent)
1563 mouse_report (ev.xbutton);
1564 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1565 break;
1566
1567 if (ev.xany.window == vt)
1453 { 1568 {
1454 menubar_control (&(ev.xbutton)); 1569 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1455 break; 1570 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1456 } 1571 ; // 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))) 1572 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1464 { 1573 {
1465 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1574 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1466 ; 1575 ;
1467 1576
1468 XQueryPointer(display->display, TermWin.vt, 1577 XQueryPointer (dpy, vt,
1469 &unused_root, &unused_child, 1578 &unused_root, &unused_child,
1470 &unused_root_x, &unused_root_y, 1579 &unused_root_x, &unused_root_y,
1471 &(ev.xbutton.x), &(ev.xbutton.y), 1580 &ev.xbutton.x, &ev.xbutton.y,
1472 &unused_mask); 1581 &ev.xbutton.state);
1473#ifdef MOUSE_THRESHOLD 1582#ifdef MOUSE_THRESHOLD
1474 /* deal with a `jumpy' mouse */ 1583 /* deal with a `jumpy' mouse */
1475 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1584 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1476 { 1585 {
1477#endif 1586#endif
1587#if ISO_14755
1588 // 5.4
1589 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1590 {
1591 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1592 break;
1593 }
1594#endif
1478 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1595 selection_extend (ev.xbutton.x, ev.xbutton.y,
1479 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1596 ev.xbutton.state & Button3Mask ? 2 : 0);
1597
1480#ifdef SELECTION_SCROLLING 1598#ifdef SELECTION_SCROLLING
1481 if (ev.xbutton.y < TermWin.int_bwidth 1599 if (ev.xbutton.y < int_bwidth
1482 || Pixel2Row(ev.xbutton.y) > (TermWin.nrow-1)) 1600 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1483 { 1601 {
1484 int dist; 1602 int dist;
1485
1486 pending_scroll_selection=1;
1487 1603
1488 /* don't clobber the current delay if we are 1604 /* don't clobber the current delay if we are
1489 * already in the middle of scrolling. 1605 * already in the middle of scrolling.
1490 */ 1606 */
1491 if (scroll_selection_delay<=0) 1607 if (!sel_scroll_ev.is_active ())
1492 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1608 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1493 1609
1494 /* save the event params so we can highlight 1610 /* save the event params so we can highlight
1495 * the selection in the pending-scroll loop 1611 * the selection in the pending-scroll loop
1496 */ 1612 */
1497 selection_save_x=ev.xbutton.x; 1613 selection_save_x = ev.xbutton.x;
1498 selection_save_y=ev.xbutton.y; 1614 selection_save_y = ev.xbutton.y;
1499 selection_save_state=
1500 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1615 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1501 1616
1502 /* calc number of lines to scroll */ 1617 /* calc number of lines to scroll */
1503 if (ev.xbutton.y<TermWin.int_bwidth) 1618 if (ev.xbutton.y < int_bwidth)
1504 { 1619 {
1505 scroll_selection_dir = UP; 1620 scroll_selection_dir = UP;
1506 dist = TermWin.int_bwidth - ev.xbutton.y; 1621 dist = int_bwidth - ev.xbutton.y;
1507 } 1622 }
1508 else 1623 else
1509 { 1624 {
1510 scroll_selection_dir = DN; 1625 scroll_selection_dir = DN;
1511 dist = ev.xbutton.y - 1626 dist = ev.xbutton.y - (int_bwidth + height);
1512 (TermWin.int_bwidth + TermWin.height);
1513 } 1627 }
1628
1514 scroll_selection_lines=(Pixel2Height(dist)/ 1629 scroll_selection_lines = Pixel2Height (dist)
1515 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1630 / SELECTION_SCROLL_LINE_SPEEDUP
1631 + 1;
1516 MIN_IT(scroll_selection_lines, 1632 min_it (scroll_selection_lines,
1517 SELECTION_SCROLL_MAX_LINES); 1633 SELECTION_SCROLL_MAX_LINES);
1518 } 1634 }
1519 else 1635 else
1520 { 1636 {
1521 /* we are within the text window, so we 1637 /* we are within the text window, so we
1522 * shouldn't be scrolling 1638 * shouldn't be scrolling
1523 */ 1639 */
1524 pending_scroll_selection = 0; 1640 sel_scroll_ev.stop();
1525 } 1641 }
1526#endif 1642#endif
1527#ifdef MOUSE_THRESHOLD 1643#ifdef MOUSE_THRESHOLD
1528
1529 } 1644 }
1530#endif 1645#endif
1531
1532 } 1646 }
1533 } 1647 }
1534 else if (isScrollbarWindow(ev.xany.window) && scrollbar_isMotion()) 1648 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1535 { 1649 {
1536 while (XCheckTypedWindowEvent(display->display, scrollBar.win, 1650 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1537 MotionNotify, &ev)) ; 1651 MotionNotify, &ev))
1652 ;
1653
1538 XQueryPointer(display->display, scrollBar.win, 1654 XQueryPointer (dpy, scrollBar.win,
1539 &unused_root, &unused_child, 1655 &unused_root, &unused_child,
1540 &unused_root_x, &unused_root_y, 1656 &unused_root_x, &unused_root_y,
1541 &(ev.xbutton.x), &(ev.xbutton.y), 1657 &ev.xbutton.x, &ev.xbutton.y,
1542 &unused_mask); 1658 &unused_mask);
1543 scr_move_to (scrollbar_position(ev.xbutton.y) - csrO, 1659 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1544 scrollbar_size()); 1660 scrollBar.size ());
1545 scr_refresh (refresh_type);
1546 refresh_limit = 0; 1661 want_refresh = 1;
1547 scrollbar_show (1); 1662 scrollBar.show (1);
1548 } 1663 }
1549 break; 1664 break;
1550 } 1665 }
1551}
1552 1666
1667#if defined(CURSOR_BLINK)
1668 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1669 {
1670 if (hidden_cursor)
1671 {
1672 hidden_cursor = 0;
1673 want_refresh = 1;
1674 }
1675
1676 cursor_blink_ev.again ();
1677 }
1678#endif
1679
1680#if defined(POINTER_BLANK)
1681 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1682 {
1683 if (ev.type == MotionNotify
1684 || ev.type == ButtonPress
1685 || ev.type == ButtonRelease)
1686 if (hidden_pointer)
1687 pointer_unblank ();
1688
1689 if (ev.type == KeyPress && hidden_pointer == 0)
1690 pointer_blank ();
1691 }
1692#endif
1693
1694 refresh_check ();
1695}
1696
1697#if ENABLE_FRILLS
1698void
1699rxvt_term::set_urgency (bool enable)
1700{
1701 if (enable == urgency_hint)
1702 return;
1703
1704 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1705 {
1706 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1707 XSetWMHints (dpy, parent[0], h);
1708 urgency_hint = enable;
1709 }
1710}
1711#endif
1712
1713void
1714rxvt_term::focus_in ()
1715{
1716 if (!focus)
1717 {
1718 focus = 1;
1719 want_refresh = 1;
1720
1721#if USE_XIM
1722 if (Input_Context != NULL)
1723 {
1724 IMSetPosition ();
1725 XSetICFocus (Input_Context);
1726 }
1727#endif
1728#if CURSOR_BLINK
1729 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.again ();
1731#endif
1732#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade])
1734 {
1735 pix_colors = pix_colors_focused;
1736 scr_recolour ();
1737 }
1738#endif
1739#if ENABLE_FRILLS
1740 if (option (Opt_urgentOnBell))
1741 set_urgency (0);
1742#endif
1743
1744 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1745 }
1746}
1747
1748void
1749rxvt_term::focus_out ()
1750{
1751 if (focus)
1752 {
1753 focus = 0;
1754 want_refresh = 1;
1755
1756#if ENABLE_FRILLS
1757 if (option (Opt_urgentOnBell))
1758 set_urgency (0);
1759#endif
1760#if ENABLE_FRILLS || ISO_14755
1761 if (iso14755buf)
1762 {
1763 iso14755buf = 0;
1764# if ISO_14755
1765 scr_overlay_off ();
1766# endif
1767 }
1768#endif
1769#if USE_XIM
1770 if (Input_Context != NULL)
1771 XUnsetICFocus (Input_Context);
1772#endif
1773#if CURSOR_BLINK
1774 if (option (Opt_cursorBlink))
1775 cursor_blink_ev.stop ();
1776
1777 hidden_cursor = 0;
1778#endif
1779#if OFF_FOCUS_FADING
1780 if (rs[Rs_fade])
1781 {
1782 pix_colors = pix_colors_unfocused;
1783 scr_recolour ();
1784 }
1785#endif
1786
1787 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1788 }
1789}
1790
1791void
1792rxvt_term::update_fade_color (unsigned int idx)
1793{
1794#if OFF_FOCUS_FADING
1795 if (rs[Rs_fade])
1796 {
1797 rgba c;
1798 pix_colors [Color_fade].get (c);
1799 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1800 }
1801#endif
1802}
1803
1804#if ENABLE_TRANSPARENCY || ENABLE_PERL
1553void 1805void
1554rxvt_term::rootwin_cb (XEvent &ev) 1806rxvt_term::rootwin_cb (XEvent &ev)
1555{ 1807{
1556 SET_R (this); 1808 make_current ();
1557 SET_LOCALE (locale);
1558 1809
1559 if (ev.type == PropertyNotify) 1810 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1811 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1812 return;
1813
1814# if ENABLE_TRANSPARENCY
1815 switch (ev.type)
1560 { 1816 {
1817 case PropertyNotify:
1561 /* 1818 /*
1562 * if user used some Esetroot compatible prog to set the root bg, 1819 * if user used some Esetroot compatible prog to set the root bg,
1563 * use the property to determine the pixmap. We use it later on. 1820 * use the property to determine the pixmap. We use it later on.
1564 */ 1821 */
1565 if (xa[XA_XROOTPMAPID] == 0)
1566 xa[XA_XROOTPMAPID] = XInternAtom(display->display, "_XROOTPMAP_ID", False);
1567
1568 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1822 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1823 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1824 {
1825 bgPixmap.set_root_pixmap ();
1826 update_background ();
1827 }
1828
1569 return; 1829 break;
1570 }
1571
1572 if ((Options & Opt_transparent) && check_our_parents ())
1573 { 1830 }
1574 if (am_transparent) 1831# endif
1575 want_full_refresh = 1;
1576 }
1577}
1578 1832
1833 refresh_check ();
1834}
1835#endif
1836
1579void 1837void
1580rxvt_term::button_press (const XButtonEvent &ev) 1838rxvt_term::button_press (XButtonEvent &ev)
1581{ 1839{
1582 int reportmode = 0, clickintime; 1840 int reportmode = 0, clickintime;
1583 1841
1584 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1842 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1843
1585 if (!bypass_keystate) 1844 if (!bypass_keystate)
1586 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1845 reportmode = !! (priv_modes & PrivMode_mouse_report);
1846
1587 /* 1847 /*
1588 * VT window processing of button press 1848 * VT window processing of button press
1589 */ 1849 */
1590 if (ev.window == TermWin.vt) 1850 if (ev.window == vt)
1591 { 1851 {
1592#if RXVT_GRAPHICS 1852 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1593 if (ev.subwindow != None) 1853 return;
1594 rxvt_Gr_ButtonPress (ev.x, ev.y);
1595 else
1596#endif
1597 1854
1855#if ISO_14755
1856 // 5.4
1857 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1858 {
1859 iso14755_54 (ev.x, ev.y);
1860 return;
1598 { 1861 }
1862#endif
1863
1599 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1864 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1865
1600 if (reportmode) 1866 if (reportmode)
1867 {
1868 /* mouse report from vt window */
1869 /* save the xbutton state (for ButtonRelease) */
1870 MEvent.state = ev.state;
1871#ifdef MOUSE_REPORT_DOUBLECLICK
1872 if (ev.button == MEvent.button && clickintime)
1601 { 1873 {
1602 /* mouse report from vt window */ 1874 /* same button, within alloted time */
1603 /* save the xbutton state (for ButtonRelease) */ 1875 MEvent.clicks++;
1604 MEvent.state = ev.state; 1876
1605#ifdef MOUSE_REPORT_DOUBLECLICK 1877 if (MEvent.clicks > 1)
1606 if (ev.button == MEvent.button && clickintime)
1607 { 1878 {
1608 /* same button, within alloted time */
1609 MEvent.clicks++;
1610 if (MEvent.clicks > 1)
1611 {
1612 /* only report double clicks */ 1879 /* only report double clicks */
1613 MEvent.clicks = 2; 1880 MEvent.clicks = 2;
1614 mouse_report (ev); 1881 mouse_report (ev);
1615 1882
1616 /* don't report the release */ 1883 /* don't report the release */
1617 MEvent.clicks = 0; 1884 MEvent.clicks = 0;
1618 MEvent.button = AnyButton; 1885 MEvent.button = AnyButton;
1619 }
1620 } 1886 }
1621 else
1622 {
1623 /* different button, or time expired */
1624 MEvent.clicks = 1;
1625 MEvent.button = ev.button;
1626 mouse_report (ev);
1627 }
1628#else
1629 MEvent.button = ev.button;
1630 mouse_report (ev);
1631#endif /* MOUSE_REPORT_DOUBLECLICK */
1632
1633 } 1887 }
1634 else 1888 else
1635 { 1889 {
1890 /* different button, or time expired */
1891 MEvent.clicks = 1;
1892 MEvent.button = ev.button;
1893 mouse_report (ev);
1894 }
1895#else
1896 MEvent.button = ev.button;
1897 mouse_report (ev);
1898#endif /* MOUSE_REPORT_DOUBLECLICK */
1899
1900 }
1901 else
1902 {
1636 if (ev.button != MEvent.button) 1903 if (ev.button != MEvent.button)
1637 MEvent.clicks = 0; 1904 MEvent.clicks = 0;
1905
1638 switch (ev.button) 1906 switch (ev.button)
1639 { 1907 {
1640 case Button1: 1908 case Button1:
1909 /* allow meta + click to select rectangular areas */
1910 /* should be done in screen.C */
1911#if ENABLE_FRILLS
1912 selection.rect = !!(ev.state & ModMetaMask);
1913#else
1914 selection.rect = false;
1915#endif
1916
1641 /* allow shift+left click to extend selection */ 1917 /* allow shift+left click to extend selection */
1642 if (ev.state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1918 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1643 { 1919 {
1644 if (MEvent.button == Button1 && clickintime)
1645 selection_rotate (ev.x, ev.y);
1646 else
1647 selection_extend (ev.x, ev.y, 1);
1648 }
1649 else
1650 {
1651 if (MEvent.button == Button1 && clickintime)
1652 MEvent.clicks++;
1653 else
1654 MEvent.clicks = 1;
1655
1656 selection_click (MEvent.clicks, ev.x, ev.y);
1657 }
1658
1659 MEvent.button = Button1;
1660 break;
1661
1662 case Button3:
1663 if (MEvent.button == Button3 && clickintime) 1920 if (MEvent.button == Button1 && clickintime)
1664 selection_rotate (ev.x, ev.y); 1921 selection_rotate (ev.x, ev.y);
1665 else 1922 else
1666 selection_extend (ev.x, ev.y, 1); 1923 selection_extend (ev.x, ev.y, 1);
1924 }
1925 else
1926 {
1927 if (MEvent.button == Button1 && clickintime)
1928 MEvent.clicks++;
1929 else
1930 MEvent.clicks = 1;
1931
1932 selection_click (MEvent.clicks, ev.x, ev.y);
1933 }
1934
1935 MEvent.button = Button1;
1936 break;
1937
1938 case Button3:
1939 if (MEvent.button == Button3 && clickintime)
1940 selection_rotate (ev.x, ev.y);
1941 else
1942 selection_extend (ev.x, ev.y, 1);
1943
1667 MEvent.button = Button3; 1944 MEvent.button = Button3;
1668 break; 1945 break;
1669 }
1670 } 1946 }
1947 }
1948
1671 MEvent.time = ev.time; 1949 MEvent.time = ev.time;
1672 return; 1950 return;
1673 }
1674 } 1951 }
1675 1952
1676 /* 1953 /*
1677 * Scrollbar window processing of button press 1954 * Scrollbar window processing of button press
1678 */ 1955 */
1679 if (isScrollbarWindow(ev.window)) 1956 if (scrollBar.state && ev.window == scrollBar.win)
1680 { 1957 {
1681 scrollBar.setIdle (); 1958 page_dirn direction = NO_DIR;
1959
1960 if (scrollBar.upButton (ev.y))
1961 direction = UP; /* up */
1962 else if (scrollBar.dnButton (ev.y))
1963 direction = DN; /* down */
1964
1965 scrollBar.state = STATE_IDLE;
1682 /* 1966 /*
1683 * Rxvt-style scrollbar: 1967 * Rxvt-style scrollbar:
1684 * move up if mouse is above slider 1968 * move up if mouse is above slider
1685 * move dn if mouse is below slider 1969 * move dn if mouse is below slider
1686 * 1970 *
… …
1695 /* 1979 /*
1696 * Mouse report disabled scrollbar: 1980 * Mouse report disabled scrollbar:
1697 * arrow buttons - send up/down 1981 * arrow buttons - send up/down
1698 * click on scrollbar - send pageup/down 1982 * click on scrollbar - send pageup/down
1699 */ 1983 */
1700 if ((scrollBar.style == R_SB_NEXT 1984 if (direction == UP)
1701 && scrollbarnext_upButton(ev.y))
1702 || (scrollBar.style == R_SB_RXVT
1703 && scrollbarrxvt_upButton(ev.y)))
1704 tt_printf("\033[A"); 1985 tt_printf ("\033[A");
1705 else if ((scrollBar.style == R_SB_NEXT 1986 else if (direction == DN)
1706 && scrollbarnext_dnButton(ev.y))
1707 || (scrollBar.style == R_SB_RXVT
1708 && scrollbarrxvt_dnButton(ev.y)))
1709 tt_printf("\033[B"); 1987 tt_printf ("\033[B");
1710 else 1988 else
1711 switch (ev.button) 1989 switch (ev.button)
1712 { 1990 {
1713 case Button2: 1991 case Button2:
1714 tt_printf("\014"); 1992 tt_printf ("\014");
1715 break; 1993 break;
1716 case Button1: 1994 case Button1:
1717 tt_printf("\033[6~"); 1995 tt_printf ("\033[6~");
1718 break; 1996 break;
1719 case Button3: 1997 case Button3:
1720 tt_printf("\033[5~"); 1998 tt_printf ("\033[5~");
1721 break; 1999 break;
1722 } 2000 }
1723 } 2001 }
1724 else 2002 else
1725#endif /* NO_SCROLLBAR_REPORT */ 2003#endif /* NO_SCROLLBAR_REPORT */
1726
1727 {
1728 char upordown = 0;
1729
1730 if (scrollBar.style == R_SB_NEXT)
1731 { 2004 {
1732 if (scrollbarnext_upButton(ev.y)) 2005 if (direction != NO_DIR)
1733 upordown = -1; /* up */
1734 else if (scrollbarnext_dnButton(ev.y))
1735 upordown = 1; /* down */
1736 }
1737 else if (scrollBar.style == R_SB_RXVT)
1738 {
1739 if (scrollbarrxvt_upButton(ev.y))
1740 upordown = -1; /* up */
1741 else if (scrollbarrxvt_dnButton(ev.y))
1742 upordown = 1; /* down */
1743 }
1744 if (upordown)
1745 { 2006 {
1746#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1747 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2008 if (!cont_scroll_ev.is_active ())
2009 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1748#endif 2010#endif
1749 if (scr_page (upordown < 0 ? UP : DN, 1)) 2011 if (scr_page (direction, 1))
1750 { 2012 {
1751 if (upordown < 0) 2013 if (direction == UP)
1752 scrollBar.setUp (); 2014 scrollBar.state = STATE_UP;
1753 else 2015 else
1754 scrollBar.setDn (); 2016 scrollBar.state = STATE_DOWN;
1755 } 2017 }
1756 } 2018 }
1757 else 2019 else
1758 switch (ev.button) 2020 switch (ev.button)
1759 { 2021 {
1760 case Button2: 2022 case Button2:
1761 switch (scrollbar_align) 2023 switch (scrollBar.align)
1762 { 2024 {
1763 case R_SB_ALIGN_TOP: 2025 case R_SB_ALIGN_TOP:
1764 csrO = 0; 2026 csrO = 0;
1765 break; 2027 break;
1766 case R_SB_ALIGN_CENTRE: 2028 case R_SB_ALIGN_CENTRE:
… …
1768 break; 2030 break;
1769 case R_SB_ALIGN_BOTTOM: 2031 case R_SB_ALIGN_BOTTOM:
1770 csrO = scrollBar.bot - scrollBar.top; 2032 csrO = scrollBar.bot - scrollBar.top;
1771 break; 2033 break;
1772 } 2034 }
2035
1773 if (scrollBar.style == R_SB_XTERM 2036 if (scrollBar.style == R_SB_XTERM
1774 || scrollbar_above_slider(ev.y) 2037 || scrollbar_above_slider (ev.y)
1775 || scrollbar_below_slider(ev.y)) 2038 || scrollbar_below_slider (ev.y))
1776 scr_move_to ( scrollbar_position(ev.y) - csrO, 2039 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
1777 scrollbar_size()); 2040
1778 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
1779 break; 2042 break;
1780 2043
1781 case Button1: 2044 case Button1:
1782 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2045 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1783 csrO = ev.y - scrollBar.top; 2046 csrO = ev.y - scrollBar.top;
1784 /* FALLTHROUGH */ 2047 /* FALLTHROUGH */
1785 2048
1786 case Button3: 2049 case Button3:
1787 if (scrollBar.style != R_SB_XTERM) 2050 if (scrollBar.style != R_SB_XTERM)
1788 { 2051 {
1789 if (scrollbar_above_slider(ev.y)) 2052 if (scrollbar_above_slider (ev.y))
1790# ifdef RXVT_SCROLL_FULL 2053# ifdef RXVT_SCROLL_FULL
1791 scr_page (UP, TermWin.nrow - 1); 2054 scr_page (UP, nrow - 1);
1792# else 2055# else
1793 scr_page (UP, TermWin.nrow / 4); 2056 scr_page (UP, nrow / 4);
1794# endif 2057# endif
1795 else if (scrollbar_below_slider(ev.y)) 2058 else if (scrollbar_below_slider (ev.y))
1796# ifdef RXVT_SCROLL_FULL 2059# ifdef RXVT_SCROLL_FULL
1797 scr_page (DN, TermWin.nrow - 1); 2060 scr_page (DN, nrow - 1);
1798# else 2061# else
1799 scr_page (DN, TermWin.nrow / 4); 2062 scr_page (DN, nrow / 4);
1800# endif 2063# endif
1801 else 2064 else
1802 scrollBar.setMotion (); 2065 scrollBar.state = STATE_MOTION;
1803 } 2066 }
1804 else 2067 else
1805 { 2068 {
1806 scr_page ((ev.button == Button1 ? DN : UP), 2069 scr_page ((ev.button == Button1 ? DN : UP),
1807 (TermWin.nrow 2070 (nrow
1808 * scrollbar_position(ev.y) 2071 * scrollbar_position (ev.y)
1809 / scrollbar_size())); 2072 / scrollBar.size ()));
1810 } 2073 }
2074
1811 break; 2075 break;
1812 } 2076 }
1813 } 2077 }
2078
1814 return; 2079 return;
1815 } 2080 }
1816#if MENUBAR
1817 /*
1818 * Menubar window processing of button press
1819 */
1820 if (isMenuBarWindow(ev.window))
1821 menubar_control (ev);
1822#endif
1823} 2081}
1824 2082
1825void 2083void
1826rxvt_term::button_release (const XButtonEvent &ev) 2084rxvt_term::button_release (XButtonEvent &ev)
1827{ 2085{
1828 int reportmode = 0; 2086 int reportmode = 0;
1829 2087
1830 csrO = 0; /* reset csr Offset */ 2088 csrO = 0; /* reset csr Offset */
1831 if (!bypass_keystate) 2089 if (!bypass_keystate)
1832 reportmode = !!(PrivateModes & PrivMode_mouse_report); 2090 reportmode = !! (priv_modes & PrivMode_mouse_report);
1833 2091
1834 if (scrollbar_isUpDn()) 2092 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1835 { 2093 {
1836 scrollBar.setIdle (); 2094 scrollBar.state = STATE_IDLE;
1837 scrollbar_show (0); 2095 scrollBar.show (0);
1838#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1839 refresh_type &= ~SMOOTH_REFRESH;
1840#endif
1841
1842 } 2096 }
2097
1843#ifdef SELECTION_SCROLLING 2098#ifdef SELECTION_SCROLLING
1844 pending_scroll_selection=0; 2099 sel_scroll_ev.stop();
1845#endif 2100#endif
2101
1846 if (ev.window == TermWin.vt) 2102 if (ev.window == vt)
1847 { 2103 {
1848#ifdef RXVT_GRAPHICS 2104 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
1849 if (ev.subwindow != None) 2105 return;
1850 rxvt_Gr_ButtonRelease(ev.x, ev.y);
1851 else
1852#endif
1853 2106
1854 { 2107#if ISO_14755
2108 // 5.4
2109 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2110 return;
2111#endif
2112
1855 if (reportmode) 2113 if (reportmode)
2114 {
2115 /* mouse report from vt window */
2116 /* don't report release of wheel "buttons" */
2117 if (ev.button >= 4)
2118 return;
2119#ifdef MOUSE_REPORT_DOUBLECLICK
2120 /* only report the release of 'slow' single clicks */
2121 if (MEvent.button != AnyButton
2122 && (ev.button != MEvent.button
2123 || (ev.time - MEvent.time
2124 > MULTICLICK_TIME / 2)))
1856 { 2125 {
1857 /* mouse report from vt window */
1858 /* don't report release of wheel "buttons" */
1859 if (ev.button >= 4)
1860 return;
1861#ifdef MOUSE_REPORT_DOUBLECLICK
1862 /* only report the release of 'slow' single clicks */
1863 if (MEvent.button != AnyButton
1864 && (ev.button != MEvent.button
1865 || (ev.time - MEvent.time
1866 > MULTICLICK_TIME / 2)))
1867 {
1868 MEvent.clicks = 0; 2126 MEvent.clicks = 0;
1869 MEvent.button = AnyButton;
1870 mouse_report (ev);
1871 }
1872#else /* MOUSE_REPORT_DOUBLECLICK */
1873 MEvent.button = AnyButton; 2127 MEvent.button = AnyButton;
1874 mouse_report (ev); 2128 mouse_report (ev);
1875#endif /* MOUSE_REPORT_DOUBLECLICK */
1876 return;
1877 } 2129 }
2130#else /* MOUSE_REPORT_DOUBLECLICK */
2131 MEvent.button = AnyButton;
2132 mouse_report (ev);
2133#endif /* MOUSE_REPORT_DOUBLECLICK */
2134 return;
2135 }
2136
1878 /* 2137 /*
1879 * dumb hack to compensate for the failure of click-and-drag 2138 * dumb hack to compensate for the failure of click-and-drag
1880 * when overriding mouse reporting 2139 * when overriding mouse reporting
1881 */ 2140 */
1882 if (PrivateModes & PrivMode_mouse_report 2141 if (priv_modes & PrivMode_mouse_report
1883 && bypass_keystate 2142 && bypass_keystate
1884 && ev.button == Button1 && MEvent.clicks <= 1) 2143 && ev.button == Button1 && MEvent.clicks <= 1)
1885 selection_extend (ev.x, ev.y, 0); 2144 selection_extend (ev.x, ev.y, 0);
1886 2145
1887 switch (ev.button) 2146 switch (ev.button)
2147 {
2148 case Button1:
2149 case Button3:
2150 selection_make (ev.time);
2151 break;
2152
2153 case Button2:
2154 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2155 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2156 break;
2157
2158#ifdef MOUSE_WHEEL
2159 case Button4:
2160 case Button5:
1888 { 2161 {
1889 case Button1: 2162 int i;
1890 case Button3: 2163 page_dirn v;
1891 selection_make (ev.time); 2164
2165 v = ev.button == Button4 ? UP : DN;
2166
2167 if (ev.state & ShiftMask)
1892 break; 2168 i = 1;
1893 case Button2: 2169 else if (option (Opt_mouseWheelScrollPage))
1894 selection_request (ev.time, ev.x, ev.y); 2170 i = nrow - 1;
2171 else
1895 break; 2172 i = 5;
2173
1896#ifdef MOUSE_WHEEL 2174# ifdef MOUSE_SLIP_WHEELING
1897 case Button4: 2175 if (ev.state & ControlMask)
1898 case Button5:
1899 { 2176 {
1900 int i;
1901 page_dirn v;
1902
1903 v = (ev.button == Button4) ? UP : DN;
1904 if (ev.state & ShiftMask)
1905 i = 1;
1906 else if ((Options & Opt_mouseWheelScrollPage))
1907 i = TermWin.nrow - 1;
1908 else
1909 i = 5;
1910# ifdef MOUSE_SLIP_WHEELING
1911 if (ev.state & ControlMask)
1912 {
1913 mouse_slip_wheel_speed += (v ? -1 : 1); 2177 mouse_slip_wheel_speed += v ? -1 : 1;
1914 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2178 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2179 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2180
2181 if (!slip_wheel_ev.is_active ())
2182 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1915 } 2183 }
2184 else
1916# endif 2185# endif
1917# ifdef JUMP_MOUSE_WHEEL 2186 {
1918 scr_page (v, i); 2187 scr_page (v, i);
1919 scr_refresh (SMOOTH_REFRESH);
1920 scrollbar_show (1); 2188 scrollBar.show (1);
1921# else
1922 while (i--)
1923 {
1924 scr_page (v, 1);
1925 scr_refresh (SMOOTH_REFRESH);
1926 scrollbar_show (1);
1927 }
1928# endif
1929
1930 }
1931 break;
1932#endif
1933
1934 }
1935 }
1936 }
1937#ifdef MENUBAR
1938 else if (isMenuBarWindow(ev.window))
1939 menubar_control (ev);
1940#endif
1941}
1942
1943
1944#ifdef TRANSPARENT
1945/*
1946 * Check our parents are still who we think they are.
1947 * Do transparency updates if required
1948 */
1949int
1950rxvt_term::check_our_parents ()
1951{
1952 int i, pchanged, aformat, have_pixmap, rootdepth;
1953 unsigned long nitems, bytes_after;
1954 Atom atype;
1955 unsigned char *prop = NULL;
1956 Window root, oldp, *list;
1957 Pixmap rootpixmap = None;
1958 XWindowAttributes wattr, wrootattr;
1959
1960 pchanged = 0;
1961
1962 if (!(Options & Opt_transparent))
1963 return pchanged; /* Don't try any more */
1964
1965 XGetWindowAttributes(display->display, display->root, &wrootattr);
1966 rootdepth = wrootattr.depth;
1967
1968 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr);
1969 if (rootdepth != wattr.depth)
1970 {
1971 if (am_transparent)
1972 {
1973 pchanged = 1;
1974 XSetWindowBackground(display->display, TermWin.vt,
1975 PixColors[Color_bg]);
1976 am_transparent = am_pixmap_trans = 0;
1977 }
1978 return pchanged; /* Don't try any more */
1979 }
1980
1981 /* Get all X ops out of the queue so that our information is up-to-date. */
1982 XSync(display->display, False);
1983
1984 /*
1985 * Make the frame window set by the window manager have
1986 * the root background. Some window managers put multiple nested frame
1987 * windows for each client, so we have to take care about that.
1988 */
1989 i = (xa[XA_XROOTPMAPID] != 0
1990 && (XGetWindowProperty(display->display, display->root, xa[XA_XROOTPMAPID],
1991 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1992 &nitems, &bytes_after, &prop) == Success));
1993 if (!i || prop == NULL)
1994 have_pixmap = 0;
1995 else
1996 {
1997 have_pixmap = 1;
1998 rootpixmap = *((Pixmap *)prop);
1999 XFree(prop);
2000 }
2001 if (have_pixmap)
2002 {
2003 /*
2004 * Copy display->root pixmap transparency
2005 */
2006 int sx, sy, nx, ny;
2007 unsigned int nw, nh;
2008 Window cr;
2009 XImage *image;
2010 GC gc;
2011 XGCValues gcvalue;
2012
2013 XTranslateCoordinates(display->display, TermWin.parent[0], display->root,
2014 0, 0, &sx, &sy, &cr);
2015 nw = (unsigned int)szHint.width;
2016 nh = (unsigned int)szHint.height;
2017 nx = ny = 0;
2018 if (sx < 0)
2019 {
2020 nw += sx;
2021 nx = -sx;
2022 sx = 0;
2023 }
2024 if (sy < 0)
2025 {
2026 nh += sy;
2027 ny = -sy;
2028 sy = 0;
2029 }
2030 MIN_IT(nw, (unsigned int)(wrootattr.width - sx));
2031 MIN_IT(nh, (unsigned int)(wrootattr.height - sy));
2032 allowedxerror = -1;
2033 image = XGetImage(display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
2034 ZPixmap);
2035 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2036 /* XXX: may need a delay here? */
2037 allowedxerror = 0;
2038 if (image == NULL)
2039 {
2040 if (am_transparent && am_pixmap_trans)
2041 {
2042 pchanged = 1;
2043 if (TermWin.pixmap != None)
2044 {
2045 XFreePixmap(display->display, TermWin.pixmap);
2046 TermWin.pixmap = None;
2047 } 2189 }
2048 } 2190 }
2049 am_pixmap_trans = 0; 2191 break;
2192#endif
2193 }
2194 }
2195}
2196
2197/*}}} */
2198
2199void
2200rxvt_term::cmd_parse ()
2201{
2202 wchar_t ch = NOCHAR;
2203 char *seq_begin; // remember start of esc-sequence here
2204
2205 for (;;)
2206 {
2207 if (expect_false (ch == NOCHAR))
2208 {
2209 seq_begin = cmdbuf_ptr;
2210 ch = next_char ();
2211
2212 if (ch == NOCHAR)
2213 break;
2214 }
2215
2216 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2217 {
2218 if (expect_false (!seen_input))
2219 {
2220 seen_input = 1;
2221 // many badly-written programs (e.g. jed) contain a race condition:
2222 // they first read the screensize and then install a SIGWINCH handler.
2223 // some window managers resize the window early, and these programs
2224 // then sometimes get the size wrong.
2225 // unfortunately other programs are even more buggy and dislike
2226 // being sent SIGWINCH, so only do it when we were in fact being
2227 // resized.
2228 if (seen_resize && cmd_pid)
2229 kill (-cmd_pid, SIGWINCH);
2230 }
2231
2232 /* Read a text string from the input buffer */
2233 wchar_t buf[UBUFSIZ];
2234 bool refreshnow = false;
2235 int nlines = 0;
2236 wchar_t *str = buf;
2237 wchar_t *eol = str + min (ncol, UBUFSIZ);
2238
2239 for (;;)
2240 {
2241 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2242 break;
2243
2244 *str++ = ch;
2245
2246 if (expect_false (ch == C0_LF || str >= eol))
2247 {
2248 if (ch == C0_LF)
2249 nlines++;
2250
2251 refresh_count++;
2252
2253 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2254 {
2255 refresh_count = 0;
2256
2257 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2258 {
2259 refreshnow = true;
2260 ch = NOCHAR;
2261 break;
2262 }
2263 }
2264
2265 // scr_add_lines only works for nlines <= nrow - 1.
2266 if (nlines >= nrow - 1)
2267 {
2268 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2269 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2270 scr_add_lines (buf, str - buf, nlines);
2271
2272 nlines = 0;
2273 str = buf;
2274 eol = str + min (ncol, UBUFSIZ);
2275 }
2276
2277 if (str >= eol)
2278 {
2279 if (eol >= buf + UBUFSIZ)
2280 {
2281 ch = NOCHAR;
2282 break;
2283 }
2284 else
2285 eol = min (eol + ncol, buf + UBUFSIZ);
2286 }
2287
2288 }
2289
2290 seq_begin = cmdbuf_ptr;
2291 ch = next_char ();
2292 }
2293
2294 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2295 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2296 scr_add_lines (buf, str - buf, nlines);
2297
2298 /*
2299 * If there have been a lot of new lines, then update the screen
2300 * What the heck we'll cheat and only refresh less than every page-full.
2301 * if skipScroll is enabled.
2302 */
2303 if (refreshnow)
2304 {
2305 scr_refresh ();
2306 want_refresh = 1;
2307 }
2050 } 2308 }
2051 else 2309 else
2052 { 2310 {
2053 if (TermWin.pixmap != None) 2311 try
2054 XFreePixmap(display->display, TermWin.pixmap);
2055 TermWin.pixmap = XCreatePixmap(display->display, TermWin.vt,
2056 (unsigned int)szHint.width,
2057 (unsigned int)szHint.height,
2058 (unsigned int)image->depth);
2059 gc = XCreateGC(display->display, TermWin.vt, 0UL, &gcvalue);
2060 XPutImage(display->display, TermWin.pixmap, gc, image, 0, 0,
2061 nx, ny, (unsigned int)image->width,
2062 (unsigned int)image->height);
2063 XFreeGC(display->display, gc);
2064 XDestroyImage(image);
2065 XSetWindowBackgroundPixmap(display->display, TermWin.vt,
2066 TermWin.pixmap);
2067 if (!am_transparent || !am_pixmap_trans)
2068 pchanged = 1;
2069 am_transparent = am_pixmap_trans = 1;
2070 }
2071 }
2072 if (!am_pixmap_trans)
2073 {
2074 unsigned int n;
2075 /*
2076 * InheritPixmap transparency
2077 */
2078 D_X((stderr, "InheritPixmap Seeking to %08lx", display->root));
2079 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window));
2080 i++)
2081 {
2082 oldp = TermWin.parent[i];
2083 XQueryTree(display->display, TermWin.parent[i - 1], &root,
2084 &TermWin.parent[i], &list, &n);
2085 XFree(list);
2086 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2087 if (TermWin.parent[i] == display->root)
2088 { 2312 {
2089 if (oldp != None) 2313 process_nonprinting (ch);
2090 pchanged = 1; 2314 }
2315 catch (const class out_of_input &o)
2316 {
2317 // we ran out of input, retry later
2318 cmdbuf_ptr = seq_begin;
2091 break; 2319 break;
2092 } 2320 }
2093 if (oldp != TermWin.parent[i]) 2321
2094 pchanged = 1; 2322 ch = NOCHAR;
2095 }
2096 n = 0;
2097 if (pchanged)
2098 { 2323 }
2099 for (; n < (unsigned int)i; n++) 2324 }
2100 { 2325}
2101 XGetWindowAttributes(display->display, TermWin.parent[n], &wattr); 2326
2102 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2327// read the next character
2103 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2328wchar_t
2104 { 2329rxvt_term::next_char () NOTHROW
2105 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2330{
2106 break; 2331 while (cmdbuf_ptr < cmdbuf_endp)
2107 } 2332 {
2108 } 2333 // assume 7-bit to be ascii ALWAYS
2334 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2335 return *cmdbuf_ptr++;
2336
2337 wchar_t wc;
2338 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2339
2340 if (len == (size_t)-2)
2109 } 2341 {
2110 if (n > (int)(sizeof(TermWin.parent) 2342 // the mbstate stores incomplete sequences. didn't know this :/
2111 / sizeof(TermWin.parent[0]))) 2343 cmdbuf_ptr = cmdbuf_endp;
2344 break;
2112 { 2345 }
2113 D_X((stderr, "InheritPixmap Turning off")); 2346
2114 XSetWindowBackground(display->display, TermWin.parent[0], 2347 if (len == (size_t)-1)
2115 PixColors[Color_fg]);
2116 XSetWindowBackground(display->display, TermWin.vt,
2117 PixColors[Color_bg]);
2118 am_transparent = 0;
2119 /* XXX: also turn off Opt_transparent? */
2120 } 2348 {
2121 else 2349 mbstate.reset (); // reset now undefined conversion state
2350 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2122 { 2351 }
2123 /* wait (an arbitrary period) for the WM to do its thing
2124 * needed for fvwm2.2.2 (and before?) */
2125# ifdef HAVE_NANOSLEEP
2126 struct timespec rqt;
2127 2352
2128 rqt.tv_sec = 1; 2353 // assume wchar == unicode
2129 rqt.tv_nsec = 0; 2354 cmdbuf_ptr += len;
2130 nanosleep(&rqt, NULL); 2355 return wc & UNICODE_MASK;
2131# else
2132 sleep(1);
2133# endif
2134 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2135 for (n = 0; n < (unsigned int)i; n++)
2136 XSetWindowBackgroundPixmap(display->display, TermWin.parent[n],
2137 ParentRelative);
2138 XSetWindowBackgroundPixmap(display->display, TermWin.vt,
2139 ParentRelative);
2140 am_transparent = 1;
2141 }
2142 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++)
2143 TermWin.parent[i] = None;
2144 } 2356 }
2357
2358 return NOCHAR;
2359}
2360
2361// read the next octet
2362uint32_t
2363rxvt_term::next_octet () NOTHROW
2364{
2365 return cmdbuf_ptr < cmdbuf_endp
2366 ? (unsigned char)*cmdbuf_ptr++
2367 : NOCHAR;
2368}
2369
2370static class out_of_input out_of_input;
2371
2372/* rxvt_cmd_getc () - Return next input character */
2373/*
2374 * Return the next input character after first passing any keyboard input
2375 * to the command.
2376 */
2377wchar_t
2378rxvt_term::cmd_getc () THROW ((class out_of_input))
2379{
2380 wchar_t c = next_char ();
2381
2382 if (c == NOCHAR)
2383 throw out_of_input;
2384
2145 return pchanged; 2385 return c;
2146} 2386}
2147#endif
2148 2387
2149/*}}} */ 2388uint32_t
2389rxvt_term::cmd_get8 () THROW ((class out_of_input))
2390{
2391 uint32_t c = next_octet ();
2392
2393 if (c == NOCHAR)
2394 throw out_of_input;
2395
2396 return c;
2397}
2150 2398
2151/*{{{ print pipe */ 2399/*{{{ print pipe */
2152/*----------------------------------------------------------------------*/ 2400/*----------------------------------------------------------------------*/
2153#ifdef PRINTPIPE 2401#ifdef PRINTPIPE
2154FILE * 2402FILE *
2155rxvt_term::popen_printer () 2403rxvt_term::popen_printer ()
2156{ 2404{
2157 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2405 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2158 2406
2159 if (stream == NULL) 2407 if (stream == NULL)
2160 rxvt_print_error("can't open printer pipe"); 2408 rxvt_warn ("can't open printer pipe, not printing.\n");
2409
2161 return stream; 2410 return stream;
2162} 2411}
2163 2412
2164int 2413int
2165rxvt_term::pclose_printer (FILE *stream) 2414rxvt_term::pclose_printer (FILE *stream)
2166{ 2415{
2167 fflush (stream); 2416 fflush (stream);
2168 /* pclose() reported not to work on SunOS 4.1.3 */
2169# if defined (__sun__) /* TODO: RESOLVE THIS */
2170 /* pclose works provided SIGCHLD handler uses waitpid */
2171 return pclose (stream); /* return fclose (stream); */
2172# else
2173 return pclose (stream); 2417 return pclose (stream);
2174# endif
2175} 2418}
2176 2419
2177/* 2420/*
2178 * simulate attached vt100 printer 2421 * simulate attached vt100 printer
2179 */ 2422 */
2180void 2423void
2181rxvt_term::process_print_pipe () 2424rxvt_term::process_print_pipe ()
2182{ 2425{
2183 int done; 2426 FILE *fd = popen_printer ();
2184 FILE *fd;
2185 2427
2186 if ((fd = popen_printer ()) == NULL) 2428 if (!fd)
2187 return; 2429 return;
2188 2430
2189 /* 2431 /*
2190 * Send all input to the printer until either ESC[4i or ESC[?4i 2432 * Send all input to the printer until either ESC[4i or ESC[?4i
2191 * is received. 2433 * is received.
2192 */ 2434 */
2193 for (done = 0; !done;) 2435 for (int done = 0; !done; )
2194 { 2436 {
2195 unsigned char buf[8]; 2437 unsigned char buf[8];
2196 unsigned char ch; 2438 unicode_t ch;
2197 unsigned int i, len; 2439 unsigned int i, len;
2198 2440
2199 if ((ch = cmd_getc ()) != C0_ESC) 2441 if ((ch = cmd_getc ()) != C0_ESC)
2200 { 2442 {
2201 if (putc(ch, fd) == EOF) 2443 if (putc (ch, fd) == EOF)
2202 break; /* done = 1 */ 2444 break; /* done = 1 */
2203 } 2445 }
2204 else 2446 else
2205 { 2447 {
2206 len = 0; 2448 len = 0;
… …
2217 { 2459 {
2218 if ((buf[len++] = cmd_getc ()) == 'i') 2460 if ((buf[len++] = cmd_getc ()) == 'i')
2219 break; /* done = 1 */ 2461 break; /* done = 1 */
2220 } 2462 }
2221 } 2463 }
2464
2222 for (i = 0; i < len; i++) 2465 for (i = 0; i < len; i++)
2223 if (putc(buf[i], fd) == EOF) 2466 if (putc (buf[i], fd) == EOF)
2224 { 2467 {
2225 done = 1; 2468 done = 1;
2226 break; 2469 break;
2227 } 2470 }
2228 } 2471 }
2229 } 2472 }
2473
2230 pclose_printer (fd); 2474 pclose_printer (fd);
2231} 2475}
2232#endif /* PRINTPIPE */ 2476#endif /* PRINTPIPE */
2233/*}}} */ 2477/*}}} */
2234 2478
2235/* *INDENT-OFF* */ 2479/* *INDENT-OFF* */
2236enum { 2480enum {
2237 C1_40 = 0x40, 2481 C1_40 = 0x40,
2238 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2482 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2239 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2483 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2240 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2484 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2241 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2485 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2242}; 2486};
2243/* *INDENT-ON* */ 2487/* *INDENT-ON* */
2244 2488
2245/*{{{ process non-printing single characters */ 2489/*{{{ process non-printing single characters */
2246void 2490void
2247rxvt_term::process_nonprinting (unsigned char ch) 2491rxvt_term::process_nonprinting (unicode_t ch)
2248{ 2492{
2249 switch (ch) 2493 switch (ch)
2250 { 2494 {
2495 case C0_ESC:
2496 process_escape_seq ();
2497 break;
2251 case C0_ENQ: /* terminal Status */ 2498 case C0_ENQ: /* terminal Status */
2252 if (rs[Rs_answerbackstring]) 2499 if (rs[Rs_answerbackstring])
2253 tt_write( 2500 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2254 (const unsigned char *)rs[Rs_answerbackstring],
2255 (unsigned int)STRLEN(rs[Rs_answerbackstring]));
2256 else 2501 else
2257 tt_write((unsigned char *)VT100_ANS, 2502 tt_write (VT100_ANS, strlen (VT100_ANS));
2258 (unsigned int)STRLEN(VT100_ANS));
2259 break; 2503 break;
2260 case C0_BEL: /* bell */ 2504 case C0_BEL: /* bell */
2261 scr_bell (); 2505 scr_bell ();
2262 break; 2506 break;
2263 case C0_BS: /* backspace */ 2507 case C0_BS: /* backspace */
… …
2278 scr_charset_choose (1); 2522 scr_charset_choose (1);
2279 break; 2523 break;
2280 case C0_SI: /* shift in - acs */ 2524 case C0_SI: /* shift in - acs */
2281 scr_charset_choose (0); 2525 scr_charset_choose (0);
2282 break; 2526 break;
2527
2528#ifdef EIGHT_BIT_CONTROLS
2529 // 8-bit controls
2530 case 0x90: /* DCS */
2531 process_dcs_seq ();
2532 break;
2533 case 0x9b: /* CSI */
2534 process_csi_seq ();
2535 break;
2536 case 0x9d: /* OSC */
2537 process_osc_seq ();
2538 break;
2539#endif
2283 } 2540 }
2284} 2541}
2285/*}}} */ 2542/*}}} */
2286 2543
2287 2544
2288/*{{{ process VT52 escape sequences */ 2545/*{{{ process VT52 escape sequences */
2289void 2546void
2290rxvt_term::process_escape_vt52 (unsigned char ch) 2547rxvt_term::process_escape_vt52 (unicode_t ch)
2291{ 2548{
2292 int row, col; 2549 int row, col;
2293 2550
2294 switch (ch) 2551 switch (ch)
2295 { 2552 {
… …
2325 row = cmd_getc () - ' '; 2582 row = cmd_getc () - ' ';
2326 col = cmd_getc () - ' '; 2583 col = cmd_getc () - ' ';
2327 scr_gotorc (row, col, 0); 2584 scr_gotorc (row, col, 0);
2328 break; 2585 break;
2329 case 'Z': /* identify the terminal type */ 2586 case 'Z': /* identify the terminal type */
2330 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2587 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2331 break; 2588 break;
2332 case '<': /* turn off VT52 mode */ 2589 case '<': /* turn off VT52 mode */
2333 PrivMode(0, PrivMode_vt52); 2590 set_privmode (PrivMode_vt52, 0);
2334 break; 2591 break;
2335 case 'F': /* use special graphics character set */ 2592 case 'F': /* use special graphics character set */
2336 case 'G': /* use regular character set */ 2593 case 'G': /* use regular character set */
2337 /* unimplemented */ 2594 /* unimplemented */
2338 break; 2595 break;
… …
2347 2604
2348/*{{{ process escape sequences */ 2605/*{{{ process escape sequences */
2349void 2606void
2350rxvt_term::process_escape_seq () 2607rxvt_term::process_escape_seq ()
2351{ 2608{
2352 unsigned char ch = cmd_getc (); 2609 unicode_t ch = cmd_getc ();
2353 2610
2354 if (PrivateModes & PrivMode_vt52) 2611 if (priv_modes & PrivMode_vt52)
2355 { 2612 {
2356 process_escape_vt52 (ch); 2613 process_escape_vt52 (ch);
2357 return; 2614 return;
2358 } 2615 }
2359 2616
… …
2374 scr_charset_set (2, (unsigned int)cmd_getc ()); 2631 scr_charset_set (2, (unsigned int)cmd_getc ());
2375 break; 2632 break;
2376 case '+': 2633 case '+':
2377 scr_charset_set (3, (unsigned int)cmd_getc ()); 2634 scr_charset_set (3, (unsigned int)cmd_getc ());
2378 break; 2635 break;
2379#ifdef MULTICHAR_SET 2636#if !ENABLE_MINIMAL
2380 case '$':
2381 scr_charset_set (-2, (unsigned int)cmd_getc ());
2382 break;
2383#endif
2384#ifndef NO_FRILLS
2385 case '6': 2637 case '6':
2386 scr_backindex (); 2638 scr_backindex ();
2387 break; 2639 break;
2388#endif 2640#endif
2389 case '7': 2641 case '7':
2390 scr_cursor (SAVE); 2642 scr_cursor (SAVE);
2391 break; 2643 break;
2392 case '8': 2644 case '8':
2393 scr_cursor (RESTORE); 2645 scr_cursor (RESTORE);
2394 break; 2646 break;
2395#ifndef NO_FRILLS 2647#if !ENABLE_MINIMAL
2396 case '9': 2648 case '9':
2397 scr_forwardindex (); 2649 scr_forwardindex ();
2398 break; 2650 break;
2399#endif 2651#endif
2400 case '=': 2652 case '=':
2401 case '>': 2653 case '>':
2402 PrivMode((ch == '='), PrivMode_aplKP); 2654 set_privmode (PrivMode_aplKP, ch == '=');
2403 break; 2655 break;
2404 2656
2405 case C1_40: 2657 case C1_40:
2406 cmd_getc (); 2658 cmd_getc ();
2407 break; 2659 break;
… …
2410 break; 2662 break;
2411 2663
2412 /* 8.3.87: NEXT LINE */ 2664 /* 8.3.87: NEXT LINE */
2413 case C1_NEL: /* ESC E */ 2665 case C1_NEL: /* ESC E */
2414 { 2666 {
2415 uint32_t nlcr[] = { '\n', '\r' }; 2667 wchar_t nlcr[] = { C0_LF, C0_CR };
2416 scr_add_lines (nlcr, 1, 2); 2668 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2417 } 2669 }
2418 break; 2670 break;
2419 2671
2420 /* kidnapped escape sequence: Should be 8.3.48 */ 2672 /* kidnapped escape sequence: Should be 8.3.48 */
2421 case C1_ESA: /* ESC G */ 2673 case C1_ESA: /* ESC G */
… …
2431 case C1_RI: /* ESC M */ 2683 case C1_RI: /* ESC M */
2432 scr_index (DN); 2684 scr_index (DN);
2433 break; 2685 break;
2434 2686
2435 /* 8.3.142: SINGLE-SHIFT TWO */ 2687 /* 8.3.142: SINGLE-SHIFT TWO */
2436 /*case C1_SS2: scr_single_shift (2); break; */ 2688 /*case C1_SS2: scr_single_shift (2); break; */
2437 2689
2438 /* 8.3.143: SINGLE-SHIFT THREE */ 2690 /* 8.3.143: SINGLE-SHIFT THREE */
2439 /*case C1_SS3: scr_single_shift (3); break; */ 2691 /*case C1_SS3: scr_single_shift (3); break; */
2440 2692
2441 /* 8.3.27: DEVICE CONTROL STRING */ 2693 /* 8.3.27: DEVICE CONTROL STRING */
2442 case C1_DCS: /* ESC P */ 2694 case C1_DCS: /* ESC P */
2443 process_dcs_seq (); 2695 process_dcs_seq ();
2444 break; 2696 break;
2445 2697
2446 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2698 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2447 case C1_SCI: /* ESC Z */ 2699 case C1_SCI: /* ESC Z */
2448 tt_write((const unsigned char *)ESCZ_ANSWER, 2700 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2449 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2450 break; /* steal obsolete ESC [ c */ 2701 break; /* steal obsolete ESC [ c */
2451 2702
2452 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2703 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2453 case C1_CSI: /* ESC [ */ 2704 case C1_CSI: /* ESC [ */
2454 process_csi_seq (); 2705 process_csi_seq ();
2455 break; 2706 break;
2456 2707
2457 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2708 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2458 case C1_OSC: /* ESC ] */ 2709 case C1_OSC: /* ESC ] */
2459 process_osc_seq (); 2710 process_osc_seq ();
2460 break; 2711 break;
2461 2712
2462 /* 8.3.106: RESET TO INITIAL STATE */ 2713 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2463 case 'c': 2714 case 'c':
2715 mbstate.reset ();
2464 scr_poweron (); 2716 scr_poweron ();
2465 scrollbar_show (1); 2717 scrollBar.show (1);
2466 break; 2718 break;
2467 2719
2468 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2720 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2469 case 'n': 2721 case 'n':
2470 scr_charset_choose (2); 2722 scr_charset_choose (2);
… …
2480 2732
2481/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2733/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2482/* *INDENT-OFF* */ 2734/* *INDENT-OFF* */
2483enum { 2735enum {
2484 CSI_ICH = 0x40, 2736 CSI_ICH = 0x40,
2485 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2737 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2486 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2738 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2487 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2739 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2488 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2740 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2489 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2741 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2490 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2742 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2494 2746
2495#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2747#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2496 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2748 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2497 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2749 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2498#define get_byte_array_bit(array, bit) \ 2750#define get_byte_array_bit(array, bit) \
2499 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2751 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2500 2752
2501const unsigned char csi_defaults[] = 2753const unsigned char csi_defaults[] =
2502 { 2754 {
2503 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2755 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2504 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2756 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2505 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2757 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2506 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2758 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2507 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2759 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2508 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2760 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2509 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2761 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2510 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2762 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2511 }; 2763 };
2512/* *INDENT-ON* */ 2764/* *INDENT-ON* */
2513 2765
2514void 2766void
2515rxvt_term::process_csi_seq () 2767rxvt_term::process_csi_seq ()
2516{ 2768{
2517 unsigned char ch, priv, i; 2769 unicode_t ch, priv, i;
2518 unsigned int nargs, p; 2770 unsigned int nargs, p;
2519 int n, ndef; 2771 int n, ndef;
2520 int arg[ESC_ARGS]; 2772 int arg[ESC_ARGS] = { };
2521 2773
2522 for (nargs = ESC_ARGS; nargs > 0;) 2774 nargs = 0;
2523 arg[--nargs] = 0;
2524 2775
2525 priv = 0; 2776 priv = 0;
2526 ch = cmd_getc (); 2777 ch = cmd_getc ();
2527 if (ch >= '<' && ch <= '?') 2778 if ((ch >= '<' && ch <= '?') || ch == '!')
2779 {
2528 { /* '<' '=' '>' '?' */ 2780 /* '<' '=' '>' '?' '!' */
2529 priv = ch; 2781 priv = ch;
2530 ch = cmd_getc (); 2782 ch = cmd_getc ();
2531 } 2783 }
2784
2532 /* read any numerical arguments */ 2785 /* read any numerical arguments */
2533 for (n = -1; ch < CSI_ICH; ) 2786 for (n = -1; ch < CSI_ICH; )
2534 { 2787 {
2535 if (isdigit(ch)) 2788 if (isdigit (ch))
2536 { 2789 {
2537 if (n < 0) 2790 if (n < 0)
2538 n = ch - '0'; 2791 n = ch - '0';
2539 else 2792 else
2540 n = n * 10 + ch - '0'; 2793 n = n * 10 + ch - '0';
… …
2543 { 2796 {
2544 if (nargs < ESC_ARGS) 2797 if (nargs < ESC_ARGS)
2545 arg[nargs++] = n; 2798 arg[nargs++] = n;
2546 n = -1; 2799 n = -1;
2547 } 2800 }
2548 else if (ch == '\b') 2801 else if (IS_CONTROL (ch))
2549 {
2550 scr_backspace ();
2551 }
2552 else if (ch == C0_ESC)
2553 {
2554 process_escape_seq ();
2555 return;
2556 }
2557 else if (ch < ' ')
2558 {
2559 process_nonprinting (ch); 2802 process_nonprinting (ch);
2560 } 2803
2561 ch = cmd_getc (); 2804 ch = cmd_getc ();
2562 } 2805 }
2563 2806
2564 if (ch > CSI_7F) 2807 if (ch > CSI_7F)
2565 return; 2808 return;
2566 2809
2567 if (nargs < ESC_ARGS) 2810 if (nargs < ESC_ARGS)
2568 arg[nargs++] = n; 2811 arg[nargs++] = n;
2569 2812
2570 i = ch - CSI_ICH; 2813 i = ch - CSI_ICH;
2571 ndef = get_byte_array_bit(csi_defaults, i); 2814 ndef = get_byte_array_bit (csi_defaults, i);
2572 for (p = 0; p < nargs; p++) 2815 for (p = 0; p < nargs; p++)
2573 if (arg[p] == -1) 2816 if (arg[p] == -1)
2574 arg[p] = ndef; 2817 arg[p] = ndef;
2575
2576#ifdef DEBUG_CMD
2577 fprintf(stderr, "CSI ");
2578 for (p = 0; p < nargs; p++)
2579 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2580 fprintf(stderr, "%c\n", ch);
2581#endif
2582 2818
2583 /* 2819 /*
2584 * private mode handling 2820 * private mode handling
2585 */ 2821 */
2586 if (priv) 2822 if (priv)
2587 { 2823 {
2588 switch (priv) 2824 switch (priv)
2589 { 2825 {
2590 case '>': 2826 case '>':
2591 if (ch == CSI_DA) /* secondary device attributes */ 2827 if (ch == CSI_DA) /* secondary device attributes */
2828 {
2829 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2830 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2831 //
2832 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2833 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2834 // versions.
2835 //
2592 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2836 tt_printf ("\033[>%d;95;0c", 'U');
2837 }
2593 break; 2838 break;
2839
2594 case '?': 2840 case '?':
2595 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2841 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2596 process_terminal_mode (ch, priv, nargs, arg); 2842 process_terminal_mode (ch, priv, nargs, arg);
2597 break; 2843 break;
2844
2845 case '!':
2846 if (ch == CSI_70)
2847 {
2848 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2849 scr_soft_reset ();
2850
2851 static const int pm_h[] = { 7, 25 };
2852 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2853
2854 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2855 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2598 } 2856 }
2857 break;
2858 }
2859
2599 return; 2860 return;
2600 } 2861 }
2601 2862
2602 switch (ch) 2863 switch (ch)
2603 { 2864 {
2604 /* 2865 /*
2605 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2866 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2606 */ 2867 */
2607#ifdef PRINTPIPE 2868#ifdef PRINTPIPE
2608 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2869 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2609 switch (arg[0]) 2870 switch (arg[0])
2610 { 2871 {
… …
2702 2963
2703 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2964 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2704 arg[0] = -arg[0]; 2965 arg[0] = -arg[0];
2705 /* FALLTHROUGH */ 2966 /* FALLTHROUGH */
2706 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2967 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2707 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2968 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2708 break; 2969 break;
2709 2970
2710 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2971 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2711 tt_write((const unsigned char *)VT100_ANS, 2972 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2712 (unsigned int)(sizeof(VT100_ANS) - 1));
2713 break; 2973 break;
2714 2974
2715 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2975 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2716 process_sgr_mode (nargs, arg); 2976 process_sgr_mode (nargs, arg);
2717 break; 2977 break;
2718 2978
2719 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2979 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2720 switch (arg[0]) 2980 switch (arg[0])
2721 { 2981 {
2722 case 5: /* DSR requested */ 2982 case 5: /* DSR requested */
2723 tt_printf("\033[0n"); 2983 tt_printf ("\033[0n");
2724 break; 2984 break;
2725 case 6: /* CPR requested */ 2985 case 6: /* CPR requested */
2726 scr_report_position (); 2986 scr_report_position ();
2727 break; 2987 break;
2728#if defined (ENABLE_DISPLAY_ANSWER)
2729 case 7: /* unofficial extension */ 2988 case 7: /* unofficial extension */
2989 if (option (Opt_insecure))
2730 tt_printf("%-.250s\n", rs[Rs_display_name]); 2990 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2731 break; 2991 break;
2732#endif
2733 case 8: /* unofficial extension */ 2992 case 8: /* unofficial extension */
2734 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2993 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2735 break; 2994 break;
2736 } 2995 }
2737 break; 2996 break;
2738 2997
2739 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2998 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2772 break; 3031 break;
2773 3032
2774 case CSI_RM: /* 8.3.107: RESET MODE */ 3033 case CSI_RM: /* 8.3.107: RESET MODE */
2775 if (arg[0] == 4) 3034 if (arg[0] == 4)
2776 scr_insert_mode (0); 3035 scr_insert_mode (0);
3036 else if (arg[0] == 20)
3037 priv_modes &= ~PrivMode_LFNL;
2777 break; 3038 break;
2778 3039
2779 case CSI_SM: /* 8.3.126: SET MODE */ 3040 case CSI_SM: /* 8.3.126: SET MODE */
2780 if (arg[0] == 4) 3041 if (arg[0] == 4)
2781 scr_insert_mode (1); 3042 scr_insert_mode (1);
3043 else if (arg[0] == 20)
3044 priv_modes |= PrivMode_LFNL;
2782 break; 3045 break;
2783 3046
2784 /* 3047 /*
2785 * PRIVATE USE beyond this point. All CSI_7? sequences here 3048 * PRIVATE USE beyond this point. All CSI_7? sequences here
2786 */ 3049 */
… …
2798 break; 3061 break;
2799 case CSI_75: 3062 case CSI_75:
2800 scr_cursor (RESTORE); 3063 scr_cursor (RESTORE);
2801 break; 3064 break;
2802 3065
2803#ifndef NO_FRILLS 3066#if !ENABLE_MINIMAL
2804 case CSI_74: 3067 case CSI_74:
2805 process_window_ops (arg, nargs); 3068 process_window_ops (arg, nargs);
2806 break; 3069 break;
2807#endif 3070#endif
2808 3071
2809 case CSI_78: /* DECREQTPARM */ 3072 case CSI_78: /* DECREQTPARM */
2810 if (arg[0] == 0 || arg[0] == 1) 3073 if (arg[0] == 0 || arg[0] == 1)
2811 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3074 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2812 /* FALLTHROUGH */ 3075 break;
2813 3076
2814 default: 3077 default:
2815 break; 3078 break;
2816 } 3079 }
2817} 3080}
2818/*}}} */ 3081/*}}} */
2819 3082
2820#ifndef NO_FRILLS 3083#if !ENABLE_MINIMAL
2821/* ARGSUSED */ 3084/* ARGSUSED */
2822void 3085void
2823rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3086rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2824{ 3087{
2825 int x, y; 3088 int x, y;
2826#if 0
2827 char *s;
2828#endif
2829 XWindowAttributes wattr; 3089 XWindowAttributes wattr;
2830 Window wdummy; 3090 Window wdummy;
3091
3092 dLocal (Display *, dpy);
2831 3093
2832 if (nargs == 0) 3094 if (nargs == 0)
2833 return; 3095 return;
3096
2834 switch (args[0]) 3097 switch (args[0])
2835 { 3098 {
2836 /* 3099 /*
2837 * commands 3100 * commands
2838 */ 3101 */
2839 case 1: /* deiconify window */ 3102 case 1: /* deiconify window */
2840 XMapWindow(display->display, TermWin.parent[0]); 3103 XMapWindow (dpy, parent[0]);
2841 break; 3104 break;
2842 case 2: /* iconify window */ 3105 case 2: /* iconify window */
2843 XIconifyWindow(display->display, TermWin.parent[0], 3106 XIconifyWindow (dpy, parent[0], display->screen);
2844 DefaultScreen(display->display));
2845 break; 3107 break;
2846 case 3: /* set position (pixels) */ 3108 case 3: /* set position (pixels) */
2847 XMoveWindow(display->display, TermWin.parent[0], args[1], args[2]); 3109 XMoveWindow (dpy, parent[0], args[1], args[2]);
2848 break; 3110 break;
2849 case 4: /* set size (pixels) */ 3111 case 4: /* set size (pixels) */
2850 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3112 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2851 break; 3113 break;
2852 case 5: /* raise window */ 3114 case 5: /* raise window */
2853 XRaiseWindow(display->display, TermWin.parent[0]); 3115 XRaiseWindow (dpy, parent[0]);
2854 break; 3116 break;
2855 case 6: /* lower window */ 3117 case 6: /* lower window */
2856 XLowerWindow(display->display, TermWin.parent[0]); 3118 XLowerWindow (dpy, parent[0]);
2857 break; 3119 break;
2858 case 7: /* refresh window */ 3120 case 7: /* refresh window */
2859 scr_touch (true); 3121 scr_touch (true);
2860 break; 3122 break;
2861 case 8: /* set size (chars) */ 3123 case 8: /* set size (chars) */
2862 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 3124 set_widthheight ((unsigned int) (args[2] * fwidth),
2863 (unsigned int)(args[1] * TermWin.fheight)); 3125 (unsigned int) (args[1] * fheight));
2864 break; 3126 break;
3127
3128 //case 9: NYI, TODO, restore maximized window or maximize window
2865 default: 3129 default:
2866 if (args[0] >= 24) /* set height (chars) */ 3130 if (args[0] >= 24) /* set height (chars) */
2867 set_widthheight ((unsigned int)TermWin.width, 3131 set_widthheight ((unsigned int)width,
2868 (unsigned int)(args[1] * TermWin.fheight)); 3132 (unsigned int) (args[1] * fheight));
2869 break; 3133 break;
3134
2870 /* 3135 /*
2871 * reports - some output format copied from XTerm 3136 * reports - some output format copied from XTerm
2872 */ 3137 */
2873 case 11: /* report window state */ 3138 case 11: /* report window state */
2874 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 3139 XGetWindowAttributes (dpy, parent[0], &wattr);
2875 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3140 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2876 break; 3141 break;
2877 case 13: /* report window position */ 3142 case 13: /* report window position */
2878 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 3143 XGetWindowAttributes (dpy, parent[0], &wattr);
2879 XTranslateCoordinates(display->display, TermWin.parent[0], wattr.root, 3144 XTranslateCoordinates (dpy, parent[0], wattr.root,
2880 -wattr.border_width, -wattr.border_width, 3145 -wattr.border_width, -wattr.border_width,
2881 &x, &y, &wdummy); 3146 &x, &y, &wdummy);
2882 tt_printf("\033[3;%d;%dt", x, y); 3147 tt_printf ("\033[3;%d;%dt", x, y);
2883 break; 3148 break;
2884 case 14: /* report window size (pixels) */ 3149 case 14: /* report window size (pixels) */
2885 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 3150 XGetWindowAttributes (dpy, parent[0], &wattr);
2886 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 3151 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2887 break; 3152 break;
3153 case 18: /* report text area size (chars) */
3154 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3155 break;
2888 case 18: /* report window size (chars) */ 3156 case 19: /* report window size (chars) */
2889 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3157 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2890 break; 3158 break;
2891#if 0 /* XXX: currently disabled due to security concerns */
2892 case 20: /* report icon label */ 3159 case 20: /* report icon label */
3160 {
3161 char *s;
2893 XGetIconName(display->display, TermWin.parent[0], &s); 3162 XGetIconName (dpy, parent[0], &s);
2894 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3163 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3164 XFree (s);
3165 }
2895 break; 3166 break;
2896 case 21: /* report window title */ 3167 case 21: /* report window title */
3168 {
3169 char *s;
2897 XFetchName(display->display, TermWin.parent[0], &s); 3170 XFetchName (dpy, parent[0], &s);
2898 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3171 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3172 XFree (s);
3173 }
2899 break; 3174 break;
2900#endif
2901
2902 } 3175 }
2903} 3176}
2904#endif 3177#endif
2905 3178
2906/*----------------------------------------------------------------------*/ 3179/*----------------------------------------------------------------------*/
2907/* 3180/*
2908 * get input up until STRING TERMINATOR (or BEL) 3181 * get input up until STRING TERMINATOR (or BEL)
2909 * ends_how is terminator used. returned input must be free()d 3182 * ends_how is terminator used. returned input must be free()'d
2910 */ 3183 */
2911unsigned char * 3184char *
2912rxvt_term::get_to_st (unsigned char *ends_how) 3185rxvt_term::get_to_st (unicode_t &ends_how)
2913{ 3186{
2914 int seen_esc = 0; /* seen escape? */ 3187 unicode_t ch;
3188 bool seen_esc = false;
2915 unsigned int n = 0; 3189 unsigned int n = 0;
2916 unsigned char *s; 3190 wchar_t string[STRING_MAX];
2917 unsigned char ch, string[STRING_MAX];
2918 3191
2919 for (; (ch = cmd_getc ());) 3192 while ((ch = cmd_getc ()) != NOCHAR)
2920 { 3193 {
2921 if (ch == C0_BEL 3194 if (seen_esc)
2922 || ch == CHAR_ST 3195 {
2923 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3196 if (ch == 0x5c) /* 7bit ST */
2924 break; 3197 break;
3198 else
3199 return NULL;
3200 }
2925 if (ch == C0_ESC) 3201 else if (ch == C0_ESC)
2926 { 3202 {
2927 seen_esc = 1; 3203 seen_esc = true;
2928 continue; 3204 continue;
2929 } 3205 }
3206 else if (ch == C0_BEL || ch == CHAR_ST)
3207 break;
2930 else if (ch == '\t') 3208 else if (ch == C0_SYN)
2931 ch = ' '; /* translate '\t' to space */ 3209 ch = cmd_get8 ();
2932 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3210 else if (ch < 0x20)
2933 return NULL; /* other control character - exit */ 3211 return NULL; /* other control character - exit */
2934 if (n < sizeof(string) - 1) 3212
3213 seen_esc = false;
3214
3215 if (n >= STRING_MAX - 1)
3216 // stop at some sane length
3217 return NULL;
3218
2935 string[n++] = ch; 3219 string[n++] = ch;
2936 seen_esc = 0;
2937 } 3220 }
3221
2938 string[n++] = '\0'; 3222 string[n++] = '\0';
2939 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 3223
2940 return NULL;
2941 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3224 ends_how = (ch == 0x5c ? C0_ESC : ch);
2942 STRNCPY(s, string, n); 3225
2943 return s; 3226 return rxvt_wcstombs (string);
2944} 3227}
2945 3228
2946/*----------------------------------------------------------------------*/ 3229/*----------------------------------------------------------------------*/
2947/* 3230/*
2948 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3231 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2949 */ 3232 */
2950void 3233void
2951rxvt_term::process_dcs_seq () 3234rxvt_term::process_dcs_seq ()
2952{ 3235{
2953 unsigned char eh, *s; 3236 char *s;
3237 unicode_t eh;
3238
2954 /* 3239 /*
2955 * Not handled yet 3240 * Not handled yet
2956 */ 3241 */
2957 s = get_to_st (&eh); 3242 s = get_to_st (eh);
2958 if (s) 3243 if (s)
2959 free(s); 3244 free (s);
3245
2960 return; 3246 return;
2961} 3247}
2962 3248
2963/*----------------------------------------------------------------------*/ 3249/*----------------------------------------------------------------------*/
2964/* 3250/*
2965 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3251 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2966 */ 3252 */
2967void 3253void
2968rxvt_term::process_osc_seq () 3254rxvt_term::process_osc_seq ()
2969{ 3255{
2970 unsigned char ch, eh, *s; 3256 unicode_t ch, eh;
2971 int arg; 3257 int arg;
2972 3258
2973 ch = cmd_getc (); 3259 ch = cmd_getc ();
2974 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 3260 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2975 arg = arg * 10 + (ch - '0'); 3261 arg = arg * 10 + (ch - '0');
2976 3262
2977 if (ch == ';') 3263 if (ch == ';')
2978 { 3264 {
2979 s = get_to_st (&eh); 3265 char *s = get_to_st (eh);
3266
2980 if (s) 3267 if (s)
2981 { 3268 {
2982 /*
2983 * rxvt_menubar_dispatch() violates the constness of the string,
2984 * so do it here
2985 */
2986 if (arg == XTerm_Menu)
2987#if 0 /* XXX: currently disabled due to security concerns */
2988 menubar_dispatch ((char *)s);
2989#else
2990 (void)0;
2991#endif
2992 else
2993 xterm_seq (arg, (char *)s, eh); 3269 process_xterm_seq (arg, s, eh);
2994 free(s); 3270 free (s);
2995 } 3271 }
3272 }
3273}
3274
3275void
3276rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3277{
3278 if (str[0] == '?' && !str[1])
2996 } 3279 {
3280 rgba c;
3281 pix_colors_focused[color].get (c);
3282
3283#if XFT
3284 if (c.a != rgba::MAX_CC)
3285 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3286 else
3287#endif
3288 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3289 }
3290 else
3291 set_window_color (color, str);
2997} 3292}
3293
2998/* 3294/*
2999 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3295 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3000 * 0 = change iconName/title
3001 * 1 = change iconName
3002 * 2 = change title
3003 * 4 = change color
3004 * 12 = change text color
3005 * 13 = change mouse foreground color
3006 * 17 = change highlight character colour
3007 * 18 = change bold character color
3008 * 19 = change underlined character color
3009 * 46 = change logfile (not implemented)
3010 * 50 = change font
3011 *
3012 * rxvt extensions:
3013 * 10 = menu (may change in future)
3014 * 20 = bg pixmap
3015 * 39 = change default fg color
3016 * 49 = change default bg color
3017 * 55 = dump scrollback buffer and all of screen
3018 */ 3296 */
3019void 3297void
3020rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 3298rxvt_term::process_xterm_seq (int op, char *str, char resp)
3021{ 3299{
3022 int changed = 0; 3300 int color;
3023 int color;
3024 char *buf, *name; 3301 char *buf, *name;
3302 bool query = str[0] == '?' && !str[1];
3303 int saveop = op;
3025 3304
3305 dLocal (Display *, dpy);
3306
3026 assert(str != NULL); 3307 assert (str != NULL);
3308
3309 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3310 return;
3311
3027 switch (op) 3312 switch (op)
3028 { 3313 {
3029 case XTerm_name: 3314 case XTerm_name:
3030 set_title (str); 3315 set_title (str);
3031 /* FALLTHROUGH */ 3316 /* FALLTHROUGH */
3032 case XTerm_iconName: 3317 case XTerm_iconName:
3033 set_iconName (str); 3318 set_icon_name (str);
3034 break; 3319 break;
3035 case XTerm_title: 3320 case XTerm_title:
3036 set_title (str); 3321 set_title (str);
3037 break; 3322 break;
3323 case XTerm_property:
3324 if (str[0] == '?')
3325 {
3326 Atom prop = display->atom (str + 1);
3327 Atom actual_type;
3328 int actual_format;
3329 unsigned long nitems;
3330 unsigned long bytes_after;
3331 unsigned char *value = 0;
3332 const char *str = "";
3333
3334 if (prop
3335 && XGetWindowProperty (dpy, parent[0],
3336 prop, 0, 1<<16, 0, AnyPropertyType,
3337 &actual_type, &actual_format,
3338 &nitems, &bytes_after, &value) == Success
3339 && actual_type != None
3340 && actual_format == 8)
3341 str = (const char *)(value);
3342
3343 tt_printf ("\033]%d;%s%c", op, str, resp);
3344
3345 XFree (value);
3346 }
3347 else
3348 {
3349 char *eq = strchr (str, '=');
3350
3351 if (eq)
3352 {
3353 *eq = 0;
3354 set_utf8_property (display->atom (str), eq + 1);
3355 }
3356 else
3357 XDeleteProperty (dpy, parent[0],
3358 display->atom (str));
3359 }
3360 break;
3361
3038 case XTerm_Color: 3362 case XTerm_Color:
3039 for (buf = (char *)str; buf && *buf;) 3363 for (buf = (char *)str; buf && *buf;)
3040 { 3364 {
3041 if ((name = STRCHR(buf, ';')) == NULL) 3365 if ((name = strchr (buf, ';')) == NULL)
3042 break; 3366 break;
3367
3043 *name++ = '\0'; 3368 *name++ = '\0';
3044 color = atoi(buf); 3369 color = atoi (buf) + minCOLOR;
3045 if (color < 0 || color >= TOTAL_COLORS) 3370
3371 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3046 break; 3372 break;
3373
3047 if ((buf = STRCHR(name, ';')) != NULL) 3374 if ((buf = strchr (name, ';')) != NULL)
3048 *buf++ = '\0'; 3375 *buf++ = '\0';
3049 set_window_color (color + minCOLOR, name); 3376
3377 process_color_seq (op, color, name, resp);
3050 } 3378 }
3379 break;
3380 case Rxvt_restoreFG:
3381 case XTerm_Color00:
3382 process_color_seq (op, Color_fg, str, resp);
3383 break;
3384 case Rxvt_restoreBG:
3385 case XTerm_Color01:
3386 process_color_seq (op, Color_bg, str, resp);
3051 break; 3387 break;
3052#ifndef NO_CURSORCOLOR 3388#ifndef NO_CURSORCOLOR
3053 case XTerm_Color_cursor: 3389 case XTerm_Color_cursor:
3054 set_window_color (Color_cursor, str); 3390 process_color_seq (op, Color_cursor, str, resp);
3055 break; 3391 break;
3056#endif 3392#endif
3057 case XTerm_Color_pointer: 3393 case XTerm_Color_pointer_fg:
3058 set_window_color (Color_pointer, str); 3394 process_color_seq (op, Color_pointer_fg, str, resp);
3395 break;
3396 case XTerm_Color_pointer_bg:
3397 process_color_seq (op, Color_pointer_bg, str, resp);
3059 break; 3398 break;
3060#ifndef NO_BOLD_UNDERLINE_REVERSE 3399#ifndef NO_BOLD_UNDERLINE_REVERSE
3061 case XTerm_Color_BD:
3062 set_window_color (Color_BD, str);
3063 break;
3064 case XTerm_Color_UL:
3065 set_window_color (Color_UL, str);
3066 break;
3067 case XTerm_Color_RV: 3400 case XTerm_Color_RV:
3068 set_window_color (Color_RV, str); 3401 process_color_seq (op, Color_RV, str, resp);
3069 break; 3402 break;
3403 case Rxvt_Color_BD:
3404 case URxvt_Color_BD:
3405 process_color_seq (op, Color_BD, str, resp);
3406 break;
3407 case Rxvt_Color_UL:
3408 case URxvt_Color_UL:
3409 process_color_seq (op, Color_UL, str, resp);
3410 break;
3411 case URxvt_Color_IT:
3412 process_color_seq (op, Color_IT, str, resp);
3413 break;
3070#endif 3414#endif
3071 3415 case URxvt_Color_border:
3072 case XTerm_Menu: 3416 process_color_seq (op, Color_border, str, resp);
3417 break;
3418#if ENABLE_TRANSPARENCY
3419 case URxvt_Color_tint:
3420 process_color_seq (op, Color_tint, str, resp);
3073 /* 3421 {
3074 * rxvt_menubar_dispatch() violates the constness of the string, 3422 bool changed = false;
3075 * so DON'T do it here 3423
3424 if (ISSET_PIXCOLOR (Color_tint))
3425 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3426 else
3427 changed = bgPixmap.unset_tint ();
3428
3429 if (changed)
3430 update_background ();
3076 */ 3431 }
3432
3077 break; 3433 break;
3434#endif
3435
3436#if BG_IMAGE_FROM_FILE
3078 case XTerm_Pixmap: 3437 case Rxvt_Pixmap:
3079 if (*str != ';') 3438 if (!strcmp (str, "?"))
3080 { 3439 {
3081#if XPM_BACKGROUND 3440 char str[256];
3082 scale_pixmap (""); /* reset to default scaling */ 3441
3083 set_bgPixmap (str); /* change pixmap */ 3442 sprintf (str, "[%dx%d+%d+%d]",
3084#endif 3443 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3085 scr_touch (true); 3444 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3445 process_xterm_seq (XTerm_title, str, CHAR_ST);
3086 } 3446 }
3087 while ((str = STRCHR(str, ';')) != NULL) 3447 else
3088 { 3448 {
3449 int changed = 0;
3450
3451 if (*str != ';')
3452 {
3453 /* reset to default scaling :*/
3454 bgPixmap.unset_geometry ();
3455 if (bgPixmap.set_file (str)) /* change pixmap */
3456 changed++;
3457 str = strchr (str, ';');
3458 if (str == NULL)
3459 bgPixmap.set_defaultGeometry ();
3460 }
3461
3462 while (str)
3463 {
3089 str++; 3464 str++;
3090#if XPM_BACKGROUND 3465 if (bgPixmap.set_geometry (str))
3091 changed += scale_pixmap (str); 3466 changed++;
3092#endif 3467 str = strchr (str, ';');
3468 }
3093 3469
3470 if (changed)
3471 update_background ();
3094 } 3472 }
3095 if (changed)
3096 {
3097#ifdef XPM_BACKGROUND
3098 resize_pixmap ();
3099#endif
3100 scr_touch (true);
3101 }
3102 break; 3473 break;
3474#endif
3103 3475
3104 case XTerm_restoreFG:
3105 set_window_color (Color_fg, str);
3106 break;
3107 case XTerm_restoreBG:
3108 set_window_color (Color_bg, str);
3109 break;
3110 case XTerm_logfile: 3476 case XTerm_logfile:
3477 // TODO, when secure mode?
3111 break; 3478 break;
3112 case XTerm_font: 3479
3113 change_font (0, str);
3114 break;
3115#if 0 3480#if 0
3116 case XTerm_dumpscreen: /* no error notices */ 3481 case Rxvt_dumpscreen: /* no error notices */
3117 { 3482 {
3118 int fd; 3483 int fd;
3119 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3484 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3120 { 3485 {
3121 scr_dump (fd); 3486 scr_dump (fd);
3122 close(fd); 3487 close (fd);
3123 } 3488 }
3124 } 3489 }
3125 break; 3490 break;
3126#endif 3491#endif
3492 case XTerm_font:
3493 op = URxvt_font;
3494 case URxvt_font:
3495#if ENABLE_STYLES
3496 case URxvt_boldFont:
3497 case URxvt_italicFont:
3498 case URxvt_boldItalicFont:
3499#endif
3500 if (query)
3501 tt_printf ("\33]%d;%-.250s%c", saveop,
3502 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3503 ? fontset[op - URxvt_font]->fontdesc : "",
3504 resp);
3505 else
3506 {
3507 const char *&res = rs[Rs_font + (op - URxvt_font)];
3127 3508
3509 res = strdup (str);
3510 allocated.push_back ((void *)res);
3511 set_fonts ();
3512 }
3513 break;
3514
3515 case URxvt_version:
3516 if (query)
3517 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3518 op,
3519 rs[Rs_name], VERSION[0], VERSION[2],
3520 resp);
3521 break;
3522
3523#if !ENABLE_MINIMAL
3524 case URxvt_locale:
3525 if (query)
3526 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3527 else
3528 {
3529 set_locale (str);
3530 pty->set_utf8_mode (enc_utf8);
3531 init_xlocale ();
3532 }
3533 break;
3534
3535 case URxvt_view_up:
3536 case URxvt_view_down:
3537 {
3538 int lines = atoi (str);
3539
3540 if (lines)
3541 scr_page (op == URxvt_view_up ? UP : DN, lines);
3542 else
3543 scr_erase_savelines ();
3544 }
3545
3546 break;
3547#endif
3548
3549#if ENABLE_PERL
3550 case URxvt_perl:
3551 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3552 break;
3553#endif
3128 } 3554 }
3129} 3555}
3130/*----------------------------------------------------------------------*/ 3556/*----------------------------------------------------------------------*/
3131 3557
3132/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3558/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3140 * so no need for fancy checking 3566 * so no need for fancy checking
3141 */ 3567 */
3142int 3568int
3143rxvt_term::privcases (int mode, unsigned long bit) 3569rxvt_term::privcases (int mode, unsigned long bit)
3144{ 3570{
3145 int state; 3571 int state;
3146 3572
3147 if (mode == 's') 3573 if (mode == 's')
3148 { 3574 {
3149 SavedModes |= (PrivateModes & bit); 3575 SavedModes |= (priv_modes & bit);
3150 return -1; 3576 return -1;
3151 } 3577 }
3152 else 3578 else
3153 { 3579 {
3154 if (mode == 'r') 3580 if (mode == 'r')
3155 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3581 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3156 else 3582 else
3157 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3583 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3158 PrivMode(state, bit); 3584 set_privmode (bit, state);
3159 } 3585 }
3586
3160 return state; 3587 return state;
3161} 3588}
3162 3589
3163/* we're not using priv _yet_ */ 3590/* we're not using priv _yet_ */
3164void 3591void
3165rxvt_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)
3166{ 3593{
3167 unsigned int i, j; 3594 unsigned int i, j;
3168 int state; 3595 int state;
3596
3169 static const struct 3597 static const struct
3170 { 3598 {
3171 const int argval; 3599 const int argval;
3172 const unsigned long bit; 3600 const unsigned long bit;
3173 }
3174 argtopriv[] = { 3601 } argtopriv[] = {
3175 { 1, PrivMode_aplCUR }, 3602 { 1, PrivMode_aplCUR }, // DECCKM
3176 { 2, PrivMode_vt52 }, 3603 { 2, PrivMode_vt52 },
3177 { 3, PrivMode_132 }, 3604 { 3, PrivMode_132 }, // DECCOLM
3178 { 4, PrivMode_smoothScroll }, 3605 { 4, PrivMode_smoothScroll }, // DECSCLM
3179 { 5, PrivMode_rVideo }, 3606 { 5, PrivMode_rVideo }, // DECSCNM
3180 { 6, PrivMode_relOrigin }, 3607 { 6, PrivMode_relOrigin }, // DECOM
3181 { 7, PrivMode_Autowrap }, 3608 { 7, PrivMode_Autowrap }, // DECAWM
3609 // 8, auto-repeat keys // DECARM
3182 { 9, PrivMode_MouseX10 }, 3610 { 9, PrivMode_MouseX10 },
3183#ifdef menuBar_esc 3611 // 18 end FF to printer after print screen
3184 { menuBar_esc, PrivMode_menuBar }, 3612 // 19 Print screen prints full screen/scorll region
3185#endif 3613 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3186#ifdef scrollBar_esc 3614#ifdef scrollBar_esc
3187 { scrollBar_esc, PrivMode_scrollBar }, 3615 { scrollBar_esc, PrivMode_scrollBar },
3188#endif 3616#endif
3189 { 25, PrivMode_VisibleCursor },
3190 { 35, PrivMode_ShiftKeys }, 3617 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 // 38, tektronix mode // DECTEK
3191 { 40, PrivMode_132OK }, 3619 { 40, PrivMode_132OK },
3620 // 41 xterm more fixes NYI
3621 // 45 margin bell NYI
3622 // 46 start logging
3192 { 47, PrivMode_Screen }, 3623 { 47, PrivMode_Screen },
3193 { 66, PrivMode_aplKP }, 3624 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3194#ifndef NO_BACKSPACE_KEY 3625#ifndef NO_BACKSPACE_KEY
3195 { 67, PrivMode_BackSpace }, 3626 { 67, PrivMode_BackSpace }, // DECBKM
3196#endif 3627#endif
3197 { 1000, PrivMode_MouseX11 }, 3628 { 1000, PrivMode_MouseX11 },
3629 { 1002, PrivMode_MouseBtnEvent },
3630 { 1003, PrivMode_MouseAnyEvent },
3198 { 1010, PrivMode_TtyOutputInh }, 3631 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3199 { 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
3200 { 1047, PrivMode_Screen }, 3636 { 1047, PrivMode_Screen },
3637 // 1048 save and restore cursor
3201 { 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 },
3202 }; 3641 };
3203 3642
3204 if (nargs == 0) 3643 if (nargs == 0)
3205 return; 3644 return;
3206 3645
… …
3213 for (i = 0; i < nargs; i++) 3652 for (i = 0; i < nargs; i++)
3214 { 3653 {
3215 state = -1; 3654 state = -1;
3216 3655
3217 /* basic handling */ 3656 /* basic handling */
3218 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3657 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3219 if (argtopriv[j].argval == arg[i]) 3658 if (argtopriv[j].argval == arg[i])
3220 { 3659 {
3221 state = privcases (mode, argtopriv[j].bit); 3660 state = privcases (mode, argtopriv[j].bit);
3222 break; 3661 break;
3223 } 3662 }
3224 3663
3225 /* extra handling for values with state unkept */ 3664 /* extra handling for values with state unkept */
3226 if (state == -1)
3227 switch (arg[i]) 3665 switch (arg[i])
3228 { 3666 {
3667#if ENABLE_STYLES
3668 case 1021:
3669 set_option (Opt_intensityStyles, mode);
3670
3671 scr_touch (true);
3672 break;
3673#endif
3229 case 1048: /* alternative cursor save */ 3674 case 1048: /* alternative cursor save */
3675 if (option (Opt_secondaryScreen))
3230 if (mode == 0) 3676 if (mode == 0)
3231 scr_cursor (RESTORE); 3677 scr_cursor (RESTORE);
3232 else if (mode == 1) 3678 else if (mode == 1)
3233 scr_cursor (SAVE); 3679 scr_cursor (SAVE);
3234 /* FALLTHROUGH */
3235 default:
3236 continue; /* for(;i;) */
3237 }
3238
3239 /* extra handling for values with valid 0 or 1 state */
3240 switch (arg[i])
3241 {
3242 /* case 1: - application cursor keys */
3243 case 2: /* VT52 mode */
3244 /* oddball mode. should be set regardless of set/reset
3245 * parameter. Return from VT52 mode with an ESC < from
3246 * within VT52 mode
3247 */
3248 PrivMode(1, PrivMode_vt52);
3249 break; 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;
3250 case 3: /* 80/132 */ 3695 case 3: /* 80/132 */
3251 if (PrivateModes & PrivMode_132OK) 3696 if (priv_modes & PrivMode_132OK)
3252 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3697 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3253 (unsigned int)TermWin.height);
3254 break; 3698 break;
3255 case 4: /* smooth scrolling */ 3699 case 4: /* smooth scrolling */
3256 if (state)
3257 Options &= ~Opt_jumpScroll;
3258 else
3259 Options |= Opt_jumpScroll; 3700 set_option (Opt_jumpScroll, !state);
3260 break; 3701 break;
3261 case 5: /* reverse video */ 3702 case 5: /* reverse video */
3262 scr_rvideo_mode (state); 3703 scr_rvideo_mode (state);
3263 break; 3704 break;
3264 case 6: /* relative/absolute origins */ 3705 case 6: /* relative/absolute origins */
3265 scr_relative_origin (state); 3706 scr_relative_origin (state);
3266 break; 3707 break;
3267 case 7: /* autowrap */ 3708 case 7: /* autowrap */
3268 scr_autowrap (state); 3709 scr_autowrap (state);
3269 break; 3710 break;
3270 /* 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 */
3271 case 9: /* X10 mouse reporting */ 3712 case 9: /* X10 mouse reporting */
3272 if (state) /* orthogonal */ 3713 if (state) /* orthogonal */
3273 PrivateModes &= ~(PrivMode_MouseX11); 3714 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3274 break; 3715 break;
3275#ifdef menuBar_esc
3276 case menuBar_esc:
3277#ifdef MENUBAR
3278 map_menuBar (state);
3279#endif
3280 break;
3281#endif
3282#ifdef scrollBar_esc 3716#ifdef scrollBar_esc
3283 case scrollBar_esc: 3717 case scrollBar_esc:
3284 if (scrollbar_mapping (state)) 3718 if (scrollBar.map (state))
3285 { 3719 {
3286 resize_all_windows (0, 0, 0); 3720 resize_all_windows (0, 0, 0);
3287 scr_touch (true); 3721 scr_touch (true);
3288 } 3722 }
3289 break; 3723 break;
3290#endif 3724#endif
3291 case 25: /* visible/invisible cursor */ 3725 case 25: /* visible/invisible cursor */
3292 scr_cursor_visible (state); 3726 scr_cursor_visible (state);
3293 break; 3727 break;
3294 /* case 35: - shift keys */ 3728 /* case 35: - shift keys */
3295 /* case 40: - 80 <--> 132 mode */ 3729 /* case 40: - 80 <--> 132 mode */
3296 case 47: /* secondary screen */ 3730 case 47: /* secondary screen */
3297 scr_change_screen (state); 3731 scr_change_screen (state);
3298 break; 3732 break;
3299 /* case 66: - application key pad */ 3733 /* case 66: - application key pad */
3300 /* case 67: - backspace key */ 3734 /* case 67: - backspace key */
3301 case 1000: /* X11 mouse reporting */ 3735 case 1000: /* X11 mouse reporting */
3302 if (state) /* orthogonal */ 3736 if (state) /* orthogonal */
3303 PrivateModes &= ~(PrivMode_MouseX10); 3737 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3304 break; 3738 break;
3305#if 0
3306 case 1001: 3739 case 1002:
3307 break; /* X11 mouse highlighting */ 3740 case 1003:
3308#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;
3309 case 1010: /* scroll to bottom on TTY output inhibit */ 3752 case 1010: /* scroll to bottom on TTY output inhibit */
3310 if (state)
3311 Options &= ~Opt_scrollTtyOutput;
3312 else
3313 Options |= Opt_scrollTtyOutput; 3753 set_option (Opt_scrollTtyOutput, !state);
3314 break; 3754 break;
3315 case 1011: /* scroll to bottom on key press */ 3755 case 1011: /* scroll to bottom on key press */
3316 if (state)
3317 Options |= Opt_scrollTtyKeypress; 3756 set_option (Opt_scrollTtyKeypress, state);
3318 else
3319 Options &= ~Opt_scrollTtyKeypress;
3320 break; 3757 break;
3321 case 1047: /* secondary screen w/ clearing */ 3758 case 1047: /* secondary screen w/ clearing last */
3322 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3759 if (option (Opt_secondaryScreen))
3323 if (current_screen != PRIMARY) 3760 if (!state)
3324 scr_erase_screen (2); 3761 scr_erase_screen (2);
3762
3325 scr_change_screen (state); 3763 scr_change_screen (state);
3326 /* FALLTHROUGH */
3327 default:
3328 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;
3329 } 3780 }
3330 } 3781 }
3331} 3782}
3332/*}}} */ 3783/*}}} */
3333 3784
3334/*{{{ process sgr sequences */ 3785/*{{{ process sgr sequences */
3335void 3786void
3336rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3787rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3337{ 3788{
3338 unsigned int i; 3789 unsigned int i;
3339 short rendset; 3790 short rendset;
3340 int rendstyle; 3791 int rendstyle;
3341 3792
3342 if (nargs == 0) 3793 if (nargs == 0)
3343 { 3794 {
3344 scr_rendition (0, ~RS_None); 3795 scr_rendition (0, ~RS_None);
3345 return; 3796 return;
3346 } 3797 }
3798
3347 for (i = 0; i < nargs; i++) 3799 for (i = 0; i < nargs; i++)
3348 { 3800 {
3349 rendset = -1; 3801 rendset = -1;
3350 switch (arg[i]) 3802 switch (arg[i])
3351 { 3803 {
… …
3353 rendset = 0, rendstyle = ~RS_None; 3805 rendset = 0, rendstyle = ~RS_None;
3354 break; 3806 break;
3355 case 1: 3807 case 1:
3356 rendset = 1, rendstyle = RS_Bold; 3808 rendset = 1, rendstyle = RS_Bold;
3357 break; 3809 break;
3810 //case 2: // low intensity
3811 case 3:
3812 rendset = 1, rendstyle = RS_Italic;
3813 break;
3358 case 4: 3814 case 4:
3359 rendset = 1, rendstyle = RS_Uline; 3815 rendset = 1, rendstyle = RS_Uline;
3360 break; 3816 break;
3361 case 5: 3817 case 5: // slowly blinking
3818 case 6: // rapidly blinking
3362 rendset = 1, rendstyle = RS_Blink; 3819 rendset = 1, rendstyle = RS_Blink;
3363 break; 3820 break;
3821 //case 6: // scoansi light background
3364 case 7: 3822 case 7:
3365 rendset = 1, rendstyle = RS_RVid; 3823 rendset = 1, rendstyle = RS_RVid;
3366 break; 3824 break;
3367 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)
3368 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;
3369 break; 3843 break;
3370 case 24: 3844 case 24:
3371 rendset = 0, rendstyle = RS_Uline; 3845 rendset = 0, rendstyle = RS_Uline;
3372 break; 3846 break;
3373 case 25: 3847 case 25:
3374 rendset = 0, rendstyle = RS_Blink; 3848 rendset = 0, rendstyle = RS_Blink;
3375 break; 3849 break;
3850 case 26: // variable spacing (iso 8613)
3851 rendset = 0, rendstyle = RS_Blink;
3852 break;
3376 case 27: 3853 case 27:
3377 rendset = 0, rendstyle = RS_RVid; 3854 rendset = 0, rendstyle = RS_RVid;
3378 break; 3855 break;
3856 //case 28: // visible. NYI
3857 //case 29: // not crossed-out
3379 } 3858 }
3859
3380 if (rendset != -1) 3860 if (rendset != -1)
3381 { 3861 {
3382 scr_rendition (rendset, rendstyle); 3862 scr_rendition (rendset, rendstyle);
3383 continue; /* for(;i;) */ 3863 continue; /* for (;i;) */
3384 } 3864 }
3385 3865
3386 switch (arg[i]) 3866 switch (arg[i])
3387 { 3867 {
3388 case 30: 3868 case 30:
… …
3391 case 33: 3871 case 33:
3392 case 34: 3872 case 34:
3393 case 35: 3873 case 35:
3394 case 36: 3874 case 36:
3395 case 37: 3875 case 37:
3396 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3876 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3397 Color_fg);
3398 break; 3877 break;
3399#ifdef TTY_256COLOR 3878 case 38: // set fg color, ISO 8613-6
3400 case 38:
3401 if (nargs > i + 2 && arg[i + 1] == 5) 3879 if (nargs > i + 2 && arg[i + 1] == 5)
3402 { 3880 {
3403 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3881 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3404 Color_fg);
3405 i += 2; 3882 i += 2;
3406 } 3883 }
3407 break; 3884 break;
3408#endif
3409 case 39: /* default fg */ 3885 case 39: /* default fg */
3410 scr_color (Color_fg, Color_fg); 3886 scr_color (Color_fg, Color_fg);
3411 break; 3887 break;
3412 3888
3413 case 40: 3889 case 40:
… …
3416 case 43: 3892 case 43:
3417 case 44: 3893 case 44:
3418 case 45: 3894 case 45:
3419 case 46: 3895 case 46:
3420 case 47: 3896 case 47:
3421 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3897 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3422 Color_bg);
3423 break; 3898 break;
3424#ifdef TTY_256COLOR 3899 case 48: // set bg color, ISO 8613-6
3425 case 48:
3426 if (nargs > i + 2 && arg[i + 1] == 5) 3900 if (nargs > i + 2 && arg[i + 1] == 5)
3427 { 3901 {
3428 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3902 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3429 Color_bg);
3430 i += 2; 3903 i += 2;
3431 } 3904 }
3432 break; 3905 break;
3433#endif
3434 case 49: /* default bg */ 3906 case 49: /* default bg */
3435 scr_color (Color_bg, Color_bg); 3907 scr_color (Color_bg, Color_bg);
3436 break; 3908 break;
3437 3909
3438#ifndef NO_BRIGHTCOLOR 3910 //case 50: // not variable spacing
3911
3912#if !ENABLE_MINIMAL
3439 case 90: 3913 case 90:
3440 case 91: /* set bright fg color */ 3914 case 91: /* set bright fg color */
3441 case 92: 3915 case 92:
3442 case 93: 3916 case 93:
3443 case 94: 3917 case 94:
3444 case 95: 3918 case 95:
3445 case 96: 3919 case 96:
3446 case 97: 3920 case 97:
3447 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3921 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3448 Color_fg);
3449 break; 3922 break;
3450 case 100: 3923 case 100:
3451 case 101: /* set bright bg color */ 3924 case 101: /* set bright bg color */
3452 case 102: 3925 case 102:
3453 case 103: 3926 case 103:
3454 case 104: 3927 case 104:
3455 case 105: 3928 case 105:
3456 case 106: 3929 case 106:
3457 case 107: 3930 case 107:
3458 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3931 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3459 Color_bg);
3460 break; 3932 break;
3461#endif 3933#endif
3462
3463 } 3934 }
3464 } 3935 }
3465} 3936}
3466/*}}} */ 3937/*}}} */
3467 3938
3468/*{{{ process Rob Nation's own graphics mode sequences */ 3939/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3469void 3940void
3470rxvt_term::process_graphics () 3941rxvt_term::process_graphics ()
3471{ 3942{
3472 unsigned char ch, cmd = cmd_getc (); 3943 unicode_t ch, cmd = cmd_getc ();
3473 3944
3474#ifndef RXVT_GRAPHICS
3475 if (cmd == 'Q') 3945 if (cmd == 'Q')
3946 {
3476 { /* query graphics */ 3947 /* query graphics */
3477 tt_printf("\033G0\n"); /* no graphics */ 3948 tt_printf ("\033G0\012"); /* no graphics */
3478 return; 3949 return;
3479 } 3950 }
3480 /* swallow other graphics sequences until terminating ':' */ 3951 /* swallow other graphics sequences until terminating ':' */
3481 do 3952 do
3482 ch = cmd_getc (); 3953 ch = cmd_getc ();
3483 while (ch != ':'); 3954 while (ch != ':');
3484#else
3485 unsigned int nargs;
3486 int args[NGRX_PTS];
3487 unsigned char *text = NULL;
3488
3489 if (cmd == 'Q')
3490 { /* query graphics */
3491 tt_printf("\033G1\n"); /* yes, graphics (color) */
3492 return;
3493 }
3494 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;)
3495 {
3496 int neg;
3497
3498 ch = cmd_getc ();
3499 neg = (ch == '-');
3500 if (neg || ch == '+')
3501 ch = cmd_getc ();
3502
3503 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3504 args[nargs] = args[nargs] * 10 + (ch - '0');
3505 if (neg)
3506 args[nargs] = -args[nargs];
3507
3508 nargs++;
3509 args[nargs] = 0;
3510 if (ch != ';')
3511 break;
3512 }
3513
3514 if ((cmd == 'T') && (nargs >= 5))
3515 {
3516 int i, len = args[4];
3517
3518 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3519
3520 if (text != NULL)
3521 {
3522 for (i = 0; i < len; i++)
3523 text[i] = cmd_getc ();
3524 text[len] = '\0';
3525 }
3526 }
3527 Gr_do_graphics (cmd, nargs, args, text);
3528#endif
3529} 3955}
3530/*}}} */ 3956/*}}} */
3531 3957
3532/* ------------------------------------------------------------------------- */ 3958/* ------------------------------------------------------------------------- */
3533 3959
3534/* 3960/*
3535 * Send printf() formatted output to the command. 3961 * Send printf () formatted output to the command.
3536 * Only use for small amounts of data. 3962 * Only use for small amounts of data.
3537 */ 3963 */
3538void 3964void
3539rxvt_term::tt_printf (const char *fmt,...) 3965rxvt_term::tt_printf (const char *fmt,...)
3540{ 3966{
3541 va_list arg_ptr; 3967 va_list arg_ptr;
3542 unsigned char buf[256]; 3968 char buf[256];
3543 3969
3544 va_start (arg_ptr, fmt); 3970 va_start (arg_ptr, fmt);
3545 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3971 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3546 va_end (arg_ptr); 3972 va_end (arg_ptr);
3547 tt_write (buf, STRLEN (buf)); 3973 tt_write (buf, strlen (buf));
3548} 3974}
3549 3975
3550/* ---------------------------------------------------------------------- */ 3976/* ---------------------------------------------------------------------- */
3551/* 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,
3552 * or generated by us in response to a query ESC sequence. 3978 * or generated by us in response to a query ESC sequence.
3553 */ 3979 */
3554void
3555rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3556{
3557 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3980const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3558 3981
3559 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;
3560 { 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
3561 if (v_buflen == 0) 4018 if (v_buflen == 0)
3562 { 4019 {
3563 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3564
3565 if ((unsigned int)written == len)
3566 return;
3567
3568 data += written;
3569 len -= written;
3570 }
3571
3572
3573 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3574
3575 memcpy (v_buffer + v_buflen, data, len);
3576 v_buflen += len;
3577 }
3578
3579 for (;;)
3580 {
3581 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3582
3583 if (written > 0)
3584 {
3585 v_buflen -= written;
3586
3587 if (v_buflen == 0)
3588 {
3589 free (v_buffer); 4020 free (v_buffer);
3590 v_buffer = 0; 4021 v_buffer = 0;
3591 v_buflen = 0;
3592 4022
3593 pty_ev.set (EVENT_READ); 4023 pty_ev.set (ev::READ);
3594 return;
3595 }
3596
3597 memmove (v_buffer, v_buffer + written, v_buflen);
3598 }
3599 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3600 // original code just ignores this...
3601 destroy ();
3602 else
3603 {
3604 pty_ev.set (EVENT_READ | EVENT_WRITE);
3605 return; 4024 return;
3606 } 4025 }
4026
4027 memmove (v_buffer, v_buffer + written, v_buflen);
3607 } 4028 }
4029 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4030 pty_ev.set (ev::READ);
3608} 4031}
3609 4032
3610/*----------------------- end-of-file (C source) -----------------------*/ 4033/*----------------------- end-of-file (C source) -----------------------*/
3611 4034

Diff Legend

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