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

Diff Legend

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