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

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

Diff Legend

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