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.41 by pcg, Tue Feb 10 00:40:39 2004 UTC vs.
Revision 1.439 by sf-exg, Wed Feb 10 16:05:42 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 (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 wether 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 426
79 if (numlock_state || (ev.state & ModNumLockMask)) 427 if (numlock_state || (ev.state & ModNumLockMask))
80 { 428 {
81 numlock_state = (ev.state & ModNumLockMask); 429 numlock_state = (ev.state & ModNumLockMask);
82 PrivMode((!numlock_state), PrivMode_aplKP); 430 set_privmode (PrivMode_aplKP, !numlock_state);
83 } 431 }
84 432
85 kbuf[0] = 0; 433 kbuf[0] = 0;
86 434
87#ifdef USE_XIM 435#ifdef USE_XIM
88 if (Input_Context) 436 if (Input_Context)
89 { 437 {
90 Status status_return; 438 Status status_return;
91 439
440#if 0
92#ifdef X_HAVE_UTF8_STRING 441#ifdef X_HAVE_UTF8_STRING
93 if (enc_utf8 && 0) 442 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
94 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 443 len = Xutf8LookupString (Input_Context, &ev, kbuf,
95 KBUFSZ, &keysym, &status_return); 444 KBUFSZ, &keysym, &status_return);
96 else 445 else
97#endif 446#endif
98 447#endif
99 { 448 {
100 wchar_t wkbuf[KBUFSZ + 1]; 449 wchar_t wkbuf[KBUFSZ + 1];
101 450
102 // the XOpenIM manpage lies about hardcoding the locale 451 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 452 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale]) 453 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]); 454 SET_LOCALE (rs[Rs_imLocale]);
455
106 // assume wchar_t == unicode or better 456 // assume wchar_t == unicode or better
107 len = XwcLookupString (Input_Context, &ev, wkbuf, 457 len = XwcLookupString (Input_Context, &ev, wkbuf,
108 KBUFSZ, &keysym, &status_return); 458 KBUFSZ, &keysym, &status_return);
459
109 if (rs[Rs_imLocale]) 460 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 461 SET_LOCALE (locale);
111 462
112 if (status_return == XLookupChars 463 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 464 || status_return == XLookupBoth)
114 { 465 {
466 /* make sure the user can type ctrl-@, i.e. NUL */
467 if (len == 1 && *wkbuf == 0)
468 {
469 kbuf[0] = 0;
470 len = 1;
471 }
472 else
473 {
115 wkbuf[len] = 0; 474 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 475 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 476 if (len < 0)
118 len = 0; 477 len = 0;
478 }
119 } 479 }
120 else 480 else
121 len = 0; 481 len = 0;
122 } 482 }
123 483
124 valid_keysym = status_return == XLookupKeySym 484 valid_keysym = status_return == XLookupKeySym
125 || status_return == XLookupBoth; 485 || status_return == XLookupBoth;
126 } 486 }
127 else 487 else
128#endif 488#endif
129
130 { 489 {
131 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 490 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
132 valid_keysym = !len; 491 valid_keysym = keysym != NoSymbol;
133 } 492 }
134 493
135 if (valid_keysym) 494 if (valid_keysym)
136 { 495 {
137 /* for some backwards compatibility */ 496#ifdef KEYSYM_RESOURCE
138#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 497 if (keyboard->dispatch (this, keysym, ev.state))
139# ifdef HOTKEY_CTRL 498 return;
140 if (ctrl)
141# else
142 if (meta)
143# endif 499#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 500
158 if (TermWin.saveLines) 501 if (saveLines)
159 { 502 {
160#ifdef UNSHIFTED_SCROLLKEYS 503#ifdef UNSHIFTED_SCROLLKEYS
161 if (!ctrl && !meta) 504 if (!ctrl && !meta)
162 {
163#else 505#else
164 if (IS_SCROLL_MOD) 506 if (IS_SCROLL_MOD)
507#endif
165 { 508 {
166#endif
167 int lnsppg; 509 int lnsppg;
168 510
169#ifdef PAGING_CONTEXT_LINES 511#ifdef PAGING_CONTEXT_LINES
170 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 512 lnsppg = nrow - PAGING_CONTEXT_LINES;
171#else 513#else
172 lnsppg = TermWin.nrow * 4 / 5; 514 lnsppg = nrow * 4 / 5;
173#endif 515#endif
516 max_it (lnsppg, 1);
517
174 if (keysym == XK_Prior) 518 if (keysym == XK_Prior)
175 { 519 {
176 scr_page (UP, lnsppg); 520 scr_page (UP, lnsppg);
177 return; 521 return;
178 } 522 }
… …
205 scr_move_to (0, 1); 549 scr_move_to (0, 1);
206 return; 550 return;
207 } 551 }
208 else if (keysym == XK_End) 552 else if (keysym == XK_End)
209 { 553 {
210 scr_move_to (1, 0); 554 scr_move_to (1, 1);
211 return; 555 return;
212 } 556 }
213 } 557 }
214#endif 558#endif
215
216 } 559 }
217 560
218 if (shft) 561 if (shft)
219 { 562 {
220 /* Shift + F1 - F10 generates F11 - F20 */ 563 /* Shift + F1 - F10 generates F11 - F20 */
221 if (keysym >= XK_F1 && keysym <= XK_F10) 564 if (keysym >= XK_F1 && keysym <= XK_F10)
222 { 565 {
223 keysym += (XK_F11 - XK_F1); 566 keysym += (XK_F11 - XK_F1);
224 shft = 0; /* turn off Shift */ 567 shft = 0; /* turn off Shift */
225 } 568 }
226 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 569 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
227 { 570 {
228 switch (keysym) 571 switch (keysym)
229 { 572 {
230 /* normal XTerm key bindings */ 573 /* normal XTerm key bindings */
231 case XK_Insert: /* Shift+Insert = paste mouse selection */ 574 case XK_Insert: /* Shift+Insert = paste mouse selection */
232 selection_request (ev.time, 0, 0); 575 selection_request (ev.time);
233 return; 576 return;
577#if TODO
234 /* rxvt extras */ 578 /* rxvt extras */
235 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 579 case XK_KP_Add: /* Shift+KP_Add = bigger font */
236 change_font (0, FONT_UP); 580 change_font (FONT_UP);
237 return; 581 return;
238 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 582 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
239 change_font (0, FONT_DN); 583 change_font (FONT_DN);
240 return; 584 return;
585#endif
241 } 586 }
242 } 587 }
243 } 588 }
244#ifdef PRINTPIPE 589
245 if (keysym == XK_Print) 590#if ENABLE_FRILLS || ISO_14755
246 { 591 // ISO 14755 support
247 scr_printscreen (ctrl | shft); 592 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
248 return;
249 } 593 {
250#endif 594 int hv;
251#ifdef GREEK_SUPPORT 595
252 if (keysym == ks_greekmodeswith) 596 if (iso14755buf & ISO_14755_51
253 { 597 && (keysym == XK_space || keysym == XK_KP_Space
254 greek_mode = !greek_mode; 598 || keysym == XK_Return || keysym == XK_KP_Enter))
255 if (greek_mode)
256 { 599 {
257 xterm_seq (XTerm_title, 600 commit_iso14755 ();
258 (greek_getmode() == GREEK_ELOT928 601 iso14755buf = ISO_14755_51;
259 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST); 602# if ISO_14755
260 greek_reset(); 603 iso14755_51 (0);
604# endif
605 return;
261 } 606 }
262 else 607 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 { 608 {
273 unsigned int l; 609 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
274 const unsigned char *kbuf0; 610# if ISO_14755
275 const unsigned char ch = C0_ESC; 611 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 612# endif
285 tt_write (&ch, 1); 613 return;
286 tt_write (kbuf0, l); 614 }
615 else if ((hv = hex_keyval (ev)) >= 0)
616 {
617 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
618 | hv | ISO_14755_51;
619# if ISO_14755
620 iso14755_51 (iso14755buf & ISO_14755_MASK);
621# endif
287 return; 622 return;
288 } 623 }
289 else 624 else
290#endif
291
292 { 625 {
626# if ISO_14755
627 scr_overlay_off ();
628# endif
629 iso14755buf = 0;
630 }
631 }
632 else if (option (Opt_iso14755) &&
633 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
634 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
635 if (!(iso14755buf & ISO_14755_STARTED))
636 {
637 iso14755buf |= ISO_14755_STARTED;
638# if ISO_14755
639 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
640 scr_overlay_set (0, 0, "ISO 14755 mode");
641# endif
642 }
643#endif
644
645#ifdef PRINTPIPE
646 if (keysym == XK_Print)
647 {
648 scr_printscreen (ctrl | shft);
649 return;
650 }
651#endif
652
653 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
654 {
655 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
656 unsigned int newlen = 1;
657
658 switch (translate_keypad (keysym, kp))
659 {
660#ifndef NO_BACKSPACE_KEY
661 case XK_BackSpace:
662 if (priv_modes & PrivMode_HaveBackSpace)
663 {
664 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
665 ^ !!ctrl) ? '\b' : '\177';
666 kbuf[1] = '\0';
667 }
668 else
669 strcpy (kbuf, rs[Rs_backspace_key]);
670 break;
671#endif
672#ifndef NO_DELETE_KEY
673 case XK_Delete:
674 strcpy (kbuf, rs[Rs_delete_key]);
675 break;
676#endif
677 case XK_Tab:
678 if (shft)
679 strcpy (kbuf, "\033[Z");
680 else
681 {
682#ifdef CTRL_TAB_MAKES_META
683 if (ctrl)
684 meta = 1;
685#endif
686#ifdef MOD4_TAB_MAKES_META
687 if (ev.state & Mod4Mask)
688 meta = 1;
689#endif
293 newlen = 1; 690 newlen = 0;
294 switch (keysym) 691 }
692 break;
693
694 case XK_Up: /* "\033[A" */
695 case XK_Down: /* "\033[B" */
696 case XK_Right: /* "\033[C" */
697 case XK_Left: /* "\033[D" */
698 strcpy (kbuf, "\033[Z");
699 kbuf[2] = "DACB"[keysym - XK_Left];
700 /* do Shift first */
701 if (shft)
702 kbuf[2] = "dacb"[keysym - XK_Left];
703 else if (ctrl)
704 {
705 kbuf[1] = 'O';
706 kbuf[2] = "dacb"[keysym - XK_Left];
707 }
708 else if (priv_modes & PrivMode_aplCUR)
709 kbuf[1] = 'O';
710 break;
711
712 case XK_KP_Enter:
713 /* allow shift to override */
714 if (kp)
715 {
716 strcpy (kbuf, "\033OM");
717 break;
718 }
719
720 /* FALLTHROUGH */
721
722 case XK_Return:
723 if (priv_modes & PrivMode_LFNL)
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\012';
727 kbuf[2] = '\0';
728 }
729 else
730 {
731 kbuf[0] = '\015';
732 kbuf[1] = '\0';
733 }
734 break;
735
736 case XK_KP_F1: /* "\033OP" */
737 case XK_KP_F2: /* "\033OQ" */
738 case XK_KP_F3: /* "\033OR" */
739 case XK_KP_F4: /* "\033OS" */
740 strcpy (kbuf, "\033OP");
741 kbuf[2] += (keysym - XK_KP_F1);
742 break;
743
744 case XK_KP_Multiply: /* "\033Oj" : "*" */
745 case XK_KP_Add: /* "\033Ok" : "+" */
746 case XK_KP_Separator: /* "\033Ol" : "," */
747 case XK_KP_Subtract: /* "\033Om" : "-" */
748 case XK_KP_Decimal: /* "\033On" : "." */
749 case XK_KP_Divide: /* "\033Oo" : "/" */
750 case XK_KP_0: /* "\033Op" : "0" */
751 case XK_KP_1: /* "\033Oq" : "1" */
752 case XK_KP_2: /* "\033Or" : "2" */
753 case XK_KP_3: /* "\033Os" : "3" */
754 case XK_KP_4: /* "\033Ot" : "4" */
755 case XK_KP_5: /* "\033Ou" : "5" */
756 case XK_KP_6: /* "\033Ov" : "6" */
757 case XK_KP_7: /* "\033Ow" : "7" */
758 case XK_KP_8: /* "\033Ox" : "8" */
759 case XK_KP_9: /* "\033Oy" : "9" */
760 /* allow shift to override */
761 if (kp)
762 {
763 strcpy (kbuf, "\033Oj");
764 kbuf[2] += (keysym - XK_KP_Multiply);
765 }
766 else
767 {
768 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
769 kbuf[1] = '\0';
770 }
771 break;
772
773 default:
295 { 774 {
296#ifndef NO_BACKSPACE_KEY 775 int param = map_function_key (keysym);
297 case XK_BackSpace: 776 if (param > 0)
298 if (PrivateModes & PrivMode_HaveBackSpace) 777 sprintf (kbuf,"\033[%d~", param);
299 {
300 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace)
301 ^ !!ctrl) ? '\b' : '\177';
302 kbuf[1] = '\0';
303 }
304 else 778 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; 779 newlen = 0;
615 break;
616 } 780 }
617 if (newlen) 781 break;
618 len = STRLEN(kbuf);
619 } 782 }
783
784 if (newlen)
785 len = strlen (kbuf);
786
620 /* 787 /*
621 * Pass meta for all function keys, if 'meta' option set 788 * Pass meta for all function keys, if 'meta' option set
622 */ 789 */
623#ifdef META8_OPTION 790#ifdef META8_OPTION
624 if (meta && (meta_char == 0x80) && len > 0) 791 if (meta && (meta_char == 0x80) && len > 0)
… …
629 else if (ctrl && keysym == XK_minus) 796 else if (ctrl && keysym == XK_minus)
630 { 797 {
631 len = 1; 798 len = 1;
632 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 799 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
633 } 800 }
801 else if (keysym == XK_ISO_Left_Tab)
802 {
803 strcpy (kbuf, "\033[Z");
804 len = 3;
805 }
634 else 806 else
635 { 807 {
636#ifdef META8_OPTION 808#ifdef META8_OPTION
637 /* set 8-bit on */ 809 /* set 8-bit on */
638 if (meta && (meta_char == 0x80)) 810 if (meta && (meta_char == 0x80))
639 { 811 {
640 unsigned char *ch; 812 char *ch;
641 813
642 for (ch = kbuf; ch < kbuf + len; ch++) 814 for (ch = kbuf; ch < kbuf + len; ch++)
643 *ch |= 0x80; 815 *ch |= 0x80;
816
644 meta = 0; 817 meta = 0;
645 } 818 }
646#endif 819#endif
647#ifdef GREEK_SUPPORT
648 if (greek_mode)
649 len = greek_xlat(kbuf, len);
650#endif
651 /* nil */ ; 820 /* nil */ ;
652 } 821 }
653 } 822 }
823
824 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
825 return;
654 826
655 if (len <= 0) 827 if (len <= 0)
656 return; /* not mapped */ 828 return; /* not mapped */
657 829
658 if (Options & Opt_scrollTtyKeypress) 830 if (option (Opt_scrollTtyKeypress))
659 if (TermWin.view_start) 831 if (view_start)
660 { 832 {
661 TermWin.view_start = 0; 833 view_start = 0;
662 want_refresh = 1; 834 want_refresh = 1;
663 } 835 }
664 836
665 /* 837 /*
666 * these modifications only affect the static keybuffer 838 * these modifications only affect the static keybuffer
… …
677 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 849 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
678 850
679 /* escape prefix */ 851 /* escape prefix */
680 if (meta 852 if (meta
681#ifdef META8_OPTION 853#ifdef META8_OPTION
682 && (meta_char == C0_ESC) 854 && meta_char == C0_ESC
683#endif 855#endif
684 ) 856 )
685 { 857 {
686 const unsigned char ch = C0_ESC; 858 const char ch = C0_ESC;
687
688 tt_write(&ch, 1); 859 tt_write (&ch, 1);
689 } 860 }
690#ifdef DEBUG_CMD
691 if (debug_key)
692 { /* Display keyboard buffer contents */
693 char *p;
694 int i;
695 861
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); 862 tt_write (kbuf, (unsigned int)len);
703} 863}
704/*}}} */
705 864
706#if (MENUBAR_MAX) 865void
707/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 866rxvt_term::key_release (XKeyEvent &ev)
708/* attempt to `write' count to the input buffer */ 867{
868#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
869 KeySym keysym;
870
871 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
872#endif
873
874#if ENABLE_FRILLS || ISO_14755
875 // ISO 14755 support
876 if (iso14755buf)
877 if (iso14755buf & ISO_14755_52)
878 {
879# if ISO_14755
880 scr_overlay_off ();
881# endif
882# if ISO_14755
883 // iso14755 part 5.2 handling: release time
884 // first: controls
885 if ((ev.state & ControlMask)
886 && ((keysym >= 0x40 && keysym <= 0x5f)
887 || (keysym >= 0x61 && keysym <= 0x7f)))
888 {
889 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
890 commit_iso14755 ();
891
892 return;
893 }
894
895 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
896 if (i[0] == keysym)
897 {
898 iso14755buf = ISO_14755_51 | i[1];
899 commit_iso14755 ();
900
901 return;
902 }
903
904 scr_bell ();
905# endif
906 iso14755buf = 0;
907
908 return;
909 }
910 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
911 {
912# if ISO_14755
913 scr_overlay_off ();
914# endif
915 if (iso14755buf & ISO_14755_51)
916 commit_iso14755 ();
917#if ISO_14755
918 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
919 {
920 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
921
922 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
923 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
924 }
925# endif
926 else
927 iso14755buf = 0;
928 }
929#endif
930
931 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
932 return;
933
934#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
935 if (!(ev.state & ControlMask))
936 slip_wheel_ev.stop ();
937 else if (keysym == XK_Control_L || keysym == XK_Control_R)
938 mouse_slip_wheel_speed = 0;
939#endif
940}
941
942#if defined (KEYSYM_RESOURCE)
709unsigned int 943unsigned int
710rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 944rxvt_term::cmd_write (const char *str, unsigned int count)
711{ 945{
712 unsigned int n, s; 946 unsigned int n, s;
713 947
714 n = cmdbuf_ptr - cmdbuf_base; 948 n = cmdbuf_ptr - cmdbuf_base;
715 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 949 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
950
716 if (n > 0 && s < count) 951 if (n > 0 && s < count)
717 { 952 {
718 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 953 memmove (cmdbuf_base, cmdbuf_ptr,
719 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 954 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
720 cmdbuf_ptr = cmdbuf_base; 955 cmdbuf_ptr = cmdbuf_base;
721 cmdbuf_endp -= n; 956 cmdbuf_endp -= n;
722 s += n; 957 s += n;
723 } 958 }
959
724 if (count > s) 960 if (count > s)
725 { 961 {
726 rxvt_print_error("data loss: cmd_write too large"); 962 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
727 count = s; 963 count = s;
728 } 964 }
965
729 for (; count--;) 966 for (; count--;)
730 *cmdbuf_endp++ = *str++; 967 *cmdbuf_endp++ = *str++;
968
969 cmd_parse ();
970
731 return 0; 971 return 0;
732} 972}
733#endif /* MENUBAR_MAX */ 973#endif
734 974
735void 975void
736rxvt_term::flush () 976rxvt_term::flush ()
737{ 977{
738#ifdef TRANSPARENT 978 flush_ev.stop ();
739 if (want_full_refresh) 979
980#ifdef HAVE_BG_PIXMAP
981 if (bgPixmap.check_clearChanged ())
740 { 982 {
741 want_full_refresh = 0; 983// scr_clear (true); This needs to be researched further!
742 scr_clear ();
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 wether 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 workaroudn 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 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1437 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1438 szHint.width, szHint.height);*/
1439 if (ev.xconfigure.window == parent[0])
1295 { 1440 {
1296 TermWin.focus = 1; 1441 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 } 1442 ;
1308 break;
1309 1443
1310 case FocusOut: 1444 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1311 if (TermWin.focus)
1312 { 1445 {
1313 TermWin.focus = 0; 1446 seen_resize = 1;
1314 want_refresh = 1; 1447 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 } 1448 }
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 1449 else
1348 { 1450 {
1349 D_SIZE((stderr, "Size: Not resizing")); 1451#ifdef HAVE_BG_PIXMAP
1452 if (bgPixmap.window_position_sensitive ())
1453 {
1454 if (mapped)
1455 update_background ();
1456 else
1457 bgPixmap.invalidate ();
1458 }
1459#endif
1350 } 1460 }
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 1461
1462 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1361 } 1463 }
1362 break; 1464 break;
1363 1465
1466 case PropertyNotify:
1467 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1468 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1469 && ev.xproperty.state == PropertyNewValue)
1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1471
1472 break;
1473
1364 case SelectionClear: 1474 case SelectionClear:
1365 display->set_selection_owner (0); 1475 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1366 break; 1476 break;
1367 1477
1368 case SelectionNotify: 1478 case SelectionNotify:
1369 if (selection_wait == Sel_normal) 1479 if (selection_wait == Sel_normal)
1370 selection_paste (ev.xselection.requestor, 1480 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1371 ev.xselection.property, True);
1372 break; 1481 break;
1373 1482
1374 case SelectionRequest: 1483 case SelectionRequest:
1375 selection_send (ev.xselectionrequest); 1484 selection_send (ev.xselectionrequest);
1376 break; 1485 break;
1377 1486
1487 case MapNotify:
1488#ifdef HAVE_BG_PIXMAP
1489 /* This is needed spcifically to fix the case of no window manager or a
1490 * non-reparenting window manager. In those cases we never get first
1491 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1492 * care of multiplicity of ConfigureNotify events arriwing while WM does
1493 * reparenting.
1494 * We should not render background immidiately, as there could be several
1495 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1496 * by scheduling background redraw as soon as we can, but giving a short
1497 * bit of time for ConfigureNotifies to arrive.
1498 * We should render background PRIOR to drawing any text, but AFTER all
1499 * of ConfigureNotifys for the best results.
1500 */
1501 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1502 update_background_ev.start (0.025);
1503#endif
1504 mapped = 1;
1505#ifdef TEXT_BLINK
1506 text_blink_ev.start ();
1507#endif
1508 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1509 break;
1510
1378 case UnmapNotify: 1511 case UnmapNotify:
1379 TermWin.mapped = 0; 1512 mapped = 0;
1380#ifdef TEXT_BLINK 1513#ifdef TEXT_BLINK
1381 text_blink_ev.stop (); 1514 text_blink_ev.stop ();
1382#endif 1515#endif
1516 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1383 break; 1517 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 1518
1398 case GraphicsExpose: 1519 case GraphicsExpose:
1399 case Expose: 1520 case Expose:
1400 if (ev.xany.window == TermWin.vt) 1521 if (ev.xany.window == vt)
1401 { 1522 {
1402#ifdef NO_SLOW_LINK_SUPPORT 1523 do
1524 {
1403 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1404 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1405#else 1527 }
1406 // don't understand this, so commented it out 1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1529
1530 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1531
1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1533 {
1407 scr_expose (ev.xexpose.x, ev.xexpose.y, 1534 scr_expose (ev.xexpose.x, ev.xexpose.y,
1408 ev.xexpose.width, ev.xexpose.height, False); 1535 ev.xexpose.width, ev.xexpose.height, False);
1409 //scr_expose (ev.xexpose.x, 0, 1536 }
1410 // ev.xexpose.width, TermWin.height, False); 1537
1411#endif
1412 want_refresh = 1; 1538 want_refresh = 1;
1413 } 1539 }
1414 else 1540 else
1415 { 1541 {
1416 XEvent unused_event; 1542 XEvent unused_event;
1417 1543
1418 while (XCheckTypedWindowEvent(display->display, ev.xany.window, 1544 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1419 Expose, 1545 ;
1420 &unused_event)) ; 1546 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1421 while (XCheckTypedWindowEvent(display->display, ev.xany.window, 1547 ;
1422 GraphicsExpose, 1548
1423 &unused_event)) ; 1549 if (scrollBar.state && ev.xany.window == scrollBar.win)
1424 if (isScrollbarWindow(ev.xany.window))
1425 { 1550 {
1426 scrollBar.setIdle(); 1551 scrollBar.state = STATE_IDLE;
1427 scrollbar_show (0); 1552 scrollBar.show (0);
1428 } 1553 }
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 } 1554 }
1438 break; 1555 break;
1439 1556
1440 case MotionNotify: 1557 case MotionNotify:
1441#ifdef POINTER_BLANK 1558#ifdef POINTER_BLANK
1442 if (hidden_pointer) 1559 if (hidden_pointer)
1443 pointer_unblank (); 1560 pointer_unblank ();
1444#endif 1561#endif
1445#if MENUBAR 1562 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1446 if (isMenuBarWindow(ev.xany.window)) 1563 || priv_modes & PrivMode_MouseAnyEvent)
1564 mouse_report (ev.xbutton);
1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1566 break;
1567
1568 if (ev.xany.window == vt)
1447 { 1569 {
1448 menubar_control (&(ev.xbutton)); 1570 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1449 break; 1571 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1450 } 1572 ; // 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))) 1573 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1458 { 1574 {
1459 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1575 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1460 ; 1576 ;
1461 1577
1462 XQueryPointer(display->display, TermWin.vt, 1578 XQueryPointer (dpy, vt,
1463 &unused_root, &unused_child, 1579 &unused_root, &unused_child,
1464 &unused_root_x, &unused_root_y, 1580 &unused_root_x, &unused_root_y,
1465 &(ev.xbutton.x), &(ev.xbutton.y), 1581 &ev.xbutton.x, &ev.xbutton.y,
1466 &unused_mask); 1582 &ev.xbutton.state);
1467#ifdef MOUSE_THRESHOLD 1583#ifdef MOUSE_THRESHOLD
1468 /* deal with a `jumpy' mouse */ 1584 /* deal with a `jumpy' mouse */
1469 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1585 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1470 { 1586 {
1471#endif 1587#endif
1588#if ISO_14755
1589 // 5.4
1590 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1591 {
1592 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1593 break;
1594 }
1595#endif
1472 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1596 selection_extend (ev.xbutton.x, ev.xbutton.y,
1473 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1597 ev.xbutton.state & Button3Mask ? 2 : 0);
1598
1474#ifdef SELECTION_SCROLLING 1599#ifdef SELECTION_SCROLLING
1475 if (ev.xbutton.y < TermWin.int_bwidth 1600 if (ev.xbutton.y < int_bwidth
1476 || Pixel2Row(ev.xbutton.y) > (TermWin.nrow-1)) 1601 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1477 { 1602 {
1478 int dist; 1603 int dist;
1479
1480 pending_scroll_selection=1;
1481 1604
1482 /* don't clobber the current delay if we are 1605 /* don't clobber the current delay if we are
1483 * already in the middle of scrolling. 1606 * already in the middle of scrolling.
1484 */ 1607 */
1485 if (scroll_selection_delay<=0) 1608 if (!sel_scroll_ev.is_active ())
1486 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1609 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1487 1610
1488 /* save the event params so we can highlight 1611 /* save the event params so we can highlight
1489 * the selection in the pending-scroll loop 1612 * the selection in the pending-scroll loop
1490 */ 1613 */
1491 selection_save_x=ev.xbutton.x; 1614 selection_save_x = ev.xbutton.x;
1492 selection_save_y=ev.xbutton.y; 1615 selection_save_y = ev.xbutton.y;
1493 selection_save_state=
1494 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1616 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1495 1617
1496 /* calc number of lines to scroll */ 1618 /* calc number of lines to scroll */
1497 if (ev.xbutton.y<TermWin.int_bwidth) 1619 if (ev.xbutton.y < int_bwidth)
1498 { 1620 {
1499 scroll_selection_dir = UP; 1621 scroll_selection_dir = UP;
1500 dist = TermWin.int_bwidth - ev.xbutton.y; 1622 dist = int_bwidth - ev.xbutton.y;
1501 } 1623 }
1502 else 1624 else
1503 { 1625 {
1504 scroll_selection_dir = DN; 1626 scroll_selection_dir = DN;
1505 dist = ev.xbutton.y - 1627 dist = ev.xbutton.y - (int_bwidth + height);
1506 (TermWin.int_bwidth + TermWin.height);
1507 } 1628 }
1629
1508 scroll_selection_lines=(Pixel2Height(dist)/ 1630 scroll_selection_lines = Pixel2Height (dist)
1509 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1631 / SELECTION_SCROLL_LINE_SPEEDUP
1632 + 1;
1510 MIN_IT(scroll_selection_lines, 1633 min_it (scroll_selection_lines,
1511 SELECTION_SCROLL_MAX_LINES); 1634 SELECTION_SCROLL_MAX_LINES);
1512 } 1635 }
1513 else 1636 else
1514 { 1637 {
1515 /* we are within the text window, so we 1638 /* we are within the text window, so we
1516 * shouldn't be scrolling 1639 * shouldn't be scrolling
1517 */ 1640 */
1518 pending_scroll_selection = 0; 1641 sel_scroll_ev.stop();
1519 } 1642 }
1520#endif 1643#endif
1521#ifdef MOUSE_THRESHOLD 1644#ifdef MOUSE_THRESHOLD
1522
1523 } 1645 }
1524#endif 1646#endif
1525
1526 } 1647 }
1527 } 1648 }
1528 else if (isScrollbarWindow(ev.xany.window) && scrollbar_isMotion()) 1649 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1529 { 1650 {
1530 while (XCheckTypedWindowEvent(display->display, scrollBar.win, 1651 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1531 MotionNotify, &ev)) ; 1652 MotionNotify, &ev))
1653 ;
1654
1532 XQueryPointer(display->display, scrollBar.win, 1655 XQueryPointer (dpy, scrollBar.win,
1533 &unused_root, &unused_child, 1656 &unused_root, &unused_child,
1534 &unused_root_x, &unused_root_y, 1657 &unused_root_x, &unused_root_y,
1535 &(ev.xbutton.x), &(ev.xbutton.y), 1658 &ev.xbutton.x, &ev.xbutton.y,
1536 &unused_mask); 1659 &unused_mask);
1537 scr_move_to (scrollbar_position(ev.xbutton.y) - csrO, 1660 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1538 scrollbar_size()); 1661 scrollBar.size ());
1539 scr_refresh (refresh_type);
1540 refresh_limit = 0; 1662 want_refresh = 1;
1541 scrollbar_show (1); 1663 scrollBar.show (1);
1542 } 1664 }
1543 break; 1665 break;
1544 } 1666 }
1545}
1546 1667
1668#if defined(CURSOR_BLINK)
1669 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1670 {
1671 if (hidden_cursor)
1672 {
1673 hidden_cursor = 0;
1674 want_refresh = 1;
1675 }
1676
1677 cursor_blink_ev.again ();
1678 }
1679#endif
1680
1681#if defined(POINTER_BLANK)
1682 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1683 {
1684 if (ev.type == MotionNotify
1685 || ev.type == ButtonPress
1686 || ev.type == ButtonRelease)
1687 if (hidden_pointer)
1688 pointer_unblank ();
1689
1690 if (ev.type == KeyPress && hidden_pointer == 0)
1691 pointer_blank ();
1692 }
1693#endif
1694
1695 refresh_check ();
1696}
1697
1698#if ENABLE_FRILLS
1699void
1700rxvt_term::set_urgency (bool enable)
1701{
1702 if (enable == urgency_hint)
1703 return;
1704
1705 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1706 {
1707 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1708 XSetWMHints (dpy, parent[0], h);
1709 urgency_hint = enable;
1710 }
1711}
1712#endif
1713
1714void
1715rxvt_term::focus_in ()
1716{
1717 if (!focus)
1718 {
1719 focus = 1;
1720 want_refresh = 1;
1721
1722#if USE_XIM
1723 if (Input_Context != NULL)
1724 {
1725 IMSetPosition ();
1726 XSetICFocus (Input_Context);
1727 }
1728#endif
1729#if CURSOR_BLINK
1730 if (option (Opt_cursorBlink))
1731 cursor_blink_ev.again ();
1732#endif
1733#if OFF_FOCUS_FADING
1734 if (rs[Rs_fade])
1735 {
1736 pix_colors = pix_colors_focused;
1737 scr_recolour ();
1738 }
1739#endif
1740#if ENABLE_FRILLS
1741 if (option (Opt_urgentOnBell))
1742 set_urgency (0);
1743#endif
1744
1745 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1746 }
1747}
1748
1749void
1750rxvt_term::focus_out ()
1751{
1752 if (focus)
1753 {
1754 focus = 0;
1755 want_refresh = 1;
1756
1757#if ENABLE_FRILLS
1758 if (option (Opt_urgentOnBell))
1759 set_urgency (0);
1760#endif
1761#if ENABLE_FRILLS || ISO_14755
1762 if (iso14755buf)
1763 {
1764 iso14755buf = 0;
1765# if ISO_14755
1766 scr_overlay_off ();
1767# endif
1768 }
1769#endif
1770#if USE_XIM
1771 if (Input_Context != NULL)
1772 XUnsetICFocus (Input_Context);
1773#endif
1774#if CURSOR_BLINK
1775 if (option (Opt_cursorBlink))
1776 cursor_blink_ev.stop ();
1777
1778 hidden_cursor = 0;
1779#endif
1780#if OFF_FOCUS_FADING
1781 if (rs[Rs_fade])
1782 {
1783 pix_colors = pix_colors_unfocused;
1784 scr_recolour ();
1785 }
1786#endif
1787
1788 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1789 }
1790}
1791
1792void
1793rxvt_term::update_fade_color (unsigned int idx)
1794{
1795#if OFF_FOCUS_FADING
1796 if (rs[Rs_fade])
1797 {
1798 rgba c;
1799 pix_colors [Color_fade].get (c);
1800 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1801 }
1802#endif
1803}
1804
1805#if ENABLE_TRANSPARENCY || ENABLE_PERL
1547void 1806void
1548rxvt_term::rootwin_cb (XEvent &ev) 1807rxvt_term::rootwin_cb (XEvent &ev)
1549{ 1808{
1550 SET_R (this); 1809 make_current ();
1551 SET_LOCALE (locale);
1552 1810
1811 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1812 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1813 return;
1814
1815# if ENABLE_TRANSPARENCY
1553 switch (ev.type) 1816 switch (ev.type)
1554 { 1817 {
1555 case PropertyNotify: 1818 case PropertyNotify:
1819 /*
1820 * if user used some Esetroot compatible prog to set the root bg,
1821 * use the property to determine the pixmap. We use it later on.
1822 */
1556 if (ev.xproperty.atom == xa[XA_VT_SELECTION]) 1823 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1557 { 1825 {
1558 if (ev.xproperty.state == PropertyNewValue) 1826 bgPixmap.set_root_pixmap ();
1559 selection_property (ev.xproperty.window, ev.xproperty.atom); 1827 update_background ();
1560 break;
1561 } 1828 }
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 1829
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; 1830 break;
1831 }
1582#endif 1832# endif
1583 }
1584}
1585 1833
1834 refresh_check ();
1835}
1836#endif
1837
1586void 1838void
1587rxvt_term::button_press (const XButtonEvent &ev) 1839rxvt_term::button_press (XButtonEvent &ev)
1588{ 1840{
1589 int reportmode = 0, clickintime; 1841 int reportmode = 0, clickintime;
1590 1842
1591 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1843 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1844
1592 if (!bypass_keystate) 1845 if (!bypass_keystate)
1593 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1846 reportmode = !! (priv_modes & PrivMode_mouse_report);
1847
1594 /* 1848 /*
1595 * VT window processing of button press 1849 * VT window processing of button press
1596 */ 1850 */
1597 if (ev.window == TermWin.vt) 1851 if (ev.window == vt)
1598 { 1852 {
1599#if RXVT_GRAPHICS 1853 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1600 if (ev.subwindow != None) 1854 return;
1601 rxvt_Gr_ButtonPress (ev.x, ev.y);
1602 else
1603#endif
1604 1855
1856#if ISO_14755
1857 // 5.4
1858 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1859 {
1860 iso14755_54 (ev.x, ev.y);
1861 return;
1605 { 1862 }
1863#endif
1864
1606 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1865 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1866
1607 if (reportmode) 1867 if (reportmode)
1868 {
1869 /* mouse report from vt window */
1870 /* save the xbutton state (for ButtonRelease) */
1871 MEvent.state = ev.state;
1872#ifdef MOUSE_REPORT_DOUBLECLICK
1873 if (ev.button == MEvent.button && clickintime)
1608 { 1874 {
1609 /* mouse report from vt window */ 1875 /* same button, within alloted time */
1610 /* save the xbutton state (for ButtonRelease) */ 1876 MEvent.clicks++;
1611 MEvent.state = ev.state; 1877
1612#ifdef MOUSE_REPORT_DOUBLECLICK 1878 if (MEvent.clicks > 1)
1613 if (ev.button == MEvent.button && clickintime)
1614 { 1879 {
1615 /* same button, within alloted time */
1616 MEvent.clicks++;
1617 if (MEvent.clicks > 1)
1618 {
1619 /* only report double clicks */ 1880 /* only report double clicks */
1620 MEvent.clicks = 2; 1881 MEvent.clicks = 2;
1621 mouse_report (ev); 1882 mouse_report (ev);
1622 1883
1623 /* don't report the release */ 1884 /* don't report the release */
1624 MEvent.clicks = 0; 1885 MEvent.clicks = 0;
1625 MEvent.button = AnyButton; 1886 MEvent.button = AnyButton;
1626 }
1627 } 1887 }
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 } 1888 }
1641 else 1889 else
1642 { 1890 {
1891 /* different button, or time expired */
1892 MEvent.clicks = 1;
1893 MEvent.button = ev.button;
1894 mouse_report (ev);
1895 }
1896#else
1897 MEvent.button = ev.button;
1898 mouse_report (ev);
1899#endif /* MOUSE_REPORT_DOUBLECLICK */
1900
1901 }
1902 else
1903 {
1643 if (ev.button != MEvent.button) 1904 if (ev.button != MEvent.button)
1644 MEvent.clicks = 0; 1905 MEvent.clicks = 0;
1906
1645 switch (ev.button) 1907 switch (ev.button)
1646 { 1908 {
1647 case Button1: 1909 case Button1:
1910 /* allow meta + click to select rectangular areas */
1911 /* should be done in screen.C */
1912#if ENABLE_FRILLS
1913 selection.rect = !!(ev.state & ModMetaMask);
1914#else
1915 selection.rect = false;
1916#endif
1917
1648 /* allow shift+left click to extend selection */ 1918 /* allow shift+left click to extend selection */
1649 if (ev.state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1919 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1650 { 1920 {
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) 1921 if (MEvent.button == Button1 && clickintime)
1671 selection_rotate (ev.x, ev.y); 1922 selection_rotate (ev.x, ev.y);
1672 else 1923 else
1673 selection_extend (ev.x, ev.y, 1); 1924 selection_extend (ev.x, ev.y, 1);
1925 }
1926 else
1927 {
1928 if (MEvent.button == Button1 && clickintime)
1929 MEvent.clicks++;
1930 else
1931 MEvent.clicks = 1;
1932
1933 selection_click (MEvent.clicks, ev.x, ev.y);
1934 }
1935
1936 MEvent.button = Button1;
1937 break;
1938
1939 case Button3:
1940 if (MEvent.button == Button3 && clickintime)
1941 selection_rotate (ev.x, ev.y);
1942 else
1943 selection_extend (ev.x, ev.y, 1);
1944
1674 MEvent.button = Button3; 1945 MEvent.button = Button3;
1675 break; 1946 break;
1676 }
1677 } 1947 }
1948 }
1949
1678 MEvent.time = ev.time; 1950 MEvent.time = ev.time;
1679 return; 1951 return;
1680 }
1681 } 1952 }
1682 1953
1683 /* 1954 /*
1684 * Scrollbar window processing of button press 1955 * Scrollbar window processing of button press
1685 */ 1956 */
1686 if (isScrollbarWindow(ev.window)) 1957 if (scrollBar.state && ev.window == scrollBar.win)
1687 { 1958 {
1688 scrollBar.setIdle (); 1959 page_dirn direction = NO_DIR;
1960
1961 if (scrollBar.upButton (ev.y))
1962 direction = UP; /* up */
1963 else if (scrollBar.dnButton (ev.y))
1964 direction = DN; /* down */
1965
1966 scrollBar.state = STATE_IDLE;
1689 /* 1967 /*
1690 * Rxvt-style scrollbar: 1968 * Rxvt-style scrollbar:
1691 * move up if mouse is above slider 1969 * move up if mouse is above slider
1692 * move dn if mouse is below slider 1970 * move dn if mouse is below slider
1693 * 1971 *
… …
1702 /* 1980 /*
1703 * Mouse report disabled scrollbar: 1981 * Mouse report disabled scrollbar:
1704 * arrow buttons - send up/down 1982 * arrow buttons - send up/down
1705 * click on scrollbar - send pageup/down 1983 * click on scrollbar - send pageup/down
1706 */ 1984 */
1707 if ((scrollBar.style == R_SB_NEXT 1985 if (direction == UP)
1708 && scrollbarnext_upButton(ev.y))
1709 || (scrollBar.style == R_SB_RXVT
1710 && scrollbarrxvt_upButton(ev.y)))
1711 tt_printf("\033[A"); 1986 tt_printf ("\033[A");
1712 else if ((scrollBar.style == R_SB_NEXT 1987 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"); 1988 tt_printf ("\033[B");
1717 else 1989 else
1718 switch (ev.button) 1990 switch (ev.button)
1719 { 1991 {
1720 case Button2: 1992 case Button2:
1721 tt_printf("\014"); 1993 tt_printf ("\014");
1722 break; 1994 break;
1723 case Button1: 1995 case Button1:
1724 tt_printf("\033[6~"); 1996 tt_printf ("\033[6~");
1725 break; 1997 break;
1726 case Button3: 1998 case Button3:
1727 tt_printf("\033[5~"); 1999 tt_printf ("\033[5~");
1728 break; 2000 break;
1729 } 2001 }
1730 } 2002 }
1731 else 2003 else
1732#endif /* NO_SCROLLBAR_REPORT */ 2004#endif /* NO_SCROLLBAR_REPORT */
1733
1734 {
1735 char upordown = 0;
1736
1737 if (scrollBar.style == R_SB_NEXT)
1738 { 2005 {
1739 if (scrollbarnext_upButton(ev.y)) 2006 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 { 2007 {
1753#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2008#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1754 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2009 if (!cont_scroll_ev.is_active ())
2010 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1755#endif 2011#endif
1756 if (scr_page (upordown < 0 ? UP : DN, 1)) 2012 if (scr_page (direction, 1))
1757 { 2013 {
1758 if (upordown < 0) 2014 if (direction == UP)
1759 scrollBar.setUp (); 2015 scrollBar.state = STATE_UP;
1760 else 2016 else
1761 scrollBar.setDn (); 2017 scrollBar.state = STATE_DOWN;
1762 } 2018 }
1763 } 2019 }
1764 else 2020 else
1765 switch (ev.button) 2021 switch (ev.button)
1766 { 2022 {
1767 case Button2: 2023 case Button2:
1768 switch (scrollbar_align) 2024 switch (scrollBar.align)
1769 { 2025 {
1770 case R_SB_ALIGN_TOP: 2026 case R_SB_ALIGN_TOP:
1771 csrO = 0; 2027 csrO = 0;
1772 break; 2028 break;
1773 case R_SB_ALIGN_CENTRE: 2029 case R_SB_ALIGN_CENTRE:
… …
1775 break; 2031 break;
1776 case R_SB_ALIGN_BOTTOM: 2032 case R_SB_ALIGN_BOTTOM:
1777 csrO = scrollBar.bot - scrollBar.top; 2033 csrO = scrollBar.bot - scrollBar.top;
1778 break; 2034 break;
1779 } 2035 }
2036
1780 if (scrollBar.style == R_SB_XTERM 2037 if (scrollBar.style == R_SB_XTERM
1781 || scrollbar_above_slider(ev.y) 2038 || scrollbar_above_slider (ev.y)
1782 || scrollbar_below_slider(ev.y)) 2039 || scrollbar_below_slider (ev.y))
1783 scr_move_to ( scrollbar_position(ev.y) - csrO, 2040 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
1784 scrollbar_size()); 2041
1785 scrollBar.setMotion (); 2042 scrollBar.state = STATE_MOTION;
1786 break; 2043 break;
1787 2044
1788 case Button1: 2045 case Button1:
1789 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2046 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1790 csrO = ev.y - scrollBar.top; 2047 csrO = ev.y - scrollBar.top;
1791 /* FALLTHROUGH */ 2048 /* FALLTHROUGH */
1792 2049
1793 case Button3: 2050 case Button3:
1794 if (scrollBar.style != R_SB_XTERM) 2051 if (scrollBar.style != R_SB_XTERM)
1795 { 2052 {
1796 if (scrollbar_above_slider(ev.y)) 2053 if (scrollbar_above_slider (ev.y))
1797# ifdef RXVT_SCROLL_FULL 2054# ifdef RXVT_SCROLL_FULL
1798 scr_page (UP, TermWin.nrow - 1); 2055 scr_page (UP, nrow - 1);
1799# else 2056# else
1800 scr_page (UP, TermWin.nrow / 4); 2057 scr_page (UP, nrow / 4);
1801# endif 2058# endif
1802 else if (scrollbar_below_slider(ev.y)) 2059 else if (scrollbar_below_slider (ev.y))
1803# ifdef RXVT_SCROLL_FULL 2060# ifdef RXVT_SCROLL_FULL
1804 scr_page (DN, TermWin.nrow - 1); 2061 scr_page (DN, nrow - 1);
1805# else 2062# else
1806 scr_page (DN, TermWin.nrow / 4); 2063 scr_page (DN, nrow / 4);
1807# endif 2064# endif
1808 else 2065 else
1809 scrollBar.setMotion (); 2066 scrollBar.state = STATE_MOTION;
1810 } 2067 }
1811 else 2068 else
1812 { 2069 {
1813 scr_page ((ev.button == Button1 ? DN : UP), 2070 scr_page ((ev.button == Button1 ? DN : UP),
1814 (TermWin.nrow 2071 (nrow
1815 * scrollbar_position(ev.y) 2072 * scrollbar_position (ev.y)
1816 / scrollbar_size())); 2073 / scrollBar.size ()));
1817 } 2074 }
2075
1818 break; 2076 break;
1819 } 2077 }
1820 } 2078 }
2079
1821 return; 2080 return;
1822 } 2081 }
1823#if MENUBAR
1824 /*
1825 * Menubar window processing of button press
1826 */
1827 if (isMenuBarWindow(ev.window))
1828 menubar_control (ev);
1829#endif
1830} 2082}
1831 2083
1832void 2084void
1833rxvt_term::button_release (const XButtonEvent &ev) 2085rxvt_term::button_release (XButtonEvent &ev)
1834{ 2086{
1835 int reportmode = 0; 2087 int reportmode = 0;
1836 2088
1837 csrO = 0; /* reset csr Offset */ 2089 csrO = 0; /* reset csr Offset */
1838 if (!bypass_keystate) 2090 if (!bypass_keystate)
1839 reportmode = !!(PrivateModes & PrivMode_mouse_report); 2091 reportmode = !! (priv_modes & PrivMode_mouse_report);
1840 2092
1841 if (scrollbar_isUpDn()) 2093 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1842 { 2094 {
1843 scrollBar.setIdle (); 2095 scrollBar.state = STATE_IDLE;
1844 scrollbar_show (0); 2096 scrollBar.show (0);
1845#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1846 refresh_type &= ~SMOOTH_REFRESH;
1847#endif
1848
1849 } 2097 }
2098
1850#ifdef SELECTION_SCROLLING 2099#ifdef SELECTION_SCROLLING
1851 pending_scroll_selection=0; 2100 sel_scroll_ev.stop();
1852#endif 2101#endif
2102
1853 if (ev.window == TermWin.vt) 2103 if (ev.window == vt)
1854 { 2104 {
1855#ifdef RXVT_GRAPHICS 2105 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
1856 if (ev.subwindow != None) 2106 return;
1857 rxvt_Gr_ButtonRelease(ev.x, ev.y);
1858 else
1859#endif
1860 2107
1861 { 2108#if ISO_14755
2109 // 5.4
2110 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2111 return;
2112#endif
2113
1862 if (reportmode) 2114 if (reportmode)
2115 {
2116 /* mouse report from vt window */
2117 /* don't report release of wheel "buttons" */
2118 if (ev.button >= 4)
2119 return;
2120#ifdef MOUSE_REPORT_DOUBLECLICK
2121 /* only report the release of 'slow' single clicks */
2122 if (MEvent.button != AnyButton
2123 && (ev.button != MEvent.button
2124 || (ev.time - MEvent.time
2125 > MULTICLICK_TIME / 2)))
1863 { 2126 {
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; 2127 MEvent.clicks = 0;
1876 MEvent.button = AnyButton;
1877 mouse_report (ev);
1878 }
1879#else /* MOUSE_REPORT_DOUBLECLICK */
1880 MEvent.button = AnyButton; 2128 MEvent.button = AnyButton;
1881 mouse_report (ev); 2129 mouse_report (ev);
1882#endif /* MOUSE_REPORT_DOUBLECLICK */
1883 return;
1884 } 2130 }
2131#else /* MOUSE_REPORT_DOUBLECLICK */
2132 MEvent.button = AnyButton;
2133 mouse_report (ev);
2134#endif /* MOUSE_REPORT_DOUBLECLICK */
2135 return;
2136 }
2137
1885 /* 2138 /*
1886 * dumb hack to compensate for the failure of click-and-drag 2139 * dumb hack to compensate for the failure of click-and-drag
1887 * when overriding mouse reporting 2140 * when overriding mouse reporting
1888 */ 2141 */
1889 if (PrivateModes & PrivMode_mouse_report 2142 if (priv_modes & PrivMode_mouse_report
1890 && bypass_keystate 2143 && bypass_keystate
1891 && ev.button == Button1 && MEvent.clicks <= 1) 2144 && ev.button == Button1 && MEvent.clicks <= 1)
1892 selection_extend (ev.x, ev.y, 0); 2145 selection_extend (ev.x, ev.y, 0);
1893 2146
1894 switch (ev.button) 2147 switch (ev.button)
2148 {
2149 case Button1:
2150 case Button3:
2151 selection_make (ev.time);
2152 break;
2153
2154 case Button2:
2155 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2156 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2157 break;
2158
2159#ifdef MOUSE_WHEEL
2160 case Button4:
2161 case Button5:
1895 { 2162 {
1896 case Button1: 2163 int i;
1897 case Button3: 2164 page_dirn v;
1898 selection_make (ev.time); 2165
2166 v = ev.button == Button4 ? UP : DN;
2167
2168 if (ev.state & ShiftMask)
1899 break; 2169 i = 1;
1900 case Button2: 2170 else if (option (Opt_mouseWheelScrollPage))
1901 selection_request (ev.time, ev.x, ev.y); 2171 i = nrow - 1;
2172 else
1902 break; 2173 i = 5;
2174
1903#ifdef MOUSE_WHEEL 2175# ifdef MOUSE_SLIP_WHEELING
1904 case Button4: 2176 if (ev.state & ControlMask)
1905 case Button5:
1906 { 2177 {
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); 2178 mouse_slip_wheel_speed += v ? -1 : 1;
1921 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2179 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2180 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2181
2182 if (!slip_wheel_ev.is_active ())
2183 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1922 } 2184 }
2185 else
1923# endif 2186# endif
1924# ifdef JUMP_MOUSE_WHEEL 2187 {
1925 scr_page (v, i); 2188 scr_page (v, i);
1926 scr_refresh (SMOOTH_REFRESH);
1927 scrollbar_show (1); 2189 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 } 2190 }
2055 } 2191 }
2056 am_pixmap_trans = 0; 2192 break;
2193#endif
2194 }
2195 }
2196}
2197
2198/*}}} */
2199
2200void
2201rxvt_term::cmd_parse ()
2202{
2203 wchar_t ch = NOCHAR;
2204 char *seq_begin; // remember start of esc-sequence here
2205
2206 for (;;)
2207 {
2208 if (expect_false (ch == NOCHAR))
2209 {
2210 seq_begin = cmdbuf_ptr;
2211 ch = next_char ();
2212
2213 if (ch == NOCHAR)
2214 break;
2215 }
2216
2217 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2218 {
2219 if (expect_false (!seen_input))
2220 {
2221 seen_input = 1;
2222 // many badly-written programs (e.g. jed) contain a race condition:
2223 // they first read the screensize and then install a SIGWINCH handler.
2224 // some window managers resize the window early, and these programs
2225 // then sometimes get the size wrong.
2226 // unfortunately other programs are even more buggy and dislike
2227 // being sent SIGWINCH, so only do it when we were in fact being
2228 // resized.
2229 if (seen_resize && cmd_pid)
2230 kill (-cmd_pid, SIGWINCH);
2231 }
2232
2233 /* Read a text string from the input buffer */
2234 wchar_t buf[UBUFSIZ];
2235 bool refreshnow = false;
2236 int nlines = 0;
2237 wchar_t *str = buf;
2238 wchar_t *eol = str + min (ncol, UBUFSIZ);
2239
2240 for (;;)
2241 {
2242 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2243 break;
2244
2245 *str++ = ch;
2246
2247 if (expect_false (ch == C0_LF || str >= eol))
2248 {
2249 if (ch == C0_LF)
2250 nlines++;
2251
2252 refresh_count++;
2253
2254 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2255 {
2256 refresh_count = 0;
2257
2258 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2259 {
2260 refreshnow = true;
2261 ch = NOCHAR;
2262 break;
2263 }
2264 }
2265
2266 // scr_add_lines only works for nlines <= nrow - 1.
2267 if (nlines >= nrow - 1)
2268 {
2269 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2270 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2271 scr_add_lines (buf, str - buf, nlines);
2272
2273 nlines = 0;
2274 str = buf;
2275 eol = str + min (ncol, UBUFSIZ);
2276 }
2277
2278 if (str >= eol)
2279 {
2280 if (eol >= buf + UBUFSIZ)
2281 {
2282 ch = NOCHAR;
2283 break;
2284 }
2285 else
2286 eol = min (eol + ncol, buf + UBUFSIZ);
2287 }
2288
2289 }
2290
2291 seq_begin = cmdbuf_ptr;
2292 ch = next_char ();
2293 }
2294
2295 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2296 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2297 scr_add_lines (buf, str - buf, nlines);
2298
2299 /*
2300 * If there have been a lot of new lines, then update the screen
2301 * What the heck we'll cheat and only refresh less than every page-full.
2302 * if skipScroll is enabled.
2303 */
2304 if (refreshnow)
2305 {
2306 scr_refresh ();
2307 want_refresh = 1;
2308 }
2057 } 2309 }
2058 else 2310 else
2059 { 2311 {
2060 if (TermWin.pixmap != None) 2312 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 { 2313 {
2096 if (oldp != None) 2314 process_nonprinting (ch);
2097 pchanged = 1; 2315 }
2316 catch (const class out_of_input &o)
2317 {
2318 // we ran out of input, retry later
2319 cmdbuf_ptr = seq_begin;
2098 break; 2320 break;
2099 } 2321 }
2100 if (oldp != TermWin.parent[i]) 2322
2101 pchanged = 1; 2323 ch = NOCHAR;
2102 }
2103 n = 0;
2104 if (pchanged)
2105 { 2324 }
2106 for (; n < (unsigned int)i; n++) 2325 }
2107 { 2326}
2108 XGetWindowAttributes(display->display, TermWin.parent[n], &wattr); 2327
2109 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2328// read the next character
2110 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2329wchar_t
2111 { 2330rxvt_term::next_char () NOTHROW
2112 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2331{
2113 break; 2332 while (cmdbuf_ptr < cmdbuf_endp)
2114 } 2333 {
2115 } 2334 // assume 7-bit to be ascii ALWAYS
2335 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2336 return *cmdbuf_ptr++;
2337
2338 wchar_t wc;
2339 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2340
2341 if (len == (size_t)-2)
2116 } 2342 {
2117 if (n > (int)(sizeof(TermWin.parent) 2343 // the mbstate stores incomplete sequences. didn't know this :/
2118 / sizeof(TermWin.parent[0]))) 2344 cmdbuf_ptr = cmdbuf_endp;
2345 break;
2119 { 2346 }
2120 D_X((stderr, "InheritPixmap Turning off")); 2347
2121 XSetWindowBackground(display->display, TermWin.parent[0], 2348 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 } 2349 {
2128 else 2350 mbstate.reset (); // reset now undefined conversion state
2351 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2129 { 2352 }
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 2353
2135 rqt.tv_sec = 1; 2354 // assume wchar == unicode
2136 rqt.tv_nsec = 0; 2355 cmdbuf_ptr += len;
2137 nanosleep(&rqt, NULL); 2356 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 } 2357 }
2358
2359 return NOCHAR;
2360}
2361
2362// read the next octet
2363uint32_t
2364rxvt_term::next_octet () NOTHROW
2365{
2366 return cmdbuf_ptr < cmdbuf_endp
2367 ? (unsigned char)*cmdbuf_ptr++
2368 : NOCHAR;
2369}
2370
2371static class out_of_input out_of_input;
2372
2373/* rxvt_cmd_getc () - Return next input character */
2374/*
2375 * Return the next input character after first passing any keyboard input
2376 * to the command.
2377 */
2378wchar_t
2379rxvt_term::cmd_getc () THROW ((class out_of_input))
2380{
2381 wchar_t c = next_char ();
2382
2383 if (c == NOCHAR)
2384 throw out_of_input;
2385
2152 return pchanged; 2386 return c;
2153} 2387}
2154#endif
2155 2388
2156/*}}} */ 2389uint32_t
2390rxvt_term::cmd_get8 () THROW ((class out_of_input))
2391{
2392 uint32_t c = next_octet ();
2393
2394 if (c == NOCHAR)
2395 throw out_of_input;
2396
2397 return c;
2398}
2157 2399
2158/*{{{ print pipe */ 2400/*{{{ print pipe */
2159/*----------------------------------------------------------------------*/ 2401/*----------------------------------------------------------------------*/
2160#ifdef PRINTPIPE 2402#ifdef PRINTPIPE
2161FILE * 2403FILE *
2162rxvt_term::popen_printer () 2404rxvt_term::popen_printer ()
2163{ 2405{
2164 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2406 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2165 2407
2166 if (stream == NULL) 2408 if (stream == NULL)
2167 rxvt_print_error("can't open printer pipe"); 2409 rxvt_warn ("can't open printer pipe, not printing.\n");
2410
2168 return stream; 2411 return stream;
2169} 2412}
2170 2413
2171int 2414int
2172rxvt_term::pclose_printer (FILE *stream) 2415rxvt_term::pclose_printer (FILE *stream)
2173{ 2416{
2174 fflush (stream); 2417 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); 2418 return pclose (stream);
2181# endif
2182} 2419}
2183 2420
2184/* 2421/*
2185 * simulate attached vt100 printer 2422 * simulate attached vt100 printer
2186 */ 2423 */
2187void 2424void
2188rxvt_term::process_print_pipe () 2425rxvt_term::process_print_pipe ()
2189{ 2426{
2190 int done; 2427 FILE *fd = popen_printer ();
2191 FILE *fd;
2192 2428
2193 if ((fd = popen_printer ()) == NULL) 2429 if (!fd)
2194 return; 2430 return;
2195 2431
2196 /* 2432 /*
2197 * Send all input to the printer until either ESC[4i or ESC[?4i 2433 * Send all input to the printer until either ESC[4i or ESC[?4i
2198 * is received. 2434 * is received.
2199 */ 2435 */
2200 for (done = 0; !done;) 2436 for (int done = 0; !done; )
2201 { 2437 {
2202 unsigned char buf[8]; 2438 unsigned char buf[8];
2203 unsigned char ch; 2439 unicode_t ch;
2204 unsigned int i, len; 2440 unsigned int i, len;
2205 2441
2206 if ((ch = cmd_getc ()) != C0_ESC) 2442 if ((ch = cmd_getc ()) != C0_ESC)
2207 { 2443 {
2208 if (putc(ch, fd) == EOF) 2444 if (putc (ch, fd) == EOF)
2209 break; /* done = 1 */ 2445 break; /* done = 1 */
2210 } 2446 }
2211 else 2447 else
2212 { 2448 {
2213 len = 0; 2449 len = 0;
… …
2224 { 2460 {
2225 if ((buf[len++] = cmd_getc ()) == 'i') 2461 if ((buf[len++] = cmd_getc ()) == 'i')
2226 break; /* done = 1 */ 2462 break; /* done = 1 */
2227 } 2463 }
2228 } 2464 }
2465
2229 for (i = 0; i < len; i++) 2466 for (i = 0; i < len; i++)
2230 if (putc(buf[i], fd) == EOF) 2467 if (putc (buf[i], fd) == EOF)
2231 { 2468 {
2232 done = 1; 2469 done = 1;
2233 break; 2470 break;
2234 } 2471 }
2235 } 2472 }
2236 } 2473 }
2474
2237 pclose_printer (fd); 2475 pclose_printer (fd);
2238} 2476}
2239#endif /* PRINTPIPE */ 2477#endif /* PRINTPIPE */
2240/*}}} */ 2478/*}}} */
2241 2479
2242/* *INDENT-OFF* */ 2480/* *INDENT-OFF* */
2243enum { 2481enum {
2244 C1_40 = 0x40, 2482 C1_40 = 0x40,
2245 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2483 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, 2484 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, 2485 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 2486 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2249}; 2487};
2250/* *INDENT-ON* */ 2488/* *INDENT-ON* */
2251 2489
2252/*{{{ process non-printing single characters */ 2490/*{{{ process non-printing single characters */
2253void 2491void
2254rxvt_term::process_nonprinting (unsigned char ch) 2492rxvt_term::process_nonprinting (unicode_t ch)
2255{ 2493{
2256 switch (ch) 2494 switch (ch)
2257 { 2495 {
2496 case C0_ESC:
2497 process_escape_seq ();
2498 break;
2258 case C0_ENQ: /* terminal Status */ 2499 case C0_ENQ: /* terminal Status */
2259 if (rs[Rs_answerbackstring]) 2500 if (rs[Rs_answerbackstring])
2260 tt_write( 2501 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 2502 else
2264 tt_write((unsigned char *)VT100_ANS, 2503 tt_write (VT100_ANS, strlen (VT100_ANS));
2265 (unsigned int)STRLEN(VT100_ANS));
2266 break; 2504 break;
2267 case C0_BEL: /* bell */ 2505 case C0_BEL: /* bell */
2268 scr_bell (); 2506 scr_bell ();
2269 break; 2507 break;
2270 case C0_BS: /* backspace */ 2508 case C0_BS: /* backspace */
… …
2285 scr_charset_choose (1); 2523 scr_charset_choose (1);
2286 break; 2524 break;
2287 case C0_SI: /* shift in - acs */ 2525 case C0_SI: /* shift in - acs */
2288 scr_charset_choose (0); 2526 scr_charset_choose (0);
2289 break; 2527 break;
2528
2529#ifdef EIGHT_BIT_CONTROLS
2530 // 8-bit controls
2531 case 0x90: /* DCS */
2532 process_dcs_seq ();
2533 break;
2534 case 0x9b: /* CSI */
2535 process_csi_seq ();
2536 break;
2537 case 0x9d: /* OSC */
2538 process_osc_seq ();
2539 break;
2540#endif
2290 } 2541 }
2291} 2542}
2292/*}}} */ 2543/*}}} */
2293 2544
2294 2545
2295/*{{{ process VT52 escape sequences */ 2546/*{{{ process VT52 escape sequences */
2296void 2547void
2297rxvt_term::process_escape_vt52 (unsigned char ch) 2548rxvt_term::process_escape_vt52 (unicode_t ch)
2298{ 2549{
2299 int row, col; 2550 int row, col;
2300 2551
2301 switch (ch) 2552 switch (ch)
2302 { 2553 {
… …
2332 row = cmd_getc () - ' '; 2583 row = cmd_getc () - ' ';
2333 col = cmd_getc () - ' '; 2584 col = cmd_getc () - ' ';
2334 scr_gotorc (row, col, 0); 2585 scr_gotorc (row, col, 0);
2335 break; 2586 break;
2336 case 'Z': /* identify the terminal type */ 2587 case 'Z': /* identify the terminal type */
2337 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2588 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2338 break; 2589 break;
2339 case '<': /* turn off VT52 mode */ 2590 case '<': /* turn off VT52 mode */
2340 PrivMode(0, PrivMode_vt52); 2591 set_privmode (PrivMode_vt52, 0);
2341 break; 2592 break;
2342 case 'F': /* use special graphics character set */ 2593 case 'F': /* use special graphics character set */
2343 case 'G': /* use regular character set */ 2594 case 'G': /* use regular character set */
2344 /* unimplemented */ 2595 /* unimplemented */
2345 break; 2596 break;
… …
2354 2605
2355/*{{{ process escape sequences */ 2606/*{{{ process escape sequences */
2356void 2607void
2357rxvt_term::process_escape_seq () 2608rxvt_term::process_escape_seq ()
2358{ 2609{
2359 unsigned char ch = cmd_getc (); 2610 unicode_t ch = cmd_getc ();
2360 2611
2361 if (PrivateModes & PrivMode_vt52) 2612 if (priv_modes & PrivMode_vt52)
2362 { 2613 {
2363 process_escape_vt52 (ch); 2614 process_escape_vt52 (ch);
2364 return; 2615 return;
2365 } 2616 }
2366 2617
… …
2381 scr_charset_set (2, (unsigned int)cmd_getc ()); 2632 scr_charset_set (2, (unsigned int)cmd_getc ());
2382 break; 2633 break;
2383 case '+': 2634 case '+':
2384 scr_charset_set (3, (unsigned int)cmd_getc ()); 2635 scr_charset_set (3, (unsigned int)cmd_getc ());
2385 break; 2636 break;
2386#ifdef MULTICHAR_SET 2637#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': 2638 case '6':
2393 scr_backindex (); 2639 scr_backindex ();
2394 break; 2640 break;
2395#endif 2641#endif
2396 case '7': 2642 case '7':
2397 scr_cursor (SAVE); 2643 scr_cursor (SAVE);
2398 break; 2644 break;
2399 case '8': 2645 case '8':
2400 scr_cursor (RESTORE); 2646 scr_cursor (RESTORE);
2401 break; 2647 break;
2402#ifndef NO_FRILLS 2648#if !ENABLE_MINIMAL
2403 case '9': 2649 case '9':
2404 scr_forwardindex (); 2650 scr_forwardindex ();
2405 break; 2651 break;
2406#endif 2652#endif
2407 case '=': 2653 case '=':
2408 case '>': 2654 case '>':
2409 PrivMode((ch == '='), PrivMode_aplKP); 2655 set_privmode (PrivMode_aplKP, ch == '=');
2410 break; 2656 break;
2411 2657
2412 case C1_40: 2658 case C1_40:
2413 cmd_getc (); 2659 cmd_getc ();
2414 break; 2660 break;
… …
2417 break; 2663 break;
2418 2664
2419 /* 8.3.87: NEXT LINE */ 2665 /* 8.3.87: NEXT LINE */
2420 case C1_NEL: /* ESC E */ 2666 case C1_NEL: /* ESC E */
2421 { 2667 {
2422 uint32_t nlcr[] = { '\n', '\r' }; 2668 wchar_t nlcr[] = { C0_LF, C0_CR };
2423 scr_add_lines (nlcr, 1, 2); 2669 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2424 } 2670 }
2425 break; 2671 break;
2426 2672
2427 /* kidnapped escape sequence: Should be 8.3.48 */ 2673 /* kidnapped escape sequence: Should be 8.3.48 */
2428 case C1_ESA: /* ESC G */ 2674 case C1_ESA: /* ESC G */
… …
2438 case C1_RI: /* ESC M */ 2684 case C1_RI: /* ESC M */
2439 scr_index (DN); 2685 scr_index (DN);
2440 break; 2686 break;
2441 2687
2442 /* 8.3.142: SINGLE-SHIFT TWO */ 2688 /* 8.3.142: SINGLE-SHIFT TWO */
2443 /*case C1_SS2: scr_single_shift (2); break; */ 2689 /*case C1_SS2: scr_single_shift (2); break; */
2444 2690
2445 /* 8.3.143: SINGLE-SHIFT THREE */ 2691 /* 8.3.143: SINGLE-SHIFT THREE */
2446 /*case C1_SS3: scr_single_shift (3); break; */ 2692 /*case C1_SS3: scr_single_shift (3); break; */
2447 2693
2448 /* 8.3.27: DEVICE CONTROL STRING */ 2694 /* 8.3.27: DEVICE CONTROL STRING */
2449 case C1_DCS: /* ESC P */ 2695 case C1_DCS: /* ESC P */
2450 process_dcs_seq (); 2696 process_dcs_seq ();
2451 break; 2697 break;
2452 2698
2453 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2699 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2454 case C1_SCI: /* ESC Z */ 2700 case C1_SCI: /* ESC Z */
2455 tt_write((const unsigned char *)ESCZ_ANSWER, 2701 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2456 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2457 break; /* steal obsolete ESC [ c */ 2702 break; /* steal obsolete ESC [ c */
2458 2703
2459 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2704 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2460 case C1_CSI: /* ESC [ */ 2705 case C1_CSI: /* ESC [ */
2461 process_csi_seq (); 2706 process_csi_seq ();
2462 break; 2707 break;
2463 2708
2464 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2709 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2465 case C1_OSC: /* ESC ] */ 2710 case C1_OSC: /* ESC ] */
2466 process_osc_seq (); 2711 process_osc_seq ();
2467 break; 2712 break;
2468 2713
2469 /* 8.3.106: RESET TO INITIAL STATE */ 2714 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2470 case 'c': 2715 case 'c':
2716 mbstate.reset ();
2471 scr_poweron (); 2717 scr_poweron ();
2472 scrollbar_show (1); 2718 scrollBar.show (1);
2473 break; 2719 break;
2474 2720
2475 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2721 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2476 case 'n': 2722 case 'n':
2477 scr_charset_choose (2); 2723 scr_charset_choose (2);
… …
2487 2733
2488/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2734/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2489/* *INDENT-OFF* */ 2735/* *INDENT-OFF* */
2490enum { 2736enum {
2491 CSI_ICH = 0x40, 2737 CSI_ICH = 0x40,
2492 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2738 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 , 2739 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, 2740 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, 2741 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, 2742 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, 2743 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2501 2747
2502#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2748#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2503 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2749 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2504 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2750 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2505#define get_byte_array_bit(array, bit) \ 2751#define get_byte_array_bit(array, bit) \
2506 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2752 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2507 2753
2508const unsigned char csi_defaults[] = 2754const unsigned char csi_defaults[] =
2509 { 2755 {
2510 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2756 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, */ 2757 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, */ 2758 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, [, \, ], ^, _, */ 2759 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, */ 2760 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, */ 2761 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, */ 2762 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, {, |, }, ~, */ 2763 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2518 }; 2764 };
2519/* *INDENT-ON* */ 2765/* *INDENT-ON* */
2520 2766
2521void 2767void
2522rxvt_term::process_csi_seq () 2768rxvt_term::process_csi_seq ()
2523{ 2769{
2524 unsigned char ch, priv, i; 2770 unicode_t ch, priv, i;
2525 unsigned int nargs, p; 2771 unsigned int nargs, p;
2526 int n, ndef; 2772 int n, ndef;
2527 int arg[ESC_ARGS]; 2773 int arg[ESC_ARGS] = { };
2528 2774
2529 for (nargs = ESC_ARGS; nargs > 0;) 2775 nargs = 0;
2530 arg[--nargs] = 0;
2531 2776
2532 priv = 0; 2777 priv = 0;
2533 ch = cmd_getc (); 2778 ch = cmd_getc ();
2534 if (ch >= '<' && ch <= '?') 2779 if ((ch >= '<' && ch <= '?') || ch == '!')
2780 {
2535 { /* '<' '=' '>' '?' */ 2781 /* '<' '=' '>' '?' '!' */
2536 priv = ch; 2782 priv = ch;
2537 ch = cmd_getc (); 2783 ch = cmd_getc ();
2538 } 2784 }
2785
2539 /* read any numerical arguments */ 2786 /* read any numerical arguments */
2540 for (n = -1; ch < CSI_ICH; ) 2787 for (n = -1; ch < CSI_ICH; )
2541 { 2788 {
2542 if (isdigit(ch)) 2789 if (isdigit (ch))
2543 { 2790 {
2544 if (n < 0) 2791 if (n < 0)
2545 n = ch - '0'; 2792 n = ch - '0';
2546 else 2793 else
2547 n = n * 10 + ch - '0'; 2794 n = n * 10 + ch - '0';
… …
2550 { 2797 {
2551 if (nargs < ESC_ARGS) 2798 if (nargs < ESC_ARGS)
2552 arg[nargs++] = n; 2799 arg[nargs++] = n;
2553 n = -1; 2800 n = -1;
2554 } 2801 }
2555 else if (ch == '\b') 2802 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); 2803 process_nonprinting (ch);
2567 } 2804
2568 ch = cmd_getc (); 2805 ch = cmd_getc ();
2569 } 2806 }
2570 2807
2571 if (ch > CSI_7F) 2808 if (ch > CSI_7F)
2572 return; 2809 return;
2573 2810
2574 if (nargs < ESC_ARGS) 2811 if (nargs < ESC_ARGS)
2575 arg[nargs++] = n; 2812 arg[nargs++] = n;
2576 2813
2577 i = ch - CSI_ICH; 2814 i = ch - CSI_ICH;
2578 ndef = get_byte_array_bit(csi_defaults, i); 2815 ndef = get_byte_array_bit (csi_defaults, i);
2579 for (p = 0; p < nargs; p++) 2816 for (p = 0; p < nargs; p++)
2580 if (arg[p] == -1) 2817 if (arg[p] == -1)
2581 arg[p] = ndef; 2818 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 2819
2590 /* 2820 /*
2591 * private mode handling 2821 * private mode handling
2592 */ 2822 */
2593 if (priv) 2823 if (priv)
2594 { 2824 {
2595 switch (priv) 2825 switch (priv)
2596 { 2826 {
2597 case '>': 2827 case '>':
2598 if (ch == CSI_DA) /* secondary device attributes */ 2828 if (ch == CSI_DA) /* secondary device attributes */
2829 {
2830 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2831 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2832 //
2833 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2834 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2835 // versions.
2836 //
2599 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2837 tt_printf ("\033[>%d;95;0c", 'U');
2838 }
2600 break; 2839 break;
2840
2601 case '?': 2841 case '?':
2602 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2603 process_terminal_mode (ch, priv, nargs, arg); 2843 process_terminal_mode (ch, priv, nargs, arg);
2604 break; 2844 break;
2845
2846 case '!':
2847 if (ch == CSI_70)
2848 {
2849 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2850 scr_soft_reset ();
2851
2852 static const int pm_h[] = { 7, 25 };
2853 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2854
2855 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2856 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2605 } 2857 }
2858 break;
2859 }
2860
2606 return; 2861 return;
2607 } 2862 }
2608 2863
2609 switch (ch) 2864 switch (ch)
2610 { 2865 {
2611 /* 2866 /*
2612 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2867 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2613 */ 2868 */
2614#ifdef PRINTPIPE 2869#ifdef PRINTPIPE
2615 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2870 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2616 switch (arg[0]) 2871 switch (arg[0])
2617 { 2872 {
… …
2709 2964
2710 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2965 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2711 arg[0] = -arg[0]; 2966 arg[0] = -arg[0];
2712 /* FALLTHROUGH */ 2967 /* FALLTHROUGH */
2713 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2968 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2714 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2969 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2715 break; 2970 break;
2716 2971
2717 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2972 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2718 tt_write((const unsigned char *)VT100_ANS, 2973 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2719 (unsigned int)(sizeof(VT100_ANS) - 1));
2720 break; 2974 break;
2721 2975
2722 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2976 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2723 process_sgr_mode (nargs, arg); 2977 process_sgr_mode (nargs, arg);
2724 break; 2978 break;
2725 2979
2726 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2980 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2727 switch (arg[0]) 2981 switch (arg[0])
2728 { 2982 {
2729 case 5: /* DSR requested */ 2983 case 5: /* DSR requested */
2730 tt_printf("\033[0n"); 2984 tt_printf ("\033[0n");
2731 break; 2985 break;
2732 case 6: /* CPR requested */ 2986 case 6: /* CPR requested */
2733 scr_report_position (); 2987 scr_report_position ();
2734 break; 2988 break;
2735#if defined (ENABLE_DISPLAY_ANSWER)
2736 case 7: /* unofficial extension */ 2989 case 7: /* unofficial extension */
2990 if (option (Opt_insecure))
2737 tt_printf("%-.250s\n", rs[Rs_display_name]); 2991 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2738 break; 2992 break;
2739#endif
2740 case 8: /* unofficial extension */ 2993 case 8: /* unofficial extension */
2741 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2994 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2742 break; 2995 break;
2743 } 2996 }
2744 break; 2997 break;
2745 2998
2746 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2999 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2779 break; 3032 break;
2780 3033
2781 case CSI_RM: /* 8.3.107: RESET MODE */ 3034 case CSI_RM: /* 8.3.107: RESET MODE */
2782 if (arg[0] == 4) 3035 if (arg[0] == 4)
2783 scr_insert_mode (0); 3036 scr_insert_mode (0);
3037 else if (arg[0] == 20)
3038 priv_modes &= ~PrivMode_LFNL;
2784 break; 3039 break;
2785 3040
2786 case CSI_SM: /* 8.3.126: SET MODE */ 3041 case CSI_SM: /* 8.3.126: SET MODE */
2787 if (arg[0] == 4) 3042 if (arg[0] == 4)
2788 scr_insert_mode (1); 3043 scr_insert_mode (1);
3044 else if (arg[0] == 20)
3045 priv_modes |= PrivMode_LFNL;
2789 break; 3046 break;
2790 3047
2791 /* 3048 /*
2792 * PRIVATE USE beyond this point. All CSI_7? sequences here 3049 * PRIVATE USE beyond this point. All CSI_7? sequences here
2793 */ 3050 */
… …
2805 break; 3062 break;
2806 case CSI_75: 3063 case CSI_75:
2807 scr_cursor (RESTORE); 3064 scr_cursor (RESTORE);
2808 break; 3065 break;
2809 3066
2810#ifndef NO_FRILLS 3067#if !ENABLE_MINIMAL
2811 case CSI_74: 3068 case CSI_74:
2812 process_window_ops (arg, nargs); 3069 process_window_ops (arg, nargs);
2813 break; 3070 break;
2814#endif 3071#endif
2815 3072
2816 case CSI_78: /* DECREQTPARM */ 3073 case CSI_78: /* DECREQTPARM */
2817 if (arg[0] == 0 || arg[0] == 1) 3074 if (arg[0] == 0 || arg[0] == 1)
2818 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3075 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2819 /* FALLTHROUGH */ 3076 break;
2820 3077
2821 default: 3078 default:
2822 break; 3079 break;
2823 } 3080 }
2824} 3081}
2825/*}}} */ 3082/*}}} */
2826 3083
2827#ifndef NO_FRILLS 3084#if !ENABLE_MINIMAL
2828/* ARGSUSED */ 3085/* ARGSUSED */
2829void 3086void
2830rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3087rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2831{ 3088{
2832 int x, y; 3089 int x, y;
2833#if 0
2834 char *s;
2835#endif
2836 XWindowAttributes wattr; 3090 XWindowAttributes wattr;
2837 Window wdummy; 3091 Window wdummy;
3092
3093 dLocal (Display *, dpy);
2838 3094
2839 if (nargs == 0) 3095 if (nargs == 0)
2840 return; 3096 return;
3097
2841 switch (args[0]) 3098 switch (args[0])
2842 { 3099 {
2843 /* 3100 /*
2844 * commands 3101 * commands
2845 */ 3102 */
2846 case 1: /* deiconify window */ 3103 case 1: /* deiconify window */
2847 XMapWindow(display->display, TermWin.parent[0]); 3104 XMapWindow (dpy, parent[0]);
2848 break; 3105 break;
2849 case 2: /* iconify window */ 3106 case 2: /* iconify window */
2850 XIconifyWindow(display->display, TermWin.parent[0], 3107 XIconifyWindow (dpy, parent[0], display->screen);
2851 DefaultScreen(display->display));
2852 break; 3108 break;
2853 case 3: /* set position (pixels) */ 3109 case 3: /* set position (pixels) */
2854 XMoveWindow(display->display, TermWin.parent[0], args[1], args[2]); 3110 XMoveWindow (dpy, parent[0], args[1], args[2]);
2855 break; 3111 break;
2856 case 4: /* set size (pixels) */ 3112 case 4: /* set size (pixels) */
2857 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3113 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2858 break; 3114 break;
2859 case 5: /* raise window */ 3115 case 5: /* raise window */
2860 XRaiseWindow(display->display, TermWin.parent[0]); 3116 XRaiseWindow (dpy, parent[0]);
2861 break; 3117 break;
2862 case 6: /* lower window */ 3118 case 6: /* lower window */
2863 XLowerWindow(display->display, TermWin.parent[0]); 3119 XLowerWindow (dpy, parent[0]);
2864 break; 3120 break;
2865 case 7: /* refresh window */ 3121 case 7: /* refresh window */
2866 scr_touch (true); 3122 scr_touch (true);
2867 break; 3123 break;
2868 case 8: /* set size (chars) */ 3124 case 8: /* set size (chars) */
2869 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 3125 set_widthheight ((unsigned int) (args[2] * fwidth),
2870 (unsigned int)(args[1] * TermWin.fheight)); 3126 (unsigned int) (args[1] * fheight));
2871 break; 3127 break;
3128
3129 //case 9: NYI, TODO, restore maximized window or maximize window
2872 default: 3130 default:
2873 if (args[0] >= 24) /* set height (chars) */ 3131 if (args[0] >= 24) /* set height (chars) */
2874 set_widthheight ((unsigned int)TermWin.width, 3132 set_widthheight ((unsigned int)width,
2875 (unsigned int)(args[1] * TermWin.fheight)); 3133 (unsigned int) (args[1] * fheight));
2876 break; 3134 break;
3135
2877 /* 3136 /*
2878 * reports - some output format copied from XTerm 3137 * reports - some output format copied from XTerm
2879 */ 3138 */
2880 case 11: /* report window state */ 3139 case 11: /* report window state */
2881 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 3140 XGetWindowAttributes (dpy, parent[0], &wattr);
2882 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3141 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2883 break; 3142 break;
2884 case 13: /* report window position */ 3143 case 13: /* report window position */
2885 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 3144 XGetWindowAttributes (dpy, parent[0], &wattr);
2886 XTranslateCoordinates(display->display, TermWin.parent[0], wattr.root, 3145 XTranslateCoordinates (dpy, parent[0], wattr.root,
2887 -wattr.border_width, -wattr.border_width, 3146 -wattr.border_width, -wattr.border_width,
2888 &x, &y, &wdummy); 3147 &x, &y, &wdummy);
2889 tt_printf("\033[3;%d;%dt", x, y); 3148 tt_printf ("\033[3;%d;%dt", x, y);
2890 break; 3149 break;
2891 case 14: /* report window size (pixels) */ 3150 case 14: /* report window size (pixels) */
2892 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent[0], &wattr);
2893 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 3152 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2894 break; 3153 break;
3154 case 18: /* report text area size (chars) */
3155 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3156 break;
2895 case 18: /* report window size (chars) */ 3157 case 19: /* report window size (chars) */
2896 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3158 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2897 break; 3159 break;
2898#if 0 /* XXX: currently disabled due to security concerns */
2899 case 20: /* report icon label */ 3160 case 20: /* report icon label */
3161 {
3162 char *s;
2900 XGetIconName(display->display, TermWin.parent[0], &s); 3163 XGetIconName (dpy, parent[0], &s);
2901 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3164 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3165 XFree (s);
3166 }
2902 break; 3167 break;
2903 case 21: /* report window title */ 3168 case 21: /* report window title */
3169 {
3170 char *s;
2904 XFetchName(display->display, TermWin.parent[0], &s); 3171 XFetchName (dpy, parent[0], &s);
2905 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3172 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3173 XFree (s);
3174 }
2906 break; 3175 break;
2907#endif
2908
2909 } 3176 }
2910} 3177}
2911#endif 3178#endif
2912 3179
2913/*----------------------------------------------------------------------*/ 3180/*----------------------------------------------------------------------*/
2914/* 3181/*
2915 * get input up until STRING TERMINATOR (or BEL) 3182 * get input up until STRING TERMINATOR (or BEL)
2916 * ends_how is terminator used. returned input must be free()d 3183 * ends_how is terminator used. returned input must be free()'d
2917 */ 3184 */
2918unsigned char * 3185char *
2919rxvt_term::get_to_st (unsigned char *ends_how) 3186rxvt_term::get_to_st (unicode_t &ends_how)
2920{ 3187{
2921 int seen_esc = 0; /* seen escape? */ 3188 unicode_t ch;
3189 bool seen_esc = false;
2922 unsigned int n = 0; 3190 unsigned int n = 0;
2923 unsigned char *s; 3191 wchar_t string[STRING_MAX];
2924 unsigned char ch, string[STRING_MAX];
2925 3192
2926 for (; (ch = cmd_getc ());) 3193 while ((ch = cmd_getc ()) != NOCHAR)
2927 { 3194 {
2928 if (ch == C0_BEL 3195 if (seen_esc)
2929 || ch == CHAR_ST 3196 {
2930 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3197 if (ch == 0x5c) /* 7bit ST */
2931 break; 3198 break;
3199 else
3200 return NULL;
3201 }
2932 if (ch == C0_ESC) 3202 else if (ch == C0_ESC)
2933 { 3203 {
2934 seen_esc = 1; 3204 seen_esc = true;
2935 continue; 3205 continue;
2936 } 3206 }
3207 else if (ch == C0_BEL || ch == CHAR_ST)
3208 break;
2937 else if (ch == '\t') 3209 else if (ch == C0_SYN)
2938 ch = ' '; /* translate '\t' to space */ 3210 ch = cmd_get8 ();
2939 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3211 else if (ch < 0x20)
2940 return NULL; /* other control character - exit */ 3212 return NULL; /* other control character - exit */
2941 if (n < sizeof(string) - 1) 3213
3214 seen_esc = false;
3215
3216 if (n >= STRING_MAX - 1)
3217 // stop at some sane length
3218 return NULL;
3219
2942 string[n++] = ch; 3220 string[n++] = ch;
2943 seen_esc = 0;
2944 } 3221 }
3222
2945 string[n++] = '\0'; 3223 string[n++] = '\0';
2946 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 3224
2947 return NULL;
2948 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3225 ends_how = (ch == 0x5c ? C0_ESC : ch);
2949 STRNCPY(s, string, n); 3226
2950 return s; 3227 return rxvt_wcstombs (string);
2951} 3228}
2952 3229
2953/*----------------------------------------------------------------------*/ 3230/*----------------------------------------------------------------------*/
2954/* 3231/*
2955 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3232 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2956 */ 3233 */
2957void 3234void
2958rxvt_term::process_dcs_seq () 3235rxvt_term::process_dcs_seq ()
2959{ 3236{
2960 unsigned char eh, *s; 3237 char *s;
3238 unicode_t eh;
3239
2961 /* 3240 /*
2962 * Not handled yet 3241 * Not handled yet
2963 */ 3242 */
2964 s = get_to_st (&eh); 3243 s = get_to_st (eh);
2965 if (s) 3244 if (s)
2966 free(s); 3245 free (s);
3246
2967 return; 3247 return;
2968} 3248}
2969 3249
2970/*----------------------------------------------------------------------*/ 3250/*----------------------------------------------------------------------*/
2971/* 3251/*
2972 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3252 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2973 */ 3253 */
2974void 3254void
2975rxvt_term::process_osc_seq () 3255rxvt_term::process_osc_seq ()
2976{ 3256{
2977 unsigned char ch, eh, *s; 3257 unicode_t ch, eh;
2978 int arg; 3258 int arg;
2979 3259
2980 ch = cmd_getc (); 3260 ch = cmd_getc ();
2981 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 3261 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2982 arg = arg * 10 + (ch - '0'); 3262 arg = arg * 10 + (ch - '0');
2983 3263
2984 if (ch == ';') 3264 if (ch == ';')
2985 { 3265 {
2986 s = get_to_st (&eh); 3266 char *s = get_to_st (eh);
3267
2987 if (s) 3268 if (s)
2988 { 3269 {
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); 3270 process_xterm_seq (arg, s, eh);
3001 free(s); 3271 free (s);
3002 } 3272 }
3273 }
3274}
3275
3276void
3277rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3278{
3279 if (str[0] == '?' && !str[1])
3003 } 3280 {
3281 rgba c;
3282 pix_colors_focused[color].get (c);
3283
3284#if XFT
3285 if (c.a != rgba::MAX_CC)
3286 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3287 else
3288#endif
3289 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3290 }
3291 else
3292 set_window_color (color, str);
3004} 3293}
3294
3005/* 3295/*
3006 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3296 * 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 */ 3297 */
3026void 3298void
3027rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 3299rxvt_term::process_xterm_seq (int op, char *str, char resp)
3028{ 3300{
3029 int changed = 0; 3301 int color;
3030 int color;
3031 char *buf, *name; 3302 char *buf, *name;
3303 bool query = str[0] == '?' && !str[1];
3304 int saveop = op;
3032 3305
3306 dLocal (Display *, dpy);
3307
3033 assert(str != NULL); 3308 assert (str != NULL);
3309
3310 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3311 return;
3312
3034 switch (op) 3313 switch (op)
3035 { 3314 {
3036 case XTerm_name: 3315 case XTerm_name:
3037 set_title (str); 3316 set_title (str);
3038 /* FALLTHROUGH */ 3317 /* FALLTHROUGH */
3039 case XTerm_iconName: 3318 case XTerm_iconName:
3040 set_iconName (str); 3319 set_icon_name (str);
3041 break; 3320 break;
3042 case XTerm_title: 3321 case XTerm_title:
3043 set_title (str); 3322 set_title (str);
3044 break; 3323 break;
3324 case XTerm_property:
3325 if (str[0] == '?')
3326 {
3327 Atom prop = display->atom (str + 1);
3328 Atom actual_type;
3329 int actual_format;
3330 unsigned long nitems;
3331 unsigned long bytes_after;
3332 unsigned char *value = 0;
3333 const char *str = "";
3334
3335 if (prop
3336 && XGetWindowProperty (dpy, parent[0],
3337 prop, 0, 1<<16, 0, AnyPropertyType,
3338 &actual_type, &actual_format,
3339 &nitems, &bytes_after, &value) == Success
3340 && actual_type != None
3341 && actual_format == 8)
3342 str = (const char *)(value);
3343
3344 tt_printf ("\033]%d;%s%c", op, str, resp);
3345
3346 XFree (value);
3347 }
3348 else
3349 {
3350 char *eq = strchr (str, '=');
3351
3352 if (eq)
3353 {
3354 *eq = 0;
3355 set_utf8_property (display->atom (str), eq + 1);
3356 }
3357 else
3358 XDeleteProperty (dpy, parent[0],
3359 display->atom (str));
3360 }
3361 break;
3362
3045 case XTerm_Color: 3363 case XTerm_Color:
3046 for (buf = (char *)str; buf && *buf;) 3364 for (buf = (char *)str; buf && *buf;)
3047 { 3365 {
3048 if ((name = STRCHR(buf, ';')) == NULL) 3366 if ((name = strchr (buf, ';')) == NULL)
3049 break; 3367 break;
3368
3050 *name++ = '\0'; 3369 *name++ = '\0';
3051 color = atoi(buf); 3370 color = atoi (buf) + minCOLOR;
3052 if (color < 0 || color >= TOTAL_COLORS) 3371
3372 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3053 break; 3373 break;
3374
3054 if ((buf = STRCHR(name, ';')) != NULL) 3375 if ((buf = strchr (name, ';')) != NULL)
3055 *buf++ = '\0'; 3376 *buf++ = '\0';
3056 set_window_color (color + minCOLOR, name); 3377
3378 process_color_seq (op, color, name, resp);
3057 } 3379 }
3380 break;
3381 case Rxvt_restoreFG:
3382 case XTerm_Color00:
3383 process_color_seq (op, Color_fg, str, resp);
3384 break;
3385 case Rxvt_restoreBG:
3386 case XTerm_Color01:
3387 process_color_seq (op, Color_bg, str, resp);
3058 break; 3388 break;
3059#ifndef NO_CURSORCOLOR 3389#ifndef NO_CURSORCOLOR
3060 case XTerm_Color_cursor: 3390 case XTerm_Color_cursor:
3061 set_window_color (Color_cursor, str); 3391 process_color_seq (op, Color_cursor, str, resp);
3062 break; 3392 break;
3063#endif 3393#endif
3064 case XTerm_Color_pointer: 3394 case XTerm_Color_pointer_fg:
3065 set_window_color (Color_pointer, str); 3395 process_color_seq (op, Color_pointer_fg, str, resp);
3396 break;
3397 case XTerm_Color_pointer_bg:
3398 process_color_seq (op, Color_pointer_bg, str, resp);
3066 break; 3399 break;
3067#ifndef NO_BOLD_UNDERLINE_REVERSE 3400#ifndef NO_BOLD_UNDERLINE_REVERSE
3068 case XTerm_Color_BD:
3069 set_window_color (Color_BD, str);
3070 break;
3071 case XTerm_Color_UL:
3072 set_window_color (Color_UL, str);
3073 break;
3074 case XTerm_Color_RV: 3401 case XTerm_Color_RV:
3075 set_window_color (Color_RV, str); 3402 process_color_seq (op, Color_RV, str, resp);
3076 break; 3403 break;
3404 case Rxvt_Color_BD:
3405 case URxvt_Color_BD:
3406 process_color_seq (op, Color_BD, str, resp);
3407 break;
3408 case Rxvt_Color_UL:
3409 case URxvt_Color_UL:
3410 process_color_seq (op, Color_UL, str, resp);
3411 break;
3412 case URxvt_Color_IT:
3413 process_color_seq (op, Color_IT, str, resp);
3414 break;
3077#endif 3415#endif
3078 3416 case URxvt_Color_border:
3079 case XTerm_Menu: 3417 process_color_seq (op, Color_border, str, resp);
3418 break;
3419#if ENABLE_TRANSPARENCY
3420 case URxvt_Color_tint:
3421 process_color_seq (op, Color_tint, str, resp);
3080 /* 3422 {
3081 * rxvt_menubar_dispatch() violates the constness of the string, 3423 bool changed = false;
3082 * so DON'T do it here 3424
3425 if (ISSET_PIXCOLOR (Color_tint))
3426 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3427 else
3428 changed = bgPixmap.unset_tint ();
3429
3430 if (changed)
3431 update_background ();
3083 */ 3432 }
3433
3084 break; 3434 break;
3435#endif
3436
3437#if BG_IMAGE_FROM_FILE
3085 case XTerm_Pixmap: 3438 case Rxvt_Pixmap:
3086 if (*str != ';') 3439 if (!strcmp (str, "?"))
3087 { 3440 {
3088#if XPM_BACKGROUND 3441 char str[256];
3089 scale_pixmap (""); /* reset to default scaling */ 3442
3090 set_bgPixmap (str); /* change pixmap */ 3443 sprintf (str, "[%dx%d+%d+%d]",
3091#endif 3444 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3092 scr_touch (true); 3445 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3446 process_xterm_seq (XTerm_title, str, CHAR_ST);
3093 } 3447 }
3094 while ((str = STRCHR(str, ';')) != NULL) 3448 else
3095 { 3449 {
3450 int changed = 0;
3451
3452 if (*str != ';')
3453 {
3454 /* reset to default scaling :*/
3455 bgPixmap.unset_geometry ();
3456 if (bgPixmap.set_file (str)) /* change pixmap */
3457 changed++;
3458 str = strchr (str, ';');
3459 if (str == NULL)
3460 bgPixmap.set_defaultGeometry ();
3461 }
3462
3463 while (str)
3464 {
3096 str++; 3465 str++;
3097#if XPM_BACKGROUND 3466 if (bgPixmap.set_geometry (str))
3098 changed += scale_pixmap (str); 3467 changed++;
3099#endif 3468 str = strchr (str, ';');
3469 }
3100 3470
3471 if (changed)
3472 update_background ();
3101 } 3473 }
3102 if (changed)
3103 {
3104#ifdef XPM_BACKGROUND
3105 resize_pixmap ();
3106#endif
3107 scr_touch (true);
3108 }
3109 break; 3474 break;
3475#endif
3110 3476
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: 3477 case XTerm_logfile:
3478 // TODO, when secure mode?
3118 break; 3479 break;
3119 case XTerm_font: 3480
3120 change_font (0, str);
3121 break;
3122#if 0 3481#if 0
3123 case XTerm_dumpscreen: /* no error notices */ 3482 case Rxvt_dumpscreen: /* no error notices */
3124 { 3483 {
3125 int fd; 3484 int fd;
3126 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3485 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3127 { 3486 {
3128 scr_dump (fd); 3487 scr_dump (fd);
3129 close(fd); 3488 close (fd);
3130 } 3489 }
3131 } 3490 }
3132 break; 3491 break;
3133#endif 3492#endif
3493 case XTerm_font:
3494 op = URxvt_font;
3495 case URxvt_font:
3496#if ENABLE_STYLES
3497 case URxvt_boldFont:
3498 case URxvt_italicFont:
3499 case URxvt_boldItalicFont:
3500#endif
3501 if (query)
3502 tt_printf ("\33]%d;%-.250s%c", saveop,
3503 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3504 ? fontset[op - URxvt_font]->fontdesc : "",
3505 resp);
3506 else
3507 {
3508 const char *&res = rs[Rs_font + (op - URxvt_font)];
3134 3509
3510 res = strdup (str);
3511 allocated.push_back ((void *)res);
3512 set_fonts ();
3513 }
3514 break;
3515
3516 case URxvt_version:
3517 if (query)
3518 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3519 op,
3520 rs[Rs_name], VERSION[0], VERSION[2],
3521 resp);
3522 break;
3523
3524#if !ENABLE_MINIMAL
3525 case URxvt_locale:
3526 if (query)
3527 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3528 else
3529 {
3530 set_locale (str);
3531 pty->set_utf8_mode (enc_utf8);
3532 init_xlocale ();
3533 }
3534 break;
3535
3536 case URxvt_view_up:
3537 case URxvt_view_down:
3538 {
3539 int lines = atoi (str);
3540
3541 if (lines)
3542 scr_page (op == URxvt_view_up ? UP : DN, lines);
3543 else
3544 scr_erase_savelines ();
3545 }
3546
3547 break;
3548#endif
3549
3550#if ENABLE_PERL
3551 case URxvt_perl:
3552 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3553 break;
3554#endif
3135 } 3555 }
3136} 3556}
3137/*----------------------------------------------------------------------*/ 3557/*----------------------------------------------------------------------*/
3138 3558
3139/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3559/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3147 * so no need for fancy checking 3567 * so no need for fancy checking
3148 */ 3568 */
3149int 3569int
3150rxvt_term::privcases (int mode, unsigned long bit) 3570rxvt_term::privcases (int mode, unsigned long bit)
3151{ 3571{
3152 int state; 3572 int state;
3153 3573
3154 if (mode == 's') 3574 if (mode == 's')
3155 { 3575 {
3156 SavedModes |= (PrivateModes & bit); 3576 SavedModes |= (priv_modes & bit);
3157 return -1; 3577 return -1;
3158 } 3578 }
3159 else 3579 else
3160 { 3580 {
3161 if (mode == 'r') 3581 if (mode == 'r')
3162 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3582 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3163 else 3583 else
3164 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3584 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3165 PrivMode(state, bit); 3585 set_privmode (bit, state);
3166 } 3586 }
3587
3167 return state; 3588 return state;
3168} 3589}
3169 3590
3170/* we're not using priv _yet_ */ 3591/* we're not using priv _yet_ */
3171void 3592void
3172rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3593rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3173{ 3594{
3174 unsigned int i, j; 3595 unsigned int i, j;
3175 int state; 3596 int state;
3597
3176 static const struct 3598 static const struct
3177 { 3599 {
3178 const int argval; 3600 const int argval;
3179 const unsigned long bit; 3601 const unsigned long bit;
3180 }
3181 argtopriv[] = { 3602 } argtopriv[] = {
3182 { 1, PrivMode_aplCUR }, 3603 { 1, PrivMode_aplCUR }, // DECCKM
3183 { 2, PrivMode_vt52 }, 3604 { 2, PrivMode_vt52 },
3184 { 3, PrivMode_132 }, 3605 { 3, PrivMode_132 }, // DECCOLM
3185 { 4, PrivMode_smoothScroll }, 3606 { 4, PrivMode_smoothScroll }, // DECSCLM
3186 { 5, PrivMode_rVideo }, 3607 { 5, PrivMode_rVideo }, // DECSCNM
3187 { 6, PrivMode_relOrigin }, 3608 { 6, PrivMode_relOrigin }, // DECOM
3188 { 7, PrivMode_Autowrap }, 3609 { 7, PrivMode_Autowrap }, // DECAWM
3610 // 8, auto-repeat keys // DECARM
3189 { 9, PrivMode_MouseX10 }, 3611 { 9, PrivMode_MouseX10 },
3190#ifdef menuBar_esc 3612 // 18 end FF to printer after print screen
3191 { menuBar_esc, PrivMode_menuBar }, 3613 // 19 Print screen prints full screen/scorll region
3192#endif 3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3193#ifdef scrollBar_esc 3615#ifdef scrollBar_esc
3194 { scrollBar_esc, PrivMode_scrollBar }, 3616 { scrollBar_esc, PrivMode_scrollBar },
3195#endif 3617#endif
3196 { 25, PrivMode_VisibleCursor },
3197 { 35, PrivMode_ShiftKeys }, 3618 { 35, PrivMode_ShiftKeys }, // rxvt extension
3619 // 38, tektronix mode // DECTEK
3198 { 40, PrivMode_132OK }, 3620 { 40, PrivMode_132OK },
3621 // 41 xterm more fixes NYI
3622 // 45 margin bell NYI
3623 // 46 start logging
3199 { 47, PrivMode_Screen }, 3624 { 47, PrivMode_Screen },
3200 { 66, PrivMode_aplKP }, 3625 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3201#ifndef NO_BACKSPACE_KEY 3626#ifndef NO_BACKSPACE_KEY
3202 { 67, PrivMode_BackSpace }, 3627 { 67, PrivMode_BackSpace }, // DECBKM
3203#endif 3628#endif
3204 { 1000, PrivMode_MouseX11 }, 3629 { 1000, PrivMode_MouseX11 },
3630 { 1002, PrivMode_MouseBtnEvent },
3631 { 1003, PrivMode_MouseAnyEvent },
3205 { 1010, PrivMode_TtyOutputInh }, 3632 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3206 { 1011, PrivMode_Keypress }, 3633 { 1011, PrivMode_Keypress }, // rxvt extension
3634 // 1035 enable modifiers for alt, numlock NYI
3635 // 1036 send ESC for meta keys NYI
3636 // 1037 send DEL for keypad delete NYI
3207 { 1047, PrivMode_Screen }, 3637 { 1047, PrivMode_Screen },
3638 // 1048 save and restore cursor
3208 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3639 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3640 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3641 { 2004, PrivMode_BracketPaste },
3209 }; 3642 };
3210 3643
3211 if (nargs == 0) 3644 if (nargs == 0)
3212 return; 3645 return;
3213 3646
… …
3220 for (i = 0; i < nargs; i++) 3653 for (i = 0; i < nargs; i++)
3221 { 3654 {
3222 state = -1; 3655 state = -1;
3223 3656
3224 /* basic handling */ 3657 /* basic handling */
3225 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3658 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3226 if (argtopriv[j].argval == arg[i]) 3659 if (argtopriv[j].argval == arg[i])
3227 { 3660 {
3228 state = privcases (mode, argtopriv[j].bit); 3661 state = privcases (mode, argtopriv[j].bit);
3229 break; 3662 break;
3230 } 3663 }
3231 3664
3232 /* extra handling for values with state unkept */ 3665 /* extra handling for values with state unkept */
3233 if (state == -1)
3234 switch (arg[i]) 3666 switch (arg[i])
3235 { 3667 {
3668#if ENABLE_STYLES
3669 case 1021:
3670 set_option (Opt_intensityStyles, mode);
3671
3672 scr_touch (true);
3673 break;
3674#endif
3236 case 1048: /* alternative cursor save */ 3675 case 1048: /* alternative cursor save */
3676 if (option (Opt_secondaryScreen))
3237 if (mode == 0) 3677 if (mode == 0)
3238 scr_cursor (RESTORE); 3678 scr_cursor (RESTORE);
3239 else if (mode == 1) 3679 else if (mode == 1)
3240 scr_cursor (SAVE); 3680 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; 3681 break;
3682 }
3683
3684 if (state >= 0)
3685 /* extra handling for values with valid 0 or 1 state */
3686 switch (arg[i])
3687 {
3688 /* case 1: - application cursor keys */
3689 case 2: /* VT52 mode */
3690 /* oddball mode. should be set regardless of set/reset
3691 * parameter. Return from VT52 mode with an ESC < from
3692 * within VT52 mode
3693 */
3694 set_privmode (PrivMode_vt52, 1);
3695 break;
3257 case 3: /* 80/132 */ 3696 case 3: /* 80/132 */
3258 if (PrivateModes & PrivMode_132OK) 3697 if (priv_modes & PrivMode_132OK)
3259 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3698 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3260 (unsigned int)TermWin.height);
3261 break; 3699 break;
3262 case 4: /* smooth scrolling */ 3700 case 4: /* smooth scrolling */
3263 if (state)
3264 Options &= ~Opt_jumpScroll;
3265 else
3266 Options |= Opt_jumpScroll; 3701 set_option (Opt_jumpScroll, !state);
3267 break; 3702 break;
3268 case 5: /* reverse video */ 3703 case 5: /* reverse video */
3269 scr_rvideo_mode (state); 3704 scr_rvideo_mode (state);
3270 break; 3705 break;
3271 case 6: /* relative/absolute origins */ 3706 case 6: /* relative/absolute origins */
3272 scr_relative_origin (state); 3707 scr_relative_origin (state);
3273 break; 3708 break;
3274 case 7: /* autowrap */ 3709 case 7: /* autowrap */
3275 scr_autowrap (state); 3710 scr_autowrap (state);
3276 break; 3711 break;
3277 /* case 8: - auto repeat, can't do on a per window basis */ 3712 /* case 8: - auto repeat, can't do on a per window basis */
3278 case 9: /* X10 mouse reporting */ 3713 case 9: /* X10 mouse reporting */
3279 if (state) /* orthogonal */ 3714 if (state) /* orthogonal */
3280 PrivateModes &= ~(PrivMode_MouseX11); 3715 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3281 break; 3716 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 3717#ifdef scrollBar_esc
3290 case scrollBar_esc: 3718 case scrollBar_esc:
3291 if (scrollbar_mapping (state)) 3719 if (scrollBar.map (state))
3292 { 3720 {
3293 resize_all_windows (0, 0, 0); 3721 resize_all_windows (0, 0, 0);
3294 scr_touch (true); 3722 scr_touch (true);
3295 } 3723 }
3296 break; 3724 break;
3297#endif 3725#endif
3298 case 25: /* visible/invisible cursor */ 3726 case 25: /* visible/invisible cursor */
3299 scr_cursor_visible (state); 3727 scr_cursor_visible (state);
3300 break; 3728 break;
3301 /* case 35: - shift keys */ 3729 /* case 35: - shift keys */
3302 /* case 40: - 80 <--> 132 mode */ 3730 /* case 40: - 80 <--> 132 mode */
3303 case 47: /* secondary screen */ 3731 case 47: /* secondary screen */
3304 scr_change_screen (state); 3732 scr_change_screen (state);
3305 break; 3733 break;
3306 /* case 66: - application key pad */ 3734 /* case 66: - application key pad */
3307 /* case 67: - backspace key */ 3735 /* case 67: - backspace key */
3308 case 1000: /* X11 mouse reporting */ 3736 case 1000: /* X11 mouse reporting */
3309 if (state) /* orthogonal */ 3737 if (state) /* orthogonal */
3310 PrivateModes &= ~(PrivMode_MouseX10); 3738 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3311 break; 3739 break;
3312#if 0
3313 case 1001: 3740 case 1002:
3314 break; /* X11 mouse highlighting */ 3741 case 1003:
3315#endif 3742 if (state)
3743 {
3744 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3745 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3746 vt_emask_mouse = PointerMotionMask;
3747 }
3748 else
3749 vt_emask_mouse = NoEventMask;
3750
3751 vt_select_input ();
3752 break;
3316 case 1010: /* scroll to bottom on TTY output inhibit */ 3753 case 1010: /* scroll to bottom on TTY output inhibit */
3317 if (state)
3318 Options &= ~Opt_scrollTtyOutput;
3319 else
3320 Options |= Opt_scrollTtyOutput; 3754 set_option (Opt_scrollTtyOutput, !state);
3321 break; 3755 break;
3322 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
3323 if (state)
3324 Options |= Opt_scrollTtyKeypress; 3757 set_option (Opt_scrollTtyKeypress, state);
3325 else
3326 Options &= ~Opt_scrollTtyKeypress;
3327 break; 3758 break;
3328 case 1047: /* secondary screen w/ clearing */ 3759 case 1047: /* secondary screen w/ clearing last */
3329 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3760 if (option (Opt_secondaryScreen))
3330 if (current_screen != PRIMARY) 3761 if (!state)
3331 scr_erase_screen (2); 3762 scr_erase_screen (2);
3763
3332 scr_change_screen (state); 3764 scr_change_screen (state);
3333 /* FALLTHROUGH */
3334 default:
3335 break; 3765 break;
3766 case 1049: /* secondary screen w/ clearing first */
3767 if (option (Opt_secondaryScreen))
3768 if (state)
3769 scr_cursor (SAVE);
3770
3771 scr_change_screen (state);
3772
3773 if (option (Opt_secondaryScreen))
3774 if (state)
3775 scr_erase_screen (2);
3776 else
3777 scr_cursor (RESTORE);
3778 break;
3779 default:
3780 break;
3336 } 3781 }
3337 } 3782 }
3338} 3783}
3339/*}}} */ 3784/*}}} */
3340 3785
3341/*{{{ process sgr sequences */ 3786/*{{{ process sgr sequences */
3342void 3787void
3343rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3788rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3344{ 3789{
3345 unsigned int i; 3790 unsigned int i;
3346 short rendset; 3791 short rendset;
3347 int rendstyle; 3792 int rendstyle;
3348 3793
3349 if (nargs == 0) 3794 if (nargs == 0)
3350 { 3795 {
3351 scr_rendition (0, ~RS_None); 3796 scr_rendition (0, ~RS_None);
3352 return; 3797 return;
3353 } 3798 }
3799
3354 for (i = 0; i < nargs; i++) 3800 for (i = 0; i < nargs; i++)
3355 { 3801 {
3356 rendset = -1; 3802 rendset = -1;
3357 switch (arg[i]) 3803 switch (arg[i])
3358 { 3804 {
… …
3360 rendset = 0, rendstyle = ~RS_None; 3806 rendset = 0, rendstyle = ~RS_None;
3361 break; 3807 break;
3362 case 1: 3808 case 1:
3363 rendset = 1, rendstyle = RS_Bold; 3809 rendset = 1, rendstyle = RS_Bold;
3364 break; 3810 break;
3811 //case 2: // low intensity
3812 case 3:
3813 rendset = 1, rendstyle = RS_Italic;
3814 break;
3365 case 4: 3815 case 4:
3366 rendset = 1, rendstyle = RS_Uline; 3816 rendset = 1, rendstyle = RS_Uline;
3367 break; 3817 break;
3368 case 5: 3818 case 5: // slowly blinking
3819 case 6: // rapidly blinking
3369 rendset = 1, rendstyle = RS_Blink; 3820 rendset = 1, rendstyle = RS_Blink;
3370 break; 3821 break;
3822 //case 6: // scoansi light background
3371 case 7: 3823 case 7:
3372 rendset = 1, rendstyle = RS_RVid; 3824 rendset = 1, rendstyle = RS_RVid;
3373 break; 3825 break;
3374 case 22: 3826 case 8:
3827 // invisible. NYI
3828 break;
3829 //case 9: // crossed out
3830 //case 10: // scoansi acs off, primary font
3831 //case 11: // scoansi acs on, first alt font
3832 //case 12: // scoansi acs on, |0x80, second alt font
3833 //...
3834 //case 19: // ninth alt font
3835 //case 20: // gothic
3836 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3375 rendset = 0, rendstyle = RS_Bold; 3837 rendset = 0, rendstyle = RS_Bold;
3838 break;
3839 case 22: // normal intensity
3840 rendset = 0, rendstyle = RS_Bold;
3841 break;
3842 case 23: // disable italic
3843 rendset = 0, rendstyle = RS_Italic;
3376 break; 3844 break;
3377 case 24: 3845 case 24:
3378 rendset = 0, rendstyle = RS_Uline; 3846 rendset = 0, rendstyle = RS_Uline;
3379 break; 3847 break;
3380 case 25: 3848 case 25:
3381 rendset = 0, rendstyle = RS_Blink; 3849 rendset = 0, rendstyle = RS_Blink;
3382 break; 3850 break;
3851 case 26: // variable spacing (iso 8613)
3852 rendset = 0, rendstyle = RS_Blink;
3853 break;
3383 case 27: 3854 case 27:
3384 rendset = 0, rendstyle = RS_RVid; 3855 rendset = 0, rendstyle = RS_RVid;
3385 break; 3856 break;
3857 //case 28: // visible. NYI
3858 //case 29: // not crossed-out
3386 } 3859 }
3860
3387 if (rendset != -1) 3861 if (rendset != -1)
3388 { 3862 {
3389 scr_rendition (rendset, rendstyle); 3863 scr_rendition (rendset, rendstyle);
3390 continue; /* for(;i;) */ 3864 continue; /* for (;i;) */
3391 } 3865 }
3392 3866
3393 switch (arg[i]) 3867 switch (arg[i])
3394 { 3868 {
3395 case 30: 3869 case 30:
… …
3398 case 33: 3872 case 33:
3399 case 34: 3873 case 34:
3400 case 35: 3874 case 35:
3401 case 36: 3875 case 36:
3402 case 37: 3876 case 37:
3403 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3877 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3404 Color_fg);
3405 break; 3878 break;
3406#ifdef TTY_256COLOR 3879 case 38: // set fg color, ISO 8613-6
3407 case 38:
3408 if (nargs > i + 2 && arg[i + 1] == 5) 3880 if (nargs > i + 2 && arg[i + 1] == 5)
3409 { 3881 {
3410 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3882 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3411 Color_fg);
3412 i += 2; 3883 i += 2;
3413 } 3884 }
3414 break; 3885 break;
3415#endif
3416 case 39: /* default fg */ 3886 case 39: /* default fg */
3417 scr_color (Color_fg, Color_fg); 3887 scr_color (Color_fg, Color_fg);
3418 break; 3888 break;
3419 3889
3420 case 40: 3890 case 40:
… …
3423 case 43: 3893 case 43:
3424 case 44: 3894 case 44:
3425 case 45: 3895 case 45:
3426 case 46: 3896 case 46:
3427 case 47: 3897 case 47:
3428 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3898 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3429 Color_bg);
3430 break; 3899 break;
3431#ifdef TTY_256COLOR 3900 case 48: // set bg color, ISO 8613-6
3432 case 48:
3433 if (nargs > i + 2 && arg[i + 1] == 5) 3901 if (nargs > i + 2 && arg[i + 1] == 5)
3434 { 3902 {
3435 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3903 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3436 Color_bg);
3437 i += 2; 3904 i += 2;
3438 } 3905 }
3439 break; 3906 break;
3440#endif
3441 case 49: /* default bg */ 3907 case 49: /* default bg */
3442 scr_color (Color_bg, Color_bg); 3908 scr_color (Color_bg, Color_bg);
3443 break; 3909 break;
3444 3910
3445#ifndef NO_BRIGHTCOLOR 3911 //case 50: // not variable spacing
3912
3913#if !ENABLE_MINIMAL
3446 case 90: 3914 case 90:
3447 case 91: /* set bright fg color */ 3915 case 91: /* set bright fg color */
3448 case 92: 3916 case 92:
3449 case 93: 3917 case 93:
3450 case 94: 3918 case 94:
3451 case 95: 3919 case 95:
3452 case 96: 3920 case 96:
3453 case 97: 3921 case 97:
3454 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3922 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3455 Color_fg);
3456 break; 3923 break;
3457 case 100: 3924 case 100:
3458 case 101: /* set bright bg color */ 3925 case 101: /* set bright bg color */
3459 case 102: 3926 case 102:
3460 case 103: 3927 case 103:
3461 case 104: 3928 case 104:
3462 case 105: 3929 case 105:
3463 case 106: 3930 case 106:
3464 case 107: 3931 case 107:
3465 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3932 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3466 Color_bg);
3467 break; 3933 break;
3468#endif 3934#endif
3469
3470 } 3935 }
3471 } 3936 }
3472} 3937}
3473/*}}} */ 3938/*}}} */
3474 3939
3475/*{{{ process Rob Nation's own graphics mode sequences */ 3940/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3476void 3941void
3477rxvt_term::process_graphics () 3942rxvt_term::process_graphics ()
3478{ 3943{
3479 unsigned char ch, cmd = cmd_getc (); 3944 unicode_t ch, cmd = cmd_getc ();
3480 3945
3481#ifndef RXVT_GRAPHICS
3482 if (cmd == 'Q') 3946 if (cmd == 'Q')
3947 {
3483 { /* query graphics */ 3948 /* query graphics */
3484 tt_printf("\033G0\n"); /* no graphics */ 3949 tt_printf ("\033G0\012"); /* no graphics */
3485 return; 3950 return;
3486 } 3951 }
3487 /* swallow other graphics sequences until terminating ':' */ 3952 /* swallow other graphics sequences until terminating ':' */
3488 do 3953 do
3489 ch = cmd_getc (); 3954 ch = cmd_getc ();
3490 while (ch != ':'); 3955 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} 3956}
3537/*}}} */ 3957/*}}} */
3538 3958
3539/* ------------------------------------------------------------------------- */ 3959/* ------------------------------------------------------------------------- */
3540 3960
3541/* 3961/*
3542 * Send printf() formatted output to the command. 3962 * Send printf () formatted output to the command.
3543 * Only use for small amounts of data. 3963 * Only use for small amounts of data.
3544 */ 3964 */
3545void 3965void
3546rxvt_term::tt_printf (const char *fmt,...) 3966rxvt_term::tt_printf (const char *fmt,...)
3547{ 3967{
3548 va_list arg_ptr; 3968 va_list arg_ptr;
3549 unsigned char buf[256]; 3969 char buf[256];
3550 3970
3551 va_start (arg_ptr, fmt); 3971 va_start (arg_ptr, fmt);
3552 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3972 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3553 va_end (arg_ptr); 3973 va_end (arg_ptr);
3554 tt_write (buf, STRLEN (buf)); 3974 tt_write (buf, strlen (buf));
3555} 3975}
3556 3976
3557/* ---------------------------------------------------------------------- */ 3977/* ---------------------------------------------------------------------- */
3558/* Write data to the pty as typed by the user, pasted with the mouse, 3978/* 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. 3979 * or generated by us in response to a query ESC sequence.
3560 */ 3980 */
3561void
3562rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3563{
3564 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3981const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3565 3982
3566 if (len) 3983void
3984rxvt_term::tt_write (const char *data, unsigned int len)
3985{
3986 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3987 return;
3988
3989 if (pty->pty < 0)
3990 return;
3991
3992 if (v_buflen == 0)
3993 {
3994 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3995
3996 if ((unsigned int)written == len)
3997 return;
3998
3999 data += written;
4000 len -= written;
3567 { 4001 }
4002
4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4004
4005 memcpy (v_buffer + v_buflen, data, len);
4006 v_buflen += len;
4007
4008 pty_ev.set (ev::READ | ev::WRITE);
4009}
4010
4011void rxvt_term::pty_write ()
4012{
4013 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4014
4015 if (written > 0)
4016 {
4017 v_buflen -= written;
4018
3568 if (v_buflen == 0) 4019 if (v_buflen == 0)
3569 { 4020 {
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); 4021 free (v_buffer);
3597 v_buffer = 0; 4022 v_buffer = 0;
3598 v_buflen = 0;
3599 4023
3600 pty_ev.set (EVENT_READ); 4024 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; 4025 return;
3613 } 4026 }
4027
4028 memmove (v_buffer, v_buffer + written, v_buflen);
3614 } 4029 }
4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4031 pty_ev.set (ev::READ);
3615} 4032}
3616 4033
3617/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
3618 4035

Diff Legend

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