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.241 by root, Fri Jan 6 05:28:55 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-2005 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_STRING_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
979 while (row > -nsaved && ROW (row - 1).is_longer ())
980 --row;
981
982 while (row < -view_start + nrow)
983 {
984 int start_row = row;
985 line_t *l;
986
987 do
988 {
989 l = &ROW (row);
990
991 if (!(l->f & LINE_FILTERED))
992 {
993 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED;
995 while (l->is_longer ())
996 {
997 l = &ROW (++row);
998 l->f |= LINE_FILTERED;
999 }
1000
1001 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003
1004 break;
1005 }
1006 }
1007 while (l->is_longer ());
1008
1009 row++;
1010 }
1011
1012 }
1013
746 scr_refresh (refresh_type); 1014 scr_refresh (refresh_type);
747 scrollbar_show (1); 1015 scrollbar_show (1);
748#ifdef USE_XIM 1016#ifdef USE_XIM
749 IMSendSpot (); 1017 IMSendSpot ();
750#endif 1018#endif
751
752 } 1019 }
753 1020
754 display->flush (); 1021 display->flush ();
755} 1022}
756 1023
… …
758rxvt_term::check_cb (check_watcher &w) 1025rxvt_term::check_cb (check_watcher &w)
759{ 1026{
760 SET_R (this); 1027 SET_R (this);
761 SET_LOCALE (locale); 1028 SET_LOCALE (locale);
762 1029
1030 display->flush ();
1031
1032 if (want_refresh && !flush_ev.active)
1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034}
1035
1036void
1037rxvt_term::flush_cb (time_watcher &w)
1038{
1039 SET_R (this);
1040 SET_LOCALE (locale);
1041
1042 refresh_limit = 1;
1043 refresh_count = 0;
763 flush (); 1044 flush ();
764} 1045}
765 1046
766#ifdef CURSOR_BLINK 1047#ifdef CURSOR_BLINK
767void 1048void
… …
785 w.start (w.at + TEXT_BLINK_INTERVAL); 1066 w.start (w.at + TEXT_BLINK_INTERVAL);
786 } 1067 }
787} 1068}
788#endif 1069#endif
789 1070
1071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1072void
1073rxvt_term::cont_scroll_cb (time_watcher &w)
1074{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081 }
1082}
1083#endif
1084
1085#ifdef SELECTION_SCROLLING
1086void
1087rxvt_term::sel_scroll_cb (time_watcher &w)
1088{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 }
1096}
1097#endif
1098
1099#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1100void
1101rxvt_term::slip_wheel_cb (time_watcher &w)
1102{
1103 if (mouse_slip_wheel_speed == 0
1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105 : scr_page (UP, mouse_slip_wheel_speed))
1106 {
1107 if (view_start == nsaved ||
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0;
1110
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 }
1115}
1116#endif
1117
1118#if HAVE_SCHED_YIELD
1119static struct event_handler
1120{
1121 check_watcher cw_yield;
1122
1123 void yield (check_watcher &w)
1124 {
1125 sched_yield ();
1126 w.stop ();
1127 }
1128
1129 event_handler ()
1130 : cw_yield (this, &event_handler::yield)
1131 {
1132 }
1133} event_handler;
1134#endif
1135
790bool 1136bool
791rxvt_term::pty_fill () 1137rxvt_term::pty_fill ()
792{ 1138{
793 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1139 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1140
1141 if (CBUFSIZ == n)
1142 {
1143 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1144 n = 0;
1145 }
794 1146
795 memmove (cmdbuf_base, cmdbuf_ptr, n); 1147 memmove (cmdbuf_base, cmdbuf_ptr, n);
796 cmdbuf_ptr = cmdbuf_base; 1148 cmdbuf_ptr = cmdbuf_base;
797 cmdbuf_endp = cmdbuf_ptr + n; 1149 cmdbuf_endp = cmdbuf_ptr + n;
798 1150
799 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
800 1152
801 if (n > 0) 1153 if (r > 0)
802 { 1154 {
803 cmdbuf_endp += n; 1155 cmdbuf_endp += r;
804 return true; 1156 return true;
805 } 1157 }
806 else if (n < 0 && errno != EAGAIN) 1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 {
1160#if HAVE_SCHED_YIELD
1161 if (display->is_local)
1162 event_handler.cw_yield.start ();
1163#endif
1164 }
1165 else
1166 {
1167 pty_ev.stop ();
1168
1169 if (!OPTION (Opt_hold))
807 destroy (); 1170 destroy ();
808 1171 }
1172
809 return false; 1173 return false;
810} 1174}
811 1175
812void 1176void
813rxvt_term::pty_cb (io_watcher &w, short revents) 1177rxvt_term::pty_cb (io_watcher &w, short revents)
814{ 1178{
815 SET_R (this); 1179 SET_R (this);
816 SET_LOCALE (locale); 1180 SET_LOCALE (locale);
817 1181
1182 if (revents & EVENT_READ)
1183 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ())
1185 if (cmd_parse ())
1186 break;
1187
818 if (revents & EVENT_WRITE) 1188 if (revents & EVENT_WRITE)
819 tt_write (0, 0); 1189 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} 1190}
936 1191
937// read the next character, currently handles UTF-8 1192void
938// will probably handle all sorts of other stuff in the future 1193rxvt_term::pointer_unblank ()
939uint32_t
940rxvt_term::next_char ()
941{ 1194{
942 while (cmdbuf_ptr < cmdbuf_endp) 1195 XDefineCursor (display->display, vt, TermWin_cursor);
943 { 1196 recolour_cursor ();
944 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
945 return *cmdbuf_ptr++;
946 1197
947 wchar_t wc; 1198#ifdef POINTER_BLANK
948 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 1199 hidden_pointer = 0;
949 1200
950 if (len == (size_t)-2) 1201 if (OPTION (Opt_pointerBlank))
951 return NOCHAR; 1202 pointer_ev.start (NOW + pointerBlankDelay);
952 1203#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} 1204}
985 1205
986#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
987void 1207void
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 () 1208rxvt_term::pointer_blank ()
1001{ 1209{
1002 if (! (Options & Opt_pointerBlank)) 1210 if (!OPTION (Opt_pointerBlank))
1003 return; 1211 return;
1004 1212
1005 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
1006 XFlush (display->display); 1214 XFlush (display->display);
1007 1215
1008 hidden_pointer = 1; 1216 hidden_pointer = 1;
1009} 1217}
1010 1218
… …
1017 pointer_blank (); 1225 pointer_blank ();
1018} 1226}
1019#endif 1227#endif
1020 1228
1021void 1229void
1022rxvt_term::mouse_report (const XButtonEvent &ev) 1230rxvt_term::mouse_report (XButtonEvent &ev)
1023{ 1231{
1024 int button_number, key_state = 0; 1232 int button_number, key_state = 0;
1025 int x, y; 1233 int x, y;
1026 1234
1027 x = ev.x; 1235 x = ev.x;
1028 y = ev.y; 1236 y = ev.y;
1029 pixel_position (&x, &y); 1237 pixel_position (&x, &y);
1030 1238
1031 if (MEvent.button == AnyButton) 1239 if (MEvent.button == AnyButton)
1032 {
1033 button_number = 3; 1240 button_number = 3;
1034 }
1035 else 1241 else
1036 { 1242 {
1037 button_number = MEvent.button - Button1; 1243 button_number = MEvent.button - Button1;
1038 /* add 0x3D for wheel events, like xterm does */ 1244 /* add 0x3D for wheel events, like xterm does */
1039 if (button_number >= 3) 1245 if (button_number >= 3)
1040 button_number += (64 - 3); 1246 button_number += (64 - 3);
1041 } 1247 }
1042 1248
1043 if (PrivateModes & PrivMode_MouseX10) 1249 if (priv_modes & PrivMode_MouseX10)
1044 { 1250 {
1045 /* 1251 /*
1046 * do not report ButtonRelease 1252 * do not report ButtonRelease
1047 * no state info allowed 1253 * no state info allowed
1048 */ 1254 */
… …
1063 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1269 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1064 + ((MEvent.state & ControlMask) ? 16 : 0); 1270 + ((MEvent.state & ControlMask) ? 16 : 0);
1065#ifdef MOUSE_REPORT_DOUBLECLICK 1271#ifdef MOUSE_REPORT_DOUBLECLICK
1066 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1272 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1067#endif 1273#endif
1068
1069 } 1274 }
1070 1275
1071#ifdef DEBUG_MOUSEREPORT 1276#if DEBUG_MOUSEREPORT
1072 fprintf (stderr, "Mouse ["); 1277 fprintf (stderr, "Mouse [");
1073 if (key_state & 16) 1278 if (key_state & 16)
1074 fputc ('C', stderr); 1279 fputc ('C', stderr);
1075 if (key_state & 4) 1280 if (key_state & 4)
1076 fputc ('S', stderr); 1281 fputc ('S', stderr);
… …
1080 fputc ('2', stderr); 1285 fputc ('2', stderr);
1081 fprintf (stderr, "]: <%d>, %d/%d\n", 1286 fprintf (stderr, "]: <%d>, %d/%d\n",
1082 button_number, 1287 button_number,
1083 x + 1, 1288 x + 1,
1084 y + 1); 1289 y + 1);
1085#else 1290#endif
1291
1086 tt_printf ("\033[M%c%c%c", 1292 tt_printf ("\033[M%c%c%c",
1087 (32 + button_number + key_state), 1293 (32 + button_number + key_state),
1088 (32 + x + 1), 1294 (32 + x + 1),
1089 (32 + y + 1)); 1295 (32 + y + 1));
1090#endif
1091} 1296}
1092 1297
1093#ifdef USING_W11LIB 1298#ifdef USING_W11LIB
1094void 1299void
1095rxvt_W11_process_x_event (XEvent *ev) 1300rxvt_W11_process_x_event (XEvent *ev)
… …
1102 1307
1103/*{{{ process an X event */ 1308/*{{{ process an X event */
1104void 1309void
1105rxvt_term::x_cb (XEvent &ev) 1310rxvt_term::x_cb (XEvent &ev)
1106{ 1311{
1312 dDisp;
1313
1107 SET_R (this); 1314 SET_R (this);
1108 SET_LOCALE (locale); 1315 SET_LOCALE (locale);
1109 1316
1110#if defined(CURSOR_BLINK) 1317#if defined(CURSOR_BLINK)
1111 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1112 { 1319 {
1113 if (hidden_cursor) 1320 if (hidden_cursor)
1114 { 1321 {
1115 hidden_cursor = 0; 1322 hidden_cursor = 0;
1116 want_refresh = 1; 1323 want_refresh = 1;
… …
1119 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1120 } 1327 }
1121#endif 1328#endif
1122 1329
1123#if defined(POINTER_BLANK) 1330#if defined(POINTER_BLANK)
1124 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1125 { 1332 {
1126 if (ev.type == MotionNotify 1333 if (ev.type == MotionNotify
1127 || ev.type == ButtonPress 1334 || ev.type == ButtonPress
1128 || ev.type == ButtonRelease) 1335 || ev.type == ButtonRelease)
1129 if (hidden_pointer) 1336 if (hidden_pointer)
… …
1132 if (ev.type == KeyPress && hidden_pointer == 0) 1339 if (ev.type == KeyPress && hidden_pointer == 0)
1133 pointer_blank (); 1340 pointer_blank ();
1134 } 1341 }
1135#endif 1342#endif
1136 1343
1137#ifdef USE_XIM
1138 if (XFilterEvent (&ev, None))
1139 return;
1140#endif
1141
1142 Window unused_root, unused_child; 1344 Window unused_root, unused_child;
1143 int unused_root_x, unused_root_y; 1345 int unused_root_x, unused_root_y;
1144 unsigned int unused_mask; 1346 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 1347
1195 switch (ev.type) 1348 switch (ev.type)
1196 { 1349 {
1197 case KeyPress: 1350 case KeyPress:
1351#if ISO_14755
1352 if (!(iso14755buf & ISO_14755_52))
1353#endif
1198 lookup_key (ev.xkey); 1354 lookup_key (ev.xkey);
1355
1356 break;
1357
1358 case KeyRelease:
1359 {
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1361 KeySym ks;
1362
1363 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364#endif
1365
1366#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support
1368 if (iso14755buf)
1369 if (iso14755buf & ISO_14755_52)
1370 {
1371# if ENABLE_OVERLAY
1372 scr_overlay_off ();
1373# endif
1374# if ISO_14755
1375 // iso14755 part 5.2 handling: release time
1376 // first: controls
1377 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f)))
1380 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1382 commit_iso14755 ();
1383 return; // case-break;
1384 }
1385
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks)
1388 {
1389 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 ();
1391 return; // case-break;
1392 }
1393
1394 scr_bell ();
1395# endif
1396 iso14755buf = 0;
1397 break;
1398 }
1399 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1400 {
1401# if ENABLE_OVERLAY
1402 scr_overlay_off ();
1403# endif
1404 if (iso14755buf & ISO_14755_51)
1405 commit_iso14755 ();
1406#if ISO_14755
1407 else if (iso14755buf & ISO_14755_STARTED)
1408 {
1409 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1410
1411 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1412 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1413 }
1414# endif
1415 else
1416 iso14755buf = 0;
1417 }
1418#endif
1419
1420 if (ev.xany.window == vt && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1199 break; 1421 break;
1200 1422
1201#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1423#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1202 case KeyRelease:
1203 {
1204 if (! (ev.xkey.state & ControlMask)) 1424 if (!(ev.xkey.state & ControlMask))
1425 slip_wheel_ev.stop ();
1426 else if (ks == XK_Control_L || ks == XK_Control_R)
1205 mouse_slip_wheel_speed = 0; 1427 mouse_slip_wheel_speed = 0;
1206 else 1428#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; 1429 break;
1215 } 1430 }
1216#endif
1217 1431
1218 case ButtonPress: 1432 case ButtonPress:
1219 button_press (ev.xbutton); 1433 button_press (ev.xbutton);
1220 break; 1434 break;
1221 1435
… …
1223 button_release (ev.xbutton); 1437 button_release (ev.xbutton);
1224 break; 1438 break;
1225 1439
1226 case ClientMessage: 1440 case ClientMessage:
1227 if (ev.xclient.format == 32 1441 if (ev.xclient.format == 32
1442 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1443 {
1228 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1444 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1229 destroy (); 1445 destroy ();
1446#if ENABLE_EWMH
1447 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1448 XSendEvent (disp, ev.xclient.window = display->root,
1449 False, SubstructureRedirectMask | SubstructureNotifyMask,
1450 &ev);
1451#endif
1452 }
1453#if ENABLE_XEMBED
1454 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1455 {
1456 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1457 focus_in ();
1458 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1459 focus_out ();
1460 }
1461#endif
1230#ifdef OFFIX_DND 1462#ifdef OFFIX_DND
1231 /* OffiX Dnd (drag 'n' drop) protocol */ 1463 /* OffiX Dnd (drag 'n' drop) protocol */
1232 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1464 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1233 && (ev.xclient.data.l[0] == DndFile 1465 && (ev.xclient.data.l[0] == DndFile
1234 || ev.xclient.data.l[0] == DndDir 1466 || ev.xclient.data.l[0] == DndDir
1235 || ev.xclient.data.l[0] == DndLink)) 1467 || ev.xclient.data.l[0] == DndLink))
1236 { 1468 {
1237 /* Get Dnd data */ 1469 /* Get Dnd data */
1238 Atom ActualType; 1470 Atom ActualType;
1239 int ActualFormat; 1471 int ActualFormat;
1240 unsigned char *data; 1472 unsigned char *data;
1241 unsigned long Size, RemainingBytes; 1473 unsigned long Size, RemainingBytes;
1242 1474
1243 XGetWindowProperty (display->display, display->root, 1475 XGetWindowProperty (disp, display->root,
1244 xa[XA_DNDSELECTION], 1476 xa[XA_DNDSELECTION],
1245 0L, 1000000L, 1477 0L, 1000000L,
1246 False, AnyPropertyType, 1478 False, AnyPropertyType,
1247 &ActualType, &ActualFormat, 1479 &ActualType, &ActualFormat,
1248 &Size, &RemainingBytes, 1480 &Size, &RemainingBytes,
1249 &data); 1481 &data);
1250 XChangeProperty (display->display, display->root, 1482 set_string_property (XA_CUT_BUFFER0, data);
1251 XA_CUT_BUFFER0, XA_STRING, 1483 XFree (data);
1252 8, PropModeReplace,
1253 data, STRLEN (data));
1254 selection_paste (display->root, XA_CUT_BUFFER0, True); 1484 selection_paste (display->root, XA_CUT_BUFFER0, true);
1255 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1485 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1256 } 1486 }
1257#endif /* OFFIX_DND */ 1487#endif /* OFFIX_DND */
1258 break; 1488 break;
1259 1489
1260 case MappingNotify: 1490 case MappingNotify:
1261 XRefreshKeyboardMapping (& (ev.xmapping)); 1491 XRefreshKeyboardMapping (&ev.xmapping);
1262 break; 1492 break;
1263 1493
1264 /* 1494 /*
1265 * XXX: this is not the _current_ arrangement 1495 * XXX: this is not the _current_ arrangement
1266 * Here's my conclusion: 1496 * Here's my conclusion:
… …
1285 break; 1515 break;
1286 } 1516 }
1287 break; 1517 break;
1288 1518
1289 case FocusIn: 1519 case FocusIn:
1290 if (!TermWin.focus) 1520 focus_in ();
1521 break;
1522
1523 case FocusOut:
1524 focus_out ();
1525 break;
1526
1527 case ConfigureNotify:
1528 if (ev.xconfigure.window == parent[0])
1291 { 1529 {
1292 TermWin.focus = 1; 1530 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1293 want_refresh = 1; 1531 ;
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 1532
1533 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1534 {
1535 seen_resize = 1;
1536 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1537 }
1538
1539#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1540 if (OPTION (Opt_transparent))
1541 check_our_parents ();
1542#endif
1303 } 1543 }
1304 break; 1544 break;
1305 1545
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: 1546 case PropertyNotify:
1325 if (ev.xconfigure.window == TermWin.parent[0]) 1547 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1326 { 1548 && ev.xproperty.state == PropertyNewValue)
1327 int height, width; 1549 selection_property (ev.xproperty.window, ev.xproperty.atom);
1328 1550
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; 1551 break;
1359 1552
1360 case SelectionClear: 1553 case SelectionClear:
1361 display->set_selection_owner (0); 1554 selection_clear ();
1362 break; 1555 break;
1363 1556
1364 case SelectionNotify: 1557 case SelectionNotify:
1365 if (selection_wait == Sel_normal) 1558 if (selection_wait == Sel_normal)
1366 selection_paste (ev.xselection.requestor, 1559 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1367 ev.xselection.property, True);
1368 break; 1560 break;
1369 1561
1370 case SelectionRequest: 1562 case SelectionRequest:
1371 selection_send (ev.xselectionrequest); 1563 selection_send (ev.xselectionrequest);
1372 break; 1564 break;
1373 1565
1374 case UnmapNotify: 1566 case UnmapNotify:
1375 TermWin.mapped = 0; 1567 mapped = 0;
1376#ifdef TEXT_BLINK 1568#ifdef TEXT_BLINK
1377 text_blink_ev.stop (); 1569 text_blink_ev.stop ();
1378#endif 1570#endif
1379 break; 1571 break;
1380 1572
1381 case MapNotify: 1573 case MapNotify:
1382 TermWin.mapped = 1; 1574 mapped = 1;
1383#ifdef TEXT_BLINK 1575#ifdef TEXT_BLINK
1384 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1576 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1385#endif 1577#endif
1386 break; 1578 break;
1387 1579
… …
1391 break; 1583 break;
1392#endif /* TRANSPARENT */ 1584#endif /* TRANSPARENT */
1393 1585
1394 case GraphicsExpose: 1586 case GraphicsExpose:
1395 case Expose: 1587 case Expose:
1396 if (ev.xany.window == TermWin.vt) 1588 if (ev.xany.window == vt)
1397 { 1589 {
1398#ifdef NO_SLOW_LINK_SUPPORT 1590 do
1399 scr_expose (ev.xexpose.x, ev.xexpose.y, 1591 scr_expose (ev.xexpose.x, ev.xexpose.y,
1400 ev.xexpose.width, ev.xexpose.height, False); 1592 ev.xexpose.width, ev.xexpose.height, False);
1401#else 1593 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1402 // don't understand this, so commented it out 1594
1595 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1596
1597 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1403 scr_expose (ev.xexpose.x, ev.xexpose.y, 1598 scr_expose (ev.xexpose.x, ev.xexpose.y,
1404 ev.xexpose.width, ev.xexpose.height, False); 1599 ev.xexpose.width, ev.xexpose.height, False);
1405 //scr_expose (ev.xexpose.x, 0, 1600
1406 // ev.xexpose.width, TermWin.height, False); 1601 scr_refresh (refresh_type);
1407#endif
1408 want_refresh = 1;
1409 } 1602 }
1410 else 1603 else
1411 { 1604 {
1412 XEvent unused_event; 1605 XEvent unused_event;
1413 1606
1414 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1607 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1415 Expose, 1608 ;
1416 &unused_event)) ; 1609 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1610 ;
1418 GraphicsExpose, 1611
1419 &unused_event)) ;
1420 if (isScrollbarWindow (ev.xany.window)) 1612 if (isScrollbarWindow (ev.xany.window))
1421 { 1613 {
1422 scrollBar.setIdle (); 1614 scrollBar.setIdle ();
1423 scrollbar_show (0); 1615 scrollbar_show (0);
1424 } 1616 }
1425#ifdef MENUBAR 1617#ifdef MENUBAR
1426 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1618 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1427 menubar_expose (); 1619 menubar_expose ();
1428#endif 1620#endif
1429#ifdef RXVT_GRAPHICS
1430 Gr_expose (ev.xany.window);
1431#endif
1432 1621
1622#ifdef TRANSPARENT
1623 if (am_transparent && ev.xany.window == parent[0])
1624 XClearWindow (disp, ev.xany.window);
1625#endif
1433 } 1626 }
1434 break; 1627 break;
1435 1628
1436 case MotionNotify: 1629 case MotionNotify:
1437#ifdef POINTER_BLANK 1630#ifdef POINTER_BLANK
… …
1439 pointer_unblank (); 1632 pointer_unblank ();
1440#endif 1633#endif
1441#if MENUBAR 1634#if MENUBAR
1442 if (isMenuBarWindow (ev.xany.window)) 1635 if (isMenuBarWindow (ev.xany.window))
1443 { 1636 {
1444 menubar_control (& (ev.xbutton)); 1637 menubar_control (ev.xbutton);
1445 break; 1638 break;
1446 } 1639 }
1447#endif 1640#endif
1448 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1641 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1449 break; 1642 break;
1450 1643
1451 if (ev.xany.window == TermWin.vt) 1644 if (ev.xany.window == vt)
1452 { 1645 {
1646 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1647 ; // nop
1453 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1648 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1454 { 1649 {
1455 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1650 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1456 ; 1651 ;
1457 1652
1458 XQueryPointer (display->display, TermWin.vt, 1653 XQueryPointer (disp, vt,
1459 &unused_root, &unused_child, 1654 &unused_root, &unused_child,
1460 &unused_root_x, &unused_root_y, 1655 &unused_root_x, &unused_root_y,
1461 & (ev.xbutton.x), & (ev.xbutton.y), 1656 &ev.xbutton.x, &ev.xbutton.y,
1462 &unused_mask); 1657 &ev.xbutton.state);
1463#ifdef MOUSE_THRESHOLD 1658#ifdef MOUSE_THRESHOLD
1464 /* deal with a `jumpy' mouse */ 1659 /* deal with a `jumpy' mouse */
1465 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1660 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1466 { 1661 {
1467#endif 1662#endif
1663#if ISO_14755
1664 // 5.4
1665 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1666 {
1667 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1668 break;
1669 }
1670#endif
1468 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1671 selection_extend (ev.xbutton.x, ev.xbutton.y,
1469 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1672 ev.xbutton.state & Button3Mask ? 2 : 0);
1673
1470#ifdef SELECTION_SCROLLING 1674#ifdef SELECTION_SCROLLING
1471 if (ev.xbutton.y < TermWin.int_bwidth 1675 if (ev.xbutton.y < int_bwidth
1472 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1676 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1473 { 1677 {
1474 int dist; 1678 int dist;
1475
1476 pending_scroll_selection=1;
1477 1679
1478 /* don't clobber the current delay if we are 1680 /* don't clobber the current delay if we are
1479 * already in the middle of scrolling. 1681 * already in the middle of scrolling.
1480 */ 1682 */
1481 if (scroll_selection_delay<=0) 1683 if (!sel_scroll_ev.active)
1482 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1684 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1483 1685
1484 /* save the event params so we can highlight 1686 /* save the event params so we can highlight
1485 * the selection in the pending-scroll loop 1687 * the selection in the pending-scroll loop
1486 */ 1688 */
1487 selection_save_x=ev.xbutton.x; 1689 selection_save_x = ev.xbutton.x;
1488 selection_save_y=ev.xbutton.y; 1690 selection_save_y = ev.xbutton.y;
1489 selection_save_state=
1490 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1691 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1491 1692
1492 /* calc number of lines to scroll */ 1693 /* calc number of lines to scroll */
1493 if (ev.xbutton.y<TermWin.int_bwidth) 1694 if (ev.xbutton.y < int_bwidth)
1494 { 1695 {
1495 scroll_selection_dir = UP; 1696 scroll_selection_dir = UP;
1496 dist = TermWin.int_bwidth - ev.xbutton.y; 1697 dist = int_bwidth - ev.xbutton.y;
1497 } 1698 }
1498 else 1699 else
1499 { 1700 {
1500 scroll_selection_dir = DN; 1701 scroll_selection_dir = DN;
1501 dist = ev.xbutton.y - 1702 dist = ev.xbutton.y - (int_bwidth + height);
1502 (TermWin.int_bwidth + TermWin.height);
1503 } 1703 }
1704
1504 scroll_selection_lines= (Pixel2Height (dist)/ 1705 scroll_selection_lines = Pixel2Height (dist)
1505 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1706 / SELECTION_SCROLL_LINE_SPEEDUP
1707 + 1;
1506 MIN_IT (scroll_selection_lines, 1708 min_it (scroll_selection_lines,
1507 SELECTION_SCROLL_MAX_LINES); 1709 SELECTION_SCROLL_MAX_LINES);
1508 } 1710 }
1509 else 1711 else
1510 { 1712 {
1511 /* we are within the text window, so we 1713 /* we are within the text window, so we
1512 * shouldn't be scrolling 1714 * shouldn't be scrolling
1513 */ 1715 */
1514 pending_scroll_selection = 0; 1716 if (sel_scroll_ev.active)
1717 sel_scroll_ev.stop();
1515 } 1718 }
1516#endif 1719#endif
1517#ifdef MOUSE_THRESHOLD 1720#ifdef MOUSE_THRESHOLD
1518
1519 } 1721 }
1520#endif 1722#endif
1521
1522 } 1723 }
1523 } 1724 }
1524 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1725 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1525 { 1726 {
1526 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1727 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1527 MotionNotify, &ev)) ; 1728 MotionNotify, &ev))
1729 ;
1730
1528 XQueryPointer (display->display, scrollBar.win, 1731 XQueryPointer (disp, scrollBar.win,
1529 &unused_root, &unused_child, 1732 &unused_root, &unused_child,
1530 &unused_root_x, &unused_root_y, 1733 &unused_root_x, &unused_root_y,
1531 & (ev.xbutton.x), & (ev.xbutton.y), 1734 &ev.xbutton.x, &ev.xbutton.y,
1532 &unused_mask); 1735 &unused_mask);
1533 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1736 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1534 scrollbar_size ()); 1737 scrollbar_size ());
1535 scr_refresh (refresh_type); 1738 scr_refresh (refresh_type);
1536 refresh_limit = 0; 1739 refresh_limit = 0;
… …
1539 break; 1742 break;
1540 } 1743 }
1541} 1744}
1542 1745
1543void 1746void
1747rxvt_term::focus_in ()
1748{
1749 if (!focus)
1750 {
1751 focus = 1;
1752 want_refresh = 1;
1753
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1755
1756#if USE_XIM
1757 if (Input_Context != NULL)
1758 {
1759 IMSetStatusPosition ();
1760 XSetICFocus (Input_Context);
1761 }
1762#endif
1763#if CURSOR_BLINK
1764 if (OPTION (Opt_cursorBlink))
1765 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1766#endif
1767#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade])
1769 {
1770 pix_colors = pix_colors_focused;
1771 scr_recolour ();
1772 }
1773#endif
1774 }
1775}
1776
1777void
1778rxvt_term::focus_out ()
1779{
1780 if (focus)
1781 {
1782 focus = 0;
1783 want_refresh = 1;
1784
1785 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1786
1787#if ENABLE_FRILLS || ISO_14755
1788 if (iso14755buf)
1789 {
1790 iso14755buf = 0;
1791# if ENABLE_OVERLAY
1792 scr_overlay_off ();
1793# endif
1794 }
1795#endif
1796#if USE_XIM
1797 if (Input_Context != NULL)
1798 XUnsetICFocus (Input_Context);
1799#endif
1800#if CURSOR_BLINK
1801 if (OPTION (Opt_cursorBlink))
1802 cursor_blink_ev.stop ();
1803 hidden_cursor = 0;
1804#endif
1805#if OFF_FOCUS_FADING
1806 if (rs[Rs_fade])
1807 {
1808 pix_colors = pix_colors_unfocused;
1809 scr_recolour ();
1810 }
1811#endif
1812 }
1813}
1814
1815#if TRANSPARENT
1816void
1544rxvt_term::rootwin_cb (XEvent &ev) 1817rxvt_term::rootwin_cb (XEvent &ev)
1545{ 1818{
1546 SET_R (this); 1819 SET_R (this);
1547 SET_LOCALE (locale); 1820 SET_LOCALE (locale);
1548 1821
1549 switch (ev.type) 1822 switch (ev.type)
1550 { 1823 {
1551 case PropertyNotify: 1824 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 /* 1825 /*
1562 * if user used some Esetroot compatible prog to set the root bg, 1826 * 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. 1827 * use the property to determine the pixmap. We use it later on.
1564 */ 1828 */
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]) 1829 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1830 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1569 return; 1831 return;
1570 }
1571 1832
1572 /* FALLTHROUGH */ 1833 /* FALLTHROUGH */
1573 case ReparentNotify: 1834 case ReparentNotify:
1574 if ((Options & Opt_transparent) && check_our_parents ()) 1835 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1575 if (am_transparent)
1576 want_full_refresh = 1; 1836 want_refresh = want_full_refresh = 1;
1577 break; 1837 break;
1578#endif
1579 } 1838 }
1580} 1839}
1840#endif
1581 1841
1582void 1842void
1583rxvt_term::button_press (const XButtonEvent &ev) 1843rxvt_term::button_press (XButtonEvent &ev)
1584{ 1844{
1585 int reportmode = 0, clickintime; 1845 int reportmode = 0, clickintime;
1586 1846
1587 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1847 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1848
1588 if (!bypass_keystate) 1849 if (!bypass_keystate)
1589 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1850 reportmode = !! (priv_modes & PrivMode_mouse_report);
1851
1590 /* 1852 /*
1591 * VT window processing of button press 1853 * VT window processing of button press
1592 */ 1854 */
1593 if (ev.window == TermWin.vt) 1855 if (ev.window == vt)
1594 { 1856 {
1595#if RXVT_GRAPHICS 1857#if ISO_14755
1596 if (ev.subwindow != None) 1858 // 5.4
1597 rxvt_Gr_ButtonPress (ev.x, ev.y); 1859 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1598 else 1860 {
1599#endif 1861 iso14755_54 (ev.x, ev.y);
1600 1862 return;
1601 { 1863 }
1864#endif
1865
1602 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1866 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1867
1603 if (reportmode) 1868 if (reportmode)
1869 {
1870 /* mouse report from vt window */
1871 /* save the xbutton state (for ButtonRelease) */
1872 MEvent.state = ev.state;
1873#ifdef MOUSE_REPORT_DOUBLECLICK
1874 if (ev.button == MEvent.button && clickintime)
1604 { 1875 {
1605 /* mouse report from vt window */ 1876 /* same button, within alloted time */
1606 /* save the xbutton state (for ButtonRelease) */ 1877 MEvent.clicks++;
1607 MEvent.state = ev.state; 1878 if (MEvent.clicks > 1)
1608#ifdef MOUSE_REPORT_DOUBLECLICK
1609 if (ev.button == MEvent.button && clickintime)
1610 { 1879 {
1611 /* same button, within alloted time */
1612 MEvent.clicks++;
1613 if (MEvent.clicks > 1)
1614 {
1615 /* only report double clicks */ 1880 /* only report double clicks */
1616 MEvent.clicks = 2; 1881 MEvent.clicks = 2;
1617 mouse_report (ev); 1882 mouse_report (ev);
1618 1883
1619 /* don't report the release */ 1884 /* don't report the release */
1620 MEvent.clicks = 0; 1885 MEvent.clicks = 0;
1621 MEvent.button = AnyButton; 1886 MEvent.button = AnyButton;
1622 }
1623 } 1887 }
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 } 1888 }
1637 else 1889 else
1638 { 1890 {
1639 if (ev.button != MEvent.button) 1891 /* different button, or time expired */
1640 MEvent.clicks = 0; 1892 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; 1893 MEvent.button = ev.button;
1663 break; 1894 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 } 1895 }
1896#else
1897 MEvent.button = ev.button;
1898 mouse_report (ev);
1899#endif /* MOUSE_REPORT_DOUBLECLICK */
1900
1901 }
1902 else
1903 {
1904 if (ev.button != MEvent.button)
1905 MEvent.clicks = 0;
1906
1907 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1908 switch (ev.button)
1909 {
1910 case Button1:
1911 /* allow meta + click to select rectangular areas */
1912 /* should be done in screen.C */
1913#if ENABLE_FRILLS
1914 selection.rect = !!(ev.state & ModMetaMask);
1915#else
1916 selection.rect = false;
1917#endif
1918
1919 /* allow shift+left click to extend selection */
1920 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1921 {
1922 if (MEvent.button == Button1 && clickintime)
1923 selection_rotate (ev.x, ev.y);
1924 else
1925 selection_extend (ev.x, ev.y, 1);
1926 }
1927 else
1928 {
1929 if (MEvent.button == Button1 && clickintime)
1930 MEvent.clicks++;
1931 else
1932 MEvent.clicks = 1;
1933
1934 selection_click (MEvent.clicks, ev.x, ev.y);
1935 }
1936
1937 MEvent.button = Button1;
1938 break;
1939
1940 case Button3:
1941 if (MEvent.button == Button3 && clickintime)
1942 selection_rotate (ev.x, ev.y);
1943 else
1944 selection_extend (ev.x, ev.y, 1);
1945
1946 MEvent.button = Button3;
1947 break;
1948 }
1949 }
1950
1674 MEvent.time = ev.time; 1951 MEvent.time = ev.time;
1675 return; 1952 return;
1676 }
1677 } 1953 }
1678 1954
1679 /* 1955 /*
1680 * Scrollbar window processing of button press 1956 * Scrollbar window processing of button press
1681 */ 1957 */
… …
1745 upordown = 1; /* down */ 2021 upordown = 1; /* down */
1746 } 2022 }
1747 if (upordown) 2023 if (upordown)
1748 { 2024 {
1749#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2025#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1750 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2026 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1751#endif 2027#endif
1752 if (scr_page (upordown < 0 ? UP : DN, 1)) 2028 if (scr_page (upordown < 0 ? UP : DN, 1))
1753 { 2029 {
1754 if (upordown < 0) 2030 if (upordown < 0)
1755 scrollBar.setUp (); 2031 scrollBar.setUp ();
… …
1771 break; 2047 break;
1772 case R_SB_ALIGN_BOTTOM: 2048 case R_SB_ALIGN_BOTTOM:
1773 csrO = scrollBar.bot - scrollBar.top; 2049 csrO = scrollBar.bot - scrollBar.top;
1774 break; 2050 break;
1775 } 2051 }
2052
1776 if (scrollBar.style == R_SB_XTERM 2053 if (scrollBar.style == R_SB_XTERM
1777 || scrollbar_above_slider (ev.y) 2054 || scrollbar_above_slider (ev.y)
1778 || scrollbar_below_slider (ev.y)) 2055 || scrollbar_below_slider (ev.y))
1779 scr_move_to ( scrollbar_position (ev.y) - csrO, 2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1780 scrollbar_size ()); 2057
1781 scrollBar.setMotion (); 2058 scrollBar.setMotion ();
1782 break; 2059 break;
1783 2060
1784 case Button1: 2061 case Button1:
1785 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2062 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1789 case Button3: 2066 case Button3:
1790 if (scrollBar.style != R_SB_XTERM) 2067 if (scrollBar.style != R_SB_XTERM)
1791 { 2068 {
1792 if (scrollbar_above_slider (ev.y)) 2069 if (scrollbar_above_slider (ev.y))
1793# ifdef RXVT_SCROLL_FULL 2070# ifdef RXVT_SCROLL_FULL
1794 scr_page (UP, TermWin.nrow - 1); 2071 scr_page (UP, nrow - 1);
1795# else 2072# else
1796 scr_page (UP, TermWin.nrow / 4); 2073 scr_page (UP, nrow / 4);
1797# endif 2074# endif
1798 else if (scrollbar_below_slider (ev.y)) 2075 else if (scrollbar_below_slider (ev.y))
1799# ifdef RXVT_SCROLL_FULL 2076# ifdef RXVT_SCROLL_FULL
1800 scr_page (DN, TermWin.nrow - 1); 2077 scr_page (DN, nrow - 1);
1801# else 2078# else
1802 scr_page (DN, TermWin.nrow / 4); 2079 scr_page (DN, nrow / 4);
1803# endif 2080# endif
1804 else 2081 else
1805 scrollBar.setMotion (); 2082 scrollBar.setMotion ();
1806 } 2083 }
1807 else 2084 else
1808 { 2085 {
1809 scr_page ((ev.button == Button1 ? DN : UP), 2086 scr_page ((ev.button == Button1 ? DN : UP),
1810 (TermWin.nrow 2087 (nrow
1811 * scrollbar_position (ev.y) 2088 * scrollbar_position (ev.y)
1812 / scrollbar_size ())); 2089 / scrollbar_size ()));
1813 } 2090 }
2091
1814 break; 2092 break;
1815 } 2093 }
1816 } 2094 }
1817 return; 2095 return;
1818 } 2096 }
… …
1824 menubar_control (ev); 2102 menubar_control (ev);
1825#endif 2103#endif
1826} 2104}
1827 2105
1828void 2106void
1829rxvt_term::button_release (const XButtonEvent &ev) 2107rxvt_term::button_release (XButtonEvent &ev)
1830{ 2108{
1831 int reportmode = 0; 2109 int reportmode = 0;
1832 2110
1833 csrO = 0; /* reset csr Offset */ 2111 csrO = 0; /* reset csr Offset */
1834 if (!bypass_keystate) 2112 if (!bypass_keystate)
1835 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2113 reportmode = !! (priv_modes & PrivMode_mouse_report);
1836 2114
1837 if (scrollbar_isUpDn ()) 2115 if (scrollbar_isUpDn ())
1838 { 2116 {
1839 scrollBar.setIdle (); 2117 scrollBar.setIdle ();
1840 scrollbar_show (0); 2118 scrollbar_show (0);
1841#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2119#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1842 refresh_type &= ~SMOOTH_REFRESH; 2120 refresh_type &= ~SMOOTH_REFRESH;
1843#endif 2121#endif
1844
1845 } 2122 }
2123
1846#ifdef SELECTION_SCROLLING 2124#ifdef SELECTION_SCROLLING
1847 pending_scroll_selection=0; 2125 if (sel_scroll_ev.active)
2126 sel_scroll_ev.stop();
1848#endif 2127#endif
2128
1849 if (ev.window == TermWin.vt) 2129 if (ev.window == vt)
1850 { 2130 {
1851#ifdef RXVT_GRAPHICS 2131#if ISO_14755
1852 if (ev.subwindow != None) 2132 // 5.4
1853 rxvt_Gr_ButtonRelease (ev.x, ev.y); 2133 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1854 else 2134 return;
1855#endif 2135#endif
1856
1857 {
1858 if (reportmode) 2136 if (reportmode)
2137 {
2138 /* mouse report from vt window */
2139 /* don't report release of wheel "buttons" */
2140 if (ev.button >= 4)
2141 return;
2142#ifdef MOUSE_REPORT_DOUBLECLICK
2143 /* only report the release of 'slow' single clicks */
2144 if (MEvent.button != AnyButton
2145 && (ev.button != MEvent.button
2146 || (ev.time - MEvent.time
2147 > MULTICLICK_TIME / 2)))
1859 { 2148 {
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; 2149 MEvent.clicks = 0;
1872 MEvent.button = AnyButton;
1873 mouse_report (ev);
1874 }
1875#else /* MOUSE_REPORT_DOUBLECLICK */
1876 MEvent.button = AnyButton; 2150 MEvent.button = AnyButton;
1877 mouse_report (ev); 2151 mouse_report (ev);
2152 }
2153#else /* MOUSE_REPORT_DOUBLECLICK */
2154 MEvent.button = AnyButton;
2155 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2156#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2157 return;
1880 } 2158 }
2159
1881 /* 2160 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2161 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2162 * when overriding mouse reporting
1884 */ 2163 */
1885 if (PrivateModes & PrivMode_mouse_report 2164 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2165 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2166 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2167 selection_extend (ev.x, ev.y, 0);
1889 2168
2169 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2170 return;
2171
1890 switch (ev.button) 2172 switch (ev.button)
2173 {
2174 case Button1:
2175 case Button3:
2176 selection_make (ev.time);
2177 break;
2178 case Button2:
2179 selection_request (ev.time, ev.x, ev.y);
2180 break;
2181#ifdef MOUSE_WHEEL
2182 case Button4:
2183 case Button5:
1891 { 2184 {
1892 case Button1: 2185 int i;
1893 case Button3: 2186 page_dirn v;
1894 selection_make (ev.time); 2187
2188 v = ev.button == Button4 ? UP : DN;
2189
2190 if (ev.state & ShiftMask)
1895 break; 2191 i = 1;
1896 case Button2: 2192 else if (OPTION (Opt_mouseWheelScrollPage))
1897 selection_request (ev.time, ev.x, ev.y); 2193 i = nrow - 1;
2194 else
1898 break; 2195 i = 5;
2196
1899#ifdef MOUSE_WHEEL 2197# ifdef MOUSE_SLIP_WHEELING
1900 case Button4: 2198 if (ev.state & ControlMask)
1901 case Button5:
1902 { 2199 {
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); 2200 mouse_slip_wheel_speed += v ? -1 : 1;
2201 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2202 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2203
2204 if (slip_wheel_ev.at < NOW)
1917 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2205 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2206
2207 slip_wheel_ev.start ();
1918 } 2208 }
2209 else
2210 {
1919# endif 2211# endif
1920# ifdef JUMP_MOUSE_WHEEL 2212# ifdef JUMP_MOUSE_WHEEL
1921 scr_page (v, i); 2213 scr_page (v, i);
1922 scr_refresh (SMOOTH_REFRESH); 2214 scr_refresh (SMOOTH_REFRESH);
1923 scrollbar_show (1); 2215 scrollbar_show (1);
… …
1927 scr_page (v, 1); 2219 scr_page (v, 1);
1928 scr_refresh (SMOOTH_REFRESH); 2220 scr_refresh (SMOOTH_REFRESH);
1929 scrollbar_show (1); 2221 scrollbar_show (1);
1930 } 2222 }
1931# endif 2223# endif
1932 2224# ifdef MOUSE_SLIP_WHEELING
1933 } 2225 }
1934 break;
1935#endif 2226#endif
1936
1937 } 2227 }
2228 break;
2229#endif
1938 } 2230 }
1939 } 2231 }
1940#ifdef MENUBAR 2232#ifdef MENUBAR
1941 else if (isMenuBarWindow (ev.window)) 2233 else if (isMenuBarWindow (ev.window))
1942 menubar_control (ev); 2234 menubar_control (ev);
1943#endif 2235#endif
1944} 2236}
1945 2237
1946
1947#ifdef TRANSPARENT 2238#ifdef TRANSPARENT
2239#if TINTING
2240/* taken from aterm-0.4.2 */
2241
2242typedef uint32_t RUINT32T;
2243
2244void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2245{
2246 int sh_r, sh_g, sh_b;
2247 RUINT32T mask_r, mask_g, mask_b;
2248 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2249 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2250 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2251 int i;
2252
2253 Visual *visual = display->visual;
2254
2255 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2256
2257 /* for convenience */
2258 mask_r = visual->red_mask;
2259 mask_g = visual->green_mask;
2260 mask_b = visual->blue_mask;
2261
2262 /* boring lookup table pre-initialization */
2263 switch (srcImage->bits_per_pixel) {
2264 case 15:
2265 if ((mask_r != 0x7c00) ||
2266 (mask_g != 0x03e0) ||
2267 (mask_b != 0x001f))
2268 return;
2269 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2270 lookup_r = lookup;
2271 lookup_g = lookup+32;
2272 lookup_b = lookup+32+32;
2273 sh_r = 10;
2274 sh_g = 5;
2275 sh_b = 0;
2276 break;
2277 case 16:
2278 if ((mask_r != 0xf800) ||
2279 (mask_g != 0x07e0) ||
2280 (mask_b != 0x001f))
2281 return;
2282 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2283 lookup_r = lookup;
2284 lookup_g = lookup+32;
2285 lookup_b = lookup+32+64;
2286 sh_r = 11;
2287 sh_g = 5;
2288 sh_b = 0;
2289 break;
2290 case 24:
2291 if ((mask_r != 0xff0000) ||
2292 (mask_g != 0x00ff00) ||
2293 (mask_b != 0x0000ff))
2294 return;
2295 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2296 lookup_r = lookup;
2297 lookup_g = lookup+256;
2298 lookup_b = lookup+256+256;
2299 sh_r = 16;
2300 sh_g = 8;
2301 sh_b = 0;
2302 break;
2303 case 32:
2304 if ((mask_r != 0xff0000) ||
2305 (mask_g != 0x00ff00) ||
2306 (mask_b != 0x0000ff))
2307 return;
2308 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2309 lookup_r = lookup;
2310 lookup_g = lookup+256;
2311 lookup_b = lookup+256+256;
2312 sh_r = 16;
2313 sh_g = 8;
2314 sh_b = 0;
2315 break;
2316 default:
2317 return; /* we do not support this color depth */
2318 }
2319
2320 /* prepare limits for color transformation (each channel is handled separately) */
2321 if (shade < 0) {
2322 shade = -shade;
2323 if (shade < 0) shade = 0;
2324 if (shade > 100) shade = 100;
2325
2326 lower_lim_r = 65535-rm;
2327 lower_lim_g = 65535-gm;
2328 lower_lim_b = 65535-bm;
2329
2330 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2331 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2332 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2333
2334 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2335 } else {
2336 if (shade < 0) shade = 0;
2337 if (shade > 100) shade = 100;
2338
2339 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2340
2341 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2342 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2343 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2344 }
2345
2346 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2347 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2348 {
2349 unsigned int tmp;
2350
2351 tmp = lower_lim_r;
2352 lower_lim_r = lower_lim_b;
2353 lower_lim_b = tmp;
2354
2355 tmp = upper_lim_r;
2356 upper_lim_r = upper_lim_b;
2357 upper_lim_b = tmp;
2358 }
2359
2360 /* fill our lookup tables */
2361 for (i = 0; i <= mask_r>>sh_r; i++)
2362 {
2363 RUINT32T tmp;
2364 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2365 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2366 lookup_r[i] = (tmp/65535)<<sh_r;
2367 }
2368 for (i = 0; i <= mask_g>>sh_g; i++)
2369 {
2370 RUINT32T tmp;
2371 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2372 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2373 lookup_g[i] = (tmp/65535)<<sh_g;
2374 }
2375 for (i = 0; i <= mask_b>>sh_b; i++)
2376 {
2377 RUINT32T tmp;
2378 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2379 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2380 lookup_b[i] = (tmp/65535)<<sh_b;
2381 }
2382
2383 /* apply table to input image (replacing colors by newly calculated ones) */
2384 switch (srcImage->bits_per_pixel)
2385 {
2386 case 15:
2387 {
2388 unsigned short *p1, *pf, *p, *pl;
2389 p1 = (unsigned short *) srcImage->data;
2390 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2391 while (p1 < pf)
2392 {
2393 p = p1;
2394 pl = p1 + srcImage->width;
2395 for (; p < pl; p++)
2396 {
2397 *p = lookup_r[(*p & 0x7c00)>>10] |
2398 lookup_g[(*p & 0x03e0)>> 5] |
2399 lookup_b[(*p & 0x001f)];
2400 }
2401 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2402 }
2403 break;
2404 }
2405 case 16:
2406 {
2407 unsigned short *p1, *pf, *p, *pl;
2408 p1 = (unsigned short *) srcImage->data;
2409 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2410 while (p1 < pf)
2411 {
2412 p = p1;
2413 pl = p1 + srcImage->width;
2414 for (; p < pl; p++)
2415 {
2416 *p = lookup_r[(*p & 0xf800)>>11] |
2417 lookup_g[(*p & 0x07e0)>> 5] |
2418 lookup_b[(*p & 0x001f)];
2419 }
2420 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2421 }
2422 break;
2423 }
2424 case 24:
2425 {
2426 unsigned char *p1, *pf, *p, *pl;
2427 p1 = (unsigned char *) srcImage->data;
2428 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2429 while (p1 < pf)
2430 {
2431 p = p1;
2432 pl = p1 + srcImage->width * 3;
2433 for (; p < pl; p += 3)
2434 {
2435 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2436 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2437 p[2] = lookup_r[(p[2] & 0x0000ff)];
2438 }
2439 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2440 }
2441 break;
2442 }
2443 case 32:
2444 {
2445 RUINT32T *p1, *pf, *p, *pl;
2446 p1 = (RUINT32T *) srcImage->data;
2447 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2448
2449 while (p1 < pf)
2450 {
2451 p = p1;
2452 pl = p1 + srcImage->width;
2453 for (; p < pl; p++)
2454 {
2455 *p = lookup_r[(*p & 0xff0000)>>16] |
2456 lookup_g[(*p & 0x00ff00)>> 8] |
2457 lookup_b[(*p & 0x0000ff)] |
2458 (*p & ~0xffffff);
2459 }
2460 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2461 }
2462 break;
2463 }
2464 }
2465
2466 free (lookup);
2467}
2468#endif
2469
1948/* 2470/*
1949 * Check our parents are still who we think they are. 2471 * Check our parents are still who we think they are.
1950 * Do transparency updates if required 2472 * Do transparency updates if required
1951 */ 2473 */
1952int 2474int
1953rxvt_term::check_our_parents () 2475rxvt_term::check_our_parents ()
1954{ 2476{
1955 int i, pchanged, aformat, have_pixmap, rootdepth; 2477 int i, pchanged, aformat, have_pixmap, rootdepth;
1956 unsigned long nitems, bytes_after; 2478 unsigned long nitems, bytes_after;
1957 Atom atype; 2479 Atom atype;
1958 unsigned char *prop = NULL; 2480 unsigned char *prop = NULL;
1959 Window root, oldp, *list; 2481 Window root, oldp, *list;
1960 Pixmap rootpixmap = None; 2482 Pixmap rootpixmap = None;
1961 XWindowAttributes wattr, wrootattr; 2483 XWindowAttributes wattr, wrootattr;
2484 dDisp;
1962 2485
1963 pchanged = 0; 2486 pchanged = 0;
1964 2487
1965 if (! (Options & Opt_transparent)) 2488 if (!OPTION (Opt_transparent))
1966 return pchanged; /* Don't try any more */ 2489 return pchanged; /* Don't try any more */
1967 2490
1968 XGetWindowAttributes (display->display, display->root, &wrootattr); 2491 XGetWindowAttributes (disp, display->root, &wrootattr);
1969 rootdepth = wrootattr.depth; 2492 rootdepth = wrootattr.depth;
1970 2493
1971 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2494 XGetWindowAttributes (disp, parent[0], &wattr);
2495
1972 if (rootdepth != wattr.depth) 2496 if (rootdepth != wattr.depth)
1973 { 2497 {
1974 if (am_transparent) 2498 if (am_transparent)
1975 { 2499 {
1976 pchanged = 1; 2500 pchanged = 1;
1977 XSetWindowBackground (display->display, TermWin.vt, 2501 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1978 PixColors[Color_bg]);
1979 am_transparent = am_pixmap_trans = 0; 2502 am_transparent = am_pixmap_trans = 0;
1980 } 2503 }
2504
1981 return pchanged; /* Don't try any more */ 2505 return pchanged; /* Don't try any more */
1982 } 2506 }
1983 2507
1984 /* Get all X ops out of the queue so that our information is up-to-date. */ 2508 /* Get all X ops out of the queue so that our information is up-to-date. */
1985 XSync (display->display, False); 2509 XSync (disp, False);
1986 2510
1987 /* 2511 /*
1988 * Make the frame window set by the window manager have 2512 * Make the frame window set by the window manager have
1989 * the root background. Some window managers put multiple nested frame 2513 * the root background. Some window managers put multiple nested frame
1990 * windows for each client, so we have to take care about that. 2514 * windows for each client, so we have to take care about that.
1991 */ 2515 */
1992 i = (xa[XA_XROOTPMAPID] != 0 2516 i = (xa[XA_XROOTPMAP_ID]
1993 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2517 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1994 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2518 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1995 &nitems, &bytes_after, &prop) == Success)); 2519 &nitems, &bytes_after, &prop) == Success);
2520
1996 if (!i || prop == NULL) 2521 if (!i || prop == NULL)
2522 i = (xa[XA_ESETROOT_PMAP_ID]
2523 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2524 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2525 &nitems, &bytes_after, &prop) == Success);
2526
2527 if (!i || prop == NULL
2528#if TINTING
2529 || !rs[Rs_color + Color_tint]
2530#endif
2531 )
1997 have_pixmap = 0; 2532 have_pixmap = 0;
1998 else 2533 else
1999 { 2534 {
2000 have_pixmap = 1; 2535 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2536 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2537 XFree (prop);
2003 } 2538 }
2539
2004 if (have_pixmap) 2540 if (have_pixmap)
2005 { 2541 {
2006 /* 2542 /*
2007 * Copy display->root pixmap transparency 2543 * Copy display->root pixmap transparency
2008 */ 2544 */
2009 int sx, sy, nx, ny; 2545 int sx, sy, nx, ny;
2010 unsigned int nw, nh; 2546 unsigned int nw, nh;
2011 Window cr; 2547 Window cr;
2012 XImage *image; 2548 XImage *image;
2013 GC gc; 2549 GC gc;
2014 XGCValues gcvalue; 2550 XGCValues gcvalue;
2015 2551
2016 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2552 XTranslateCoordinates (disp, parent[0], display->root,
2017 0, 0, &sx, &sy, &cr); 2553 0, 0, &sx, &sy, &cr);
2018 nw = (unsigned int)szHint.width; 2554 nw = (unsigned int)szHint.width;
2019 nh = (unsigned int)szHint.height; 2555 nh = (unsigned int)szHint.height;
2020 nx = ny = 0; 2556 nx = ny = 0;
2557
2021 if (sx < 0) 2558 if (sx < 0)
2022 { 2559 {
2023 nw += sx; 2560 nw += sx;
2024 nx = -sx; 2561 nx = -sx;
2025 sx = 0; 2562 sx = 0;
2026 } 2563 }
2564
2027 if (sy < 0) 2565 if (sy < 0)
2028 { 2566 {
2029 nh += sy; 2567 nh += sy;
2030 ny = -sy; 2568 ny = -sy;
2031 sy = 0; 2569 sy = 0;
2032 } 2570 }
2571
2033 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2572 min_it (nw, (unsigned int) (wrootattr.width - sx));
2034 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2573 min_it (nh, (unsigned int) (wrootattr.height - sy));
2574
2575 XSync (disp, False);
2035 allowedxerror = -1; 2576 allowedxerror = -1;
2036 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2577 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2037 ZPixmap); 2578
2038 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2579 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2039 /* XXX: may need a delay here? */ 2580 /* XXX: may need a delay here? */
2040 allowedxerror = 0; 2581 allowedxerror = 0;
2582
2041 if (image == NULL) 2583 if (image == NULL)
2042 { 2584 {
2043 if (am_transparent && am_pixmap_trans) 2585 if (am_transparent && am_pixmap_trans)
2044 { 2586 {
2045 pchanged = 1; 2587 pchanged = 1;
2046 if (TermWin.pixmap != None) 2588 if (pixmap != None)
2047 { 2589 {
2048 XFreePixmap (display->display, TermWin.pixmap); 2590 XFreePixmap (disp, pixmap);
2049 TermWin.pixmap = None; 2591 pixmap = None;
2050 } 2592 }
2051 } 2593 }
2594
2052 am_pixmap_trans = 0; 2595 am_pixmap_trans = 0;
2053 } 2596 }
2054 else 2597 else
2055 { 2598 {
2056 if (TermWin.pixmap != None) 2599 if (pixmap != None)
2057 XFreePixmap (display->display, TermWin.pixmap); 2600 XFreePixmap (disp, pixmap);
2601
2602#if TINTING
2603 if (ISSET_PIXCOLOR (Color_tint))
2604 {
2605 unsigned short rm, gm, bm;
2606 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2607
2608 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2609
2610 ShadeXImage (display, image, shade, rm, gm, bm);
2611 }
2612#endif
2613
2058 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2614 pixmap = XCreatePixmap (disp, vt,
2059 (unsigned int)szHint.width,
2060 (unsigned int)szHint.height, 2615 szHint.width, szHint.height, image->depth);
2061 (unsigned int)image->depth);
2062 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2616 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2063 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2617 XPutImage (disp, pixmap, gc, image, 0, 0,
2064 nx, ny, (unsigned int)image->width,
2065 (unsigned int)image->height); 2618 nx, ny, image->width, image->height);
2066 XFreeGC (display->display, gc); 2619 XFreeGC (disp, gc);
2067 XDestroyImage (image); 2620 XDestroyImage (image);
2068 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2621 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2069 TermWin.pixmap); 2622 XClearWindow (disp, parent[0]);
2623
2070 if (!am_transparent || !am_pixmap_trans) 2624 if (!am_transparent || !am_pixmap_trans)
2071 pchanged = 1; 2625 pchanged = 1;
2626
2072 am_transparent = am_pixmap_trans = 1; 2627 am_transparent = am_pixmap_trans = 1;
2073 } 2628 }
2074 } 2629 }
2630
2075 if (!am_pixmap_trans) 2631 if (am_pixmap_trans)
2632 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2633 else
2076 { 2634 {
2077 unsigned int n; 2635 unsigned int n;
2078 /* 2636 /*
2079 * InheritPixmap transparency 2637 * InheritPixmap transparency
2080 */ 2638 */
2081 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2082 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2639 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2083 i++)
2084 { 2640 {
2085 oldp = TermWin.parent[i]; 2641 oldp = parent[i];
2086 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2642 XQueryTree (disp, parent[i - 1], &root,
2087 &TermWin.parent[i], &list, &n); 2643 &parent[i], &list, &n);
2088 XFree (list); 2644 XFree (list);
2089 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2645
2090 if (TermWin.parent[i] == display->root) 2646 if (parent[i] == display->root)
2091 { 2647 {
2092 if (oldp != None) 2648 if (oldp != None)
2093 pchanged = 1; 2649 pchanged = 1;
2650
2094 break; 2651 break;
2095 } 2652 }
2653
2096 if (oldp != TermWin.parent[i]) 2654 if (oldp != parent[i])
2097 pchanged = 1; 2655 pchanged = 1;
2098 } 2656 }
2657
2099 n = 0; 2658 n = 0;
2659
2100 if (pchanged) 2660 if (pchanged)
2101 { 2661 {
2102 for (; n < (unsigned int)i; n++) 2662 for (; n < (unsigned int)i; n++)
2103 { 2663 {
2104 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2664 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) 2665 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2107 { 2666 {
2108 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2667 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2109 break; 2668 break;
2110 } 2669 }
2111 } 2670 }
2112 } 2671 }
2113 if (n > (int) (sizeof (TermWin.parent) 2672
2114 / sizeof (TermWin.parent[0]))) 2673 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2115 { 2674 {
2116 D_X ((stderr, "InheritPixmap Turning off")); 2675 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2117 XSetWindowBackground (display->display, TermWin.parent[0], 2676 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; 2677 am_transparent = 0;
2122 /* XXX: also turn off Opt_transparent? */ 2678 /* XXX: also turn off Opt_transparent? */
2123 } 2679 }
2124 else 2680 else
2125 { 2681 {
2682#if WAIT_FOR_WM
2126 /* wait (an arbitrary period) for the WM to do its thing 2683 /* wait (an arbitrary period) for the WM to do its thing
2127 * needed for fvwm2.2.2 (and before?) */ 2684 * 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); 2685 sleep (1);
2136# endif 2686#endif
2137 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2138 for (n = 0; n < (unsigned int)i; n++) 2687 for (n = 0; n < (unsigned int)i; n++)
2139 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2688 {
2140 ParentRelative); 2689 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2141 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2690 XClearWindow (disp, parent[n]);
2142 ParentRelative); 2691 }
2692
2693 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2143 am_transparent = 1; 2694 am_transparent = 1;
2144 } 2695 }
2696
2145 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2697 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2146 TermWin.parent[i] = None; 2698 parent[i] = None;
2699 }
2700
2701 if (scrollBar.win)
2147 } 2702 {
2703 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2704 scrollBar.setIdle ();
2705 scrollbar_show (0);
2706 }
2707
2708 if (am_transparent)
2709 {
2710 want_refresh = want_full_refresh = 1;
2711 if (am_pixmap_trans)
2712 flush ();
2713 }
2714
2148 return pchanged; 2715 return pchanged;
2149} 2716}
2150#endif 2717#endif
2151 2718
2152/*}}} */ 2719/*}}} */
2720
2721bool
2722rxvt_term::cmd_parse ()
2723{
2724 bool flag = false;
2725 unicode_t ch = NOCHAR;
2726 char *seq_begin; // remember start of esc-sequence here
2727
2728 for (;;)
2729 {
2730 if (ch == NOCHAR)
2731 {
2732 seq_begin = cmdbuf_ptr;
2733 ch = next_char ();
2734
2735 if (ch == NOCHAR)
2736 break;
2737 }
2738
2739 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2740 {
2741 if (!seen_input)
2742 {
2743 seen_input = 1;
2744 // many badly-written programs (e.g. jed) contain a race condition:
2745 // they first read the screensize and then install a SIGWINCH handler.
2746 // some window managers resize the window early, and these programs
2747 // then sometimes get the size wrong.
2748 // unfortunately other programs are even more buggy and dislike
2749 // being sent SIGWINCH, so only do it when we were in fact being
2750 // resized.
2751 if (seen_resize && cmd_pid)
2752 kill (-cmd_pid, SIGWINCH);
2753 }
2754
2755 /* Read a text string from the input buffer */
2756 unicode_t buf[UBUFSIZ];
2757 bool refreshnow = false;
2758 int nlines = 0;
2759 unicode_t *str = buf;
2760 unicode_t *eol = str + min (ncol, UBUFSIZ);
2761
2762 for (;;)
2763 {
2764 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2765 break;
2766
2767 *str++ = ch;
2768
2769 if (ch == C0_LF || str >= eol)
2770 {
2771 if (ch == C0_LF)
2772 nlines++;
2773
2774 refresh_count++;
2775
2776 if (!OPTION (Opt_jumpScroll)
2777 || (refresh_count >= refresh_limit * (nrow - 1)))
2778 {
2779 refreshnow = true;
2780 refresh_count = 0;
2781 ch = NOCHAR;
2782 break;
2783 }
2784
2785 // scr_add_lines only works for nlines <= nrow - 1.
2786 if (nlines >= nrow - 1)
2787 {
2788 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2789 scr_add_lines (buf, nlines, str - buf);
2790
2791 nlines = 0;
2792 str = buf;
2793 eol = str + min (ncol, UBUFSIZ);
2794 }
2795
2796 if (str >= eol)
2797 {
2798 if (eol >= buf + UBUFSIZ)
2799 {
2800 ch = NOCHAR;
2801 break;
2802 }
2803 else
2804 eol = min (eol + ncol, buf + UBUFSIZ);
2805 }
2806
2807 }
2808
2809 seq_begin = cmdbuf_ptr;
2810 ch = next_char ();
2811 }
2812
2813 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2814 scr_add_lines (buf, nlines, str - buf);
2815
2816 /*
2817 * If there have been a lot of new lines, then update the screen
2818 * What the heck I'll cheat and only refresh less than every page-full.
2819 * the number of pages between refreshes is refresh_limit, which
2820 * is incremented here because we must be doing flat-out scrolling.
2821 */
2822 if (refreshnow)
2823 {
2824 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2825 refresh_limit++;
2826 else
2827 {
2828 flag = true;
2829 scr_refresh (refresh_type);
2830 flush_ev.stop ();
2831 }
2832 }
2833
2834 }
2835 else
2836 {
2837 try
2838 {
2839 process_nonprinting (ch);
2840 }
2841 catch (const class out_of_input &o)
2842 {
2843 // we ran out of input, retry later
2844 cmdbuf_ptr = seq_begin;
2845 break;
2846 }
2847
2848 ch = NOCHAR;
2849 }
2850 }
2851
2852 return flag;
2853}
2854
2855// read the next octet
2856unicode_t
2857rxvt_term::next_octet ()
2858{
2859 return cmdbuf_ptr < cmdbuf_endp
2860 ? *cmdbuf_ptr++
2861 : NOCHAR;
2862}
2863
2864// read the next character
2865unicode_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 *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/* rxvt_cmd_getc () - Return next input character */
2896/*
2897 * Return the next input character after first passing any keyboard input
2898 * to the command.
2899 */
2900unicode_t
2901rxvt_term::cmd_getc ()
2902{
2903 unicode_t c = next_char ();
2904
2905 if (c == NOCHAR)
2906 throw out_of_input;
2907
2908 return c;
2909}
2910
2911unicode_t
2912rxvt_term::cmd_get8 ()
2913{
2914 unicode_t c = next_octet ();
2915
2916 if (c == NOCHAR)
2917 throw out_of_input;
2918
2919 return c;
2920}
2153 2921
2154/*{{{ print pipe */ 2922/*{{{ print pipe */
2155/*----------------------------------------------------------------------*/ 2923/*----------------------------------------------------------------------*/
2156#ifdef PRINTPIPE 2924#ifdef PRINTPIPE
2157FILE * 2925FILE *
2158rxvt_term::popen_printer () 2926rxvt_term::popen_printer ()
2159{ 2927{
2160 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2928 FILE *stream = popen (rs[Rs_print_pipe], "w");
2161 2929
2162 if (stream == NULL) 2930 if (stream == NULL)
2163 rxvt_print_error ("can't open printer pipe"); 2931 rxvt_warn ("can't open printer pipe, not printing.\n");
2932
2164 return stream; 2933 return stream;
2165} 2934}
2166 2935
2167int 2936int
2168rxvt_term::pclose_printer (FILE *stream) 2937rxvt_term::pclose_printer (FILE *stream)
2169{ 2938{
2170 fflush (stream); 2939 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); 2940 return pclose (stream);
2177# endif
2178} 2941}
2179 2942
2180/* 2943/*
2181 * simulate attached vt100 printer 2944 * simulate attached vt100 printer
2182 */ 2945 */
2183void 2946void
2184rxvt_term::process_print_pipe () 2947rxvt_term::process_print_pipe ()
2185{ 2948{
2186 int done; 2949 int done;
2187 FILE *fd; 2950 FILE *fd;
2188 2951
2189 if ((fd = popen_printer ()) == NULL) 2952 if ((fd = popen_printer ()) == NULL)
2190 return; 2953 return;
2191 2954
2192 /* 2955 /*
2193 * Send all input to the printer until either ESC[4i or ESC[?4i 2956 * Send all input to the printer until either ESC[4i or ESC[?4i
2194 * is received. 2957 * is received.
2195 */ 2958 */
2196 for (done = 0; !done;) 2959 for (done = 0; !done;)
2197 { 2960 {
2198 unsigned char buf[8]; 2961 unsigned char buf[8];
2199 unsigned char ch; 2962 unicode_t ch;
2200 unsigned int i, len; 2963 unsigned int i, len;
2201 2964
2202 if ((ch = cmd_getc ()) != C0_ESC) 2965 if ((ch = cmd_getc ()) != C0_ESC)
2203 { 2966 {
2204 if (putc (ch, fd) == EOF) 2967 if (putc (ch, fd) == EOF)
2205 break; /* done = 1 */ 2968 break; /* done = 1 */
… …
2220 { 2983 {
2221 if ((buf[len++] = cmd_getc ()) == 'i') 2984 if ((buf[len++] = cmd_getc ()) == 'i')
2222 break; /* done = 1 */ 2985 break; /* done = 1 */
2223 } 2986 }
2224 } 2987 }
2988
2225 for (i = 0; i < len; i++) 2989 for (i = 0; i < len; i++)
2226 if (putc (buf[i], fd) == EOF) 2990 if (putc (buf[i], fd) == EOF)
2227 { 2991 {
2228 done = 1; 2992 done = 1;
2229 break; 2993 break;
2230 } 2994 }
2231 } 2995 }
2232 } 2996 }
2997
2233 pclose_printer (fd); 2998 pclose_printer (fd);
2234} 2999}
2235#endif /* PRINTPIPE */ 3000#endif /* PRINTPIPE */
2236/*}}} */ 3001/*}}} */
2237 3002
2238/* *INDENT-OFF* */ 3003/* *INDENT-OFF* */
2239enum { 3004enum {
2240 C1_40 = 0x40, 3005 C1_40 = 0x40,
2241 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 3006 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, 3007 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, 3008 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 3009 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2245}; 3010};
2246/* *INDENT-ON* */ 3011/* *INDENT-ON* */
2247 3012
2248/*{{{ process non-printing single characters */ 3013/*{{{ process non-printing single characters */
2249void 3014void
2250rxvt_term::process_nonprinting (unsigned char ch) 3015rxvt_term::process_nonprinting (unicode_t ch)
2251{ 3016{
2252 switch (ch) 3017 switch (ch)
2253 { 3018 {
3019 case C0_ESC:
3020 process_escape_seq ();
3021 break;
2254 case C0_ENQ: /* terminal Status */ 3022 case C0_ENQ: /* terminal Status */
2255 if (rs[Rs_answerbackstring]) 3023 if (rs[Rs_answerbackstring])
2256 tt_write ( 3024 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 3025 else
2260 tt_write ((unsigned char *)VT100_ANS, 3026 tt_write (VT100_ANS, strlen (VT100_ANS));
2261 (unsigned int)STRLEN (VT100_ANS));
2262 break; 3027 break;
2263 case C0_BEL: /* bell */ 3028 case C0_BEL: /* bell */
2264 scr_bell (); 3029 scr_bell ();
2265 break; 3030 break;
2266 case C0_BS: /* backspace */ 3031 case C0_BS: /* backspace */
… …
2281 scr_charset_choose (1); 3046 scr_charset_choose (1);
2282 break; 3047 break;
2283 case C0_SI: /* shift in - acs */ 3048 case C0_SI: /* shift in - acs */
2284 scr_charset_choose (0); 3049 scr_charset_choose (0);
2285 break; 3050 break;
3051
3052#ifdef EIGHT_BIT_CONTROLS
3053 // 8-bit controls
3054 case 0x90: /* DCS */
3055 process_dcs_seq ();
3056 break;
3057 case 0x9b: /* CSI */
3058 process_csi_seq ();
3059 break;
3060 case 0x9d: /* CSI */
3061 process_osc_seq ();
3062 break;
3063#endif
2286 } 3064 }
2287} 3065}
2288/*}}} */ 3066/*}}} */
2289 3067
2290 3068
2291/*{{{ process VT52 escape sequences */ 3069/*{{{ process VT52 escape sequences */
2292void 3070void
2293rxvt_term::process_escape_vt52 (unsigned char ch) 3071rxvt_term::process_escape_vt52 (unicode_t ch)
2294{ 3072{
2295 int row, col; 3073 int row, col;
2296 3074
2297 switch (ch) 3075 switch (ch)
2298 { 3076 {
… …
2350 3128
2351/*{{{ process escape sequences */ 3129/*{{{ process escape sequences */
2352void 3130void
2353rxvt_term::process_escape_seq () 3131rxvt_term::process_escape_seq ()
2354{ 3132{
2355 unsigned char ch = cmd_getc (); 3133 unicode_t ch = cmd_getc ();
2356 3134
2357 if (PrivateModes & PrivMode_vt52) 3135 if (priv_modes & PrivMode_vt52)
2358 { 3136 {
2359 process_escape_vt52 (ch); 3137 process_escape_vt52 (ch);
2360 return; 3138 return;
2361 } 3139 }
2362 3140
… …
2377 scr_charset_set (2, (unsigned int)cmd_getc ()); 3155 scr_charset_set (2, (unsigned int)cmd_getc ());
2378 break; 3156 break;
2379 case '+': 3157 case '+':
2380 scr_charset_set (3, (unsigned int)cmd_getc ()); 3158 scr_charset_set (3, (unsigned int)cmd_getc ());
2381 break; 3159 break;
2382#ifdef MULTICHAR_SET 3160#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': 3161 case '6':
2389 scr_backindex (); 3162 scr_backindex ();
2390 break; 3163 break;
2391#endif 3164#endif
2392 case '7': 3165 case '7':
2393 scr_cursor (SAVE); 3166 scr_cursor (SAVE);
2394 break; 3167 break;
2395 case '8': 3168 case '8':
2396 scr_cursor (RESTORE); 3169 scr_cursor (RESTORE);
2397 break; 3170 break;
2398#ifndef NO_FRILLS 3171#if ENABLE_FRILLS
2399 case '9': 3172 case '9':
2400 scr_forwardindex (); 3173 scr_forwardindex ();
2401 break; 3174 break;
2402#endif 3175#endif
2403 case '=': 3176 case '=':
… …
2413 break; 3186 break;
2414 3187
2415 /* 8.3.87: NEXT LINE */ 3188 /* 8.3.87: NEXT LINE */
2416 case C1_NEL: /* ESC E */ 3189 case C1_NEL: /* ESC E */
2417 { 3190 {
2418 uint32_t nlcr[] = { '\n', '\r' }; 3191 unicode_t nlcr[] = { C0_LF, C0_CR };
2419 scr_add_lines (nlcr, 1, 2); 3192 scr_add_lines (nlcr, 1, 2);
2420 } 3193 }
2421 break; 3194 break;
2422 3195
2423 /* kidnapped escape sequence: Should be 8.3.48 */ 3196 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2434 case C1_RI: /* ESC M */ 3207 case C1_RI: /* ESC M */
2435 scr_index (DN); 3208 scr_index (DN);
2436 break; 3209 break;
2437 3210
2438 /* 8.3.142: SINGLE-SHIFT TWO */ 3211 /* 8.3.142: SINGLE-SHIFT TWO */
2439 /*case C1_SS2: scr_single_shift (2); break; */ 3212 /*case C1_SS2: scr_single_shift (2); break; */
2440 3213
2441 /* 8.3.143: SINGLE-SHIFT THREE */ 3214 /* 8.3.143: SINGLE-SHIFT THREE */
2442 /*case C1_SS3: scr_single_shift (3); break; */ 3215 /*case C1_SS3: scr_single_shift (3); break; */
2443 3216
2444 /* 8.3.27: DEVICE CONTROL STRING */ 3217 /* 8.3.27: DEVICE CONTROL STRING */
2445 case C1_DCS: /* ESC P */ 3218 case C1_DCS: /* ESC P */
2446 process_dcs_seq (); 3219 process_dcs_seq ();
2447 break; 3220 break;
2448 3221
2449 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3222 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2450 case C1_SCI: /* ESC Z */ 3223 case C1_SCI: /* ESC Z */
2451 tt_write ((const unsigned char *)ESCZ_ANSWER, 3224 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2452 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2453 break; /* steal obsolete ESC [ c */ 3225 break; /* steal obsolete ESC [ c */
2454 3226
2455 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3227 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2456 case C1_CSI: /* ESC [ */ 3228 case C1_CSI: /* ESC [ */
2457 process_csi_seq (); 3229 process_csi_seq ();
… …
2462 process_osc_seq (); 3234 process_osc_seq ();
2463 break; 3235 break;
2464 3236
2465 /* 8.3.106: RESET TO INITIAL STATE */ 3237 /* 8.3.106: RESET TO INITIAL STATE */
2466 case 'c': 3238 case 'c':
3239 mbstate.reset ();
2467 scr_poweron (); 3240 scr_poweron ();
2468 scrollbar_show (1); 3241 scrollbar_show (1);
2469 break; 3242 break;
2470 3243
2471 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3244 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2483 3256
2484/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3257/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2485/* *INDENT-OFF* */ 3258/* *INDENT-OFF* */
2486enum { 3259enum {
2487 CSI_ICH = 0x40, 3260 CSI_ICH = 0x40,
2488 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3261 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 , 3262 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, 3263 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, 3264 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, 3265 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, 3266 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, */ 3281 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, [, \, ], ^, _, */ 3282 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, */ 3283 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, */ 3284 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, */ 3285 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, {, |, }, ~, */ 3286 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2514 }; 3287 };
2515/* *INDENT-ON* */ 3288/* *INDENT-ON* */
2516 3289
2517void 3290void
2518rxvt_term::process_csi_seq () 3291rxvt_term::process_csi_seq ()
2519{ 3292{
2520 unsigned char ch, priv, i; 3293 unicode_t ch, priv, i;
2521 unsigned int nargs, p; 3294 unsigned int nargs, p;
2522 int n, ndef; 3295 int n, ndef;
2523 int arg[ESC_ARGS]; 3296 int arg[ESC_ARGS];
2524 3297
2525 for (nargs = ESC_ARGS; nargs > 0;) 3298 for (nargs = ESC_ARGS; nargs > 0;)
2526 arg[--nargs] = 0; 3299 arg[--nargs] = 0;
2527 3300
2528 priv = 0; 3301 priv = 0;
… …
2530 if (ch >= '<' && ch <= '?') 3303 if (ch >= '<' && ch <= '?')
2531 { /* '<' '=' '>' '?' */ 3304 { /* '<' '=' '>' '?' */
2532 priv = ch; 3305 priv = ch;
2533 ch = cmd_getc (); 3306 ch = cmd_getc ();
2534 } 3307 }
3308
2535 /* read any numerical arguments */ 3309 /* read any numerical arguments */
2536 for (n = -1; ch < CSI_ICH; ) 3310 for (n = -1; ch < CSI_ICH; )
2537 { 3311 {
2538 if (isdigit (ch)) 3312 if (isdigit (ch))
2539 { 3313 {
… …
2546 { 3320 {
2547 if (nargs < ESC_ARGS) 3321 if (nargs < ESC_ARGS)
2548 arg[nargs++] = n; 3322 arg[nargs++] = n;
2549 n = -1; 3323 n = -1;
2550 } 3324 }
2551 else if (ch == '\b') 3325 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); 3326 process_nonprinting (ch);
2563 } 3327
2564 ch = cmd_getc (); 3328 ch = cmd_getc ();
2565 } 3329 }
2566 3330
2567 if (ch > CSI_7F) 3331 if (ch > CSI_7F)
2568 return; 3332 return;
… …
2590 { 3354 {
2591 switch (priv) 3355 switch (priv)
2592 { 3356 {
2593 case '>': 3357 case '>':
2594 if (ch == CSI_DA) /* secondary device attributes */ 3358 if (ch == CSI_DA) /* secondary device attributes */
2595 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3359 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2596 break; 3360 break;
2597 case '?': 3361 case '?':
2598 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3362 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2599 process_terminal_mode (ch, priv, nargs, arg); 3363 process_terminal_mode (ch, priv, nargs, arg);
2600 break; 3364 break;
… …
2705 3469
2706 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3470 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2707 arg[0] = -arg[0]; 3471 arg[0] = -arg[0];
2708 /* FALLTHROUGH */ 3472 /* FALLTHROUGH */
2709 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3473 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2710 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3474 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2711 break; 3475 break;
2712 3476
2713 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3477 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2714 tt_write ((const unsigned char *)VT100_ANS, 3478 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2715 (unsigned int) (sizeof (VT100_ANS) - 1));
2716 break; 3479 break;
2717 3480
2718 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3481 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2719 process_sgr_mode (nargs, arg); 3482 process_sgr_mode (nargs, arg);
2720 break; 3483 break;
… …
2726 tt_printf ("\033[0n"); 3489 tt_printf ("\033[0n");
2727 break; 3490 break;
2728 case 6: /* CPR requested */ 3491 case 6: /* CPR requested */
2729 scr_report_position (); 3492 scr_report_position ();
2730 break; 3493 break;
2731#if defined (ENABLE_DISPLAY_ANSWER)
2732 case 7: /* unofficial extension */ 3494 case 7: /* unofficial extension */
3495 if (OPTION (Opt_insecure))
2733 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3496 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2734 break; 3497 break;
2735#endif
2736 case 8: /* unofficial extension */ 3498 case 8: /* unofficial extension */
2737 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3499 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2738 break; 3500 break;
2739 } 3501 }
2740 break; 3502 break;
2741 3503
2742 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3504 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2775 break; 3537 break;
2776 3538
2777 case CSI_RM: /* 8.3.107: RESET MODE */ 3539 case CSI_RM: /* 8.3.107: RESET MODE */
2778 if (arg[0] == 4) 3540 if (arg[0] == 4)
2779 scr_insert_mode (0); 3541 scr_insert_mode (0);
3542 else if (arg[0] == 20)
3543 priv_modes &= ~PrivMode_LFNL;
2780 break; 3544 break;
2781 3545
2782 case CSI_SM: /* 8.3.126: SET MODE */ 3546 case CSI_SM: /* 8.3.126: SET MODE */
2783 if (arg[0] == 4) 3547 if (arg[0] == 4)
2784 scr_insert_mode (1); 3548 scr_insert_mode (1);
3549 else if (arg[0] == 20)
3550 priv_modes |= PrivMode_LFNL;
2785 break; 3551 break;
2786 3552
2787 /* 3553 /*
2788 * PRIVATE USE beyond this point. All CSI_7? sequences here 3554 * PRIVATE USE beyond this point. All CSI_7? sequences here
2789 */ 3555 */
… …
2801 break; 3567 break;
2802 case CSI_75: 3568 case CSI_75:
2803 scr_cursor (RESTORE); 3569 scr_cursor (RESTORE);
2804 break; 3570 break;
2805 3571
2806#ifndef NO_FRILLS 3572#if ENABLE_FRILLS
2807 case CSI_74: 3573 case CSI_74:
2808 process_window_ops (arg, nargs); 3574 process_window_ops (arg, nargs);
2809 break; 3575 break;
2810#endif 3576#endif
2811 3577
2812 case CSI_78: /* DECREQTPARM */ 3578 case CSI_78: /* DECREQTPARM */
2813 if (arg[0] == 0 || arg[0] == 1) 3579 if (arg[0] == 0 || arg[0] == 1)
2814 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3580 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2815 /* FALLTHROUGH */ 3581 break;
2816 3582
2817 default: 3583 default:
2818 break; 3584 break;
2819 } 3585 }
2820} 3586}
2821/*}}} */ 3587/*}}} */
2822 3588
2823#ifndef NO_FRILLS 3589#if ENABLE_FRILLS
2824/* ARGSUSED */ 3590/* ARGSUSED */
2825void 3591void
2826rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3592rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2827{ 3593{
2828 int x, y; 3594 int x, y;
2829#if 0
2830 char *s;
2831#endif
2832 XWindowAttributes wattr; 3595 XWindowAttributes wattr;
2833 Window wdummy; 3596 Window wdummy;
3597 dDisp;
2834 3598
2835 if (nargs == 0) 3599 if (nargs == 0)
2836 return; 3600 return;
3601
2837 switch (args[0]) 3602 switch (args[0])
2838 { 3603 {
2839 /* 3604 /*
2840 * commands 3605 * commands
2841 */ 3606 */
2842 case 1: /* deiconify window */ 3607 case 1: /* deiconify window */
2843 XMapWindow (display->display, TermWin.parent[0]); 3608 XMapWindow (disp, parent[0]);
2844 break; 3609 break;
2845 case 2: /* iconify window */ 3610 case 2: /* iconify window */
2846 XIconifyWindow (display->display, TermWin.parent[0], 3611 XIconifyWindow (disp, parent[0], display->screen);
2847 DefaultScreen (display->display));
2848 break; 3612 break;
2849 case 3: /* set position (pixels) */ 3613 case 3: /* set position (pixels) */
2850 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3614 XMoveWindow (disp, parent[0], args[1], args[2]);
2851 break; 3615 break;
2852 case 4: /* set size (pixels) */ 3616 case 4: /* set size (pixels) */
2853 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3617 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2854 break; 3618 break;
2855 case 5: /* raise window */ 3619 case 5: /* raise window */
2856 XRaiseWindow (display->display, TermWin.parent[0]); 3620 XRaiseWindow (disp, parent[0]);
2857 break; 3621 break;
2858 case 6: /* lower window */ 3622 case 6: /* lower window */
2859 XLowerWindow (display->display, TermWin.parent[0]); 3623 XLowerWindow (disp, parent[0]);
2860 break; 3624 break;
2861 case 7: /* refresh window */ 3625 case 7: /* refresh window */
2862 scr_touch (true); 3626 scr_touch (true);
2863 break; 3627 break;
2864 case 8: /* set size (chars) */ 3628 case 8: /* set size (chars) */
2865 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3629 set_widthheight ((unsigned int) (args[2] * fwidth),
2866 (unsigned int) (args[1] * TermWin.fheight)); 3630 (unsigned int) (args[1] * fheight));
2867 break; 3631 break;
3632
3633 //case 9: NYI, TODO, restore maximized window or maximize window
2868 default: 3634 default:
2869 if (args[0] >= 24) /* set height (chars) */ 3635 if (args[0] >= 24) /* set height (chars) */
2870 set_widthheight ((unsigned int)TermWin.width, 3636 set_widthheight ((unsigned int)width,
2871 (unsigned int) (args[1] * TermWin.fheight)); 3637 (unsigned int) (args[1] * fheight));
2872 break; 3638 break;
3639
3640
2873 /* 3641 /*
2874 * reports - some output format copied from XTerm 3642 * reports - some output format copied from XTerm
2875 */ 3643 */
2876 case 11: /* report window state */ 3644 case 11: /* report window state */
2877 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3645 XGetWindowAttributes (disp, parent[0], &wattr);
2878 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3646 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2879 break; 3647 break;
2880 case 13: /* report window position */ 3648 case 13: /* report window position */
2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3649 XGetWindowAttributes (disp, parent[0], &wattr);
2882 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3650 XTranslateCoordinates (disp, parent[0], wattr.root,
2883 -wattr.border_width, -wattr.border_width, 3651 -wattr.border_width, -wattr.border_width,
2884 &x, &y, &wdummy); 3652 &x, &y, &wdummy);
2885 tt_printf ("\033[3;%d;%dt", x, y); 3653 tt_printf ("\033[3;%d;%dt", x, y);
2886 break; 3654 break;
2887 case 14: /* report window size (pixels) */ 3655 case 14: /* report window size (pixels) */
2888 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3656 XGetWindowAttributes (disp, parent[0], &wattr);
2889 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3657 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2890 break; 3658 break;
3659 case 18: /* report text area size (chars) */
3660 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3661 break;
2891 case 18: /* report window size (chars) */ 3662 case 19: /* report window size (chars) */
2892 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3663 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2893 break; 3664 break;
2894#if 0 /* XXX: currently disabled due to security concerns */
2895 case 20: /* report icon label */ 3665 case 20: /* report icon label */
3666 {
3667 char *s;
2896 XGetIconName (display->display, TermWin.parent[0], &s); 3668 XGetIconName (disp, parent[0], &s);
2897 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3669 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3670 XFree (s);
3671 }
2898 break; 3672 break;
2899 case 21: /* report window title */ 3673 case 21: /* report window title */
3674 {
3675 char *s;
2900 XFetchName (display->display, TermWin.parent[0], &s); 3676 XFetchName (disp, parent[0], &s);
2901 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3677 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3678 XFree (s);
3679 }
2902 break; 3680 break;
2903#endif
2904
2905 } 3681 }
2906} 3682}
2907#endif 3683#endif
2908 3684
2909/*----------------------------------------------------------------------*/ 3685/*----------------------------------------------------------------------*/
2910/* 3686/*
2911 * get input up until STRING TERMINATOR (or BEL) 3687 * get input up until STRING TERMINATOR (or BEL)
2912 * ends_how is terminator used. returned input must be free ()d 3688 * ends_how is terminator used. returned input must be free()'d
2913 */ 3689 */
2914unsigned char * 3690char *
2915rxvt_term::get_to_st (unsigned char *ends_how) 3691rxvt_term::get_to_st (unicode_t &ends_how)
2916{ 3692{
2917 int seen_esc = 0; /* seen escape? */ 3693 unicode_t ch;
3694 bool seen_esc = false;
2918 unsigned int n = 0; 3695 unsigned int n = 0;
2919 unsigned char *s; 3696 wchar_t string[STRING_MAX];
2920 unsigned char ch, string[STRING_MAX];
2921 3697
2922 for (; (ch = cmd_getc ());) 3698 while ((ch = cmd_getc ()) != NOCHAR)
2923 { 3699 {
2924 if (ch == C0_BEL 3700 if (seen_esc)
2925 || ch == CHAR_ST 3701 {
2926 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3702 if (ch == 0x5c) /* 7bit ST */
2927 break; 3703 break;
3704 else
3705 return NULL;
3706 }
2928 if (ch == C0_ESC) 3707 else if (ch == C0_ESC)
2929 { 3708 {
2930 seen_esc = 1; 3709 seen_esc = true;
2931 continue; 3710 continue;
2932 } 3711 }
2933 else if (ch == '\t') 3712 else if (ch == C0_BEL || ch == CHAR_ST)
2934 ch = ' '; /* translate '\t' to space */ 3713 break;
2935 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3714 else if (ch < 0x20)
2936 return NULL; /* other control character - exit */ 3715 return NULL; /* other control character - exit */
2937 if (n < sizeof (string) - 1) 3716
3717 seen_esc = false;
3718
3719 if (n >= STRING_MAX - 1)
3720 // stop at some sane length
3721 return NULL;
3722
3723 if (ch == C0_SYN)
3724 string[n++] = cmd_get8 ();
3725 else
2938 string[n++] = ch; 3726 string[n++] = ch;
2939 seen_esc = 0;
2940 } 3727 }
3728
2941 string[n++] = '\0'; 3729 string[n++] = '\0';
2942 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3730
2943 return NULL;
2944 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3731 ends_how = (ch == 0x5c ? C0_ESC : ch);
2945 STRNCPY (s, string, n); 3732
2946 return s; 3733 return rxvt_wcstombs (string);
2947} 3734}
2948 3735
2949/*----------------------------------------------------------------------*/ 3736/*----------------------------------------------------------------------*/
2950/* 3737/*
2951 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3738 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2952 */ 3739 */
2953void 3740void
2954rxvt_term::process_dcs_seq () 3741rxvt_term::process_dcs_seq ()
2955{ 3742{
2956 unsigned char eh, *s; 3743 char *s;
3744 unicode_t eh;
3745
2957 /* 3746 /*
2958 * Not handled yet 3747 * Not handled yet
2959 */ 3748 */
2960 s = get_to_st (&eh); 3749 s = get_to_st (eh);
2961 if (s) 3750 if (s)
2962 free (s); 3751 free (s);
3752
2963 return; 3753 return;
2964} 3754}
2965 3755
2966/*----------------------------------------------------------------------*/ 3756/*----------------------------------------------------------------------*/
2967/* 3757/*
2968 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3758 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2969 */ 3759 */
2970void 3760void
2971rxvt_term::process_osc_seq () 3761rxvt_term::process_osc_seq ()
2972{ 3762{
2973 unsigned char ch, eh, *s; 3763 unicode_t ch, eh;
2974 int arg; 3764 int arg;
2975 3765
2976 ch = cmd_getc (); 3766 ch = cmd_getc ();
2977 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3767 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2978 arg = arg * 10 + (ch - '0'); 3768 arg = arg * 10 + (ch - '0');
2979 3769
2980 if (ch == ';') 3770 if (ch == ';')
2981 { 3771 {
2982 s = get_to_st (&eh); 3772 char *s = get_to_st (eh);
3773
2983 if (s) 3774 if (s)
2984 { 3775 {
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); 3776 process_xterm_seq (arg, s, eh);
2997 free (s); 3777 free (s);
2998 } 3778 }
2999 } 3779 }
3000} 3780}
3781
3782void
3783rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3784{
3785 if (str[0] == '?' && !str[1])
3786 {
3787 unsigned short r, g, b;
3788 pix_colors_focused[color].get (display, r, g, b);
3789 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3790 }
3791 else
3792 set_window_color (color, str);
3793}
3794
3001/* 3795/*
3002 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3796 * 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 */ 3797 */
3022void 3798void
3023rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3799rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3024{ 3800{
3025 int changed = 0; 3801 int changed = 0;
3026 int color; 3802 int color;
3027 char *buf, *name; 3803 char *buf, *name;
3804 bool query = str[0] == '?' && !str[1];
3805 int saveop = op;
3806 dDisp;
3028 3807
3029 assert (str != NULL); 3808 assert (str != NULL);
3030 switch (op) 3809 switch (op)
3031 { 3810 {
3032 case XTerm_name: 3811 case XTerm_name:
3033 set_title (str); 3812 set_title (str);
3034 /* FALLTHROUGH */ 3813 /* FALLTHROUGH */
3035 case XTerm_iconName: 3814 case XTerm_iconName:
3036 set_iconName (str); 3815 set_icon_name (str);
3037 break; 3816 break;
3038 case XTerm_title: 3817 case XTerm_title:
3039 set_title (str); 3818 set_title (str);
3040 break; 3819 break;
3820 case XTerm_property:
3821 if (str[0] == '?')
3822 {
3823 Atom prop = display->atom (str + 1);
3824 Atom actual_type;
3825 int actual_format;
3826 unsigned long nitems;
3827 unsigned long bytes_after;
3828 unsigned char *value = 0;
3829 const char *str = "";
3830
3831 if (prop
3832 && XGetWindowProperty (disp, parent[0],
3833 prop, 0, 1<<16, 0, AnyPropertyType,
3834 &actual_type, &actual_format,
3835 &nitems, &bytes_after, &value) == Success
3836 && actual_type != None
3837 && actual_format == 8)
3838 str = (const char *)(value);
3839
3840 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3841
3842 XFree (value);
3843 }
3844 else
3845 {
3846 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3847
3848 if (eq)
3849 {
3850 *eq = 0;
3851 set_utf8_property (display->atom (str), eq + 1);
3852 }
3853 else
3854 XDeleteProperty (disp, parent[0],
3855 display->atom (str));
3856 }
3857 break;
3858
3041 case XTerm_Color: 3859 case XTerm_Color:
3042 for (buf = (char *)str; buf && *buf;) 3860 for (buf = (char *)str; buf && *buf;)
3043 { 3861 {
3044 if ((name = STRCHR (buf, ';')) == NULL) 3862 if ((name = strchr (buf, ';')) == NULL)
3045 break; 3863 break;
3864
3046 *name++ = '\0'; 3865 *name++ = '\0';
3047 color = atoi (buf); 3866 color = atoi (buf);
3867
3048 if (color < 0 || color >= TOTAL_COLORS) 3868 if (color < 0 || color >= TOTAL_COLORS)
3049 break; 3869 break;
3870
3050 if ((buf = STRCHR (name, ';')) != NULL) 3871 if ((buf = strchr (name, ';')) != NULL)
3051 *buf++ = '\0'; 3872 *buf++ = '\0';
3873
3874 if (name[0] == '?' && !name[1])
3875 {
3876 unsigned short r, g, b;
3877 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3878 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3879 }
3880 else
3052 set_window_color (color + minCOLOR, name); 3881 set_window_color (color + minCOLOR, name);
3053 } 3882 }
3883 break;
3884 case XTerm_Color00:
3885 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3886 break;
3887 case XTerm_Color01:
3888 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3054 break; 3889 break;
3055#ifndef NO_CURSORCOLOR 3890#ifndef NO_CURSORCOLOR
3056 case XTerm_Color_cursor: 3891 case XTerm_Color_cursor:
3057 set_window_color (Color_cursor, str); 3892 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3058 break; 3893 break;
3059#endif 3894#endif
3060 case XTerm_Color_pointer: 3895 case XTerm_Color_pointer_fg:
3061 set_window_color (Color_pointer, str); 3896 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3897 break;
3898 case XTerm_Color_pointer_bg:
3899 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3062 break; 3900 break;
3063#ifndef NO_BOLD_UNDERLINE_REVERSE 3901#ifndef NO_BOLD_UNDERLINE_REVERSE
3064 case XTerm_Color_BD: 3902 case XTerm_Color_BD:
3065 set_window_color (Color_BD, str); 3903 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3066 break; 3904 break;
3067 case XTerm_Color_UL: 3905 case XTerm_Color_UL:
3068 set_window_color (Color_UL, str); 3906 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3069 break; 3907 break;
3070 case XTerm_Color_RV: 3908 case XTerm_Color_RV:
3071 set_window_color (Color_RV, str); 3909 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3072 break; 3910 break;
3073#endif 3911 case URxvt_Color_IT:
3074 3912 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; 3913 break;
3914#endif
3915#if TRANSPARENT && TINTING
3916 case URxvt_Color_tint:
3917 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3918 check_our_parents ();
3919 if (am_transparent)
3920 want_full_refresh = want_refresh = 1;
3921 break;
3922#endif
3923
3081 case XTerm_Pixmap: 3924 case XTerm_Pixmap:
3082 if (*str != ';') 3925 if (*str != ';')
3083 { 3926 {
3084#if XPM_BACKGROUND 3927#if XPM_BACKGROUND
3085 scale_pixmap (""); /* reset to default scaling */ 3928 scale_pixmap (""); /* reset to default scaling */
3086 set_bgPixmap (str); /* change pixmap */ 3929 set_bgPixmap (str); /* change pixmap */
3087#endif 3930#endif
3088 scr_touch (true); 3931 scr_touch (true);
3089 } 3932 }
3090 while ((str = STRCHR (str, ';')) != NULL) 3933 while ((str = strchr (str, ';')) != NULL)
3091 { 3934 {
3092 str++; 3935 str++;
3093#if XPM_BACKGROUND 3936#if XPM_BACKGROUND
3094 changed += scale_pixmap (str); 3937 changed += scale_pixmap (str);
3095#endif 3938#endif
3096
3097 } 3939 }
3940
3098 if (changed) 3941 if (changed)
3099 { 3942 {
3100#ifdef XPM_BACKGROUND 3943#ifdef XPM_BACKGROUND
3101 resize_pixmap (); 3944 resize_pixmap ();
3102#endif 3945#endif
… …
3108 set_window_color (Color_fg, str); 3951 set_window_color (Color_fg, str);
3109 break; 3952 break;
3110 case XTerm_restoreBG: 3953 case XTerm_restoreBG:
3111 set_window_color (Color_bg, str); 3954 set_window_color (Color_bg, str);
3112 break; 3955 break;
3956
3113 case XTerm_logfile: 3957 case XTerm_logfile:
3958 // TODO, when secure mode?
3959 break;
3960
3961#ifdef MENUBAR
3962 case URxvt_Menu:
3963 if (OPTION (Opt_insecure))
3964 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3114 break; 3965 break;
3115 case XTerm_font: 3966#endif
3116 change_font (0, str);
3117 break;
3118#if 0 3967#if 0
3119 case XTerm_dumpscreen: /* no error notices */ 3968 case XTerm_dumpscreen: /* no error notices */
3120 { 3969 {
3121 int fd; 3970 int fd;
3122 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3971 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3123 { 3972 {
3124 scr_dump (fd); 3973 scr_dump (fd);
3125 close (fd); 3974 close (fd);
3126 } 3975 }
3127 } 3976 }
3128 break; 3977 break;
3129#endif 3978#endif
3979 case XTerm_font:
3980 op = URxvt_font;
3981 case URxvt_font:
3982#if ENABLE_STYLES
3983 case URxvt_boldFont:
3984 case URxvt_italicFont:
3985 case URxvt_boldItalicFont:
3986#endif
3987 if (query)
3988 tt_printf ("\33]%d;%-.250s%c", saveop,
3989 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3990 ? fontset[op - URxvt_font]->fontdesc : "",
3991 resp);
3992 else
3993 {
3994 const char *&res = rs[Rs_font + (op - URxvt_font)];
3130 3995
3996 res = strdup (str);
3997 allocated.push_back ((void *)res);
3998 set_fonts ();
3999 }
4000 break;
4001
4002#if ENABLE_FRILLS
4003 case URxvt_locale:
4004 if (query)
4005 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4006 else
4007 {
4008 set_locale (str);
4009 pty.set_utf8_mode (enc_utf8);
4010 init_xlocale ();
4011 }
4012 break;
4013
4014 case URxvt_view_up:
4015 case URxvt_view_down:
4016 {
4017 int lines = atoi (str);
4018
4019 if (lines)
4020 scr_page (op == URxvt_view_up ? UP : DN, lines);
4021 else
4022 scr_erase_savelines ();
4023 }
4024
4025 break;
4026#endif
4027
4028#if ENABLE_PERL
4029 case URxvt_perl:
4030 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
4031 ; // no responses yet
4032 break;
4033#endif
3131 } 4034 }
3132} 4035}
3133/*----------------------------------------------------------------------*/ 4036/*----------------------------------------------------------------------*/
3134 4037
3135/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 4038/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3143 * so no need for fancy checking 4046 * so no need for fancy checking
3144 */ 4047 */
3145int 4048int
3146rxvt_term::privcases (int mode, unsigned long bit) 4049rxvt_term::privcases (int mode, unsigned long bit)
3147{ 4050{
3148 int state; 4051 int state;
3149 4052
3150 if (mode == 's') 4053 if (mode == 's')
3151 { 4054 {
3152 SavedModes |= (PrivateModes & bit); 4055 SavedModes |= (priv_modes & bit);
3153 return -1; 4056 return -1;
3154 } 4057 }
3155 else 4058 else
3156 { 4059 {
3157 if (mode == 'r') 4060 if (mode == 'r')
3158 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4061 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3159 else 4062 else
3160 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4063 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3161 PrivMode (state, bit); 4064 PrivMode (state, bit);
3162 } 4065 }
4066
3163 return state; 4067 return state;
3164} 4068}
3165 4069
3166/* we're not using priv _yet_ */ 4070/* we're not using priv _yet_ */
3167void 4071void
3168rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4072rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3169{ 4073{
3170 unsigned int i, j; 4074 unsigned int i, j;
3171 int state; 4075 int state;
4076
3172 static const struct 4077 static const struct
3173 { 4078 {
3174 const int argval; 4079 const int argval;
3175 const unsigned long bit; 4080 const unsigned long bit;
3176 } 4081 }
4082
3177 argtopriv[] = { 4083 argtopriv[] = {
3178 { 1, PrivMode_aplCUR }, 4084 { 1, PrivMode_aplCUR },
3179 { 2, PrivMode_vt52 }, 4085 { 2, PrivMode_vt52 },
3180 { 3, PrivMode_132 }, 4086 { 3, PrivMode_132 },
3181 { 4, PrivMode_smoothScroll }, 4087 { 4, PrivMode_smoothScroll },
3182 { 5, PrivMode_rVideo }, 4088 { 5, PrivMode_rVideo },
3183 { 6, PrivMode_relOrigin }, 4089 { 6, PrivMode_relOrigin },
3184 { 7, PrivMode_Autowrap }, 4090 { 7, PrivMode_Autowrap },
4091 // 8, bi-directional support mode
3185 { 9, PrivMode_MouseX10 }, 4092 { 9, PrivMode_MouseX10 },
3186#ifdef menuBar_esc 4093#ifdef menuBar_esc
3187 { menuBar_esc, PrivMode_menuBar }, 4094 { menuBar_esc, PrivMode_menuBar },
3188#endif 4095#endif
4096 // 18, 19 printing-related
4097 { 25, PrivMode_VisibleCursor },
3189#ifdef scrollBar_esc 4098#ifdef scrollBar_esc
3190 { scrollBar_esc, PrivMode_scrollBar }, 4099 { scrollBar_esc, PrivMode_scrollBar },
3191#endif 4100#endif
3192 { 25, PrivMode_VisibleCursor },
3193 { 35, PrivMode_ShiftKeys }, 4101 { 35, PrivMode_ShiftKeys }, // rxvt extension
3194 { 40, PrivMode_132OK }, 4102 { 40, PrivMode_132OK },
4103 // 41 xterm more fixes NYI
4104 // 45 margin bell NYI
4105 // 46 start logging
3195 { 47, PrivMode_Screen }, 4106 { 47, PrivMode_Screen },
3196 { 66, PrivMode_aplKP }, 4107 { 66, PrivMode_aplKP },
3197#ifndef NO_BACKSPACE_KEY 4108#ifndef NO_BACKSPACE_KEY
3198 { 67, PrivMode_BackSpace }, 4109 { 67, PrivMode_BackSpace },
3199#endif 4110#endif
3200 { 1000, PrivMode_MouseX11 }, 4111 { 1000, PrivMode_MouseX11 },
4112 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4113 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
4114 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3201 { 1010, PrivMode_TtyOutputInh }, 4115 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3202 { 1011, PrivMode_Keypress }, 4116 { 1011, PrivMode_Keypress }, // rxvt extension
4117 // 1035 enable modifiers for alt, numlock NYI
4118 // 1036 send ESC for meta keys NYI
4119 // 1037 send DEL for keypad delete NYI
3203 { 1047, PrivMode_Screen }, 4120 { 1047, PrivMode_Screen },
4121 // 1048 save and restore cursor
3204 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4122 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4123 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3205 }; 4124 };
3206 4125
3207 if (nargs == 0) 4126 if (nargs == 0)
3208 return; 4127 return;
3209 4128
… …
3224 state = privcases (mode, argtopriv[j].bit); 4143 state = privcases (mode, argtopriv[j].bit);
3225 break; 4144 break;
3226 } 4145 }
3227 4146
3228 /* extra handling for values with state unkept */ 4147 /* extra handling for values with state unkept */
3229 if (state == -1)
3230 switch (arg[i]) 4148 switch (arg[i])
3231 { 4149 {
4150#if ENABLE_STYLES
4151 case 1021:
4152 if (mode)
4153 SET_OPTION (Opt_intensityStyles);
4154 else
4155 CLR_OPTION (Opt_intensityStyles);
4156
4157 scr_touch (true);
4158 break;
4159#endif
3232 case 1048: /* alternative cursor save */ 4160 case 1048: /* alternative cursor save */
4161 case 1049:
4162 if (OPTION (Opt_secondaryScreen))
3233 if (mode == 0) 4163 if (mode == 0)
3234 scr_cursor (RESTORE); 4164 scr_cursor (RESTORE);
3235 else if (mode == 1) 4165 else if (mode == 1)
3236 scr_cursor (SAVE); 4166 scr_cursor (SAVE);
3237 /* FALLTHROUGH */
3238 default:
3239 continue; /* for (;i;) */
3240 }
3241
3242 /* extra handling for values with valid 0 or 1 state */
3243 switch (arg[i])
3244 {
3245 /* case 1: - application cursor keys */
3246 case 2: /* VT52 mode */
3247 /* oddball mode. should be set regardless of set/reset
3248 * parameter. Return from VT52 mode with an ESC < from
3249 * within VT52 mode
3250 */
3251 PrivMode (1, PrivMode_vt52);
3252 break; 4167 break;
4168 }
4169
4170 if (state >= 0)
4171 /* extra handling for values with valid 0 or 1 state */
4172 switch (arg[i])
4173 {
4174 /* case 1: - application cursor keys */
4175 case 2: /* VT52 mode */
4176 /* oddball mode. should be set regardless of set/reset
4177 * parameter. Return from VT52 mode with an ESC < from
4178 * within VT52 mode
4179 */
4180 PrivMode (1, PrivMode_vt52);
4181 break;
3253 case 3: /* 80/132 */ 4182 case 3: /* 80/132 */
3254 if (PrivateModes & PrivMode_132OK) 4183 if (priv_modes & PrivMode_132OK)
3255 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4184 set_widthheight (((state ? 132 : 80) * fwidth), height);
3256 (unsigned int)TermWin.height);
3257 break; 4185 break;
3258 case 4: /* smooth scrolling */ 4186 case 4: /* smooth scrolling */
3259 if (state) 4187 if (!state)
3260 Options &= ~Opt_jumpScroll; 4188 SET_OPTION (Opt_jumpScroll);
3261 else 4189 else
3262 Options |= Opt_jumpScroll; 4190 CLR_OPTION (Opt_jumpScroll);
3263 break; 4191 break;
3264 case 5: /* reverse video */ 4192 case 5: /* reverse video */
3265 scr_rvideo_mode (state); 4193 scr_rvideo_mode (state);
3266 break; 4194 break;
3267 case 6: /* relative/absolute origins */ 4195 case 6: /* relative/absolute origins */
3268 scr_relative_origin (state); 4196 scr_relative_origin (state);
3269 break; 4197 break;
3270 case 7: /* autowrap */ 4198 case 7: /* autowrap */
3271 scr_autowrap (state); 4199 scr_autowrap (state);
3272 break; 4200 break;
3273 /* case 8: - auto repeat, can't do on a per window basis */ 4201 /* case 8: - auto repeat, can't do on a per window basis */
3274 case 9: /* X10 mouse reporting */ 4202 case 9: /* X10 mouse reporting */
3275 if (state) /* orthogonal */ 4203 if (state) /* orthogonal */
3276 PrivateModes &= ~ (PrivMode_MouseX11); 4204 priv_modes &= ~PrivMode_MouseX11;
3277 break; 4205 break;
3278#ifdef menuBar_esc 4206#ifdef menuBar_esc
3279 case menuBar_esc: 4207 case menuBar_esc:
3280#ifdef MENUBAR 4208#ifdef MENUBAR
3281 map_menuBar (state); 4209 map_menuBar (state);
3282#endif 4210#endif
3283 break; 4211 break;
3284#endif 4212#endif
3285#ifdef scrollBar_esc 4213#ifdef scrollBar_esc
3286 case scrollBar_esc: 4214 case scrollBar_esc:
3287 if (scrollbar_mapping (state)) 4215 if (scrollbar_mapping (state))
3288 { 4216 {
3289 resize_all_windows (0, 0, 0); 4217 resize_all_windows (0, 0, 0);
3290 scr_touch (true); 4218 scr_touch (true);
3291 } 4219 }
3292 break; 4220 break;
3293#endif 4221#endif
3294 case 25: /* visible/invisible cursor */ 4222 case 25: /* visible/invisible cursor */
3295 scr_cursor_visible (state); 4223 scr_cursor_visible (state);
3296 break; 4224 break;
3297 /* case 35: - shift keys */ 4225 /* case 35: - shift keys */
3298 /* case 40: - 80 <--> 132 mode */ 4226 /* case 40: - 80 <--> 132 mode */
3299 case 47: /* secondary screen */ 4227 case 47: /* secondary screen */
3300 scr_change_screen (state); 4228 scr_change_screen (state);
3301 break; 4229 break;
3302 /* case 66: - application key pad */ 4230 /* case 66: - application key pad */
3303 /* case 67: - backspace key */ 4231 /* case 67: - backspace key */
3304 case 1000: /* X11 mouse reporting */ 4232 case 1000: /* X11 mouse reporting */
3305 if (state) /* orthogonal */ 4233 if (state) /* orthogonal */
3306 PrivateModes &= ~ (PrivMode_MouseX10); 4234 priv_modes &= ~PrivMode_MouseX10;
3307 break; 4235 break;
3308#if 0 4236#if 0
3309 case 1001: 4237 case 1001:
3310 break; /* X11 mouse highlighting */ 4238 break; /* X11 mouse highlighting */
3311#endif 4239#endif
3312 case 1010: /* scroll to bottom on TTY output inhibit */ 4240 case 1010: /* scroll to bottom on TTY output inhibit */
3313 if (state) 4241 if (!state)
3314 Options &= ~Opt_scrollTtyOutput; 4242 SET_OPTION (Opt_scrollTtyOutput);
3315 else 4243 else
3316 Options |= Opt_scrollTtyOutput; 4244 CLR_OPTION (Opt_scrollTtyOutput);
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) 4247 if (state)
3320 Options |= Opt_scrollTtyKeypress; 4248 SET_OPTION (Opt_scrollTtyKeypress);
3321 else 4249 else
3322 Options &= ~Opt_scrollTtyKeypress; 4250 CLR_OPTION (Opt_scrollTtyKeypress);
3323 break; 4251 break;
3324 case 1047: /* secondary screen w/ clearing */ 4252 case 1047: /* secondary screen w/ clearing last */
3325 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4253 if (OPTION (Opt_secondaryScreen))
3326 if (current_screen != PRIMARY) 4254 if (current_screen != PRIMARY)
3327 scr_erase_screen (2); 4255 scr_erase_screen (2);
3328 scr_change_screen (state); 4256 scr_change_screen (state);
3329 /* FALLTHROUGH */
3330 default:
3331 break; 4257 break;
4258 case 1049: /* secondary screen w/ clearing first */
4259 scr_change_screen (state);
4260 if (OPTION (Opt_secondaryScreen))
4261 if (current_screen != PRIMARY)
4262 scr_erase_screen (2);
4263 break;
4264 default:
4265 break;
3332 } 4266 }
3333 } 4267 }
3334} 4268}
3335/*}}} */ 4269/*}}} */
3336 4270
3337/*{{{ process sgr sequences */ 4271/*{{{ process sgr sequences */
3338void 4272void
3339rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4273rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3340{ 4274{
3341 unsigned int i; 4275 unsigned int i;
3342 short rendset; 4276 short rendset;
3343 int rendstyle; 4277 int rendstyle;
3344 4278
3345 if (nargs == 0) 4279 if (nargs == 0)
3346 { 4280 {
3347 scr_rendition (0, ~RS_None); 4281 scr_rendition (0, ~RS_None);
3348 return; 4282 return;
3349 } 4283 }
4284
3350 for (i = 0; i < nargs; i++) 4285 for (i = 0; i < nargs; i++)
3351 { 4286 {
3352 rendset = -1; 4287 rendset = -1;
3353 switch (arg[i]) 4288 switch (arg[i])
3354 { 4289 {
… …
3356 rendset = 0, rendstyle = ~RS_None; 4291 rendset = 0, rendstyle = ~RS_None;
3357 break; 4292 break;
3358 case 1: 4293 case 1:
3359 rendset = 1, rendstyle = RS_Bold; 4294 rendset = 1, rendstyle = RS_Bold;
3360 break; 4295 break;
4296 //case 2: // low intensity
4297 case 3:
4298 rendset = 1, rendstyle = RS_Italic;
4299 break;
3361 case 4: 4300 case 4:
3362 rendset = 1, rendstyle = RS_Uline; 4301 rendset = 1, rendstyle = RS_Uline;
3363 break; 4302 break;
3364 case 5: 4303 case 5: // slowly blinking
4304 case 6: // rapidly blinking
3365 rendset = 1, rendstyle = RS_Blink; 4305 rendset = 1, rendstyle = RS_Blink;
3366 break; 4306 break;
4307 //case 6: // scoansi light background
3367 case 7: 4308 case 7:
3368 rendset = 1, rendstyle = RS_RVid; 4309 rendset = 1, rendstyle = RS_RVid;
3369 break; 4310 break;
3370 case 22: 4311 case 8:
4312 // invisible. NYI
4313 break;
4314 //case 9: // crossed out
4315 //case 10: // scoansi acs off, primary font
4316 //case 11: // scoansi acs on, first alt font
4317 //case 12: // scoansi acs on, |0x80, second alt font
4318 //...
4319 //case 19: // ninth alt font
4320 //case 20: // gothic
4321 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3371 rendset = 0, rendstyle = RS_Bold; 4322 rendset = 0, rendstyle = RS_Bold;
4323 break;
4324 case 22: // normal intensity
4325 rendset = 0, rendstyle = RS_Bold;
4326 break;
4327 case 23: // disable italic
4328 rendset = 0, rendstyle = RS_Italic;
3372 break; 4329 break;
3373 case 24: 4330 case 24:
3374 rendset = 0, rendstyle = RS_Uline; 4331 rendset = 0, rendstyle = RS_Uline;
3375 break; 4332 break;
3376 case 25: 4333 case 25:
3377 rendset = 0, rendstyle = RS_Blink; 4334 rendset = 0, rendstyle = RS_Blink;
3378 break; 4335 break;
4336 case 26: // variable spacing (iso 8613)
4337 rendset = 0, rendstyle = RS_Blink;
4338 break;
3379 case 27: 4339 case 27:
3380 rendset = 0, rendstyle = RS_RVid; 4340 rendset = 0, rendstyle = RS_RVid;
3381 break; 4341 break;
4342 //case 28: // visible. NYI
4343 //case 29: // not crossed-out
3382 } 4344 }
4345
3383 if (rendset != -1) 4346 if (rendset != -1)
3384 { 4347 {
3385 scr_rendition (rendset, rendstyle); 4348 scr_rendition (rendset, rendstyle);
3386 continue; /* for (;i;) */ 4349 continue; /* for (;i;) */
3387 } 4350 }
… …
3394 case 33: 4357 case 33:
3395 case 34: 4358 case 34:
3396 case 35: 4359 case 35:
3397 case 36: 4360 case 36:
3398 case 37: 4361 case 37:
3399 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4362 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3400 Color_fg);
3401 break; 4363 break;
3402#ifdef TTY_256COLOR 4364 case 38: // set fg color, ISO 8613-6
3403 case 38:
3404 if (nargs > i + 2 && arg[i + 1] == 5) 4365 if (nargs > i + 2 && arg[i + 1] == 5)
3405 { 4366 {
3406 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4367 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3407 Color_fg);
3408 i += 2; 4368 i += 2;
3409 } 4369 }
3410 break; 4370 break;
3411#endif
3412 case 39: /* default fg */ 4371 case 39: /* default fg */
3413 scr_color (Color_fg, Color_fg); 4372 scr_color (Color_fg, Color_fg);
3414 break; 4373 break;
3415 4374
3416 case 40: 4375 case 40:
… …
3419 case 43: 4378 case 43:
3420 case 44: 4379 case 44:
3421 case 45: 4380 case 45:
3422 case 46: 4381 case 46:
3423 case 47: 4382 case 47:
3424 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3425 Color_bg);
3426 break; 4384 break;
3427#ifdef TTY_256COLOR 4385 case 48: // set bg color, ISO 8613-6
3428 case 48:
3429 if (nargs > i + 2 && arg[i + 1] == 5) 4386 if (nargs > i + 2 && arg[i + 1] == 5)
3430 { 4387 {
3431 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4388 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3432 Color_bg);
3433 i += 2; 4389 i += 2;
3434 } 4390 }
3435 break; 4391 break;
3436#endif
3437 case 49: /* default bg */ 4392 case 49: /* default bg */
3438 scr_color (Color_bg, Color_bg); 4393 scr_color (Color_bg, Color_bg);
3439 break; 4394 break;
3440 4395
3441#ifndef NO_BRIGHTCOLOR 4396 //case 50: // not variable spacing
4397
4398#if ENABLE_FRILLS
3442 case 90: 4399 case 90:
3443 case 91: /* set bright fg color */ 4400 case 91: /* set bright fg color */
3444 case 92: 4401 case 92:
3445 case 93: 4402 case 93:
3446 case 94: 4403 case 94:
3447 case 95: 4404 case 95:
3448 case 96: 4405 case 96:
3449 case 97: 4406 case 97:
3450 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4407 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3451 Color_fg);
3452 break; 4408 break;
3453 case 100: 4409 case 100:
3454 case 101: /* set bright bg color */ 4410 case 101: /* set bright bg color */
3455 case 102: 4411 case 102:
3456 case 103: 4412 case 103:
3457 case 104: 4413 case 104:
3458 case 105: 4414 case 105:
3459 case 106: 4415 case 106:
3460 case 107: 4416 case 107:
3461 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4417 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3462 Color_bg);
3463 break; 4418 break;
3464#endif 4419#endif
3465
3466 } 4420 }
3467 } 4421 }
3468} 4422}
3469/*}}} */ 4423/*}}} */
3470 4424
3471/*{{{ process Rob Nation's own graphics mode sequences */ 4425/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3472void 4426void
3473rxvt_term::process_graphics () 4427rxvt_term::process_graphics ()
3474{ 4428{
3475 unsigned char ch, cmd = cmd_getc (); 4429 unicode_t ch, cmd = cmd_getc ();
3476 4430
3477#ifndef RXVT_GRAPHICS
3478 if (cmd == 'Q') 4431 if (cmd == 'Q')
3479 { /* query graphics */ 4432 { /* query graphics */
3480 tt_printf ("\033G0\n"); /* no graphics */ 4433 tt_printf ("\033G0\012"); /* no graphics */
3481 return; 4434 return;
3482 } 4435 }
3483 /* swallow other graphics sequences until terminating ':' */ 4436 /* swallow other graphics sequences until terminating ':' */
3484 do 4437 do
3485 ch = cmd_getc (); 4438 ch = cmd_getc ();
3486 while (ch != ':'); 4439 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} 4440}
3533/*}}} */ 4441/*}}} */
3534 4442
3535/* ------------------------------------------------------------------------- */ 4443/* ------------------------------------------------------------------------- */
3536 4444
… …
3540 */ 4448 */
3541void 4449void
3542rxvt_term::tt_printf (const char *fmt,...) 4450rxvt_term::tt_printf (const char *fmt,...)
3543{ 4451{
3544 va_list arg_ptr; 4452 va_list arg_ptr;
3545 unsigned char buf[256]; 4453 char buf[256];
3546 4454
3547 va_start (arg_ptr, fmt); 4455 va_start (arg_ptr, fmt);
3548 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4456 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3549 va_end (arg_ptr); 4457 va_end (arg_ptr);
3550 tt_write (buf, STRLEN (buf)); 4458 tt_write (buf, strlen (buf));
3551} 4459}
3552 4460
3553/* ---------------------------------------------------------------------- */ 4461/* ---------------------------------------------------------------------- */
3554/* Write data to the pty as typed by the user, pasted with the mouse, 4462/* 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. 4463 * or generated by us in response to a query ESC sequence.
3556 */ 4464 */
4465const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4466
3557void 4467void
3558rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4468rxvt_term::tt_write (const char *data, unsigned int len)
3559{ 4469{
3560 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4470 if (pty.pty < 0)
4471 return;
3561 4472
3562 if (len) 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