ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.49 by pcg, Sat Feb 21 22:14:00 2004 UTC vs.
Revision 1.305 by root, Thu Feb 2 18:04:45 2006 UTC

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

Diff Legend

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