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

Diff Legend

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