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

Diff Legend

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