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.277 by root, Fri Jan 20 12:16:28 2006 UTC

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

Diff Legend

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