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

Diff Legend

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