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

Diff Legend

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