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

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

Diff Legend

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