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

Diff Legend

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