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.45 by pcg, Sat Feb 21 20:33:39 2004 UTC vs.
Revision 1.322 by ayin, Wed May 2 23:06:32 2007 UTC

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

Diff Legend

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