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

Diff Legend

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