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

Diff Legend

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