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

Diff Legend

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