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.49 by pcg, Sat Feb 21 22:14:00 2004 UTC vs.
Revision 1.191 by root, Wed Jan 26 07:08:15 2005 UTC

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

Diff Legend

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