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

Diff Legend

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