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

Diff Legend

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