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

Diff Legend

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