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

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

Diff Legend

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