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

Diff Legend

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