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.49 by pcg, Sat Feb 21 22:14:00 2004 UTC vs.
Revision 1.299 by root, Tue Jan 31 19:11:43 2006 UTC

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

Diff Legend

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