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

Diff Legend

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