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.43 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.255 by root, Wed Jan 11 03:13:26 2006 UTC

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

Diff Legend

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