ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.36 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.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;
345#endif 578#endif
346#ifdef MOD4_TAB_MAKES_META 579#ifdef MOD4_TAB_MAKES_META
347 if (ev->state & Mod4Mask) 580 if (ev.state & Mod4Mask)
348 meta = 1; 581 meta = 1;
349#endif 582#endif
350 newlen = 0; 583 newlen = 0;
351 } 584 }
352 break; 585 break;
353 586
354
355#ifdef XK_KP_Left 587#ifdef XK_KP_Left
356 case XK_KP_Up: /* \033Ox or standard */ 588 case XK_KP_Up: /* \033Ox or standard */
357 case XK_KP_Down: /* \033Or or standard */ 589 case XK_KP_Down: /* \033Or or standard */
358 case XK_KP_Right: /* \033Ov or standard */ 590 case XK_KP_Right: /* \033Ov or standard */
359 case XK_KP_Left: /* \033Ot or standard */ 591 case XK_KP_Left: /* \033Ot or standard */
360 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 592 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
361 { 593 {
362 STRCPY(kbuf, "\033OZ"); 594 strcpy (kbuf, "\033OZ");
363 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 595 kbuf[2] = "txvr"[keysym - XK_KP_Left];
364 break; 596 break;
365 } 597 }
366 else 598 else
367 /* translate to std. cursor key */ 599 /* translate to std. cursor key */
368 keysym = XK_Left + (keysym - XK_KP_Left); 600 keysym = XK_Left + (keysym - XK_KP_Left);
… …
370#endif 602#endif
371 case XK_Up: /* "\033[A" */ 603 case XK_Up: /* "\033[A" */
372 case XK_Down: /* "\033[B" */ 604 case XK_Down: /* "\033[B" */
373 case XK_Right: /* "\033[C" */ 605 case XK_Right: /* "\033[C" */
374 case XK_Left: /* "\033[D" */ 606 case XK_Left: /* "\033[D" */
375 STRCPY(kbuf, "\033[Z"); 607 strcpy (kbuf, "\033[Z");
376 kbuf[2] = ("DACB"[keysym - XK_Left]); 608 kbuf[2] = "DACB"[keysym - XK_Left];
377 /* do Shift first */ 609 /* do Shift first */
378 if (shft) 610 if (shft)
379 kbuf[2] = ("dacb"[keysym - XK_Left]); 611 kbuf[2] = "dacb"[keysym - XK_Left];
380 else if (ctrl) 612 else if (ctrl)
381 { 613 {
382 kbuf[1] = 'O'; 614 kbuf[1] = 'O';
383 kbuf[2] = ("dacb"[keysym - XK_Left]); 615 kbuf[2] = "dacb"[keysym - XK_Left];
384 } 616 }
385 else if (PrivateModes & PrivMode_aplCUR) 617 else if (priv_modes & PrivMode_aplCUR)
386 kbuf[1] = 'O'; 618 kbuf[1] = 'O';
387#ifdef MULTICHAR_SET
388 //TODO: ??
389 if (Options & Opt_mc_hack)
390 {
391 int col, row, m;
392
393 col = screen.cur.col;
394 row = screen.cur.row + TermWin.saveLines;
395 m = 0;
396 if (keysym == XK_Right
397 && IS_MULTI1(screen.rend[row][col]))
398 m = 1;
399 else if (keysym == XK_Left)
400 {
401 if (col > 0)
402 {
403 if (IS_MULTI2(screen.rend[row][col - 1]))
404 m = 1;
405 }
406 else if (screen.cur.row > 0)
407 {
408 col = screen.tlen[--row];
409 if (col == -1)
410 col = TermWin.ncol - 1;
411 else
412 col--;
413 if (col > 0
414 && IS_MULTI2(screen.rend[row][col]))
415 m = 1;
416 }
417 }
418 if (m)
419 MEMMOVE(kbuf + 3, kbuf, 3 + 1);
420 }
421#endif
422 break; 619 break;
423 620
424#ifndef UNSHIFTED_SCROLLKEYS 621#ifndef UNSHIFTED_SCROLLKEYS
425# ifdef XK_KP_Prior 622# ifdef XK_KP_Prior
426 case XK_KP_Prior: 623 case XK_KP_Prior:
427 /* allow shift to override */ 624 /* allow shift to override */
428 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 625 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
429 { 626 {
430 STRCPY(kbuf, "\033Oy"); 627 strcpy (kbuf, "\033Oy");
431 break; 628 break;
432 } 629 }
433 /* FALLTHROUGH */ 630 /* FALLTHROUGH */
434# endif 631# endif
435 case XK_Prior: 632 case XK_Prior:
436 STRCPY(kbuf, "\033[5~"); 633 strcpy (kbuf, "\033[5~");
437 break; 634 break;
438# ifdef XK_KP_Next 635# ifdef XK_KP_Next
439 case XK_KP_Next: 636 case XK_KP_Next:
440 /* allow shift to override */ 637 /* allow shift to override */
441 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
442 { 639 {
443 STRCPY(kbuf, "\033Os"); 640 strcpy (kbuf, "\033Os");
444 break; 641 break;
445 } 642 }
446 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
447# endif 644# endif
448 case XK_Next: 645 case XK_Next:
449 STRCPY(kbuf, "\033[6~"); 646 strcpy (kbuf, "\033[6~");
450 break; 647 break;
451#endif 648#endif
452 case XK_KP_Enter: 649 case XK_KP_Enter:
453 /* allow shift to override */ 650 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 652 {
456 STRCPY(kbuf, "\033OM"); 653 strcpy (kbuf, "\033OM");
654 break;
655 }
656
657 /* FALLTHROUGH */
658
659 case XK_Return:
660 if (priv_modes & PrivMode_LFNL)
661 {
662 kbuf[0] = '\015';
663 kbuf[1] = '\012';
664 kbuf[2] = '\0';
457 } 665 }
458 else 666 else
459 { 667 {
460 kbuf[0] = '\r'; 668 kbuf[0] = '\015';
461 kbuf[1] = '\0'; 669 kbuf[1] = '\0';
462 } 670 }
463 break; 671 break;
464 672
465#ifdef XK_KP_Begin 673#ifdef XK_KP_Begin
466 case XK_KP_Begin: 674 case XK_KP_Begin:
467 STRCPY(kbuf, "\033Ou"); 675 strcpy (kbuf, "\033Ou");
468 break; 676 break;
469 677
470 case XK_KP_Insert:
471 STRCPY(kbuf, "\033Op");
472 break;
473
474 case XK_KP_Delete:
475 STRCPY(kbuf, "\033On");
476 break;
477#endif 678#endif
478 case XK_KP_F1: /* "\033OP" */ 679 case XK_KP_F1: /* "\033OP" */
479 case XK_KP_F2: /* "\033OQ" */ 680 case XK_KP_F2: /* "\033OQ" */
480 case XK_KP_F3: /* "\033OR" */ 681 case XK_KP_F3: /* "\033OR" */
481 case XK_KP_F4: /* "\033OS" */ 682 case XK_KP_F4: /* "\033OS" */
482 STRCPY(kbuf, "\033OP"); 683 strcpy (kbuf, "\033OP");
483 kbuf[2] += (keysym - XK_KP_F1); 684 kbuf[2] += (keysym - XK_KP_F1);
484 break; 685 break;
485 686
486 case XK_KP_Multiply: /* "\033Oj" : "*" */ 687 case XK_KP_Multiply: /* "\033Oj" : "*" */
487 case XK_KP_Add: /* "\033Ok" : "+" */ 688 case XK_KP_Add: /* "\033Ok" : "+" */
488 case XK_KP_Separator: /* "\033Ol" : "," */ 689 case XK_KP_Separator: /* "\033Ol" : "," */
489 case XK_KP_Subtract: /* "\033Om" : "-" */ 690 case XK_KP_Subtract: /* "\033Om" : "-" */
490 case XK_KP_Decimal: /* "\033On" : "." */ 691 case XK_KP_Decimal: /* "\033On" : "." */
491 case XK_KP_Divide: /* "\033Oo" : "/" */ 692 case XK_KP_Divide: /* "\033Oo" : "/" */
492 case XK_KP_0: /* "\033Op" : "0" */ 693 case XK_KP_0: /* "\033Op" : "0" */
… …
498 case XK_KP_6: /* "\033Ov" : "6" */ 699 case XK_KP_6: /* "\033Ov" : "6" */
499 case XK_KP_7: /* "\033Ow" : "7" */ 700 case XK_KP_7: /* "\033Ow" : "7" */
500 case XK_KP_8: /* "\033Ox" : "8" */ 701 case XK_KP_8: /* "\033Ox" : "8" */
501 case XK_KP_9: /* "\033Oy" : "9" */ 702 case XK_KP_9: /* "\033Oy" : "9" */
502 /* allow shift to override */ 703 /* allow shift to override */
503 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 704 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
504 { 705 {
505 STRCPY(kbuf, "\033Oj"); 706 strcpy (kbuf, "\033Oj");
506 kbuf[2] += (keysym - XK_KP_Multiply); 707 kbuf[2] += (keysym - XK_KP_Multiply);
507 } 708 }
508 else 709 else
509 { 710 {
510 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 711 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
511 kbuf[1] = '\0'; 712 kbuf[1] = '\0';
512 } 713 }
513 break; 714 break;
514 715
515 case XK_Find: 716 case XK_Find:
516 STRCPY(kbuf, "\033[1~"); 717 strcpy (kbuf, "\033[1~");
517 break; 718 break;
719
720#ifdef XK_KP_End
721 case XK_KP_Insert:
722 /* allow shift to override */
723 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
724 {
725 strcpy (kbuf, "\033Op");
726 break;
727 }
728 /* FALLTHROUGH */
729#endif
518 case XK_Insert: 730 case XK_Insert:
519 STRCPY(kbuf, "\033[2~"); 731 strcpy (kbuf, "\033[2~");
520 break; 732 break;
521#ifdef DXK_Remove /* support for DEC remove like key */ 733#ifdef DXK_Remove /* support for DEC remove like key */
522 case DXK_Remove: 734 case DXK_Remove:
523 /* FALLTHROUGH */ 735 /* FALLTHROUGH */
524#endif 736#endif
525 case XK_Execute: 737 case XK_Execute:
526 STRCPY(kbuf, "\033[3~"); 738 strcpy (kbuf, "\033[3~");
527 break; 739 break;
528 case XK_Select: 740 case XK_Select:
529 STRCPY(kbuf, "\033[4~"); 741 strcpy (kbuf, "\033[4~");
530 break; 742 break;
531#ifdef XK_KP_End 743#ifdef XK_KP_End
532 case XK_KP_End: 744 case XK_KP_End:
533 /* allow shift to override */ 745 /* allow shift to override */
534 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 746 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
535 { 747 {
536 STRCPY(kbuf, "\033Oq"); 748 strcpy (kbuf, "\033Oq");
537 break; 749 break;
538 } 750 }
539 /* FALLTHROUGH */ 751 /* FALLTHROUGH */
540#endif 752#endif
541 case XK_End: 753 case XK_End:
542 STRCPY(kbuf, KS_END); 754 strcpy (kbuf, KS_END);
543 break; 755 break;
544#ifdef XK_KP_Home 756#ifdef XK_KP_Home
545 case XK_KP_Home: 757 case XK_KP_Home:
546 /* allow shift to override */ 758 /* allow shift to override */
547 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
548 { 760 {
549 STRCPY(kbuf, "\033Ow"); 761 strcpy (kbuf, "\033Ow");
550 break; 762 break;
551 } 763 }
552 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
553#endif 765#endif
554 case XK_Home: 766 case XK_Home:
555 STRCPY(kbuf, KS_HOME); 767 strcpy (kbuf, KS_HOME);
556 break; 768 break;
557 769
558#define FKEY(n, fkey) \ 770#define FKEY(n, fkey) \
559 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 771 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
560 772
561 case XK_F1: /* "\033[11~" */ 773 case XK_F1: /* "\033[11~" */
562 case XK_F2: /* "\033[12~" */ 774 case XK_F2: /* "\033[12~" */
563 case XK_F3: /* "\033[13~" */ 775 case XK_F3: /* "\033[13~" */
564 case XK_F4: /* "\033[14~" */ 776 case XK_F4: /* "\033[14~" */
565 case XK_F5: /* "\033[15~" */ 777 case XK_F5: /* "\033[15~" */
566 FKEY(11, XK_F1); 778 FKEY (11, XK_F1);
567 break; 779 break;
568 case XK_F6: /* "\033[17~" */ 780 case XK_F6: /* "\033[17~" */
569 case XK_F7: /* "\033[18~" */ 781 case XK_F7: /* "\033[18~" */
570 case XK_F8: /* "\033[19~" */ 782 case XK_F8: /* "\033[19~" */
571 case XK_F9: /* "\033[20~" */ 783 case XK_F9: /* "\033[20~" */
572 case XK_F10: /* "\033[21~" */ 784 case XK_F10: /* "\033[21~" */
573 FKEY(17, XK_F6); 785 FKEY (17, XK_F6);
574 break; 786 break;
575 case XK_F11: /* "\033[23~" */ 787 case XK_F11: /* "\033[23~" */
576 case XK_F12: /* "\033[24~" */ 788 case XK_F12: /* "\033[24~" */
577 case XK_F13: /* "\033[25~" */ 789 case XK_F13: /* "\033[25~" */
578 case XK_F14: /* "\033[26~" */ 790 case XK_F14: /* "\033[26~" */
579 FKEY(23, XK_F11); 791 FKEY (23, XK_F11);
580 break; 792 break;
581 case XK_F15: /* "\033[28~" */ 793 case XK_F15: /* "\033[28~" */
582 case XK_F16: /* "\033[29~" */ 794 case XK_F16: /* "\033[29~" */
583 FKEY(28, XK_F15); 795 FKEY (28, XK_F15);
584 break; 796 break;
585 case XK_Help: /* "\033[28~" */ 797 case XK_Help: /* "\033[28~" */
586 FKEY(28, XK_Help); 798 FKEY (28, XK_Help);
587 break; 799 break;
588 case XK_Menu: /* "\033[29~" */ 800 case XK_Menu: /* "\033[29~" */
589 FKEY(29, XK_Menu); 801 FKEY (29, XK_Menu);
590 break; 802 break;
591 case XK_F17: /* "\033[31~" */ 803 case XK_F17: /* "\033[31~" */
592 case XK_F18: /* "\033[32~" */ 804 case XK_F18: /* "\033[32~" */
593 case XK_F19: /* "\033[33~" */ 805 case XK_F19: /* "\033[33~" */
594 case XK_F20: /* "\033[34~" */ 806 case XK_F20: /* "\033[34~" */
… …
605 case XK_F31: /* "\033[45~" */ 817 case XK_F31: /* "\033[45~" */
606 case XK_F32: /* "\033[46~" */ 818 case XK_F32: /* "\033[46~" */
607 case XK_F33: /* "\033[47~" */ 819 case XK_F33: /* "\033[47~" */
608 case XK_F34: /* "\033[48~" */ 820 case XK_F34: /* "\033[48~" */
609 case XK_F35: /* "\033[49~" */ 821 case XK_F35: /* "\033[49~" */
610 FKEY(31, XK_F17); 822 FKEY (31, XK_F17);
611 break; 823 break;
612#undef FKEY 824#undef FKEY
613 default: 825 default:
614 newlen = 0; 826 newlen = 0;
615 break; 827 break;
616 } 828 }
829
617 if (newlen) 830 if (newlen)
618 len = STRLEN(kbuf); 831 len = strlen (kbuf);
619 } 832 }
833
620 /* 834 /*
621 * Pass meta for all function keys, if 'meta' option set 835 * Pass meta for all function keys, if 'meta' option set
622 */ 836 */
623#ifdef META8_OPTION 837#ifdef META8_OPTION
624 if (meta && (meta_char == 0x80) && len > 0) 838 if (meta && (meta_char == 0x80) && len > 0)
… …
629 else if (ctrl && keysym == XK_minus) 843 else if (ctrl && keysym == XK_minus)
630 { 844 {
631 len = 1; 845 len = 1;
632 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 846 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
633 } 847 }
848 else if (keysym == XK_ISO_Left_Tab)
849 {
850 strcpy (kbuf, "\033[Z");
851 len = 3;
852 }
634 else 853 else
635 { 854 {
636#ifdef META8_OPTION 855#ifdef META8_OPTION
637 /* set 8-bit on */ 856 /* set 8-bit on */
638 if (meta && (meta_char == 0x80)) 857 if (meta && (meta_char == 0x80))
639 { 858 {
640 unsigned char *ch; 859 unsigned char *ch;
641 860
642 for (ch = kbuf; ch < kbuf + len; ch++) 861 for (ch = kbuf; ch < kbuf + len; ch++)
643 *ch |= 0x80; 862 *ch |= 0x80;
863
644 meta = 0; 864 meta = 0;
645 } 865 }
646#endif 866#endif
647#ifdef GREEK_SUPPORT
648 if (greek_mode)
649 len = greek_xlat(kbuf, len);
650#endif
651 /* nil */ ; 867 /* nil */ ;
652 } 868 }
653 } 869 }
654 870
655 if (len <= 0) 871 if (len <= 0)
656 return; /* not mapped */ 872 return; /* not mapped */
657 873
658 if (Options & Opt_scrollTtyKeypress) 874 if (OPTION (Opt_scrollTtyKeypress))
659 if (TermWin.view_start) 875 if (view_start)
660 { 876 {
661 TermWin.view_start = 0; 877 view_start = 0;
662 want_refresh = 1; 878 want_refresh = 1;
663 } 879 }
664 880
665 /* 881 /*
666 * these modifications only affect the static keybuffer 882 * these modifications only affect the static keybuffer
… …
677 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 893 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
678 894
679 /* escape prefix */ 895 /* escape prefix */
680 if (meta 896 if (meta
681#ifdef META8_OPTION 897#ifdef META8_OPTION
682 && (meta_char == C0_ESC) 898 && meta_char == C0_ESC
683#endif 899#endif
684 ) 900 )
685 { 901 {
686 const unsigned char ch = C0_ESC; 902 const unsigned char ch = C0_ESC;
687
688 tt_write(&ch, 1); 903 tt_write (&ch, 1);
689 } 904 }
905
690#ifdef DEBUG_CMD 906#if defined(DEBUG_CMD)
691 if (debug_key)
692 { /* Display keyboard buffer contents */ 907 /* Display keyboard buffer contents */
693 char *p; 908 unsigned char *p;
694 int i; 909 int i;
695 910
696 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 911 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
697 for (i = 0, p = kbuf; i < len; i++, p++) 912 for (i = 0, p = kbuf; i < len; i++, p++)
698 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 913 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
699 fprintf(stderr, "'\n"); 914 fprintf (stderr, "'\n");
700 }
701#endif /* DEBUG_CMD */ 915#endif /* DEBUG_CMD */
702 tt_write (kbuf, (unsigned int)len); 916 tt_write (kbuf, (unsigned int)len);
703} 917}
704/*}}} */ 918/*}}} */
705 919
706#if (MENUBAR_MAX) 920#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
707/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 921/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
708/* attempt to `write' count to the input buffer */ 922/* attempt to `write' count to the input buffer */
709unsigned int 923unsigned int
710rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 924rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
711{ 925{
712 unsigned int n, s; 926 unsigned int n, s;
713 927
714 n = cmdbuf_ptr - cmdbuf_base; 928 n = cmdbuf_ptr - cmdbuf_base;
715 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 929 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
930
716 if (n > 0 && s < count) 931 if (n > 0 && s < count)
717 { 932 {
718 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 933 memmove (cmdbuf_base, cmdbuf_ptr,
719 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 934 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
720 cmdbuf_ptr = cmdbuf_base; 935 cmdbuf_ptr = cmdbuf_base;
721 cmdbuf_endp -= n; 936 cmdbuf_endp -= n;
722 s += n; 937 s += n;
723 } 938 }
939
724 if (count > s) 940 if (count > s)
725 { 941 {
726 rxvt_print_error("data loss: cmd_write too large"); 942 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
727 count = s; 943 count = s;
728 } 944 }
945
729 for (; count--;) 946 for (; count--;)
730 *cmdbuf_endp++ = *str++; 947 *cmdbuf_endp++ = *str++;
948
949 cmd_parse ();
950
731 return 0; 951 return 0;
732} 952}
733#endif /* MENUBAR_MAX */ 953#endif
734 954
735void 955void
736rxvt_term::flush () 956rxvt_term::flush ()
737{ 957{
958 flush_ev.stop ();
959
738#ifdef TRANSPARENT 960#ifdef TRANSPARENT
739 if (want_full_refresh) 961 if (want_full_refresh)
740 { 962 {
741 want_full_refresh = 0; 963 want_full_refresh = 0;
742 scr_clear (); 964 scr_clear ();
743 scr_touch (false); 965 scr_touch (false);
744 want_refresh = 1;
745 } 966 }
746#endif 967#endif
747 968
748 if (want_refresh) 969 if (want_refresh)
749 { 970 {
750 scr_refresh (refresh_type); 971 scr_refresh (refresh_type);
751 scrollbar_show (1); 972 scrollbar_show (1);
752#ifdef USE_XIM 973#ifdef USE_XIM
753 IMSendSpot (); 974 IMSendSpot ();
754#endif 975#endif
755
756 } 976 }
757 977
758 XFlush (Xdisplay); 978 display->flush ();
759} 979}
760 980
761void 981void
762rxvt_term::check_cb (check_watcher &w) 982rxvt_term::check_cb (check_watcher &w)
763{ 983{
764 SET_R (this); 984 SET_R (this);
765 SET_LOCALE (locale); 985 SET_LOCALE (locale);
766 986
987 display->flush ();
988
989 if (want_refresh && !flush_ev.active)
990 flush_ev.start (NOW + 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}
769
770void
771rxvt_term::process_x_events ()
772{
773 do
774 {
775 XEvent xev;
776
777 XNextEvent (Xdisplay, &xev);
778
779#if defined(CURSOR_BLINK)
780 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
781 {
782 if (hidden_cursor)
783 {
784 hidden_cursor = 0;
785 want_refresh = 1;
786 }
787
788 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
789 }
790#endif
791
792#if defined(POINTER_BLANK)
793 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
794 {
795 if (xev.type == MotionNotify
796 || xev.type == ButtonPress
797 || xev.type == ButtonRelease)
798 if (hidden_pointer)
799 pointer_unblank ();
800
801 if (xev.type == KeyPress && hidden_pointer == 0)
802 pointer_blank ();
803 }
804#endif
805
806#ifdef USE_XIM
807 if (!XFilterEvent (&xev, xev.xany.window))
808#endif
809 process_x_event (&xev);
810 }
811 while (XPending (Xdisplay));
812} 1002}
813 1003
814#ifdef CURSOR_BLINK 1004#ifdef CURSOR_BLINK
815void 1005void
816rxvt_term::cursor_blink_cb (time_watcher &w) 1006rxvt_term::cursor_blink_cb (time_watcher &w)
… …
833 w.start (w.at + TEXT_BLINK_INTERVAL); 1023 w.start (w.at + TEXT_BLINK_INTERVAL);
834 } 1024 }
835} 1025}
836#endif 1026#endif
837 1027
1028#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
838void 1029void
839rxvt_term::x_cb (io_watcher &w, short revents) 1030rxvt_term::cont_scroll_cb (time_watcher &w)
840{ 1031{
841 SET_R (this); 1032 if ((scrollbar_isUp() || scrollbar_isDn()) &&
842 SET_LOCALE (locale); 1033 scr_page (scrollbar_isUp() ? UP : DN, 1))
843 1034 {
844 process_x_events (); 1035 refresh_type |= SMOOTH_REFRESH;
1036 want_refresh = 1;
1037 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1038 }
845} 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
846 1074
847bool 1075bool
848rxvt_term::pty_fill () 1076rxvt_term::pty_fill ()
849{ 1077{
850 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 }
851 1085
852 memmove (cmdbuf_base, cmdbuf_ptr, n); 1086 memmove (cmdbuf_base, cmdbuf_ptr, n);
853 cmdbuf_ptr = cmdbuf_base; 1087 cmdbuf_ptr = cmdbuf_base;
854 cmdbuf_endp = cmdbuf_ptr + n; 1088 cmdbuf_endp = cmdbuf_ptr + n;
855 1089
856 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1090 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
857 1091
858 if (n > 0) 1092 if (r > 0)
859 { 1093 {
860 cmdbuf_endp += n; 1094 cmdbuf_endp += r;
861 return true; 1095 return true;
862 } 1096 }
863 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))
864 destroy (); 1108 destroy ();
865 1109 }
1110
866 return false; 1111 return false;
867} 1112}
868 1113
869void 1114void
870rxvt_term::pty_cb (io_watcher &w, short revents) 1115rxvt_term::pty_cb (io_watcher &w, short revents)
871{ 1116{
872 SET_R (this); 1117 SET_R (this);
873 SET_LOCALE (locale); 1118 SET_LOCALE (locale);
874 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
875 if (revents & EVENT_WRITE) 1126 if (revents & EVENT_WRITE)
876 tt_write (0, 0); 1127 pty_write ();
877 else if (revents & EVENT_READ)
878 {
879 bool flag = true;
880
881 // loop, but don't allow a single term to monopolize us
882 // the number of loops is fully arbitrary, and thus wrong
883 while (flag && pty_fill ())
884 {
885 if (!seen_input)
886 {
887 seen_input = 1;
888 /* once we know the shell is running, send the screen size. Again! */
889 tt_winch ();
890 }
891
892 uint32_t ch = NOCHAR;
893
894 for (;;)
895 {
896 if (ch == NOCHAR)
897 ch = next_char ();
898
899 if (ch == NOCHAR) // TODO: improve
900 break;
901
902 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
903 {
904 /* Read a text string from the input buffer */
905 uint32_t buf[BUFSIZ];
906 bool refreshnow = false;
907 int nlines = 0;
908 uint32_t *str = buf;
909
910 *str++ = ch;
911
912 for (;;)
913 {
914 ch = next_char ();
915
916 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
917 break;
918 else
919 {
920 *str++ = ch;
921
922 if (ch == '\n')
923 {
924 nlines++;
925 refresh_count++;
926
927 if (!(Options & Opt_jumpScroll)
928 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
929 {
930 refreshnow = true;
931 flag = false;
932 ch = NOCHAR;
933 break;
934 }
935 }
936
937 if (str >= buf + BUFSIZ)
938 {
939 ch = NOCHAR;
940 break;
941 }
942 }
943 }
944
945 scr_add_lines (buf, nlines, str - buf);
946
947 /*
948 * If there have been a lot of new lines, then update the screen
949 * What the heck I'll cheat and only refresh less than every page-full.
950 * the number of pages between refreshes is refresh_limit, which
951 * is incremented here because we must be doing flat-out scrolling.
952 *
953 * refreshing should be correct for small scrolls, because of the
954 * time-out
955 */
956 if (refreshnow)
957 {
958 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
959 refresh_limit++;
960
961 scr_refresh (refresh_type);
962 }
963
964 }
965 else
966 {
967 switch (ch)
968 {
969 default:
970 process_nonprinting (ch);
971 break;
972 case C0_ESC: /* escape char */
973 process_escape_seq ();
974 break;
975 /*case 0x9b: */ /* CSI */
976 /* process_csi_seq (); */
977 }
978
979 ch = NOCHAR;
980 }
981 }
982 }
983 }
984} 1128}
985 1129
986// read the next character, currently handles UTF-8 1130void
987// will probably handle all sorts of other stuff in the future 1131rxvt_term::pointer_unblank ()
988uint32_t
989rxvt_term::next_char ()
990{ 1132{
991 while (cmdbuf_ptr < cmdbuf_endp) 1133 XDefineCursor (display->display, vt, TermWin_cursor);
992 { 1134 recolour_cursor ();
993 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
994 return *cmdbuf_ptr++;
995 1135
996 wchar_t wc; 1136#ifdef POINTER_BLANK
997 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 1137 hidden_pointer = 0;
998 1138
999 if (len == (size_t)-2) 1139 if (OPTION (Opt_pointerBlank))
1000 return NOCHAR; 1140 pointer_ev.start (NOW + pointerBlankDelay);
1001 1141#endif
1002 if (len == (size_t)-1)
1003 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
1004
1005 // assume wchar == unicode
1006 cmdbuf_ptr += len;
1007 return wc;
1008 }
1009
1010 return NOCHAR;
1011}
1012
1013/* rxvt_cmd_getc() - Return next input character */
1014/*
1015 * Return the next input character after first passing any keyboard input
1016 * to the command.
1017 */
1018uint32_t
1019rxvt_term::cmd_getc ()
1020{
1021 for (;;)
1022 {
1023 uint32_t c = next_char ();
1024 if (c != NOCHAR)
1025 return c;
1026
1027 // incomplete sequences should occur rarely, still, a better solution
1028 // would be preferred. either setjmp/longjmp or better design.
1029 fcntl (cmd_fd, F_SETFL, 0);
1030 pty_fill ();
1031 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
1032 }
1033} 1142}
1034 1143
1035#ifdef POINTER_BLANK 1144#ifdef POINTER_BLANK
1036void 1145void
1037rxvt_term::pointer_unblank ()
1038{
1039 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1040 recolour_cursor ();
1041
1042 hidden_pointer = 0;
1043
1044 if (Options & Opt_pointerBlank)
1045 pointer_ev.start (NOW + pointerBlankDelay);
1046}
1047
1048void
1049rxvt_term::pointer_blank () 1146rxvt_term::pointer_blank ()
1050{ 1147{
1051 if (!(Options & Opt_pointerBlank)) 1148 if (! OPTION (Opt_pointerBlank))
1052 return; 1149 return;
1053 1150
1054 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1151 XDefineCursor (display->display, vt, display->blank_cursor);
1055 XFlush (Xdisplay); 1152 XFlush (display->display);
1056 1153
1057 hidden_pointer = 1; 1154 hidden_pointer = 1;
1058} 1155}
1059 1156
1060void 1157void
… …
1066 pointer_blank (); 1163 pointer_blank ();
1067} 1164}
1068#endif 1165#endif
1069 1166
1070void 1167void
1071rxvt_term::mouse_report (const XButtonEvent *ev) 1168rxvt_term::mouse_report (XButtonEvent &ev)
1072{ 1169{
1073 int button_number, key_state = 0; 1170 int button_number, key_state = 0;
1074 int x, y; 1171 int x, y;
1075 1172
1076 x = ev->x; 1173 x = ev.x;
1077 y = ev->y; 1174 y = ev.y;
1078 pixel_position (&x, &y); 1175 pixel_position (&x, &y);
1079 1176
1080 if (MEvent.button == AnyButton) 1177 if (MEvent.button == AnyButton)
1081 {
1082 button_number = 3; 1178 button_number = 3;
1083 }
1084 else 1179 else
1085 { 1180 {
1086 button_number = MEvent.button - Button1; 1181 button_number = MEvent.button - Button1;
1087 /* add 0x3D for wheel events, like xterm does */ 1182 /* add 0x3D for wheel events, like xterm does */
1088 if (button_number >= 3) 1183 if (button_number >= 3)
1089 button_number += (64 - 3); 1184 button_number += (64 - 3);
1090 } 1185 }
1091 1186
1092 if (PrivateModes & PrivMode_MouseX10) 1187 if (priv_modes & PrivMode_MouseX10)
1093 { 1188 {
1094 /* 1189 /*
1095 * do not report ButtonRelease 1190 * do not report ButtonRelease
1096 * no state info allowed 1191 * no state info allowed
1097 */ 1192 */
… …
1112 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1207 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1113 + ((MEvent.state & ControlMask) ? 16 : 0); 1208 + ((MEvent.state & ControlMask) ? 16 : 0);
1114#ifdef MOUSE_REPORT_DOUBLECLICK 1209#ifdef MOUSE_REPORT_DOUBLECLICK
1115 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1210 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1116#endif 1211#endif
1117
1118 } 1212 }
1119 1213
1120#ifdef DEBUG_MOUSEREPORT 1214#if DEBUG_MOUSEREPORT
1121 fprintf(stderr, "Mouse ["); 1215 fprintf (stderr, "Mouse [");
1122 if (key_state & 16) 1216 if (key_state & 16)
1123 fputc('C', stderr); 1217 fputc ('C', stderr);
1124 if (key_state & 4) 1218 if (key_state & 4)
1125 fputc('S', stderr); 1219 fputc ('S', stderr);
1126 if (key_state & 8) 1220 if (key_state & 8)
1127 fputc('A', stderr); 1221 fputc ('A', stderr);
1128 if (key_state & 32) 1222 if (key_state & 32)
1129 fputc('2', stderr); 1223 fputc ('2', stderr);
1130 fprintf(stderr, "]: <%d>, %d/%d\n", 1224 fprintf (stderr, "]: <%d>, %d/%d\n",
1131 button_number, 1225 button_number,
1132 x + 1, 1226 x + 1,
1133 y + 1); 1227 y + 1);
1134#else 1228#endif
1229
1135 tt_printf("\033[M%c%c%c", 1230 tt_printf ("\033[M%c%c%c",
1136 (32 + button_number + key_state), 1231 (32 + button_number + key_state),
1137 (32 + x + 1), 1232 (32 + x + 1),
1138 (32 + y + 1)); 1233 (32 + y + 1));
1139#endif
1140} 1234}
1141 1235
1142#ifdef USING_W11LIB 1236#ifdef USING_W11LIB
1143void 1237void
1144rxvt_W11_process_x_event(XEvent *ev) 1238rxvt_W11_process_x_event (XEvent *ev)
1145{ 1239{
1146 rxvt_t *r = rxvt_get_r(); 1240 rxvt_t *r = rxvt_get_r ();
1147 1241
1148 process_x_event (ev); 1242 x_cb (*ev);
1149} 1243}
1150#endif 1244#endif
1151 1245
1152/*{{{ process an X event */ 1246/*{{{ process an X event */
1153void 1247void
1154rxvt_term::process_x_event (XEvent *ev) 1248rxvt_term::x_cb (XEvent &ev)
1155{ 1249{
1250 dDisp;
1251
1252 SET_R (this);
1253 SET_LOCALE (locale);
1254
1255#if defined(CURSOR_BLINK)
1256 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1257 {
1258 if (hidden_cursor)
1259 {
1260 hidden_cursor = 0;
1261 want_refresh = 1;
1262 }
1263
1264 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1265 }
1266#endif
1267
1268#if defined(POINTER_BLANK)
1269 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1270 {
1271 if (ev.type == MotionNotify
1272 || ev.type == ButtonPress
1273 || ev.type == ButtonRelease)
1274 if (hidden_pointer)
1275 pointer_unblank ();
1276
1277 if (ev.type == KeyPress && hidden_pointer == 0)
1278 pointer_blank ();
1279 }
1280#endif
1281
1156 Window unused_root, unused_child; 1282 Window unused_root, unused_child;
1157 int unused_root_x, unused_root_y; 1283 int unused_root_x, unused_root_y;
1158 unsigned int unused_mask; 1284 unsigned int unused_mask;
1159 1285
1160#ifdef DEBUG_X
1161 const char *const eventnames[] =
1162 { /* mason - this matches my system */
1163 "",
1164 "",
1165 "KeyPress",
1166 "KeyRelease",
1167 "ButtonPress",
1168 "ButtonRelease",
1169 "MotionNotify",
1170 "EnterNotify",
1171 "LeaveNotify",
1172 "FocusIn",
1173 "FocusOut",
1174 "KeymapNotify",
1175 "Expose",
1176 "GraphicsExpose",
1177 "NoExpose",
1178 "VisibilityNotify",
1179 "CreateNotify",
1180 "DestroyNotify",
1181 "UnmapNotify",
1182 "MapNotify",
1183 "MapRequest",
1184 "ReparentNotify",
1185 "ConfigureNotify",
1186 "ConfigureRequest",
1187 "GravityNotify",
1188 "ResizeRequest",
1189 "CirculateNotify",
1190 "CirculateRequest",
1191 "PropertyNotify",
1192 "SelectionClear",
1193 "SelectionRequest",
1194 "SelectionNotify",
1195 "ColormapNotify",
1196 "ClientMessage",
1197 "MappingNotify"
1198 };
1199#endif
1200
1201#ifdef DEBUG_X
1202 struct timeval tp;
1203 struct tm *ltt;
1204 (void)gettimeofday(&tp, NULL);
1205 ltt = localtime(&(tp.tv_sec));
1206 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == TermWin.parent[0] ? "parent" : (ev->xany.window == TermWin.vt ? "vt" : (ev->xany.window == scrollBar.win ? "scroll" : (ev->xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev->xany.window == TermWin.vt ? TermWin.vt : (ev->xany.window == scrollBar.win ? scrollBar.win : (ev->xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial));
1207#endif
1208
1209 switch (ev->type) 1286 switch (ev.type)
1210 { 1287 {
1211 case KeyPress: 1288 case KeyPress:
1212 lookup_key ((XKeyEvent *)ev); 1289#if ISO_14755
1290 if (!(iso14755buf & ISO_14755_52))
1291#endif
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;
1213 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
1214 1357
1215#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1358#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1216 case KeyRelease:
1217 {
1218 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)
1219 mouse_slip_wheel_speed = 0; 1362 mouse_slip_wheel_speed = 0;
1220 else 1363#endif
1221 {
1222 KeySym ks;
1223
1224 ks = XKeycodeToKeysym(Xdisplay, ev->xkey.keycode, 0);
1225 if (ks == XK_Control_L || ks == XK_Control_R)
1226 mouse_slip_wheel_speed = 0;
1227 }
1228 break; 1364 break;
1229 } 1365 }
1230#endif
1231 1366
1232 case ButtonPress: 1367 case ButtonPress:
1233 button_press ((XButtonEvent *)ev); 1368 button_press (ev.xbutton);
1234 break; 1369 break;
1235 1370
1236 case ButtonRelease: 1371 case ButtonRelease:
1237 button_release ((XButtonEvent *)ev); 1372 button_release (ev.xbutton);
1238 break; 1373 break;
1239 1374
1240 case ClientMessage: 1375 case ClientMessage:
1241 if (ev->xclient.format == 32 1376 if (ev.xclient.format == 32
1377 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1378 {
1242 && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1379 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1243 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
1244#ifdef OFFIX_DND 1397#ifdef OFFIX_DND
1245 /* OffiX Dnd (drag 'n' drop) protocol */ 1398 /* OffiX Dnd (drag 'n' drop) protocol */
1246 else if (ev->xclient.message_type == xa[XA_DNDPROTOCOL] 1399 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1247 && (ev->xclient.data.l[0] == DndFile 1400 && (ev.xclient.data.l[0] == DndFile
1248 || ev->xclient.data.l[0] == DndDir 1401 || ev.xclient.data.l[0] == DndDir
1249 || ev->xclient.data.l[0] == DndLink)) 1402 || ev.xclient.data.l[0] == DndLink))
1250 { 1403 {
1251 /* Get Dnd data */ 1404 /* Get Dnd data */
1252 Atom ActualType; 1405 Atom ActualType;
1253 int ActualFormat; 1406 int ActualFormat;
1254 unsigned char *data; 1407 unsigned char *data;
1255 unsigned long Size, RemainingBytes; 1408 unsigned long Size, RemainingBytes;
1256 1409
1257 XGetWindowProperty(Xdisplay, Xroot, 1410 XGetWindowProperty (disp, display->root,
1258 xa[XA_DNDSELECTION], 1411 xa[XA_DNDSELECTION],
1259 0L, 1000000L, 1412 0L, 1000000L,
1260 False, AnyPropertyType, 1413 False, AnyPropertyType,
1261 &ActualType, &ActualFormat, 1414 &ActualType, &ActualFormat,
1262 &Size, &RemainingBytes, 1415 &Size, &RemainingBytes,
1263 &data); 1416 &data);
1264 XChangeProperty(Xdisplay, Xroot, 1417 set_string_property (XA_CUT_BUFFER0, data);
1265 XA_CUT_BUFFER0, XA_STRING, 1418 XFree (data);
1266 8, PropModeReplace,
1267 data, STRLEN(data));
1268 selection_paste (Xroot, XA_CUT_BUFFER0, True); 1419 selection_paste (display->root, XA_CUT_BUFFER0, true);
1269 XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime); 1420 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1270 } 1421 }
1271#endif /* OFFIX_DND */ 1422#endif /* OFFIX_DND */
1272 break; 1423 break;
1273 1424
1274 case MappingNotify: 1425 case MappingNotify:
1275 XRefreshKeyboardMapping(&(ev->xmapping)); 1426 XRefreshKeyboardMapping (&ev.xmapping);
1276 break; 1427 break;
1277 1428
1278 /* 1429 /*
1279 * XXX: this is not the _current_ arrangement 1430 * XXX: this is not the _current_ arrangement
1280 * Here's my conclusion: 1431 * Here's my conclusion:
… …
1284 * in the GraphicsExpose parts, which means that after each refresh, 1435 * in the GraphicsExpose parts, which means that after each refresh,
1285 * we need to wait for the graphics expose or Noexpose events, 1436 * we need to wait for the graphics expose or Noexpose events,
1286 * which ought to make things real slow! 1437 * which ought to make things real slow!
1287 */ 1438 */
1288 case VisibilityNotify: 1439 case VisibilityNotify:
1289 switch (ev->xvisibility.state) 1440 switch (ev.xvisibility.state)
1290 { 1441 {
1291 case VisibilityUnobscured: 1442 case VisibilityUnobscured:
1292 refresh_type = FAST_REFRESH; 1443 refresh_type = FAST_REFRESH;
1293 break; 1444 break;
1294 case VisibilityPartiallyObscured: 1445 case VisibilityPartiallyObscured:
… …
1299 break; 1450 break;
1300 } 1451 }
1301 break; 1452 break;
1302 1453
1303 case FocusIn: 1454 case FocusIn:
1304 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])
1305 { 1464 {
1306 TermWin.focus = 1; 1465 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1307 want_refresh = 1; 1466 ;
1308#ifdef USE_XIM
1309 if (Input_Context != NULL)
1310 XSetICFocus(Input_Context);
1311#endif
1312#ifdef CURSOR_BLINK
1313 if (Options & Opt_cursorBlink)
1314 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1315#endif
1316 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
1317 } 1478 }
1318 break; 1479 break;
1319 1480
1320 case FocusOut:
1321 if (TermWin.focus)
1322 {
1323 TermWin.focus = 0;
1324 want_refresh = 1;
1325#ifdef USE_XIM
1326 if (Input_Context != NULL)
1327 XUnsetICFocus(Input_Context);
1328#endif
1329#ifdef CURSOR_BLINK
1330 if (Options & Opt_cursorBlink)
1331 cursor_blink_ev.stop ();
1332 hidden_cursor = 0;
1333#endif
1334
1335 }
1336 break;
1337
1338 case ConfigureNotify: 1481 case PropertyNotify:
1339 if (ev->xconfigure.window == TermWin.parent[0]) 1482 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1340 { 1483 && ev.xproperty.state == PropertyNewValue)
1341 int height, width; 1484 selection_property (ev.xproperty.window, ev.xproperty.atom);
1342 1485
1343 do
1344 { /* Wrap lots of configures into one */
1345 width = ev->xconfigure.width;
1346 height = ev->xconfigure.height;
1347 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1348 }
1349 while (XCheckTypedWindowEvent(Xdisplay, ev->xconfigure.window,
1350 ConfigureNotify, ev));
1351 if (szHint.width != width || szHint.height != height)
1352 {
1353 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1354 resize_all_windows (width, height, 1);
1355 }
1356#ifdef DEBUG_SIZE
1357 else
1358 {
1359 D_SIZE((stderr, "Size: Not resizing"));
1360 }
1361#endif
1362#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1363 if (Options & Opt_transparent)
1364 {
1365 check_our_parents ();
1366 if (am_transparent)
1367 want_full_refresh = 1;
1368 }
1369#endif
1370
1371 }
1372 break; 1486 break;
1373 1487
1374 case SelectionClear: 1488 case SelectionClear:
1375 selection_clear (); 1489 selection_clear ();
1376 break; 1490 break;
1377 1491
1378 case SelectionNotify: 1492 case SelectionNotify:
1379 if (selection_wait == Sel_normal) 1493 if (selection_wait == Sel_normal)
1380 selection_paste (ev->xselection.requestor, 1494 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1381 ev->xselection.property, True);
1382 break; 1495 break;
1383 1496
1384 case SelectionRequest: 1497 case SelectionRequest:
1385 selection_send (&(ev->xselectionrequest)); 1498 selection_send (ev.xselectionrequest);
1386 break; 1499 break;
1387 1500
1388 case UnmapNotify: 1501 case UnmapNotify:
1389 TermWin.mapped = 0; 1502 mapped = 0;
1390#ifdef TEXT_BLINK 1503#ifdef TEXT_BLINK
1391 text_blink_ev.stop (); 1504 text_blink_ev.stop ();
1392#endif 1505#endif
1393 break; 1506 break;
1394 1507
1395 case MapNotify: 1508 case MapNotify:
1396 TermWin.mapped = 1; 1509 mapped = 1;
1397#ifdef TEXT_BLINK 1510#ifdef TEXT_BLINK
1398 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1511 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1399#endif 1512#endif
1400 break; 1513 break;
1401 1514
1402 case PropertyNotify:
1403 if (ev->xproperty.atom == xa[XA_VT_SELECTION])
1404 {
1405 if (ev->xproperty.state == PropertyNewValue)
1406 selection_property (ev->xproperty.window,
1407 ev->xproperty.atom);
1408 break;
1409 }
1410#ifdef TRANSPARENT 1515#ifdef TRANSPARENT
1411 /*
1412 * if user used some Esetroot compatible prog to set the root bg,
1413 * use the property to determine the pixmap. We use it later on.
1414 */
1415 if (xa[XA_XROOTPMAPID] == 0)
1416 xa[XA_XROOTPMAPID] = XInternAtom(Xdisplay,
1417 "_XROOTPMAP_ID", False);
1418 if (ev->xproperty.atom != xa[XA_XROOTPMAPID])
1419 break;
1420 /* FALLTHROUGH */
1421 case ReparentNotify: 1516 case ReparentNotify:
1422 if ((Options & Opt_transparent) && check_our_parents ()) 1517 rootwin_cb (ev);
1423 { 1518 break;
1424 if (am_transparent)
1425 want_full_refresh = 1;
1426 }
1427#endif /* TRANSPARENT */ 1519#endif /* TRANSPARENT */
1428 break;
1429 1520
1430 case GraphicsExpose: 1521 case GraphicsExpose:
1431 case Expose: 1522 case Expose:
1432 if (ev->xany.window == TermWin.vt) 1523 if (ev.xany.window == vt)
1433 { 1524 {
1434#ifdef NO_SLOW_LINK_SUPPORT 1525 do
1435 scr_expose (ev->xexpose.x, ev->xexpose.y, 1526 scr_expose (ev.xexpose.x, ev.xexpose.y,
1436 ev->xexpose.width, ev->xexpose.height, False); 1527 ev.xexpose.width, ev.xexpose.height, False);
1437#else 1528 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1438 // 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))
1439 scr_expose (ev->xexpose.x, ev->xexpose.y, 1533 scr_expose (ev.xexpose.x, ev.xexpose.y,
1440 ev->xexpose.width, ev->xexpose.height, False); 1534 ev.xexpose.width, ev.xexpose.height, False);
1441 //scr_expose (ev->xexpose.x, 0, 1535
1442 // ev->xexpose.width, TermWin.height, False); 1536 scr_refresh (refresh_type);
1443#endif
1444 want_refresh = 1;
1445 } 1537 }
1446 else 1538 else
1447 { 1539 {
1448 XEvent unused_xevent; 1540 XEvent unused_event;
1449 1541
1450 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1542 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1451 Expose, 1543 ;
1452 &unused_xevent)) ;
1453 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1544 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1454 GraphicsExpose, 1545 ;
1455 &unused_xevent)) ; 1546
1456 if (isScrollbarWindow(ev->xany.window)) 1547 if (isScrollbarWindow (ev.xany.window))
1457 { 1548 {
1458 scrollBar.setIdle(); 1549 scrollBar.setIdle ();
1459 scrollbar_show (0); 1550 scrollbar_show (0);
1460 } 1551 }
1461#ifdef MENUBAR 1552#ifdef MENUBAR
1462 if (menubar_visible () && isMenuBarWindow(ev->xany.window)) 1553 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1463 menubar_expose (); 1554 menubar_expose ();
1464#endif 1555#endif
1465#ifdef RXVT_GRAPHICS
1466 Gr_expose (ev->xany.window);
1467#endif
1468 1556
1557#ifdef TRANSPARENT
1558 if (am_transparent && ev.xany.window == parent[0])
1559 XClearWindow (disp, ev.xany.window);
1560#endif
1469 } 1561 }
1470 break; 1562 break;
1471 1563
1472 case MotionNotify: 1564 case MotionNotify:
1473#ifdef POINTER_BLANK 1565#ifdef POINTER_BLANK
1474 if (hidden_pointer) 1566 if (hidden_pointer)
1475 pointer_unblank (); 1567 pointer_unblank ();
1476#endif 1568#endif
1477#if MENUBAR 1569#if MENUBAR
1478 if (isMenuBarWindow(ev->xany.window)) 1570 if (isMenuBarWindow (ev.xany.window))
1479 { 1571 {
1480 menubar_control (&(ev->xbutton)); 1572 menubar_control (ev.xbutton);
1481 break; 1573 break;
1482 } 1574 }
1483#endif 1575#endif
1484 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1485 break; 1577 break;
1486 1578
1487 if (ev->xany.window == TermWin.vt) 1579 if (ev.xany.window == vt)
1488 { 1580 {
1489 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) 1581 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1490 { 1582 {
1491 while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt, 1583 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1492 MotionNotify, ev)) ; 1584 ;
1585
1493 XQueryPointer(Xdisplay, TermWin.vt, 1586 XQueryPointer (disp, vt,
1494 &unused_root, &unused_child, 1587 &unused_root, &unused_child,
1495 &unused_root_x, &unused_root_y, 1588 &unused_root_x, &unused_root_y,
1496 &(ev->xbutton.x), &(ev->xbutton.y), 1589 &ev.xbutton.x, &ev.xbutton.y,
1497 &unused_mask); 1590 &ev.xbutton.state);
1498#ifdef MOUSE_THRESHOLD 1591#ifdef MOUSE_THRESHOLD
1499 /* deal with a `jumpy' mouse */ 1592 /* deal with a `jumpy' mouse */
1500 if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1593 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1501 { 1594 {
1502#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
1503 selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1604 selection_extend (ev.xbutton.x, ev.xbutton.y,
1504 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1605 ev.xbutton.state & Button3Mask ? 2 : 0);
1606
1505#ifdef SELECTION_SCROLLING 1607#ifdef SELECTION_SCROLLING
1506 if (ev->xbutton.y < TermWin.int_bwidth 1608 if (ev.xbutton.y < int_bwidth
1507 || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) 1609 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1508 { 1610 {
1509 int dist; 1611 int dist;
1510
1511 pending_scroll_selection=1;
1512 1612
1513 /* don't clobber the current delay if we are 1613 /* don't clobber the current delay if we are
1514 * already in the middle of scrolling. 1614 * already in the middle of scrolling.
1515 */ 1615 */
1516 if (scroll_selection_delay<=0) 1616 if (!sel_scroll_ev.active)
1517 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1617 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1518 1618
1519 /* save the event params so we can highlight 1619 /* save the event params so we can highlight
1520 * the selection in the pending-scroll loop 1620 * the selection in the pending-scroll loop
1521 */ 1621 */
1522 selection_save_x=ev->xbutton.x; 1622 selection_save_x = ev.xbutton.x;
1523 selection_save_y=ev->xbutton.y; 1623 selection_save_y = ev.xbutton.y;
1524 selection_save_state=
1525 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1624 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1526 1625
1527 /* calc number of lines to scroll */ 1626 /* calc number of lines to scroll */
1528 if (ev->xbutton.y<TermWin.int_bwidth) 1627 if (ev.xbutton.y < int_bwidth)
1529 { 1628 {
1530 scroll_selection_dir = UP; 1629 scroll_selection_dir = UP;
1531 dist = TermWin.int_bwidth - ev->xbutton.y; 1630 dist = int_bwidth - ev.xbutton.y;
1532 } 1631 }
1533 else 1632 else
1534 { 1633 {
1535 scroll_selection_dir = DN; 1634 scroll_selection_dir = DN;
1536 dist = ev->xbutton.y - 1635 dist = ev.xbutton.y - (int_bwidth + height);
1537 (TermWin.int_bwidth + TermWin.height);
1538 } 1636 }
1637
1539 scroll_selection_lines=(Pixel2Height(dist)/ 1638 scroll_selection_lines = Pixel2Height (dist)
1540 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1639 / SELECTION_SCROLL_LINE_SPEEDUP
1640 + 1;
1541 MIN_IT(scroll_selection_lines, 1641 min_it (scroll_selection_lines,
1542 SELECTION_SCROLL_MAX_LINES); 1642 SELECTION_SCROLL_MAX_LINES);
1543 } 1643 }
1544 else 1644 else
1545 { 1645 {
1546 /* we are within the text window, so we 1646 /* we are within the text window, so we
1547 * shouldn't be scrolling 1647 * shouldn't be scrolling
1548 */ 1648 */
1549 pending_scroll_selection = 0; 1649 if (sel_scroll_ev.active)
1650 sel_scroll_ev.stop();
1550 } 1651 }
1551#endif 1652#endif
1552#ifdef MOUSE_THRESHOLD 1653#ifdef MOUSE_THRESHOLD
1553
1554 } 1654 }
1555#endif 1655#endif
1556
1557 } 1656 }
1558 } 1657 }
1559 else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) 1658 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1560 { 1659 {
1561 while (XCheckTypedWindowEvent(Xdisplay, scrollBar.win, 1660 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1562 MotionNotify, ev)) ; 1661 MotionNotify, &ev))
1662 ;
1663
1563 XQueryPointer(Xdisplay, scrollBar.win, 1664 XQueryPointer (disp, scrollBar.win,
1564 &unused_root, &unused_child, 1665 &unused_root, &unused_child,
1565 &unused_root_x, &unused_root_y, 1666 &unused_root_x, &unused_root_y,
1566 &(ev->xbutton.x), &(ev->xbutton.y), 1667 &ev.xbutton.x, &ev.xbutton.y,
1567 &unused_mask); 1668 &unused_mask);
1568 scr_move_to (scrollbar_position(ev->xbutton.y) - csrO, 1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1569 scrollbar_size()); 1670 scrollbar_size ());
1570 scr_refresh (refresh_type); 1671 scr_refresh (refresh_type);
1571 refresh_limit = 0; 1672 refresh_limit = 0;
1572 scrollbar_show (1); 1673 scrollbar_show (1);
1573 } 1674 }
1574 break; 1675 break;
1575 } 1676 }
1576} 1677}
1577 1678
1578void 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
1742rxvt_term::rootwin_cb (XEvent &ev)
1743{
1744 SET_R (this);
1745 SET_LOCALE (locale);
1746
1747 switch (ev.type)
1748 {
1749 case PropertyNotify:
1750 /*
1751 * if user used some Esetroot compatible prog to set the root bg,
1752 * use the property to determine the pixmap. We use it later on.
1753 */
1754 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1755 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1756 return;
1757
1758 /* FALLTHROUGH */
1759 case ReparentNotify:
1760 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1761 want_refresh = want_full_refresh = 1;
1762 break;
1763 }
1764}
1765#endif
1766
1767void
1579rxvt_term::button_press (XButtonEvent *ev) 1768rxvt_term::button_press (XButtonEvent &ev)
1580{ 1769{
1581 int reportmode = 0, clickintime; 1770 int reportmode = 0, clickintime;
1582 1771
1583 bypass_keystate = ev->state & (ModMetaMask | ShiftMask); 1772 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1584 if (!bypass_keystate) 1773 if (!bypass_keystate)
1585 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1774 reportmode = !! (priv_modes & PrivMode_mouse_report);
1775
1586 /* 1776 /*
1587 * VT window processing of button press 1777 * VT window processing of button press
1588 */ 1778 */
1589 if (ev->window == TermWin.vt) 1779 if (ev.window == vt)
1590 { 1780 {
1591#if RXVT_GRAPHICS 1781#if ISO_14755
1592 if (ev->subwindow != None) 1782 // 5.4
1593 rxvt_Gr_ButtonPress (ev->x, ev->y); 1783 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1594 else 1784 {
1595#endif 1785 iso14755_54 (ev.x, ev.y);
1596 1786 return;
1597 { 1787 }
1788#endif
1789
1598 clickintime = ev->time - MEvent.time < MULTICLICK_TIME; 1790 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1791
1599 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)
1600 { 1799 {
1601 /* mouse report from vt window */ 1800 /* same button, within alloted time */
1602 /* save the xbutton state (for ButtonRelease) */ 1801 MEvent.clicks++;
1603 MEvent.state = ev->state; 1802 if (MEvent.clicks > 1)
1604#ifdef MOUSE_REPORT_DOUBLECLICK
1605 if (ev->button == MEvent.button && clickintime)
1606 { 1803 {
1607 /* same button, within alloted time */
1608 MEvent.clicks++;
1609 if (MEvent.clicks > 1)
1610 {
1611 /* only report double clicks */ 1804 /* only report double clicks */
1612 MEvent.clicks = 2; 1805 MEvent.clicks = 2;
1613 mouse_report (ev); 1806 mouse_report (ev);
1614 1807
1615 /* don't report the release */ 1808 /* don't report the release */
1616 MEvent.clicks = 0; 1809 MEvent.clicks = 0;
1617 MEvent.button = AnyButton; 1810 MEvent.button = AnyButton;
1618 }
1619 } 1811 }
1620 else
1621 {
1622 /* different button, or time expired */
1623 MEvent.clicks = 1;
1624 MEvent.button = ev->button;
1625 mouse_report (ev);
1626 }
1627#else
1628 MEvent.button = ev->button;
1629 mouse_report (ev);
1630#endif /* MOUSE_REPORT_DOUBLECLICK */
1631
1632 } 1812 }
1633 else 1813 else
1634 { 1814 {
1635 if (ev->button != MEvent.button) 1815 /* different button, or time expired */
1636 MEvent.clicks = 0; 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 {
1828 if (ev.button != MEvent.button)
1829 MEvent.clicks = 0;
1830
1637 switch (ev->button) 1831 switch (ev.button)
1638 { 1832 {
1639 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
1640 /* allow shift+left click to extend selection */ 1842 /* allow shift+left click to extend selection */
1641 if (ev->state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1843 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1642 { 1844 {
1643 if (MEvent.button == Button1 && clickintime) 1845 if (MEvent.button == Button1 && clickintime)
1644 selection_rotate (ev->x, ev->y); 1846 selection_rotate (ev.x, ev.y);
1645 else
1646 selection_extend (ev->x, ev->y, 1);
1647 }
1648 else 1847 else
1649 { 1848 selection_extend (ev.x, ev.y, 1);
1650 if (MEvent.button == Button1 && clickintime)
1651 MEvent.clicks++;
1652 else
1653 MEvent.clicks = 1;
1654
1655 selection_click (MEvent.clicks, ev->x, ev->y);
1656 } 1849 }
1657 1850 else
1658 MEvent.button = Button1;
1659 break; 1851 {
1660
1661 case Button3:
1662 if (MEvent.button == Button3 && clickintime) 1852 if (MEvent.button == Button1 && clickintime)
1663 selection_rotate (ev->x, ev->y); 1853 MEvent.clicks++;
1664 else 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
1665 selection_extend (ev->x, ev->y, 1); 1867 selection_extend (ev.x, ev.y, 1);
1868
1666 MEvent.button = Button3; 1869 MEvent.button = Button3;
1667 break; 1870 break;
1668 }
1669 } 1871 }
1872 }
1873
1670 MEvent.time = ev->time; 1874 MEvent.time = ev.time;
1671 return; 1875 return;
1672 }
1673 } 1876 }
1674 1877
1675 /* 1878 /*
1676 * Scrollbar window processing of button press 1879 * Scrollbar window processing of button press
1677 */ 1880 */
1678 if (isScrollbarWindow(ev->window)) 1881 if (isScrollbarWindow (ev.window))
1679 { 1882 {
1680 scrollBar.setIdle (); 1883 scrollBar.setIdle ();
1681 /* 1884 /*
1682 * Rxvt-style scrollbar: 1885 * Rxvt-style scrollbar:
1683 * move up if mouse is above slider 1886 * move up if mouse is above slider
… …
1695 * Mouse report disabled scrollbar: 1898 * Mouse report disabled scrollbar:
1696 * arrow buttons - send up/down 1899 * arrow buttons - send up/down
1697 * click on scrollbar - send pageup/down 1900 * click on scrollbar - send pageup/down
1698 */ 1901 */
1699 if ((scrollBar.style == R_SB_NEXT 1902 if ((scrollBar.style == R_SB_NEXT
1700 && scrollbarnext_upButton(ev->y)) 1903 && scrollbarnext_upButton (ev.y))
1701 || (scrollBar.style == R_SB_RXVT 1904 || (scrollBar.style == R_SB_RXVT
1702 && scrollbarrxvt_upButton(ev->y))) 1905 && scrollbarrxvt_upButton (ev.y)))
1703 tt_printf("\033[A"); 1906 tt_printf ("\033[A");
1704 else if ((scrollBar.style == R_SB_NEXT 1907 else if ((scrollBar.style == R_SB_NEXT
1705 && scrollbarnext_dnButton(ev->y)) 1908 && scrollbarnext_dnButton (ev.y))
1706 || (scrollBar.style == R_SB_RXVT 1909 || (scrollBar.style == R_SB_RXVT
1707 && scrollbarrxvt_dnButton(ev->y))) 1910 && scrollbarrxvt_dnButton (ev.y)))
1708 tt_printf("\033[B"); 1911 tt_printf ("\033[B");
1709 else 1912 else
1710 switch (ev->button) 1913 switch (ev.button)
1711 { 1914 {
1712 case Button2: 1915 case Button2:
1713 tt_printf("\014"); 1916 tt_printf ("\014");
1714 break; 1917 break;
1715 case Button1: 1918 case Button1:
1716 tt_printf("\033[6~"); 1919 tt_printf ("\033[6~");
1717 break; 1920 break;
1718 case Button3: 1921 case Button3:
1719 tt_printf("\033[5~"); 1922 tt_printf ("\033[5~");
1720 break; 1923 break;
1721 } 1924 }
1722 } 1925 }
1723 else 1926 else
1724#endif /* NO_SCROLLBAR_REPORT */ 1927#endif /* NO_SCROLLBAR_REPORT */
… …
1726 { 1929 {
1727 char upordown = 0; 1930 char upordown = 0;
1728 1931
1729 if (scrollBar.style == R_SB_NEXT) 1932 if (scrollBar.style == R_SB_NEXT)
1730 { 1933 {
1731 if (scrollbarnext_upButton(ev->y)) 1934 if (scrollbarnext_upButton (ev.y))
1732 upordown = -1; /* up */ 1935 upordown = -1; /* up */
1733 else if (scrollbarnext_dnButton(ev->y)) 1936 else if (scrollbarnext_dnButton (ev.y))
1734 upordown = 1; /* down */ 1937 upordown = 1; /* down */
1735 } 1938 }
1736 else if (scrollBar.style == R_SB_RXVT) 1939 else if (scrollBar.style == R_SB_RXVT)
1737 { 1940 {
1738 if (scrollbarrxvt_upButton(ev->y)) 1941 if (scrollbarrxvt_upButton (ev.y))
1739 upordown = -1; /* up */ 1942 upordown = -1; /* up */
1740 else if (scrollbarrxvt_dnButton(ev->y)) 1943 else if (scrollbarrxvt_dnButton (ev.y))
1741 upordown = 1; /* down */ 1944 upordown = 1; /* down */
1742 } 1945 }
1743 if (upordown) 1946 if (upordown)
1744 { 1947 {
1745#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1948#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1746 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1949 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1747#endif 1950#endif
1748 if (scr_page (upordown < 0 ? UP : DN, 1)) 1951 if (scr_page (upordown < 0 ? UP : DN, 1))
1749 { 1952 {
1750 if (upordown < 0) 1953 if (upordown < 0)
1751 scrollBar.setUp (); 1954 scrollBar.setUp ();
1752 else 1955 else
1753 scrollBar.setDn (); 1956 scrollBar.setDn ();
1754 } 1957 }
1755 } 1958 }
1756 else 1959 else
1757 switch (ev->button) 1960 switch (ev.button)
1758 { 1961 {
1759 case Button2: 1962 case Button2:
1760 switch (scrollbar_align) 1963 switch (scrollbar_align)
1761 { 1964 {
1762 case R_SB_ALIGN_TOP: 1965 case R_SB_ALIGN_TOP:
… …
1767 break; 1970 break;
1768 case R_SB_ALIGN_BOTTOM: 1971 case R_SB_ALIGN_BOTTOM:
1769 csrO = scrollBar.bot - scrollBar.top; 1972 csrO = scrollBar.bot - scrollBar.top;
1770 break; 1973 break;
1771 } 1974 }
1975
1772 if (scrollBar.style == R_SB_XTERM 1976 if (scrollBar.style == R_SB_XTERM
1773 || scrollbar_above_slider(ev->y) 1977 || scrollbar_above_slider (ev.y)
1774 || scrollbar_below_slider(ev->y)) 1978 || scrollbar_below_slider (ev.y))
1775 scr_move_to ( scrollbar_position(ev->y) - csrO, 1979 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1776 scrollbar_size()); 1980
1777 scrollBar.setMotion (); 1981 scrollBar.setMotion ();
1778 break; 1982 break;
1779 1983
1780 case Button1: 1984 case Button1:
1781 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1985 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1782 csrO = ev->y - scrollBar.top; 1986 csrO = ev.y - scrollBar.top;
1783 /* FALLTHROUGH */ 1987 /* FALLTHROUGH */
1784 1988
1785 case Button3: 1989 case Button3:
1786 if (scrollBar.style != R_SB_XTERM) 1990 if (scrollBar.style != R_SB_XTERM)
1787 { 1991 {
1788 if (scrollbar_above_slider(ev->y)) 1992 if (scrollbar_above_slider (ev.y))
1789# ifdef RXVT_SCROLL_FULL 1993# ifdef RXVT_SCROLL_FULL
1790 scr_page (UP, TermWin.nrow - 1); 1994 scr_page (UP, nrow - 1);
1791# else 1995# else
1792 scr_page (UP, TermWin.nrow / 4); 1996 scr_page (UP, nrow / 4);
1793# endif 1997# endif
1794 else if (scrollbar_below_slider(ev->y)) 1998 else if (scrollbar_below_slider (ev.y))
1795# ifdef RXVT_SCROLL_FULL 1999# ifdef RXVT_SCROLL_FULL
1796 scr_page (DN, TermWin.nrow - 1); 2000 scr_page (DN, nrow - 1);
1797# else 2001# else
1798 scr_page (DN, TermWin.nrow / 4); 2002 scr_page (DN, nrow / 4);
1799# endif 2003# endif
1800 else 2004 else
1801 scrollBar.setMotion (); 2005 scrollBar.setMotion ();
1802 } 2006 }
1803 else 2007 else
1804 { 2008 {
1805 scr_page ((ev->button == Button1 ? DN : UP), 2009 scr_page ((ev.button == Button1 ? DN : UP),
1806 (TermWin.nrow 2010 (nrow
1807 * scrollbar_position(ev->y) 2011 * scrollbar_position (ev.y)
1808 / scrollbar_size())); 2012 / scrollbar_size ()));
1809 } 2013 }
2014
1810 break; 2015 break;
1811 } 2016 }
1812 } 2017 }
1813 return; 2018 return;
1814 } 2019 }
1815#if MENUBAR 2020#if MENUBAR
1816 /* 2021 /*
1817 * Menubar window processing of button press 2022 * Menubar window processing of button press
1818 */ 2023 */
1819 if (isMenuBarWindow(ev->window)) 2024 if (isMenuBarWindow (ev.window))
1820 menubar_control (ev); 2025 menubar_control (ev);
1821#endif 2026#endif
1822} 2027}
1823 2028
1824void 2029void
1825rxvt_term::button_release (XButtonEvent *ev) 2030rxvt_term::button_release (XButtonEvent &ev)
1826{ 2031{
1827 int reportmode = 0; 2032 int reportmode = 0;
1828 2033
1829 csrO = 0; /* reset csr Offset */ 2034 csrO = 0; /* reset csr Offset */
1830 if (!bypass_keystate) 2035 if (!bypass_keystate)
1831 reportmode = !!(PrivateModes & PrivMode_mouse_report); 2036 reportmode = !! (priv_modes & PrivMode_mouse_report);
1832 2037
1833 if (scrollbar_isUpDn()) 2038 if (scrollbar_isUpDn ())
1834 { 2039 {
1835 scrollBar.setIdle (); 2040 scrollBar.setIdle ();
1836 scrollbar_show (0); 2041 scrollbar_show (0);
1837#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2042#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1838 refresh_type &= ~SMOOTH_REFRESH; 2043 refresh_type &= ~SMOOTH_REFRESH;
1839#endif 2044#endif
1840
1841 } 2045 }
2046
1842#ifdef SELECTION_SCROLLING 2047#ifdef SELECTION_SCROLLING
1843 pending_scroll_selection=0; 2048 if (sel_scroll_ev.active)
2049 sel_scroll_ev.stop();
1844#endif 2050#endif
2051
1845 if (ev->window == TermWin.vt) 2052 if (ev.window == vt)
1846 { 2053 {
1847#ifdef RXVT_GRAPHICS 2054#if ISO_14755
1848 if (ev->subwindow != None) 2055 // 5.4
1849 rxvt_Gr_ButtonRelease(ev->x, ev->y); 2056 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1850 else 2057 return;
1851#endif 2058#endif
1852
1853 {
1854 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)))
1855 { 2071 {
1856 /* mouse report from vt window */
1857 /* don't report release of wheel "buttons" */
1858 if (ev->button >= 4)
1859 return;
1860#ifdef MOUSE_REPORT_DOUBLECLICK
1861 /* only report the release of 'slow' single clicks */
1862 if (MEvent.button != AnyButton
1863 && (ev->button != MEvent.button
1864 || (ev->time - MEvent.time
1865 > MULTICLICK_TIME / 2)))
1866 {
1867 MEvent.clicks = 0; 2072 MEvent.clicks = 0;
1868 MEvent.button = AnyButton;
1869 mouse_report (ev);
1870 }
1871#else /* MOUSE_REPORT_DOUBLECLICK */
1872 MEvent.button = AnyButton; 2073 MEvent.button = AnyButton;
1873 mouse_report (ev); 2074 mouse_report (ev);
2075 }
2076#else /* MOUSE_REPORT_DOUBLECLICK */
2077 MEvent.button = AnyButton;
2078 mouse_report (ev);
1874#endif /* MOUSE_REPORT_DOUBLECLICK */ 2079#endif /* MOUSE_REPORT_DOUBLECLICK */
1875 return; 2080 return;
1876 } 2081 }
2082
1877 /* 2083 /*
1878 * dumb hack to compensate for the failure of click-and-drag 2084 * dumb hack to compensate for the failure of click-and-drag
1879 * when overriding mouse reporting 2085 * when overriding mouse reporting
1880 */ 2086 */
1881 if (PrivateModes & PrivMode_mouse_report 2087 if (priv_modes & PrivMode_mouse_report
1882 && bypass_keystate 2088 && bypass_keystate
1883 && ev->button == Button1 && MEvent.clicks <= 1) 2089 && ev.button == Button1 && MEvent.clicks <= 1)
1884 selection_extend (ev->x, ev->y, 0); 2090 selection_extend (ev.x, ev.y, 0);
1885 2091
1886 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:
1887 { 2104 {
1888 case Button1: 2105 int i;
1889 case Button3: 2106 page_dirn v;
1890 selection_make (ev->time); 2107
2108 v = ev.button == Button4 ? UP : DN;
2109
2110 if (ev.state & ShiftMask)
1891 break; 2111 i = 1;
1892 case Button2: 2112 else if (OPTION (Opt_mouseWheelScrollPage))
1893 selection_request (ev->time, ev->x, ev->y); 2113 i = nrow - 1;
2114 else
1894 break; 2115 i = 5;
2116
1895#ifdef MOUSE_WHEEL 2117# ifdef MOUSE_SLIP_WHEELING
1896 case Button4: 2118 if (ev.state & ControlMask)
1897 case Button5:
1898 { 2119 {
1899 int i;
1900 page_dirn v;
1901
1902 v = (ev->button == Button4) ? UP : DN;
1903 if (ev->state & ShiftMask)
1904 i = 1;
1905 else if ((Options & Opt_mouseWheelScrollPage))
1906 i = TermWin.nrow - 1;
1907 else
1908 i = 5;
1909# ifdef MOUSE_SLIP_WHEELING
1910 if (ev->state & ControlMask)
1911 {
1912 mouse_slip_wheel_speed += (v ? -1 : 1); 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)
1913 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2125 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2126
2127 slip_wheel_ev.start ();
1914 } 2128 }
2129 else
2130 {
1915# endif 2131# endif
1916# ifdef JUMP_MOUSE_WHEEL 2132# ifdef JUMP_MOUSE_WHEEL
1917 scr_page (v, i); 2133 scr_page (v, i);
1918 scr_refresh (SMOOTH_REFRESH); 2134 scr_refresh (SMOOTH_REFRESH);
1919 scrollbar_show (1); 2135 scrollbar_show (1);
… …
1923 scr_page (v, 1); 2139 scr_page (v, 1);
1924 scr_refresh (SMOOTH_REFRESH); 2140 scr_refresh (SMOOTH_REFRESH);
1925 scrollbar_show (1); 2141 scrollbar_show (1);
1926 } 2142 }
1927# endif 2143# endif
1928 2144# ifdef MOUSE_SLIP_WHEELING
1929 } 2145 }
1930 break;
1931#endif 2146#endif
1932
1933 } 2147 }
2148 break;
2149#endif
1934 } 2150 }
1935 } 2151 }
1936#ifdef MENUBAR 2152#ifdef MENUBAR
1937 else if (isMenuBarWindow(ev->window)) 2153 else if (isMenuBarWindow (ev.window))
1938 menubar_control (ev); 2154 menubar_control (ev);
1939#endif 2155#endif
1940} 2156}
1941 2157
1942
1943#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
1944/* 2390/*
1945 * Check our parents are still who we think they are. 2391 * Check our parents are still who we think they are.
1946 * Do transparency updates if required 2392 * Do transparency updates if required
1947 */ 2393 */
1948int 2394int
1949rxvt_term::check_our_parents () 2395rxvt_term::check_our_parents ()
1950{ 2396{
1951 int i, pchanged, aformat, have_pixmap, rootdepth; 2397 int i, pchanged, aformat, have_pixmap, rootdepth;
1952 unsigned long nitems, bytes_after; 2398 unsigned long nitems, bytes_after;
1953 Atom atype; 2399 Atom atype;
1954 unsigned char *prop = NULL; 2400 unsigned char *prop = NULL;
1955 Window root, oldp, *list; 2401 Window root, oldp, *list;
1956 Pixmap rootpixmap = None; 2402 Pixmap rootpixmap = None;
1957 XWindowAttributes wattr, wrootattr; 2403 XWindowAttributes wattr, wrootattr;
2404 dDisp;
1958 2405
1959 pchanged = 0; 2406 pchanged = 0;
1960 2407
1961 if (!(Options & Opt_transparent)) 2408 if (!OPTION (Opt_transparent))
1962 return pchanged; /* Don't try any more */ 2409 return pchanged; /* Don't try any more */
1963 2410
1964 XGetWindowAttributes(Xdisplay, Xroot, &wrootattr); 2411 XGetWindowAttributes (disp, display->root, &wrootattr);
1965 rootdepth = wrootattr.depth; 2412 rootdepth = wrootattr.depth;
1966 2413
1967 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2414 XGetWindowAttributes (disp, parent[0], &wattr);
2415
1968 if (rootdepth != wattr.depth) 2416 if (rootdepth != wattr.depth)
1969 { 2417 {
1970 if (am_transparent) 2418 if (am_transparent)
1971 { 2419 {
1972 pchanged = 1; 2420 pchanged = 1;
1973 XSetWindowBackground(Xdisplay, TermWin.vt, 2421 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1974 PixColors[Color_bg]);
1975 am_transparent = am_pixmap_trans = 0; 2422 am_transparent = am_pixmap_trans = 0;
1976 } 2423 }
2424
1977 return pchanged; /* Don't try any more */ 2425 return pchanged; /* Don't try any more */
1978 } 2426 }
1979 2427
1980 /* 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. */
1981 XSync(Xdisplay, False); 2429 XSync (disp, False);
1982 2430
1983 /* 2431 /*
1984 * Make the frame window set by the window manager have 2432 * Make the frame window set by the window manager have
1985 * the root background. Some window managers put multiple nested frame 2433 * the root background. Some window managers put multiple nested frame
1986 * 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.
1987 */ 2435 */
1988 i = (xa[XA_XROOTPMAPID] != 0 2436 i = (xa[XA_XROOTPMAP_ID]
1989 && (XGetWindowProperty(Xdisplay, Xroot, xa[XA_XROOTPMAPID], 2437 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1990 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2438 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1991 &nitems, &bytes_after, &prop) == Success)); 2439 &nitems, &bytes_after, &prop) == Success);
2440
1992 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 )
1993 have_pixmap = 0; 2452 have_pixmap = 0;
1994 else 2453 else
1995 { 2454 {
1996 have_pixmap = 1; 2455 have_pixmap = 1;
1997 rootpixmap = *((Pixmap *)prop); 2456 rootpixmap = *(Pixmap *)prop;
1998 XFree(prop); 2457 XFree (prop);
1999 } 2458 }
2459
2000 if (have_pixmap) 2460 if (have_pixmap)
2001 { 2461 {
2002 /* 2462 /*
2003 * Copy Xroot pixmap transparency 2463 * Copy display->root pixmap transparency
2004 */ 2464 */
2005 int sx, sy, nx, ny; 2465 int sx, sy, nx, ny;
2006 unsigned int nw, nh; 2466 unsigned int nw, nh;
2007 Window cr; 2467 Window cr;
2008 XImage *image; 2468 XImage *image;
2009 GC gc; 2469 GC gc;
2010 XGCValues gcvalue; 2470 XGCValues gcvalue;
2011 2471
2012 XTranslateCoordinates(Xdisplay, TermWin.parent[0], Xroot, 2472 XTranslateCoordinates (disp, parent[0], display->root,
2013 0, 0, &sx, &sy, &cr); 2473 0, 0, &sx, &sy, &cr);
2014 nw = (unsigned int)szHint.width; 2474 nw = (unsigned int)szHint.width;
2015 nh = (unsigned int)szHint.height; 2475 nh = (unsigned int)szHint.height;
2016 nx = ny = 0; 2476 nx = ny = 0;
2477
2017 if (sx < 0) 2478 if (sx < 0)
2018 { 2479 {
2019 nw += sx; 2480 nw += sx;
2020 nx = -sx; 2481 nx = -sx;
2021 sx = 0; 2482 sx = 0;
2022 } 2483 }
2484
2023 if (sy < 0) 2485 if (sy < 0)
2024 { 2486 {
2025 nh += sy; 2487 nh += sy;
2026 ny = -sy; 2488 ny = -sy;
2027 sy = 0; 2489 sy = 0;
2028 } 2490 }
2491
2029 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2492 min_it (nw, (unsigned int) (wrootattr.width - sx));
2030 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2493 min_it (nh, (unsigned int) (wrootattr.height - sy));
2494
2495 XSync (disp, False);
2031 allowedxerror = -1; 2496 allowedxerror = -1;
2032 image = XGetImage(Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 2497 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2033 ZPixmap); 2498
2034 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2499 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2035 /* XXX: may need a delay here? */ 2500 /* XXX: may need a delay here? */
2036 allowedxerror = 0; 2501 allowedxerror = 0;
2502
2037 if (image == NULL) 2503 if (image == NULL)
2038 { 2504 {
2039 if (am_transparent && am_pixmap_trans) 2505 if (am_transparent && am_pixmap_trans)
2040 { 2506 {
2041 pchanged = 1; 2507 pchanged = 1;
2042 if (TermWin.pixmap != None) 2508 if (pixmap != None)
2043 { 2509 {
2044 XFreePixmap(Xdisplay, TermWin.pixmap); 2510 XFreePixmap (disp, pixmap);
2045 TermWin.pixmap = None; 2511 pixmap = None;
2046 } 2512 }
2047 } 2513 }
2514
2048 am_pixmap_trans = 0; 2515 am_pixmap_trans = 0;
2049 } 2516 }
2050 else 2517 else
2051 { 2518 {
2052 if (TermWin.pixmap != None) 2519 if (pixmap != None)
2053 XFreePixmap(Xdisplay, TermWin.pixmap); 2520 XFreePixmap (disp, pixmap);
2521
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
2054 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, 2534 pixmap = XCreatePixmap (disp, vt,
2055 (unsigned int)szHint.width,
2056 (unsigned int)szHint.height, 2535 szHint.width, szHint.height, image->depth);
2057 (unsigned int)image->depth);
2058 gc = XCreateGC(Xdisplay, TermWin.vt, 0UL, &gcvalue); 2536 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2059 XPutImage(Xdisplay, TermWin.pixmap, gc, image, 0, 0, 2537 XPutImage (disp, pixmap, gc, image, 0, 0,
2060 nx, ny, (unsigned int)image->width,
2061 (unsigned int)image->height); 2538 nx, ny, image->width, image->height);
2062 XFreeGC(Xdisplay, gc); 2539 XFreeGC (disp, gc);
2063 XDestroyImage(image); 2540 XDestroyImage (image);
2064 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2541 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2065 TermWin.pixmap); 2542 XClearWindow (disp, parent[0]);
2543
2066 if (!am_transparent || !am_pixmap_trans) 2544 if (!am_transparent || !am_pixmap_trans)
2067 pchanged = 1; 2545 pchanged = 1;
2546
2068 am_transparent = am_pixmap_trans = 1; 2547 am_transparent = am_pixmap_trans = 1;
2069 } 2548 }
2070 } 2549 }
2550
2071 if (!am_pixmap_trans) 2551 if (am_pixmap_trans)
2552 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2553 else
2072 { 2554 {
2073 unsigned int n; 2555 unsigned int n;
2074 /* 2556 /*
2075 * InheritPixmap transparency 2557 * InheritPixmap transparency
2076 */ 2558 */
2077 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot));
2078 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2559 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2079 i++)
2080 { 2560 {
2081 oldp = TermWin.parent[i]; 2561 oldp = parent[i];
2082 XQueryTree(Xdisplay, TermWin.parent[i - 1], &root, 2562 XQueryTree (disp, parent[i - 1], &root,
2083 &TermWin.parent[i], &list, &n); 2563 &parent[i], &list, &n);
2084 XFree(list); 2564 XFree (list);
2085 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2565
2086 if (TermWin.parent[i] == Xroot) 2566 if (parent[i] == display->root)
2087 { 2567 {
2088 if (oldp != None) 2568 if (oldp != None)
2089 pchanged = 1; 2569 pchanged = 1;
2570
2090 break; 2571 break;
2091 } 2572 }
2573
2092 if (oldp != TermWin.parent[i]) 2574 if (oldp != parent[i])
2093 pchanged = 1; 2575 pchanged = 1;
2094 } 2576 }
2577
2095 n = 0; 2578 n = 0;
2579
2096 if (pchanged) 2580 if (pchanged)
2097 { 2581 {
2098 for (; n < (unsigned int)i; n++) 2582 for (; n < (unsigned int)i; n++)
2099 { 2583 {
2100 XGetWindowAttributes(Xdisplay, TermWin.parent[n], &wattr); 2584 XGetWindowAttributes (disp, parent[n], &wattr);
2101 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2102 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2585 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2103 { 2586 {
2104 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2587 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2105 break; 2588 break;
2106 } 2589 }
2107 } 2590 }
2108 } 2591 }
2109 if (n > (int)(sizeof(TermWin.parent) 2592
2110 / sizeof(TermWin.parent[0]))) 2593 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2111 { 2594 {
2112 D_X((stderr, "InheritPixmap Turning off")); 2595 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2113 XSetWindowBackground(Xdisplay, TermWin.parent[0], 2596 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2114 PixColors[Color_fg]);
2115 XSetWindowBackground(Xdisplay, TermWin.vt,
2116 PixColors[Color_bg]);
2117 am_transparent = 0; 2597 am_transparent = 0;
2118 /* XXX: also turn off Opt_transparent? */ 2598 /* XXX: also turn off Opt_transparent? */
2119 } 2599 }
2120 else 2600 else
2121 { 2601 {
2602#if WAIT_FOR_WM
2122 /* wait (an arbitrary period) for the WM to do its thing 2603 /* wait (an arbitrary period) for the WM to do its thing
2123 * needed for fvwm2.2.2 (and before?) */ 2604 * needed for fvwm2.2.2 (and before?) */
2124# ifdef HAVE_NANOSLEEP
2125 struct timespec rqt;
2126
2127 rqt.tv_sec = 1;
2128 rqt.tv_nsec = 0;
2129 nanosleep(&rqt, NULL);
2130# else
2131 sleep(1); 2605 sleep (1);
2132# endif 2606#endif
2133 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2134 for (n = 0; n < (unsigned int)i; n++) 2607 for (n = 0; n < (unsigned int)i; n++)
2608 {
2135 XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n], 2609 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2136 ParentRelative); 2610 XClearWindow (disp, parent[n]);
2611 }
2612
2137 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2613 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2138 ParentRelative);
2139 am_transparent = 1; 2614 am_transparent = 1;
2140 } 2615 }
2616
2141 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2617 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2142 TermWin.parent[i] = None; 2618 parent[i] = None;
2619 }
2620
2621 if (scrollBar.win)
2143 } 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
2144 return pchanged; 2635 return pchanged;
2145} 2636}
2146#endif 2637#endif
2147 2638
2148/*}}} */ 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}
2149 2836
2150/*{{{ print pipe */ 2837/*{{{ print pipe */
2151/*----------------------------------------------------------------------*/ 2838/*----------------------------------------------------------------------*/
2152#ifdef PRINTPIPE 2839#ifdef PRINTPIPE
2153FILE * 2840FILE *
2154rxvt_term::popen_printer () 2841rxvt_term::popen_printer ()
2155{ 2842{
2156 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2843 FILE *stream = popen (rs[Rs_print_pipe], "w");
2157 2844
2158 if (stream == NULL) 2845 if (stream == NULL)
2159 rxvt_print_error("can't open printer pipe"); 2846 rxvt_warn ("can't open printer pipe, not printing.\n");
2847
2160 return stream; 2848 return stream;
2161} 2849}
2162 2850
2163int 2851int
2164rxvt_term::pclose_printer (FILE *stream) 2852rxvt_term::pclose_printer (FILE *stream)
2165{ 2853{
2166 fflush (stream); 2854 fflush (stream);
2167 /* pclose() reported not to work on SunOS 4.1.3 */
2168# if defined (__sun__) /* TODO: RESOLVE THIS */
2169 /* pclose works provided SIGCHLD handler uses waitpid */
2170 return pclose (stream); /* return fclose (stream); */
2171# else
2172 return pclose (stream); 2855 return pclose (stream);
2173# endif
2174} 2856}
2175 2857
2176/* 2858/*
2177 * simulate attached vt100 printer 2859 * simulate attached vt100 printer
2178 */ 2860 */
2179void 2861void
2180rxvt_term::process_print_pipe () 2862rxvt_term::process_print_pipe ()
2181{ 2863{
2182 int done; 2864 int done;
2183 FILE *fd; 2865 FILE *fd;
2184 2866
2185 if ((fd = popen_printer ()) == NULL) 2867 if ((fd = popen_printer ()) == NULL)
2186 return; 2868 return;
2187 2869
2188 /* 2870 /*
2189 * 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
2190 * is received. 2872 * is received.
2191 */ 2873 */
2192 for (done = 0; !done;) 2874 for (done = 0; !done;)
2193 { 2875 {
2194 unsigned char buf[8]; 2876 unsigned char buf[8];
2195 unsigned char ch; 2877 unicode_t ch;
2196 unsigned int i, len; 2878 unsigned int i, len;
2197 2879
2198 if ((ch = cmd_getc ()) != C0_ESC) 2880 if ((ch = cmd_getc ()) != C0_ESC)
2199 { 2881 {
2200 if (putc(ch, fd) == EOF) 2882 if (putc (ch, fd) == EOF)
2201 break; /* done = 1 */ 2883 break; /* done = 1 */
2202 } 2884 }
2203 else 2885 else
2204 { 2886 {
2205 len = 0; 2887 len = 0;
… …
2216 { 2898 {
2217 if ((buf[len++] = cmd_getc ()) == 'i') 2899 if ((buf[len++] = cmd_getc ()) == 'i')
2218 break; /* done = 1 */ 2900 break; /* done = 1 */
2219 } 2901 }
2220 } 2902 }
2903
2221 for (i = 0; i < len; i++) 2904 for (i = 0; i < len; i++)
2222 if (putc(buf[i], fd) == EOF) 2905 if (putc (buf[i], fd) == EOF)
2223 { 2906 {
2224 done = 1; 2907 done = 1;
2225 break; 2908 break;
2226 } 2909 }
2227 } 2910 }
2228 } 2911 }
2912
2229 pclose_printer (fd); 2913 pclose_printer (fd);
2230} 2914}
2231#endif /* PRINTPIPE */ 2915#endif /* PRINTPIPE */
2232/*}}} */ 2916/*}}} */
2233 2917
2234/* *INDENT-OFF* */ 2918/* *INDENT-OFF* */
2235enum { 2919enum {
2236 C1_40 = 0x40, 2920 C1_40 = 0x40,
2237 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,
2238 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,
2239 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,
2240 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,
2241}; 2925};
2242/* *INDENT-ON* */ 2926/* *INDENT-ON* */
2243 2927
2244/*{{{ process non-printing single characters */ 2928/*{{{ process non-printing single characters */
2245void 2929void
2246rxvt_term::process_nonprinting (unsigned char ch) 2930rxvt_term::process_nonprinting (unicode_t ch)
2247{ 2931{
2248 switch (ch) 2932 switch (ch)
2249 { 2933 {
2934 case C0_ESC:
2935 process_escape_seq ();
2936 break;
2250 case C0_ENQ: /* terminal Status */ 2937 case C0_ENQ: /* terminal Status */
2251 if (rs[Rs_answerbackstring]) 2938 if (rs[Rs_answerbackstring])
2252 tt_write(
2253 (const unsigned char *)rs[Rs_answerbackstring], 2939 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2254 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2940 (unsigned int)strlen (rs[Rs_answerbackstring]));
2255 else 2941 else
2256 tt_write((unsigned char *)VT100_ANS, 2942 tt_write ((unsigned char *)VT100_ANS,
2257 (unsigned int)STRLEN(VT100_ANS)); 2943 (unsigned int)strlen (VT100_ANS));
2258 break; 2944 break;
2259 case C0_BEL: /* bell */ 2945 case C0_BEL: /* bell */
2260 scr_bell (); 2946 scr_bell ();
2261 break; 2947 break;
2262 case C0_BS: /* backspace */ 2948 case C0_BS: /* backspace */
… …
2277 scr_charset_choose (1); 2963 scr_charset_choose (1);
2278 break; 2964 break;
2279 case C0_SI: /* shift in - acs */ 2965 case C0_SI: /* shift in - acs */
2280 scr_charset_choose (0); 2966 scr_charset_choose (0);
2281 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
2282 } 2981 }
2283} 2982}
2284/*}}} */ 2983/*}}} */
2285 2984
2286 2985
2287/*{{{ process VT52 escape sequences */ 2986/*{{{ process VT52 escape sequences */
2288void 2987void
2289rxvt_term::process_escape_vt52 (unsigned char ch) 2988rxvt_term::process_escape_vt52 (unicode_t ch)
2290{ 2989{
2291 int row, col; 2990 int row, col;
2292 2991
2293 switch (ch) 2992 switch (ch)
2294 { 2993 {
… …
2324 row = cmd_getc () - ' '; 3023 row = cmd_getc () - ' ';
2325 col = cmd_getc () - ' '; 3024 col = cmd_getc () - ' ';
2326 scr_gotorc (row, col, 0); 3025 scr_gotorc (row, col, 0);
2327 break; 3026 break;
2328 case 'Z': /* identify the terminal type */ 3027 case 'Z': /* identify the terminal type */
2329 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 3028 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2330 break; 3029 break;
2331 case '<': /* turn off VT52 mode */ 3030 case '<': /* turn off VT52 mode */
2332 PrivMode(0, PrivMode_vt52); 3031 PrivMode (0, PrivMode_vt52);
2333 break; 3032 break;
2334 case 'F': /* use special graphics character set */ 3033 case 'F': /* use special graphics character set */
2335 case 'G': /* use regular character set */ 3034 case 'G': /* use regular character set */
2336 /* unimplemented */ 3035 /* unimplemented */
2337 break; 3036 break;
… …
2346 3045
2347/*{{{ process escape sequences */ 3046/*{{{ process escape sequences */
2348void 3047void
2349rxvt_term::process_escape_seq () 3048rxvt_term::process_escape_seq ()
2350{ 3049{
2351 unsigned char ch = cmd_getc (); 3050 unicode_t ch = cmd_getc ();
2352 3051
2353 if (PrivateModes & PrivMode_vt52) 3052 if (priv_modes & PrivMode_vt52)
2354 { 3053 {
2355 process_escape_vt52 (ch); 3054 process_escape_vt52 (ch);
2356 return; 3055 return;
2357 } 3056 }
2358 3057
… …
2373 scr_charset_set (2, (unsigned int)cmd_getc ()); 3072 scr_charset_set (2, (unsigned int)cmd_getc ());
2374 break; 3073 break;
2375 case '+': 3074 case '+':
2376 scr_charset_set (3, (unsigned int)cmd_getc ()); 3075 scr_charset_set (3, (unsigned int)cmd_getc ());
2377 break; 3076 break;
2378#ifdef MULTICHAR_SET 3077#if ENABLE_FRILLS
2379 case '$':
2380 scr_charset_set (-2, (unsigned int)cmd_getc ());
2381 break;
2382#endif
2383#ifndef NO_FRILLS
2384 case '6': 3078 case '6':
2385 scr_backindex (); 3079 scr_backindex ();
2386 break; 3080 break;
2387#endif 3081#endif
2388 case '7': 3082 case '7':
2389 scr_cursor (SAVE); 3083 scr_cursor (SAVE);
2390 break; 3084 break;
2391 case '8': 3085 case '8':
2392 scr_cursor (RESTORE); 3086 scr_cursor (RESTORE);
2393 break; 3087 break;
2394#ifndef NO_FRILLS 3088#if ENABLE_FRILLS
2395 case '9': 3089 case '9':
2396 scr_forwardindex (); 3090 scr_forwardindex ();
2397 break; 3091 break;
2398#endif 3092#endif
2399 case '=': 3093 case '=':
2400 case '>': 3094 case '>':
2401 PrivMode((ch == '='), PrivMode_aplKP); 3095 PrivMode ((ch == '='), PrivMode_aplKP);
2402 break; 3096 break;
2403 3097
2404 case C1_40: 3098 case C1_40:
2405 cmd_getc (); 3099 cmd_getc ();
2406 break; 3100 break;
… …
2409 break; 3103 break;
2410 3104
2411 /* 8.3.87: NEXT LINE */ 3105 /* 8.3.87: NEXT LINE */
2412 case C1_NEL: /* ESC E */ 3106 case C1_NEL: /* ESC E */
2413 { 3107 {
2414 uint32_t nlcr[] = { '\n', '\r' }; 3108 unicode_t nlcr[] = { C0_LF, C0_CR };
2415 scr_add_lines (nlcr, 1, 2); 3109 scr_add_lines (nlcr, 1, 2);
2416 } 3110 }
2417 break; 3111 break;
2418 3112
2419 /* kidnapped escape sequence: Should be 8.3.48 */ 3113 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2430 case C1_RI: /* ESC M */ 3124 case C1_RI: /* ESC M */
2431 scr_index (DN); 3125 scr_index (DN);
2432 break; 3126 break;
2433 3127
2434 /* 8.3.142: SINGLE-SHIFT TWO */ 3128 /* 8.3.142: SINGLE-SHIFT TWO */
2435 /*case C1_SS2: scr_single_shift (2); break; */ 3129 /*case C1_SS2: scr_single_shift (2); break; */
2436 3130
2437 /* 8.3.143: SINGLE-SHIFT THREE */ 3131 /* 8.3.143: SINGLE-SHIFT THREE */
2438 /*case C1_SS3: scr_single_shift (3); break; */ 3132 /*case C1_SS3: scr_single_shift (3); break; */
2439 3133
2440 /* 8.3.27: DEVICE CONTROL STRING */ 3134 /* 8.3.27: DEVICE CONTROL STRING */
2441 case C1_DCS: /* ESC P */ 3135 case C1_DCS: /* ESC P */
2442 process_dcs_seq (); 3136 process_dcs_seq ();
2443 break; 3137 break;
2444 3138
2445 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3139 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2446 case C1_SCI: /* ESC Z */ 3140 case C1_SCI: /* ESC Z */
2447 tt_write((const unsigned char *)ESCZ_ANSWER, 3141 tt_write ((const unsigned char *)ESCZ_ANSWER,
2448 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 3142 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2449 break; /* steal obsolete ESC [ c */ 3143 break; /* steal obsolete ESC [ c */
2450 3144
2451 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3145 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2452 case C1_CSI: /* ESC [ */ 3146 case C1_CSI: /* ESC [ */
2453 process_csi_seq (); 3147 process_csi_seq ();
… …
2458 process_osc_seq (); 3152 process_osc_seq ();
2459 break; 3153 break;
2460 3154
2461 /* 8.3.106: RESET TO INITIAL STATE */ 3155 /* 8.3.106: RESET TO INITIAL STATE */
2462 case 'c': 3156 case 'c':
3157 mbstate.reset ();
2463 scr_poweron (); 3158 scr_poweron ();
2464 scrollbar_show (1); 3159 scrollbar_show (1);
2465 break; 3160 break;
2466 3161
2467 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3162 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2479 3174
2480/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3175/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2481/* *INDENT-OFF* */ 3176/* *INDENT-OFF* */
2482enum { 3177enum {
2483 CSI_ICH = 0x40, 3178 CSI_ICH = 0x40,
2484 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,
2485 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 ,
2486 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,
2487 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,
2488 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,
2489 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,
… …
2493 3188
2494#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 3189#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2495 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 3190 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2496 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 3191 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2497#define get_byte_array_bit(array, bit) \ 3192#define get_byte_array_bit(array, bit) \
2498 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 3193 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2499 3194
2500const unsigned char csi_defaults[] = 3195const unsigned char csi_defaults[] =
2501 { 3196 {
2502 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, */
2503 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, */
2504 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, */
2505 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, [, \, ], ^, _, */
2506 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, */
2507 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, */
2508 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, */
2509 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, {, |, }, ~, */
2510 }; 3205 };
2511/* *INDENT-ON* */ 3206/* *INDENT-ON* */
2512 3207
2513void 3208void
2514rxvt_term::process_csi_seq () 3209rxvt_term::process_csi_seq ()
2515{ 3210{
2516 unsigned char ch, priv, i; 3211 unicode_t ch, priv, i;
2517 unsigned int nargs, p; 3212 unsigned int nargs, p;
2518 int n, ndef; 3213 int n, ndef;
2519 int arg[ESC_ARGS]; 3214 int arg[ESC_ARGS];
2520 3215
2521 for (nargs = ESC_ARGS; nargs > 0;) 3216 for (nargs = ESC_ARGS; nargs > 0;)
2522 arg[--nargs] = 0; 3217 arg[--nargs] = 0;
2523 3218
2524 priv = 0; 3219 priv = 0;
… …
2526 if (ch >= '<' && ch <= '?') 3221 if (ch >= '<' && ch <= '?')
2527 { /* '<' '=' '>' '?' */ 3222 { /* '<' '=' '>' '?' */
2528 priv = ch; 3223 priv = ch;
2529 ch = cmd_getc (); 3224 ch = cmd_getc ();
2530 } 3225 }
3226
2531 /* read any numerical arguments */ 3227 /* read any numerical arguments */
2532 for (n = -1; ch < CSI_ICH; ) 3228 for (n = -1; ch < CSI_ICH; )
2533 { 3229 {
2534 if (isdigit(ch)) 3230 if (isdigit (ch))
2535 { 3231 {
2536 if (n < 0) 3232 if (n < 0)
2537 n = ch - '0'; 3233 n = ch - '0';
2538 else 3234 else
2539 n = n * 10 + ch - '0'; 3235 n = n * 10 + ch - '0';
… …
2542 { 3238 {
2543 if (nargs < ESC_ARGS) 3239 if (nargs < ESC_ARGS)
2544 arg[nargs++] = n; 3240 arg[nargs++] = n;
2545 n = -1; 3241 n = -1;
2546 } 3242 }
2547 else if (ch == '\b') 3243 else if (IS_CONTROL (ch))
2548 {
2549 scr_backspace ();
2550 }
2551 else if (ch == C0_ESC)
2552 {
2553 process_escape_seq ();
2554 return;
2555 }
2556 else if (ch < ' ')
2557 {
2558 process_nonprinting (ch); 3244 process_nonprinting (ch);
2559 } 3245
2560 ch = cmd_getc (); 3246 ch = cmd_getc ();
2561 } 3247 }
2562 3248
2563 if (ch > CSI_7F) 3249 if (ch > CSI_7F)
2564 return; 3250 return;
2565 3251
2566 if (nargs < ESC_ARGS) 3252 if (nargs < ESC_ARGS)
2567 arg[nargs++] = n; 3253 arg[nargs++] = n;
2568 3254
2569 i = ch - CSI_ICH; 3255 i = ch - CSI_ICH;
2570 ndef = get_byte_array_bit(csi_defaults, i); 3256 ndef = get_byte_array_bit (csi_defaults, i);
2571 for (p = 0; p < nargs; p++) 3257 for (p = 0; p < nargs; p++)
2572 if (arg[p] == -1) 3258 if (arg[p] == -1)
2573 arg[p] = ndef; 3259 arg[p] = ndef;
2574 3260
2575#ifdef DEBUG_CMD 3261#ifdef DEBUG_CMD
2576 fprintf(stderr, "CSI "); 3262 fprintf (stderr, "CSI ");
2577 for (p = 0; p < nargs; p++) 3263 for (p = 0; p < nargs; p++)
2578 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 3264 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2579 fprintf(stderr, "%c\n", ch); 3265 fprintf (stderr, "%c\n", ch);
2580#endif 3266#endif
2581 3267
2582 /* 3268 /*
2583 * private mode handling 3269 * private mode handling
2584 */ 3270 */
… …
2586 { 3272 {
2587 switch (priv) 3273 switch (priv)
2588 { 3274 {
2589 case '>': 3275 case '>':
2590 if (ch == CSI_DA) /* secondary device attributes */ 3276 if (ch == CSI_DA) /* secondary device attributes */
2591 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 3277 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2592 break; 3278 break;
2593 case '?': 3279 case '?':
2594 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3280 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2595 process_terminal_mode (ch, priv, nargs, arg); 3281 process_terminal_mode (ch, priv, nargs, arg);
2596 break; 3282 break;
… …
2599 } 3285 }
2600 3286
2601 switch (ch) 3287 switch (ch)
2602 { 3288 {
2603 /* 3289 /*
2604 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 3290 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2605 */ 3291 */
2606#ifdef PRINTPIPE 3292#ifdef PRINTPIPE
2607 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 3293 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2608 switch (arg[0]) 3294 switch (arg[0])
2609 { 3295 {
… …
2701 3387
2702 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3388 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2703 arg[0] = -arg[0]; 3389 arg[0] = -arg[0];
2704 /* FALLTHROUGH */ 3390 /* FALLTHROUGH */
2705 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3391 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2706 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3392 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2707 break; 3393 break;
2708 3394
2709 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3395 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2710 tt_write((const unsigned char *)VT100_ANS, 3396 tt_write ((const unsigned char *)VT100_ANS,
2711 (unsigned int)(sizeof(VT100_ANS) - 1)); 3397 (unsigned int) (sizeof (VT100_ANS) - 1));
2712 break; 3398 break;
2713 3399
2714 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3400 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2715 process_sgr_mode (nargs, arg); 3401 process_sgr_mode (nargs, arg);
2716 break; 3402 break;
2717 3403
2718 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 3404 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2719 switch (arg[0]) 3405 switch (arg[0])
2720 { 3406 {
2721 case 5: /* DSR requested */ 3407 case 5: /* DSR requested */
2722 tt_printf("\033[0n"); 3408 tt_printf ("\033[0n");
2723 break; 3409 break;
2724 case 6: /* CPR requested */ 3410 case 6: /* CPR requested */
2725 scr_report_position (); 3411 scr_report_position ();
2726 break; 3412 break;
2727#if defined (ENABLE_DISPLAY_ANSWER)
2728 case 7: /* unofficial extension */ 3413 case 7: /* unofficial extension */
3414 if (OPTION (Opt_insecure))
2729 tt_printf("%-.250s\n", rs[Rs_display_name]); 3415 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2730 break; 3416 break;
2731#endif
2732 case 8: /* unofficial extension */ 3417 case 8: /* unofficial extension */
2733 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3418 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2734 break; 3419 break;
2735 } 3420 }
2736 break; 3421 break;
2737 3422
2738 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3423 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2771 break; 3456 break;
2772 3457
2773 case CSI_RM: /* 8.3.107: RESET MODE */ 3458 case CSI_RM: /* 8.3.107: RESET MODE */
2774 if (arg[0] == 4) 3459 if (arg[0] == 4)
2775 scr_insert_mode (0); 3460 scr_insert_mode (0);
3461 else if (arg[0] == 20)
3462 priv_modes &= ~PrivMode_LFNL;
2776 break; 3463 break;
2777 3464
2778 case CSI_SM: /* 8.3.126: SET MODE */ 3465 case CSI_SM: /* 8.3.126: SET MODE */
2779 if (arg[0] == 4) 3466 if (arg[0] == 4)
2780 scr_insert_mode (1); 3467 scr_insert_mode (1);
3468 else if (arg[0] == 20)
3469 priv_modes |= PrivMode_LFNL;
2781 break; 3470 break;
2782 3471
2783 /* 3472 /*
2784 * PRIVATE USE beyond this point. All CSI_7? sequences here 3473 * PRIVATE USE beyond this point. All CSI_7? sequences here
2785 */ 3474 */
… …
2797 break; 3486 break;
2798 case CSI_75: 3487 case CSI_75:
2799 scr_cursor (RESTORE); 3488 scr_cursor (RESTORE);
2800 break; 3489 break;
2801 3490
2802#ifndef NO_FRILLS 3491#if ENABLE_FRILLS
2803 case CSI_74: 3492 case CSI_74:
2804 process_window_ops (arg, nargs); 3493 process_window_ops (arg, nargs);
2805 break; 3494 break;
2806#endif 3495#endif
2807 3496
2808 case CSI_78: /* DECREQTPARM */ 3497 case CSI_78: /* DECREQTPARM */
2809 if (arg[0] == 0 || arg[0] == 1) 3498 if (arg[0] == 0 || arg[0] == 1)
2810 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);
2811 /* FALLTHROUGH */ 3500 break;
2812 3501
2813 default: 3502 default:
2814 break; 3503 break;
2815 } 3504 }
2816} 3505}
2817/*}}} */ 3506/*}}} */
2818 3507
2819#ifndef NO_FRILLS 3508#if ENABLE_FRILLS
2820/* ARGSUSED */ 3509/* ARGSUSED */
2821void 3510void
2822rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3511rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2823{ 3512{
2824 int x, y; 3513 int x, y;
2825#if 0
2826 char *s;
2827#endif
2828 XWindowAttributes wattr; 3514 XWindowAttributes wattr;
2829 Window wdummy; 3515 Window wdummy;
3516 dDisp;
2830 3517
2831 if (nargs == 0) 3518 if (nargs == 0)
2832 return; 3519 return;
3520
2833 switch (args[0]) 3521 switch (args[0])
2834 { 3522 {
2835 /* 3523 /*
2836 * commands 3524 * commands
2837 */ 3525 */
2838 case 1: /* deiconify window */ 3526 case 1: /* deiconify window */
2839 XMapWindow(Xdisplay, TermWin.parent[0]); 3527 XMapWindow (disp, parent[0]);
2840 break; 3528 break;
2841 case 2: /* iconify window */ 3529 case 2: /* iconify window */
2842 XIconifyWindow(Xdisplay, TermWin.parent[0], 3530 XIconifyWindow (disp, parent[0], display->screen);
2843 DefaultScreen(Xdisplay));
2844 break; 3531 break;
2845 case 3: /* set position (pixels) */ 3532 case 3: /* set position (pixels) */
2846 XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]); 3533 XMoveWindow (disp, parent[0], args[1], args[2]);
2847 break; 3534 break;
2848 case 4: /* set size (pixels) */ 3535 case 4: /* set size (pixels) */
2849 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3536 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2850 break; 3537 break;
2851 case 5: /* raise window */ 3538 case 5: /* raise window */
2852 XRaiseWindow(Xdisplay, TermWin.parent[0]); 3539 XRaiseWindow (disp, parent[0]);
2853 break; 3540 break;
2854 case 6: /* lower window */ 3541 case 6: /* lower window */
2855 XLowerWindow(Xdisplay, TermWin.parent[0]); 3542 XLowerWindow (disp, parent[0]);
2856 break; 3543 break;
2857 case 7: /* refresh window */ 3544 case 7: /* refresh window */
2858 scr_touch (true); 3545 scr_touch (true);
2859 break; 3546 break;
2860 case 8: /* set size (chars) */ 3547 case 8: /* set size (chars) */
2861 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 3548 set_widthheight ((unsigned int) (args[2] * fwidth),
2862 (unsigned int)(args[1] * TermWin.fheight)); 3549 (unsigned int) (args[1] * fheight));
2863 break; 3550 break;
3551
3552 //case 9: NYI, TODO, restore maximized window or maximize window
2864 default: 3553 default:
2865 if (args[0] >= 24) /* set height (chars) */ 3554 if (args[0] >= 24) /* set height (chars) */
2866 set_widthheight ((unsigned int)TermWin.width, 3555 set_widthheight ((unsigned int)width,
2867 (unsigned int)(args[1] * TermWin.fheight)); 3556 (unsigned int) (args[1] * fheight));
2868 break; 3557 break;
3558
3559
2869 /* 3560 /*
2870 * reports - some output format copied from XTerm 3561 * reports - some output format copied from XTerm
2871 */ 3562 */
2872 case 11: /* report window state */ 3563 case 11: /* report window state */
2873 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 3564 XGetWindowAttributes (disp, parent[0], &wattr);
2874 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3565 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2875 break; 3566 break;
2876 case 13: /* report window position */ 3567 case 13: /* report window position */
2877 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 3568 XGetWindowAttributes (disp, parent[0], &wattr);
2878 XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root, 3569 XTranslateCoordinates (disp, parent[0], wattr.root,
2879 -wattr.border_width, -wattr.border_width, 3570 -wattr.border_width, -wattr.border_width,
2880 &x, &y, &wdummy); 3571 &x, &y, &wdummy);
2881 tt_printf("\033[3;%d;%dt", x, y); 3572 tt_printf ("\033[3;%d;%dt", x, y);
2882 break; 3573 break;
2883 case 14: /* report window size (pixels) */ 3574 case 14: /* report window size (pixels) */
2884 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 3575 XGetWindowAttributes (disp, parent[0], &wattr);
2885 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 3576 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2886 break; 3577 break;
3578 case 18: /* report text area size (chars) */
3579 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3580 break;
2887 case 18: /* report window size (chars) */ 3581 case 19: /* report window size (chars) */
2888 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3582 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2889 break; 3583 break;
2890#if 0 /* XXX: currently disabled due to security concerns */
2891 case 20: /* report icon label */ 3584 case 20: /* report icon label */
3585 {
3586 char *s;
2892 XGetIconName(Xdisplay, TermWin.parent[0], &s); 3587 XGetIconName (disp, parent[0], &s);
2893 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 }
2894 break; 3591 break;
2895 case 21: /* report window title */ 3592 case 21: /* report window title */
3593 {
3594 char *s;
2896 XFetchName(Xdisplay, TermWin.parent[0], &s); 3595 XFetchName (disp, parent[0], &s);
2897 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 }
2898 break; 3599 break;
2899#endif
2900
2901 } 3600 }
2902} 3601}
2903#endif 3602#endif
2904 3603
2905/*----------------------------------------------------------------------*/ 3604/*----------------------------------------------------------------------*/
2906/* 3605/*
2907 * get input up until STRING TERMINATOR (or BEL) 3606 * get input up until STRING TERMINATOR (or BEL)
2908 * ends_how is terminator used. returned input must be free()d 3607 * ends_how is terminator used. returned input must be free()'d
2909 */ 3608 */
2910unsigned char * 3609unsigned char *
2911rxvt_term::get_to_st (unsigned char *ends_how) 3610rxvt_term::get_to_st (unicode_t &ends_how)
2912{ 3611{
2913 int seen_esc = 0; /* seen escape? */ 3612 unicode_t ch;
3613 bool seen_esc = false;
2914 unsigned int n = 0; 3614 unsigned int n = 0;
2915 unsigned char *s; 3615 wchar_t string[STRING_MAX];
2916 unsigned char ch, string[STRING_MAX];
2917 3616
2918 for (; (ch = cmd_getc ());) 3617 while ((ch = cmd_getc ()) != NOCHAR)
2919 { 3618 {
2920 if (ch == C0_BEL 3619 if (seen_esc)
2921 || ch == CHAR_ST 3620 {
2922 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3621 if (ch == 0x5c) /* 7bit ST */
2923 break; 3622 break;
3623 else
3624 return NULL;
3625 }
2924 if (ch == C0_ESC) 3626 else if (ch == C0_ESC)
2925 { 3627 {
2926 seen_esc = 1; 3628 seen_esc = true;
2927 continue; 3629 continue;
2928 } 3630 }
2929 else if (ch == '\t') 3631 else if (ch == C0_BEL || ch == CHAR_ST)
2930 ch = ' '; /* translate '\t' to space */ 3632 break;
2931 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3633 else if (ch < 0x20)
2932 return NULL; /* other control character - exit */ 3634 return NULL; /* other control character - exit */
2933 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
2934 string[n++] = ch; 3645 string[n++] = ch;
2935 seen_esc = 0;
2936 } 3646 }
3647
2937 string[n++] = '\0'; 3648 string[n++] = '\0';
2938 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 3649
2939 return NULL;
2940 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3650 ends_how = (ch == 0x5c ? C0_ESC : ch);
2941 STRNCPY(s, string, n); 3651
2942 return s; 3652 return (unsigned char *)rxvt_wcstombs (string);
2943} 3653}
2944 3654
2945/*----------------------------------------------------------------------*/ 3655/*----------------------------------------------------------------------*/
2946/* 3656/*
2947 * 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)'
2948 */ 3658 */
2949void 3659void
2950rxvt_term::process_dcs_seq () 3660rxvt_term::process_dcs_seq ()
2951{ 3661{
2952 unsigned char eh, *s; 3662 unsigned char *s;
3663 unicode_t eh;
3664
2953 /* 3665 /*
2954 * Not handled yet 3666 * Not handled yet
2955 */ 3667 */
2956 s = get_to_st (&eh); 3668 s = get_to_st (eh);
2957 if (s) 3669 if (s)
2958 free(s); 3670 free (s);
3671
2959 return; 3672 return;
2960} 3673}
2961 3674
2962/*----------------------------------------------------------------------*/ 3675/*----------------------------------------------------------------------*/
2963/* 3676/*
2964 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3677 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2965 */ 3678 */
2966void 3679void
2967rxvt_term::process_osc_seq () 3680rxvt_term::process_osc_seq ()
2968{ 3681{
2969 unsigned char ch, eh, *s; 3682 unicode_t ch, eh;
2970 int arg; 3683 int arg;
2971 3684
2972 ch = cmd_getc (); 3685 ch = cmd_getc ();
2973 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 3686 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2974 arg = arg * 10 + (ch - '0'); 3687 arg = arg * 10 + (ch - '0');
2975 3688
2976 if (ch == ';') 3689 if (ch == ';')
2977 { 3690 {
2978 s = get_to_st (&eh); 3691 unsigned char *s = get_to_st (eh);
3692
2979 if (s) 3693 if (s)
2980 { 3694 {
2981 /*
2982 * rxvt_menubar_dispatch() violates the constness of the string,
2983 * so do it here
2984 */
2985 if (arg == XTerm_Menu)
2986#if 0 /* XXX: currently disabled due to security concerns */
2987 menubar_dispatch ((char *)s);
2988#else
2989 (void)0;
2990#endif
2991 else
2992 xterm_seq (arg, (char *)s, eh); 3695 process_xterm_seq (arg, (char *)s, eh);
2993 free(s); 3696 free (s);
2994 } 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])
2995 } 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);
2996} 3712}
3713
2997/* 3714/*
2998 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2999 * 0 = change iconName/title
3000 * 1 = change iconName
3001 * 2 = change title
3002 * 4 = change color
3003 * 12 = change text color
3004 * 13 = change mouse foreground color
3005 * 17 = change highlight character colour
3006 * 18 = change bold character color
3007 * 19 = change underlined character color
3008 * 46 = change logfile (not implemented)
3009 * 50 = change font
3010 *
3011 * rxvt extensions:
3012 * 10 = menu (may change in future)
3013 * 20 = bg pixmap
3014 * 39 = change default fg color
3015 * 49 = change default bg color
3016 * 55 = dump scrollback buffer and all of screen
3017 */ 3716 */
3018void 3717void
3019rxvt_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)
3020{ 3719{
3021 int changed = 0; 3720 int changed = 0;
3022 int color; 3721 int color;
3023 char *buf, *name; 3722 char *buf, *name;
3723 bool query = str[0] == '?' && !str[1];
3724 int saveop = op;
3725 dDisp;
3024 3726
3025 assert(str != NULL); 3727 assert (str != NULL);
3026 switch (op) 3728 switch (op)
3027 { 3729 {
3028 case XTerm_name: 3730 case XTerm_name:
3029 set_title (str); 3731 set_title (str);
3030 /* FALLTHROUGH */ 3732 /* FALLTHROUGH */
3031 case XTerm_iconName: 3733 case XTerm_iconName:
3032 set_iconName (str); 3734 set_icon_name (str);
3033 break; 3735 break;
3034 case XTerm_title: 3736 case XTerm_title:
3035 set_title (str); 3737 set_title (str);
3036 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
3037 case XTerm_Color: 3778 case XTerm_Color:
3038 for (buf = (char *)str; buf && *buf;) 3779 for (buf = (char *)str; buf && *buf;)
3039 { 3780 {
3040 if ((name = STRCHR(buf, ';')) == NULL) 3781 if ((name = strchr (buf, ';')) == NULL)
3041 break; 3782 break;
3783
3042 *name++ = '\0'; 3784 *name++ = '\0';
3043 color = atoi(buf); 3785 color = atoi (buf);
3786
3044 if (color < 0 || color >= TOTAL_COLORS) 3787 if (color < 0 || color >= TOTAL_COLORS)
3045 break; 3788 break;
3789
3046 if ((buf = STRCHR(name, ';')) != NULL) 3790 if ((buf = strchr (name, ';')) != NULL)
3047 *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
3048 set_window_color (color + minCOLOR, name); 3800 set_window_color (color + minCOLOR, name);
3049 } 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);
3050 break; 3808 break;
3051#ifndef NO_CURSORCOLOR 3809#ifndef NO_CURSORCOLOR
3052 case XTerm_Color_cursor: 3810 case XTerm_Color_cursor:
3053 set_window_color (Color_cursor, str); 3811 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3054 break; 3812 break;
3055#endif 3813#endif
3056 case XTerm_Color_pointer: 3814 case XTerm_Color_pointer_fg:
3057 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);
3058 break; 3819 break;
3059#ifndef NO_BOLD_UNDERLINE_REVERSE 3820#ifndef NO_BOLD_UNDERLINE_REVERSE
3060 case XTerm_Color_BD: 3821 case XTerm_Color_BD:
3061 set_window_color (Color_BD, str); 3822 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3062 break; 3823 break;
3063 case XTerm_Color_UL: 3824 case XTerm_Color_UL:
3064 set_window_color (Color_UL, str); 3825 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3065 break; 3826 break;
3066 case XTerm_Color_RV: 3827 case XTerm_Color_RV:
3067 set_window_color (Color_RV, str); 3828 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3068 break; 3829 break;
3069#endif 3830 case URxvt_Color_IT:
3070 3831 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3071 case XTerm_Menu:
3072 /*
3073 * rxvt_menubar_dispatch() violates the constness of the string,
3074 * so DON'T do it here
3075 */
3076 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
3077 case XTerm_Pixmap: 3843 case XTerm_Pixmap:
3078 if (*str != ';') 3844 if (*str != ';')
3079 { 3845 {
3080#if XPM_BACKGROUND 3846#if XPM_BACKGROUND
3081 scale_pixmap (""); /* reset to default scaling */ 3847 scale_pixmap (""); /* reset to default scaling */
3082 set_bgPixmap (str); /* change pixmap */ 3848 set_bgPixmap (str); /* change pixmap */
3083#endif 3849#endif
3084 scr_touch (true); 3850 scr_touch (true);
3085 } 3851 }
3086 while ((str = STRCHR(str, ';')) != NULL) 3852 while ((str = strchr (str, ';')) != NULL)
3087 { 3853 {
3088 str++; 3854 str++;
3089#if XPM_BACKGROUND 3855#if XPM_BACKGROUND
3090 changed += scale_pixmap (str); 3856 changed += scale_pixmap (str);
3091#endif 3857#endif
3092
3093 } 3858 }
3859
3094 if (changed) 3860 if (changed)
3095 { 3861 {
3096#ifdef XPM_BACKGROUND 3862#ifdef XPM_BACKGROUND
3097 resize_pixmap (); 3863 resize_pixmap ();
3098#endif 3864#endif
… …
3104 set_window_color (Color_fg, str); 3870 set_window_color (Color_fg, str);
3105 break; 3871 break;
3106 case XTerm_restoreBG: 3872 case XTerm_restoreBG:
3107 set_window_color (Color_bg, str); 3873 set_window_color (Color_bg, str);
3108 break; 3874 break;
3875
3109 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
3110 break; 3884 break;
3111 case XTerm_font: 3885#endif
3112 change_font (0, str);
3113 break;
3114#if 0 3886#if 0
3115 case XTerm_dumpscreen: /* no error notices */ 3887 case XTerm_dumpscreen: /* no error notices */
3116 { 3888 {
3117 int fd; 3889 int fd;
3118 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)
3119 { 3891 {
3120 scr_dump (fd); 3892 scr_dump (fd);
3121 close(fd); 3893 close (fd);
3122 } 3894 }
3123 } 3895 }
3124 break; 3896 break;
3125#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)];
3126 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
3127 } 3946 }
3128} 3947}
3129/*----------------------------------------------------------------------*/ 3948/*----------------------------------------------------------------------*/
3130 3949
3131/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3950/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3139 * so no need for fancy checking 3958 * so no need for fancy checking
3140 */ 3959 */
3141int 3960int
3142rxvt_term::privcases (int mode, unsigned long bit) 3961rxvt_term::privcases (int mode, unsigned long bit)
3143{ 3962{
3144 int state; 3963 int state;
3145 3964
3146 if (mode == 's') 3965 if (mode == 's')
3147 { 3966 {
3148 SavedModes |= (PrivateModes & bit); 3967 SavedModes |= (priv_modes & bit);
3149 return -1; 3968 return -1;
3150 } 3969 }
3151 else 3970 else
3152 { 3971 {
3153 if (mode == 'r') 3972 if (mode == 'r')
3154 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3973 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3155 else 3974 else
3156 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3975 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3157 PrivMode(state, bit); 3976 PrivMode (state, bit);
3158 } 3977 }
3978
3159 return state; 3979 return state;
3160} 3980}
3161 3981
3162/* we're not using priv _yet_ */ 3982/* we're not using priv _yet_ */
3163void 3983void
3164rxvt_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)
3165{ 3985{
3166 unsigned int i, j; 3986 unsigned int i, j;
3167 int state; 3987 int state;
3988
3168 static const struct 3989 static const struct
3169 { 3990 {
3170 const int argval; 3991 const int argval;
3171 const unsigned long bit; 3992 const unsigned long bit;
3172 } 3993 }
3994
3173 argtopriv[] = { 3995 argtopriv[] = {
3174 { 1, PrivMode_aplCUR }, 3996 { 1, PrivMode_aplCUR },
3175 { 2, PrivMode_vt52 }, 3997 { 2, PrivMode_vt52 },
3176 { 3, PrivMode_132 }, 3998 { 3, PrivMode_132 },
3177 { 4, PrivMode_smoothScroll }, 3999 { 4, PrivMode_smoothScroll },
3178 { 5, PrivMode_rVideo }, 4000 { 5, PrivMode_rVideo },
3179 { 6, PrivMode_relOrigin }, 4001 { 6, PrivMode_relOrigin },
3180 { 7, PrivMode_Autowrap }, 4002 { 7, PrivMode_Autowrap },
4003 // 8, bi-directional support mode
3181 { 9, PrivMode_MouseX10 }, 4004 { 9, PrivMode_MouseX10 },
3182#ifdef menuBar_esc 4005#ifdef menuBar_esc
3183 { menuBar_esc, PrivMode_menuBar }, 4006 { menuBar_esc, PrivMode_menuBar },
3184#endif 4007#endif
4008 // 18, 19 printing-related
4009 { 25, PrivMode_VisibleCursor },
3185#ifdef scrollBar_esc 4010#ifdef scrollBar_esc
3186 { scrollBar_esc, PrivMode_scrollBar }, 4011 { scrollBar_esc, PrivMode_scrollBar },
3187#endif 4012#endif
3188 { 25, PrivMode_VisibleCursor },
3189 { 35, PrivMode_ShiftKeys }, 4013 { 35, PrivMode_ShiftKeys }, // rxvt extension
3190 { 40, PrivMode_132OK }, 4014 { 40, PrivMode_132OK },
4015 // 41 xterm more fixes NYI
4016 // 45 margin bell NYI
4017 // 46 start logging
3191 { 47, PrivMode_Screen }, 4018 { 47, PrivMode_Screen },
3192 { 66, PrivMode_aplKP }, 4019 { 66, PrivMode_aplKP },
3193#ifndef NO_BACKSPACE_KEY 4020#ifndef NO_BACKSPACE_KEY
3194 { 67, PrivMode_BackSpace }, 4021 { 67, PrivMode_BackSpace },
3195#endif 4022#endif
3196 { 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
3197 { 1010, PrivMode_TtyOutputInh }, 4027 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3198 { 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
3199 { 1047, PrivMode_Screen }, 4032 { 1047, PrivMode_Screen },
4033 // 1048 save and restore cursor
3200 { 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
3201 }; 4036 };
3202 4037
3203 if (nargs == 0) 4038 if (nargs == 0)
3204 return; 4039 return;
3205 4040
… …
3212 for (i = 0; i < nargs; i++) 4047 for (i = 0; i < nargs; i++)
3213 { 4048 {
3214 state = -1; 4049 state = -1;
3215 4050
3216 /* basic handling */ 4051 /* basic handling */
3217 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 4052 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3218 if (argtopriv[j].argval == arg[i]) 4053 if (argtopriv[j].argval == arg[i])
3219 { 4054 {
3220 state = privcases (mode, argtopriv[j].bit); 4055 state = privcases (mode, argtopriv[j].bit);
3221 break; 4056 break;
3222 } 4057 }
3223 4058
3224 /* extra handling for values with state unkept */ 4059 /* extra handling for values with state unkept */
3225 if (state == -1)
3226 switch (arg[i]) 4060 switch (arg[i])
3227 { 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
3228 case 1048: /* alternative cursor save */ 4073 case 1048: /* alternative cursor save */
4074 case 1049:
4075 if (OPTION (Opt_secondaryScreen))
3229 if (mode == 0) 4076 if (mode == 0)
3230 scr_cursor (RESTORE); 4077 scr_cursor (RESTORE);
3231 else if (mode == 1) 4078 else if (mode == 1)
3232 scr_cursor (SAVE); 4079 scr_cursor (SAVE);
3233 /* FALLTHROUGH */
3234 default:
3235 continue; /* for(;i;) */
3236 }
3237
3238 /* extra handling for values with valid 0 or 1 state */
3239 switch (arg[i])
3240 {
3241 /* case 1: - application cursor keys */
3242 case 2: /* VT52 mode */
3243 /* oddball mode. should be set regardless of set/reset
3244 * parameter. Return from VT52 mode with an ESC < from
3245 * within VT52 mode
3246 */
3247 PrivMode(1, PrivMode_vt52);
3248 break; 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;
3249 case 3: /* 80/132 */ 4095 case 3: /* 80/132 */
3250 if (PrivateModes & PrivMode_132OK) 4096 if (priv_modes & PrivMode_132OK)
3251 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 4097 set_widthheight (((state ? 132 : 80) * fwidth), height);
3252 (unsigned int)TermWin.height);
3253 break; 4098 break;
3254 case 4: /* smooth scrolling */ 4099 case 4: /* smooth scrolling */
3255 if (state) 4100 if (!state)
3256 Options &= ~Opt_jumpScroll; 4101 SET_OPTION (Opt_jumpScroll);
3257 else 4102 else
3258 Options |= Opt_jumpScroll; 4103 CLR_OPTION (Opt_jumpScroll);
3259 break; 4104 break;
3260 case 5: /* reverse video */ 4105 case 5: /* reverse video */
3261 scr_rvideo_mode (state); 4106 scr_rvideo_mode (state);
3262 break; 4107 break;
3263 case 6: /* relative/absolute origins */ 4108 case 6: /* relative/absolute origins */
3264 scr_relative_origin (state); 4109 scr_relative_origin (state);
3265 break; 4110 break;
3266 case 7: /* autowrap */ 4111 case 7: /* autowrap */
3267 scr_autowrap (state); 4112 scr_autowrap (state);
3268 break; 4113 break;
3269 /* 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 */
3270 case 9: /* X10 mouse reporting */ 4115 case 9: /* X10 mouse reporting */
3271 if (state) /* orthogonal */ 4116 if (state) /* orthogonal */
3272 PrivateModes &= ~(PrivMode_MouseX11); 4117 priv_modes &= ~PrivMode_MouseX11;
3273 break; 4118 break;
3274#ifdef menuBar_esc 4119#ifdef menuBar_esc
3275 case menuBar_esc: 4120 case menuBar_esc:
3276#ifdef MENUBAR 4121#ifdef MENUBAR
3277 map_menuBar (state); 4122 map_menuBar (state);
3278#endif 4123#endif
3279 break; 4124 break;
3280#endif 4125#endif
3281#ifdef scrollBar_esc 4126#ifdef scrollBar_esc
3282 case scrollBar_esc: 4127 case scrollBar_esc:
3283 if (scrollbar_mapping (state)) 4128 if (scrollbar_mapping (state))
3284 { 4129 {
3285 resize_all_windows (0, 0, 0); 4130 resize_all_windows (0, 0, 0);
3286 scr_touch (true); 4131 scr_touch (true);
3287 } 4132 }
3288 break; 4133 break;
3289#endif 4134#endif
3290 case 25: /* visible/invisible cursor */ 4135 case 25: /* visible/invisible cursor */
3291 scr_cursor_visible (state); 4136 scr_cursor_visible (state);
3292 break; 4137 break;
3293 /* case 35: - shift keys */ 4138 /* case 35: - shift keys */
3294 /* case 40: - 80 <--> 132 mode */ 4139 /* case 40: - 80 <--> 132 mode */
3295 case 47: /* secondary screen */ 4140 case 47: /* secondary screen */
3296 scr_change_screen (state); 4141 scr_change_screen (state);
3297 break; 4142 break;
3298 /* case 66: - application key pad */ 4143 /* case 66: - application key pad */
3299 /* case 67: - backspace key */ 4144 /* case 67: - backspace key */
3300 case 1000: /* X11 mouse reporting */ 4145 case 1000: /* X11 mouse reporting */
3301 if (state) /* orthogonal */ 4146 if (state) /* orthogonal */
3302 PrivateModes &= ~(PrivMode_MouseX10); 4147 priv_modes &= ~PrivMode_MouseX10;
3303 break; 4148 break;
3304#if 0 4149#if 0
3305 case 1001: 4150 case 1001:
3306 break; /* X11 mouse highlighting */ 4151 break; /* X11 mouse highlighting */
3307#endif 4152#endif
3308 case 1010: /* scroll to bottom on TTY output inhibit */ 4153 case 1010: /* scroll to bottom on TTY output inhibit */
3309 if (state) 4154 if (!state)
3310 Options &= ~Opt_scrollTtyOutput; 4155 SET_OPTION (Opt_scrollTtyOutput);
3311 else 4156 else
3312 Options |= Opt_scrollTtyOutput; 4157 CLR_OPTION (Opt_scrollTtyOutput);
3313 break; 4158 break;
3314 case 1011: /* scroll to bottom on key press */ 4159 case 1011: /* scroll to bottom on key press */
3315 if (state) 4160 if (state)
3316 Options |= Opt_scrollTtyKeypress; 4161 SET_OPTION (Opt_scrollTtyKeypress);
3317 else 4162 else
3318 Options &= ~Opt_scrollTtyKeypress; 4163 CLR_OPTION (Opt_scrollTtyKeypress);
3319 break; 4164 break;
3320 case 1047: /* secondary screen w/ clearing */ 4165 case 1047: /* secondary screen w/ clearing last */
3321 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4166 if (OPTION (Opt_secondaryScreen))
3322 if (current_screen != PRIMARY) 4167 if (current_screen != PRIMARY)
3323 scr_erase_screen (2); 4168 scr_erase_screen (2);
3324 scr_change_screen (state); 4169 scr_change_screen (state);
3325 /* FALLTHROUGH */
3326 default:
3327 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;
3328 } 4179 }
3329 } 4180 }
3330} 4181}
3331/*}}} */ 4182/*}}} */
3332 4183
3333/*{{{ process sgr sequences */ 4184/*{{{ process sgr sequences */
3334void 4185void
3335rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4186rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3336{ 4187{
3337 unsigned int i; 4188 unsigned int i;
3338 short rendset; 4189 short rendset;
3339 int rendstyle; 4190 int rendstyle;
3340 4191
3341 if (nargs == 0) 4192 if (nargs == 0)
3342 { 4193 {
3343 scr_rendition (0, ~RS_None); 4194 scr_rendition (0, ~RS_None);
3344 return; 4195 return;
3345 } 4196 }
4197
3346 for (i = 0; i < nargs; i++) 4198 for (i = 0; i < nargs; i++)
3347 { 4199 {
3348 rendset = -1; 4200 rendset = -1;
3349 switch (arg[i]) 4201 switch (arg[i])
3350 { 4202 {
… …
3352 rendset = 0, rendstyle = ~RS_None; 4204 rendset = 0, rendstyle = ~RS_None;
3353 break; 4205 break;
3354 case 1: 4206 case 1:
3355 rendset = 1, rendstyle = RS_Bold; 4207 rendset = 1, rendstyle = RS_Bold;
3356 break; 4208 break;
4209 //case 2: // low intensity
4210 case 3:
4211 rendset = 1, rendstyle = RS_Italic;
4212 break;
3357 case 4: 4213 case 4:
3358 rendset = 1, rendstyle = RS_Uline; 4214 rendset = 1, rendstyle = RS_Uline;
3359 break; 4215 break;
3360 case 5: 4216 case 5: // slowly blinking
4217 case 6: // rapidly blinking
3361 rendset = 1, rendstyle = RS_Blink; 4218 rendset = 1, rendstyle = RS_Blink;
3362 break; 4219 break;
4220 //case 6: // scoansi light background
3363 case 7: 4221 case 7:
3364 rendset = 1, rendstyle = RS_RVid; 4222 rendset = 1, rendstyle = RS_RVid;
3365 break; 4223 break;
3366 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)
3367 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;
3368 break; 4242 break;
3369 case 24: 4243 case 24:
3370 rendset = 0, rendstyle = RS_Uline; 4244 rendset = 0, rendstyle = RS_Uline;
3371 break; 4245 break;
3372 case 25: 4246 case 25:
3373 rendset = 0, rendstyle = RS_Blink; 4247 rendset = 0, rendstyle = RS_Blink;
3374 break; 4248 break;
4249 case 26: // variable spacing (iso 8613)
4250 rendset = 0, rendstyle = RS_Blink;
4251 break;
3375 case 27: 4252 case 27:
3376 rendset = 0, rendstyle = RS_RVid; 4253 rendset = 0, rendstyle = RS_RVid;
3377 break; 4254 break;
4255 //case 28: // visible. NYI
4256 //case 29: // not crossed-out
3378 } 4257 }
4258
3379 if (rendset != -1) 4259 if (rendset != -1)
3380 { 4260 {
3381 scr_rendition (rendset, rendstyle); 4261 scr_rendition (rendset, rendstyle);
3382 continue; /* for(;i;) */ 4262 continue; /* for (;i;) */
3383 } 4263 }
3384 4264
3385 switch (arg[i]) 4265 switch (arg[i])
3386 { 4266 {
3387 case 30: 4267 case 30:
… …
3390 case 33: 4270 case 33:
3391 case 34: 4271 case 34:
3392 case 35: 4272 case 35:
3393 case 36: 4273 case 36:
3394 case 37: 4274 case 37:
3395 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 4275 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3396 Color_fg);
3397 break; 4276 break;
3398#ifdef TTY_256COLOR 4277 case 38: // set fg color, ISO 8613-6
3399 case 38:
3400 if (nargs > i + 2 && arg[i + 1] == 5) 4278 if (nargs > i + 2 && arg[i + 1] == 5)
3401 { 4279 {
3402 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 4280 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3403 Color_fg);
3404 i += 2; 4281 i += 2;
3405 } 4282 }
3406 break; 4283 break;
3407#endif
3408 case 39: /* default fg */ 4284 case 39: /* default fg */
3409 scr_color (Color_fg, Color_fg); 4285 scr_color (Color_fg, Color_fg);
3410 break; 4286 break;
3411 4287
3412 case 40: 4288 case 40:
… …
3415 case 43: 4291 case 43:
3416 case 44: 4292 case 44:
3417 case 45: 4293 case 45:
3418 case 46: 4294 case 46:
3419 case 47: 4295 case 47:
3420 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 4296 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3421 Color_bg);
3422 break; 4297 break;
3423#ifdef TTY_256COLOR 4298 case 48: // set bg color, ISO 8613-6
3424 case 48:
3425 if (nargs > i + 2 && arg[i + 1] == 5) 4299 if (nargs > i + 2 && arg[i + 1] == 5)
3426 { 4300 {
3427 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 4301 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3428 Color_bg);
3429 i += 2; 4302 i += 2;
3430 } 4303 }
3431 break; 4304 break;
3432#endif
3433 case 49: /* default bg */ 4305 case 49: /* default bg */
3434 scr_color (Color_bg, Color_bg); 4306 scr_color (Color_bg, Color_bg);
3435 break; 4307 break;
4308
4309 //case 50: // not variable spacing
3436 4310
3437#ifndef NO_BRIGHTCOLOR 4311#ifndef NO_BRIGHTCOLOR
3438 case 90: 4312 case 90:
3439 case 91: /* set bright fg color */ 4313 case 91: /* set bright fg color */
3440 case 92: 4314 case 92:
3441 case 93: 4315 case 93:
3442 case 94: 4316 case 94:
3443 case 95: 4317 case 95:
3444 case 96: 4318 case 96:
3445 case 97: 4319 case 97:
3446 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 4320 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3447 Color_fg);
3448 break; 4321 break;
3449 case 100: 4322 case 100:
3450 case 101: /* set bright bg color */ 4323 case 101: /* set bright bg color */
3451 case 102: 4324 case 102:
3452 case 103: 4325 case 103:
3453 case 104: 4326 case 104:
3454 case 105: 4327 case 105:
3455 case 106: 4328 case 106:
3456 case 107: 4329 case 107:
3457 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 4330 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3458 Color_bg);
3459 break; 4331 break;
3460#endif 4332#endif
3461
3462 } 4333 }
3463 } 4334 }
3464} 4335}
3465/*}}} */ 4336/*}}} */
3466 4337
3467/*{{{ process Rob Nation's own graphics mode sequences */ 4338/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3468void 4339void
3469rxvt_term::process_graphics () 4340rxvt_term::process_graphics ()
3470{ 4341{
3471 unsigned char ch, cmd = cmd_getc (); 4342 unicode_t ch, cmd = cmd_getc ();
3472 4343
3473#ifndef RXVT_GRAPHICS
3474 if (cmd == 'Q') 4344 if (cmd == 'Q')
3475 { /* query graphics */ 4345 { /* query graphics */
3476 tt_printf("\033G0\n"); /* no graphics */ 4346 tt_printf ("\033G0\012"); /* no graphics */
3477 return; 4347 return;
3478 } 4348 }
3479 /* swallow other graphics sequences until terminating ':' */ 4349 /* swallow other graphics sequences until terminating ':' */
3480 do 4350 do
3481 ch = cmd_getc (); 4351 ch = cmd_getc ();
3482 while (ch != ':'); 4352 while (ch != ':');
3483#else
3484 unsigned int nargs;
3485 int args[NGRX_PTS];
3486 unsigned char *text = NULL;
3487
3488 if (cmd == 'Q')
3489 { /* query graphics */
3490 tt_printf("\033G1\n"); /* yes, graphics (color) */
3491 return;
3492 }
3493 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;)
3494 {
3495 int neg;
3496
3497 ch = cmd_getc ();
3498 neg = (ch == '-');
3499 if (neg || ch == '+')
3500 ch = cmd_getc ();
3501
3502 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3503 args[nargs] = args[nargs] * 10 + (ch - '0');
3504 if (neg)
3505 args[nargs] = -args[nargs];
3506
3507 nargs++;
3508 args[nargs] = 0;
3509 if (ch != ';')
3510 break;
3511 }
3512
3513 if ((cmd == 'T') && (nargs >= 5))
3514 {
3515 int i, len = args[4];
3516
3517 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3518
3519 if (text != NULL)
3520 {
3521 for (i = 0; i < len; i++)
3522 text[i] = cmd_getc ();
3523 text[len] = '\0';
3524 }
3525 }
3526 Gr_do_graphics (cmd, nargs, args, text);
3527#endif
3528} 4353}
3529/*}}} */ 4354/*}}} */
3530 4355
3531/* ------------------------------------------------------------------------- */ 4356/* ------------------------------------------------------------------------- */
3532 4357
3533/* 4358/*
3534 * Send printf() formatted output to the command. 4359 * Send printf () formatted output to the command.
3535 * Only use for small amounts of data. 4360 * Only use for small amounts of data.
3536 */ 4361 */
3537void 4362void
3538rxvt_term::tt_printf (const char *fmt,...) 4363rxvt_term::tt_printf (const char *fmt,...)
3539{ 4364{
… …
3541 unsigned char buf[256]; 4366 unsigned char buf[256];
3542 4367
3543 va_start (arg_ptr, fmt); 4368 va_start (arg_ptr, fmt);
3544 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4369 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3545 va_end (arg_ptr); 4370 va_end (arg_ptr);
3546 tt_write (buf, STRLEN (buf)); 4371 tt_write (buf, strlen (buf));
3547} 4372}
3548 4373
3549/* ---------------------------------------------------------------------- */ 4374/* ---------------------------------------------------------------------- */
3550/* 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,
3551 * or generated by us in response to a query ESC sequence. 4376 * or generated by us in response to a query ESC sequence.
3552 */ 4377 */
4378const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4379
3553void 4380void
3554rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4381rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3555{ 4382{
3556 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));
3557 4386
3558 if (len) 4387 if ((unsigned int)written == len)
4388 return;
4389
4390 data += written;
4391 len -= written;
3559 { 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
3560 if (v_buflen == 0) 4410 if (v_buflen == 0)
3561 { 4411 {
3562 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3563
3564 if ((unsigned int)written == len)
3565 return;
3566
3567 data += written;
3568 len -= written;
3569 }
3570
3571
3572 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3573
3574 memcpy (v_buffer + v_buflen, data, len);
3575 v_buflen += len;
3576 }
3577
3578 for (;;)
3579 {
3580 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3581
3582 if (written > 0)
3583 {
3584 v_buflen -= written;
3585
3586 if (v_buflen == 0)
3587 {
3588 free (v_buffer); 4412 free (v_buffer);
3589 v_buffer = 0; 4413 v_buffer = 0;
3590 v_buflen = 0; 4414 v_buflen = 0;
3591 4415
3592 pty_ev.set (EVENT_READ); 4416 pty_ev.set (EVENT_READ);
3593 return;
3594 }
3595
3596 memmove (v_buffer, v_buffer + written, v_buflen);
3597 }
3598 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3599 // original code just ignores this...
3600 destroy ();
3601 else
3602 {
3603 pty_ev.set (EVENT_READ | EVENT_WRITE);
3604 return; 4417 return;
3605 } 4418 }
4419
4420 memmove (v_buffer, v_buffer + written, v_buflen);
3606 } 4421 }
4422 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4423 pty_ev.set (EVENT_READ);
3607} 4424}
3608 4425
3609/*----------------------- end-of-file (C source) -----------------------*/ 4426/*----------------------- end-of-file (C source) -----------------------*/
3610 4427

Diff Legend

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