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

Diff Legend

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