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.42 by pcg, Thu Feb 12 01:42:03 2004 UTC vs.
Revision 1.438 by root, Thu Feb 4 21:55:12 2010 UTC

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

Diff Legend

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