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.68 by pcg, Sun Mar 14 17:33:07 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
… …
140 valid_keysym = keysym != NoSymbol; 348 valid_keysym = keysym != NoSymbol;
141 } 349 }
142 350
143 if (valid_keysym) 351 if (valid_keysym)
144 { 352 {
353#ifdef KEYSYM_RESOURCE
354 if (keyboard->dispatch (this, keysym, ev.state))
355 return;
356#endif
357
145 if (TermWin.saveLines) 358 if (TermWin.saveLines)
146 { 359 {
147#ifdef UNSHIFTED_SCROLLKEYS 360#ifdef UNSHIFTED_SCROLLKEYS
148 if (!ctrl && !meta) 361 if (!ctrl && !meta)
149 {
150#else 362#else
151 if (IS_SCROLL_MOD) 363 if (IS_SCROLL_MOD)
364#endif
152 { 365 {
153#endif
154 int lnsppg; 366 int lnsppg;
155 367
156#ifdef PAGING_CONTEXT_LINES 368#ifdef PAGING_CONTEXT_LINES
157 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 369 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
158#else 370#else
… …
207 if (keysym >= XK_F1 && keysym <= XK_F10) 419 if (keysym >= XK_F1 && keysym <= XK_F10)
208 { 420 {
209 keysym += (XK_F11 - XK_F1); 421 keysym += (XK_F11 - XK_F1);
210 shft = 0; /* turn off Shift */ 422 shft = 0; /* turn off Shift */
211 } 423 }
212 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 424 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
213 { 425 {
214 switch (keysym) 426 switch (keysym)
215 { 427 {
216 /* normal XTerm key bindings */ 428 /* normal XTerm key bindings */
217 case XK_Insert: /* Shift+Insert = paste mouse selection */ 429 case XK_Insert: /* Shift+Insert = paste mouse selection */
218 selection_request (ev.time, 0, 0); 430 selection_request (ev.time, 0, 0);
219 return; 431 return;
432#if TODO
220 /* rxvt extras */ 433 /* rxvt extras */
221 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 434 case XK_KP_Add: /* Shift+KP_Add = bigger font */
222 change_font (FONT_UP); 435 change_font (FONT_UP);
223 return; 436 return;
224 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 437 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
225 change_font (FONT_DN); 438 change_font (FONT_DN);
226 return; 439 return;
440#endif
227 } 441 }
228 } 442 }
229 } 443 }
230#ifdef PRINTPIPE 444
231 if (keysym == XK_Print) 445#if ENABLE_FRILLS || ISO_14755
232 { 446 // ISO 14755 support
233 scr_printscreen (ctrl | shft); 447 if (shft && ctrl)
234 return;
235 } 448 {
236#endif 449 int hv;
237 450
238 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 451 if (iso14755buf & ISO_14755_51
239 { 452 && (keysym == XK_space || keysym == XK_KP_Space
240#ifdef KEYSYM_RESOURCE 453 || keysym == XK_Return || keysym == XK_KP_Enter))
241 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
242 { 454 {
243 unsigned int l; 455 commit_iso14755 ();
244 const unsigned char *kbuf0; 456 iso14755buf = ISO_14755_51;
245 457# if ISO_14755
246 kbuf0 = (Keysym_map[keysym & 0xFF]); 458 iso14755_51 (0);
247 l = (unsigned int)*kbuf0++;
248
249 /* escape prefix */
250 if (meta
251# ifdef META8_OPTION
252 && meta_char == C0_ESC
253# endif 459# endif
254 ) 460 return;
255 {
256 const unsigned char ch = C0_ESC;
257 tt_write (&ch, 1);
258 } 461 }
259 462 else if ((hv = hex_keyval (ev)) >= 0)
260 tt_write (kbuf0, l); 463 {
464 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
465 | hv | ISO_14755_51;
466# if ISO_14755
467 iso14755_51 (iso14755buf & ISO_14755_MASK);
468# endif
261 return; 469 return;
262 } 470 }
263 else 471 else
472 {
473# if ENABLE_OVERLAY
474 scr_overlay_off ();
264#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 {
265 { 501 {
266 newlen = 1; 502 newlen = 1;
267 switch (keysym) 503 switch (keysym)
268 { 504 {
269#ifndef NO_BACKSPACE_KEY 505#ifndef NO_BACKSPACE_KEY
270 case XK_BackSpace: 506 case XK_BackSpace:
271 if (PrivateModes & PrivMode_HaveBackSpace) 507 if (priv_modes & PrivMode_HaveBackSpace)
272 { 508 {
273 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 509 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
274 ^ !!ctrl) ? '\b' : '\177'; 510 ^ !!ctrl) ? '\b' : '\177';
275 kbuf[1] = '\0'; 511 kbuf[1] = '\0';
276 } 512 }
277 else 513 else
278 STRCPY (kbuf, key_backspace); 514 strcpy (kbuf, key_backspace);
279 break; 515 break;
280#endif 516#endif
281#ifndef NO_DELETE_KEY 517#ifndef NO_DELETE_KEY
282 case XK_Delete: 518 case XK_Delete:
283 STRCPY (kbuf, key_delete); 519 strcpy (kbuf, key_delete);
284 break; 520 break;
285#endif 521#endif
286 case XK_Tab: 522 case XK_Tab:
287 if (shft) 523 if (shft)
288 STRCPY (kbuf, "\033[Z"); 524 strcpy (kbuf, "\033[Z");
289 else 525 else
290 { 526 {
291#ifdef CTRL_TAB_MAKES_META 527#ifdef CTRL_TAB_MAKES_META
292 if (ctrl) 528 if (ctrl)
293 meta = 1; 529 meta = 1;
… …
299 newlen = 0; 535 newlen = 0;
300 } 536 }
301 break; 537 break;
302 538
303#ifdef XK_KP_Left 539#ifdef XK_KP_Left
304 case XK_KP_Up: /* \033Ox or standard */ 540 case XK_KP_Up: /* \033Ox or standard */
305 case XK_KP_Down: /* \033Or or standard */ 541 case XK_KP_Down: /* \033Or or standard */
306 case XK_KP_Right: /* \033Ov or standard */ 542 case XK_KP_Right: /* \033Ov or standard */
307 case XK_KP_Left: /* \033Ot or standard */ 543 case XK_KP_Left: /* \033Ot or standard */
308 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 544 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
309 { 545 {
310 STRCPY (kbuf, "\033OZ"); 546 strcpy (kbuf, "\033OZ");
311 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 547 kbuf[2] = "txvr"[keysym - XK_KP_Left];
312 break; 548 break;
313 } 549 }
314 else 550 else
315 /* translate to std. cursor key */ 551 /* translate to std. cursor key */
… …
318#endif 554#endif
319 case XK_Up: /* "\033[A" */ 555 case XK_Up: /* "\033[A" */
320 case XK_Down: /* "\033[B" */ 556 case XK_Down: /* "\033[B" */
321 case XK_Right: /* "\033[C" */ 557 case XK_Right: /* "\033[C" */
322 case XK_Left: /* "\033[D" */ 558 case XK_Left: /* "\033[D" */
323 STRCPY (kbuf, "\033[Z"); 559 strcpy (kbuf, "\033[Z");
324 kbuf[2] = "DACB"[keysym - XK_Left]; 560 kbuf[2] = "DACB"[keysym - XK_Left];
325 /* do Shift first */ 561 /* do Shift first */
326 if (shft) 562 if (shft)
327 kbuf[2] = "dacb"[keysym - XK_Left]; 563 kbuf[2] = "dacb"[keysym - XK_Left];
328 else if (ctrl) 564 else if (ctrl)
329 { 565 {
330 kbuf[1] = 'O'; 566 kbuf[1] = 'O';
331 kbuf[2] = "dacb"[keysym - XK_Left]; 567 kbuf[2] = "dacb"[keysym - XK_Left];
332 } 568 }
333 else if (PrivateModes & PrivMode_aplCUR) 569 else if (priv_modes & PrivMode_aplCUR)
334 kbuf[1] = 'O'; 570 kbuf[1] = 'O';
335 break; 571 break;
336 572
337#ifndef UNSHIFTED_SCROLLKEYS 573#ifndef UNSHIFTED_SCROLLKEYS
338# ifdef XK_KP_Prior 574# ifdef XK_KP_Prior
339 case XK_KP_Prior: 575 case XK_KP_Prior:
340 /* allow shift to override */ 576 /* allow shift to override */
341 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 577 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
342 { 578 {
343 STRCPY (kbuf, "\033Oy"); 579 strcpy (kbuf, "\033Oy");
344 break; 580 break;
345 } 581 }
346 /* FALLTHROUGH */ 582 /* FALLTHROUGH */
347# endif 583# endif
348 case XK_Prior: 584 case XK_Prior:
349 STRCPY (kbuf, "\033[5~"); 585 strcpy (kbuf, "\033[5~");
350 break; 586 break;
351# ifdef XK_KP_Next 587# ifdef XK_KP_Next
352 case XK_KP_Next: 588 case XK_KP_Next:
353 /* allow shift to override */ 589 /* allow shift to override */
354 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 590 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
355 { 591 {
356 STRCPY (kbuf, "\033Os"); 592 strcpy (kbuf, "\033Os");
357 break; 593 break;
358 } 594 }
359 /* FALLTHROUGH */ 595 /* FALLTHROUGH */
360# endif 596# endif
361 case XK_Next: 597 case XK_Next:
362 STRCPY (kbuf, "\033[6~"); 598 strcpy (kbuf, "\033[6~");
363 break; 599 break;
364#endif 600#endif
365 case XK_KP_Enter: 601 case XK_KP_Enter:
366 /* allow shift to override */ 602 /* allow shift to override */
367 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 603 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
368 { 604 {
369 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';
370 } 617 }
371 else 618 else
372 { 619 {
373 kbuf[0] = '\r'; 620 kbuf[0] = '\015';
374 kbuf[1] = '\0'; 621 kbuf[1] = '\0';
375 } 622 }
376 break; 623 break;
377 624
378#ifdef XK_KP_Begin 625#ifdef XK_KP_Begin
379 case XK_KP_Begin: 626 case XK_KP_Begin:
380 STRCPY (kbuf, "\033Ou"); 627 strcpy (kbuf, "\033Ou");
381 break; 628 break;
382 629
383 case XK_KP_Insert: 630 case XK_KP_Insert:
384 STRCPY (kbuf, "\033Op"); 631 strcpy (kbuf, "\033Op");
385 break; 632 break;
386 633
387 case XK_KP_Delete: 634 case XK_KP_Delete:
388 STRCPY (kbuf, "\033On"); 635 strcpy (kbuf, "\033On");
389 break; 636 break;
390#endif 637#endif
391 case XK_KP_F1: /* "\033OP" */ 638 case XK_KP_F1: /* "\033OP" */
392 case XK_KP_F2: /* "\033OQ" */ 639 case XK_KP_F2: /* "\033OQ" */
393 case XK_KP_F3: /* "\033OR" */ 640 case XK_KP_F3: /* "\033OR" */
394 case XK_KP_F4: /* "\033OS" */ 641 case XK_KP_F4: /* "\033OS" */
395 STRCPY (kbuf, "\033OP"); 642 strcpy (kbuf, "\033OP");
396 kbuf[2] += (keysym - XK_KP_F1); 643 kbuf[2] += (keysym - XK_KP_F1);
397 break; 644 break;
398 645
399 case XK_KP_Multiply: /* "\033Oj" : "*" */ 646 case XK_KP_Multiply: /* "\033Oj" : "*" */
400 case XK_KP_Add: /* "\033Ok" : "+" */ 647 case XK_KP_Add: /* "\033Ok" : "+" */
… …
411 case XK_KP_6: /* "\033Ov" : "6" */ 658 case XK_KP_6: /* "\033Ov" : "6" */
412 case XK_KP_7: /* "\033Ow" : "7" */ 659 case XK_KP_7: /* "\033Ow" : "7" */
413 case XK_KP_8: /* "\033Ox" : "8" */ 660 case XK_KP_8: /* "\033Ox" : "8" */
414 case XK_KP_9: /* "\033Oy" : "9" */ 661 case XK_KP_9: /* "\033Oy" : "9" */
415 /* allow shift to override */ 662 /* allow shift to override */
416 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 663 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
417 { 664 {
418 STRCPY (kbuf, "\033Oj"); 665 strcpy (kbuf, "\033Oj");
419 kbuf[2] += (keysym - XK_KP_Multiply); 666 kbuf[2] += (keysym - XK_KP_Multiply);
420 } 667 }
421 else 668 else
422 { 669 {
423 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 670 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
424 kbuf[1] = '\0'; 671 kbuf[1] = '\0';
425 } 672 }
426 break; 673 break;
427 674
428 case XK_Find: 675 case XK_Find:
429 STRCPY (kbuf, "\033[1~"); 676 strcpy (kbuf, "\033[1~");
430 break; 677 break;
431 case XK_Insert: 678 case XK_Insert:
432 STRCPY (kbuf, "\033[2~"); 679 strcpy (kbuf, "\033[2~");
433 break; 680 break;
434#ifdef DXK_Remove /* support for DEC remove like key */ 681#ifdef DXK_Remove /* support for DEC remove like key */
435 case DXK_Remove: 682 case DXK_Remove:
436 /* FALLTHROUGH */ 683 /* FALLTHROUGH */
437#endif 684#endif
438 case XK_Execute: 685 case XK_Execute:
439 STRCPY (kbuf, "\033[3~"); 686 strcpy (kbuf, "\033[3~");
440 break; 687 break;
441 case XK_Select: 688 case XK_Select:
442 STRCPY (kbuf, "\033[4~"); 689 strcpy (kbuf, "\033[4~");
443 break; 690 break;
444#ifdef XK_KP_End 691#ifdef XK_KP_End
445 case XK_KP_End: 692 case XK_KP_End:
446 /* allow shift to override */ 693 /* allow shift to override */
447 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 694 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
448 { 695 {
449 STRCPY (kbuf, "\033Oq"); 696 strcpy (kbuf, "\033Oq");
450 break; 697 break;
451 } 698 }
452 /* FALLTHROUGH */ 699 /* FALLTHROUGH */
453#endif 700#endif
454 case XK_End: 701 case XK_End:
455 STRCPY (kbuf, KS_END); 702 strcpy (kbuf, KS_END);
456 break; 703 break;
457#ifdef XK_KP_Home 704#ifdef XK_KP_Home
458 case XK_KP_Home: 705 case XK_KP_Home:
459 /* allow shift to override */ 706 /* allow shift to override */
460 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 707 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
461 { 708 {
462 STRCPY (kbuf, "\033Ow"); 709 strcpy (kbuf, "\033Ow");
463 break; 710 break;
464 } 711 }
465 /* FALLTHROUGH */ 712 /* FALLTHROUGH */
466#endif 713#endif
467 case XK_Home: 714 case XK_Home:
468 STRCPY (kbuf, KS_HOME); 715 strcpy (kbuf, KS_HOME);
469 break; 716 break;
470 717
471#define FKEY(n, fkey) \ 718#define FKEY(n, fkey) \
472 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 719 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
473 720
… …
525#undef FKEY 772#undef FKEY
526 default: 773 default:
527 newlen = 0; 774 newlen = 0;
528 break; 775 break;
529 } 776 }
777
530 if (newlen) 778 if (newlen)
531 len = STRLEN (kbuf); 779 len = strlen (kbuf);
532 } 780 }
533 781
534 /* 782 /*
535 * Pass meta for all function keys, if 'meta' option set 783 * Pass meta for all function keys, if 'meta' option set
536 */ 784 */
… …
543 else if (ctrl && keysym == XK_minus) 791 else if (ctrl && keysym == XK_minus)
544 { 792 {
545 len = 1; 793 len = 1;
546 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 794 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
547 } 795 }
796 else if (keysym == XK_ISO_Left_Tab)
797 {
798 strcpy (kbuf, "\033[Z");
799 len = 3;
800 }
548 else 801 else
549 { 802 {
550#ifdef META8_OPTION 803#ifdef META8_OPTION
551 /* set 8-bit on */ 804 /* set 8-bit on */
552 if (meta && (meta_char == 0x80)) 805 if (meta && (meta_char == 0x80))
… …
564 } 817 }
565 818
566 if (len <= 0) 819 if (len <= 0)
567 return; /* not mapped */ 820 return; /* not mapped */
568 821
569 if (Options & Opt_scrollTtyKeypress) 822 if (options & Opt_scrollTtyKeypress)
570 if (TermWin.view_start) 823 if (TermWin.view_start)
571 { 824 {
572 TermWin.view_start = 0; 825 TermWin.view_start = 0;
573 want_refresh = 1; 826 want_refresh = 1;
574 } 827 }
… …
610#endif /* DEBUG_CMD */ 863#endif /* DEBUG_CMD */
611 tt_write (kbuf, (unsigned int)len); 864 tt_write (kbuf, (unsigned int)len);
612} 865}
613/*}}} */ 866/*}}} */
614 867
615#if (MENUBAR_MAX) 868#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
616/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 869/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
617/* attempt to `write' count to the input buffer */ 870/* attempt to `write' count to the input buffer */
618unsigned int 871unsigned int
619rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 872rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
620{ 873{
621 unsigned int n, s; 874 unsigned int n, s;
622 875
623 n = cmdbuf_ptr - cmdbuf_base; 876 n = cmdbuf_ptr - cmdbuf_base;
624 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 877 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
625 878
626 if (n > 0 && s < count) 879 if (n > 0 && s < count)
627 { 880 {
628 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 881 memmove (cmdbuf_base, cmdbuf_ptr,
629 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 882 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
630 cmdbuf_ptr = cmdbuf_base; 883 cmdbuf_ptr = cmdbuf_base;
631 cmdbuf_endp -= n; 884 cmdbuf_endp -= n;
632 s += n; 885 s += n;
633 } 886 }
634 887
635 if (count > s) 888 if (count > s)
636 { 889 {
637 rxvt_print_error ("data loss: cmd_write too large"); 890 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
638 count = s; 891 count = s;
639 } 892 }
640 893
641 for (; count--;) 894 for (; count--;)
642 *cmdbuf_endp++ = *str++; 895 *cmdbuf_endp++ = *str++;
643 896
644 cmd_parse (); 897 cmd_parse ();
645 898
646 return 0; 899 return 0;
647} 900}
648#endif /* MENUBAR_MAX */ 901#endif
649 902
650void 903void
651rxvt_term::flush () 904rxvt_term::flush ()
652{ 905{
906 flush_ev.stop ();
907
653#ifdef TRANSPARENT 908#ifdef TRANSPARENT
654 if (want_full_refresh) 909 if (want_full_refresh)
655 { 910 {
656 want_full_refresh = 0; 911 want_full_refresh = 0;
657 scr_clear (); 912 scr_clear ();
658 scr_touch (false); 913 scr_touch (false);
659 want_refresh = 1;
660 } 914 }
661#endif 915#endif
662 916
663 if (want_refresh) 917 if (want_refresh)
664 { 918 {
665 scr_refresh (refresh_type); 919 scr_refresh (refresh_type);
666 scrollbar_show (1); 920 scrollbar_show (1);
667#ifdef USE_XIM 921#ifdef USE_XIM
668 IMSendSpot (); 922 IMSendSpot ();
669#endif 923#endif
670
671 } 924 }
672 925
673 display->flush (); 926 display->flush ();
674} 927}
675 928
… …
677rxvt_term::check_cb (check_watcher &w) 930rxvt_term::check_cb (check_watcher &w)
678{ 931{
679 SET_R (this); 932 SET_R (this);
680 SET_LOCALE (locale); 933 SET_LOCALE (locale);
681 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;
682 flush (); 949 flush ();
683} 950}
684 951
685#ifdef CURSOR_BLINK 952#ifdef CURSOR_BLINK
686void 953void
… …
704 w.start (w.at + TEXT_BLINK_INTERVAL); 971 w.start (w.at + TEXT_BLINK_INTERVAL);
705 } 972 }
706} 973}
707#endif 974#endif
708 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
709bool 1023bool
710rxvt_term::pty_fill () 1024rxvt_term::pty_fill ()
711{ 1025{
712 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 }
713 1033
714 memmove (cmdbuf_base, cmdbuf_ptr, n); 1034 memmove (cmdbuf_base, cmdbuf_ptr, n);
715 cmdbuf_ptr = cmdbuf_base; 1035 cmdbuf_ptr = cmdbuf_base;
716 cmdbuf_endp = cmdbuf_ptr + n; 1036 cmdbuf_endp = cmdbuf_ptr + n;
717 1037
718 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1038 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
719 1039
720 if (n > 0) 1040 if (n > 0)
721 { 1041 {
722 cmdbuf_endp += n; 1042 cmdbuf_endp += n;
723 return true; 1043 return true;
… …
732rxvt_term::pty_cb (io_watcher &w, short revents) 1052rxvt_term::pty_cb (io_watcher &w, short revents)
733{ 1053{
734 SET_R (this); 1054 SET_R (this);
735 SET_LOCALE (locale); 1055 SET_LOCALE (locale);
736 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
737 if (revents & EVENT_WRITE) 1063 if (revents & EVENT_WRITE)
738 tt_write (0, 0); 1064 pty_write ();
739 else if (revents & EVENT_READ)
740 {
741 bool flag = true;
742
743 // loop, but don't allow a single term to monopolize us
744 // the number of loops is fully arbitrary, and thus wrong
745 while (flag && pty_fill ())
746 {
747 if (!seen_input)
748 {
749 seen_input = 1;
750 /* once we know the shell is running, send the screen size. Again! */
751 tt_winch ();
752 }
753
754 if (cmd_parse ())
755 break;
756 }
757 }
758} 1065}
759 1066
760bool 1067void
761rxvt_term::cmd_parse () 1068rxvt_term::pointer_unblank ()
762{ 1069{
763 bool flag = false; 1070 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
764 uint32_t ch = NOCHAR; 1071 recolour_cursor ();
765 1072
766 for (;;) 1073#ifdef POINTER_BLANK
767 { 1074 hidden_pointer = 0;
768 if (ch == NOCHAR)
769 ch = next_char ();
770 1075
771 if (ch == NOCHAR) // TODO: improve 1076 if (options & Opt_pointerBlank)
772 break; 1077 pointer_ev.start (NOW + pointerBlankDelay);
773 1078#endif
774 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
775 {
776 /* Read a text string from the input buffer */
777 uint32_t buf[BUFSIZ];
778 bool refreshnow = false;
779 int nlines = 0;
780 uint32_t *str = buf;
781
782 *str++ = ch;
783
784 for (;;)
785 {
786 ch = next_char ();
787
788 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
789 break;
790 else
791 {
792 *str++ = ch;
793
794 if (ch == '\n')
795 {
796 nlines++;
797 refresh_count++;
798
799 if (! (Options & Opt_jumpScroll)
800 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
801 {
802 refreshnow = true;
803 flag = false;
804 ch = NOCHAR;
805 break;
806 }
807
808 // scr_add_lines only works for nlines < TermWin.nrow - 1.
809 if (nlines >= TermWin.nrow - 1)
810 {
811 scr_add_lines (buf, nlines, str - buf);
812 nlines = 0;
813 str = buf;
814 }
815 }
816
817 if (str >= buf + BUFSIZ)
818 {
819 ch = NOCHAR;
820 break;
821 }
822 }
823 }
824
825 scr_add_lines (buf, nlines, str - buf);
826
827 /*
828 * If there have been a lot of new lines, then update the screen
829 * What the heck I'll cheat and only refresh less than every page-full.
830 * the number of pages between refreshes is refresh_limit, which
831 * is incremented here because we must be doing flat-out scrolling.
832 *
833 * refreshing should be correct for small scrolls, because of the
834 * time-out
835 */
836 if (refreshnow)
837 {
838 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
839 refresh_limit++;
840
841 scr_refresh (refresh_type);
842 }
843
844 }
845 else
846 {
847 switch (ch)
848 {
849 default:
850 process_nonprinting (ch);
851 break;
852 case C0_ESC: /* escape char */
853 process_escape_seq ();
854 break;
855 /*case 0x9b: */ /* CSI */
856 /* process_csi_seq (); */
857 }
858
859 ch = NOCHAR;
860 }
861 }
862
863 return flag;
864}
865
866// read the next character, currently handles UTF-8
867// will probably handle all sorts of other stuff in the future
868uint32_t
869rxvt_term::next_char ()
870{
871 while (cmdbuf_ptr < cmdbuf_endp)
872 {
873 // assume 0x20 .. 0x7f to be ascii ALWAYS (all shift-states etc.) uh-oh
874 if ((*cmdbuf_ptr <= 0x7f && 0x20 <= *cmdbuf_ptr)
875 || !*cmdbuf_ptr)
876 return *cmdbuf_ptr++;
877
878 wchar_t wc;
879 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
880
881 if (len == (size_t)-2)
882 {
883 // the mbstate stores incomplete sequences. didn't know this :/
884 cmdbuf_ptr = cmdbuf_endp;
885 break;
886 }
887
888 if (len == (size_t)-1)
889 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
890
891 // assume wchar == unicode
892 cmdbuf_ptr += len;
893 return wc;
894 }
895
896 return NOCHAR;
897}
898
899/* rxvt_cmd_getc () - Return next input character */
900/*
901 * Return the next input character after first passing any keyboard input
902 * to the command.
903 */
904uint32_t
905rxvt_term::cmd_getc ()
906{
907 for (;;)
908 {
909 uint32_t c = next_char ();
910 if (c != NOCHAR)
911 return c;
912
913 // incomplete sequences should occur rarely, still, a better solution
914 // would be preferred. either setjmp/longjmp or better design.
915 fcntl (cmd_fd, F_SETFL, 0);
916 pty_fill ();
917 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
918 }
919} 1079}
920 1080
921#ifdef POINTER_BLANK 1081#ifdef POINTER_BLANK
922void 1082void
923rxvt_term::pointer_unblank ()
924{
925 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
926 recolour_cursor ();
927
928 hidden_pointer = 0;
929
930 if (Options & Opt_pointerBlank)
931 pointer_ev.start (NOW + pointerBlankDelay);
932}
933
934void
935rxvt_term::pointer_blank () 1083rxvt_term::pointer_blank ()
936{ 1084{
937 if (! (Options & Opt_pointerBlank)) 1085 if (! (options & Opt_pointerBlank))
938 return; 1086 return;
939 1087
940 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1088 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
941 XFlush (display->display); 1089 XFlush (display->display);
942 1090
943 hidden_pointer = 1; 1091 hidden_pointer = 1;
944} 1092}
945 1093
… …
962 x = ev.x; 1110 x = ev.x;
963 y = ev.y; 1111 y = ev.y;
964 pixel_position (&x, &y); 1112 pixel_position (&x, &y);
965 1113
966 if (MEvent.button == AnyButton) 1114 if (MEvent.button == AnyButton)
967 {
968 button_number = 3; 1115 button_number = 3;
969 }
970 else 1116 else
971 { 1117 {
972 button_number = MEvent.button - Button1; 1118 button_number = MEvent.button - Button1;
973 /* add 0x3D for wheel events, like xterm does */ 1119 /* add 0x3D for wheel events, like xterm does */
974 if (button_number >= 3) 1120 if (button_number >= 3)
975 button_number += (64 - 3); 1121 button_number += (64 - 3);
976 } 1122 }
977 1123
978 if (PrivateModes & PrivMode_MouseX10) 1124 if (priv_modes & PrivMode_MouseX10)
979 { 1125 {
980 /* 1126 /*
981 * do not report ButtonRelease 1127 * do not report ButtonRelease
982 * no state info allowed 1128 * no state info allowed
983 */ 1129 */
… …
998 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1144 + ((MEvent.state & ModMetaMask) ? 8 : 0)
999 + ((MEvent.state & ControlMask) ? 16 : 0); 1145 + ((MEvent.state & ControlMask) ? 16 : 0);
1000#ifdef MOUSE_REPORT_DOUBLECLICK 1146#ifdef MOUSE_REPORT_DOUBLECLICK
1001 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1147 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1002#endif 1148#endif
1003
1004 } 1149 }
1005 1150
1006#ifdef DEBUG_MOUSEREPORT 1151#if DEBUG_MOUSEREPORT
1007 fprintf (stderr, "Mouse ["); 1152 fprintf (stderr, "Mouse [");
1008 if (key_state & 16) 1153 if (key_state & 16)
1009 fputc ('C', stderr); 1154 fputc ('C', stderr);
1010 if (key_state & 4) 1155 if (key_state & 4)
1011 fputc ('S', stderr); 1156 fputc ('S', stderr);
… …
1015 fputc ('2', stderr); 1160 fputc ('2', stderr);
1016 fprintf (stderr, "]: <%d>, %d/%d\n", 1161 fprintf (stderr, "]: <%d>, %d/%d\n",
1017 button_number, 1162 button_number,
1018 x + 1, 1163 x + 1,
1019 y + 1); 1164 y + 1);
1020#else 1165#endif
1166
1021 tt_printf ("\033[M%c%c%c", 1167 tt_printf ("\033[M%c%c%c",
1022 (32 + button_number + key_state), 1168 (32 + button_number + key_state),
1023 (32 + x + 1), 1169 (32 + x + 1),
1024 (32 + y + 1)); 1170 (32 + y + 1));
1025#endif
1026} 1171}
1027 1172
1028#ifdef USING_W11LIB 1173#ifdef USING_W11LIB
1029void 1174void
1030rxvt_W11_process_x_event (XEvent *ev) 1175rxvt_W11_process_x_event (XEvent *ev)
… …
1041{ 1186{
1042 SET_R (this); 1187 SET_R (this);
1043 SET_LOCALE (locale); 1188 SET_LOCALE (locale);
1044 1189
1045#if defined(CURSOR_BLINK) 1190#if defined(CURSOR_BLINK)
1046 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1191 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1047 { 1192 {
1048 if (hidden_cursor) 1193 if (hidden_cursor)
1049 { 1194 {
1050 hidden_cursor = 0; 1195 hidden_cursor = 0;
1051 want_refresh = 1; 1196 want_refresh = 1;
… …
1054 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1199 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1055 } 1200 }
1056#endif 1201#endif
1057 1202
1058#if defined(POINTER_BLANK) 1203#if defined(POINTER_BLANK)
1059 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1204 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1060 { 1205 {
1061 if (ev.type == MotionNotify 1206 if (ev.type == MotionNotify
1062 || ev.type == ButtonPress 1207 || ev.type == ButtonPress
1063 || ev.type == ButtonRelease) 1208 || ev.type == ButtonRelease)
1064 if (hidden_pointer) 1209 if (hidden_pointer)
… …
1067 if (ev.type == KeyPress && hidden_pointer == 0) 1212 if (ev.type == KeyPress && hidden_pointer == 0)
1068 pointer_blank (); 1213 pointer_blank ();
1069 } 1214 }
1070#endif 1215#endif
1071 1216
1072#ifdef USE_XIM
1073 if (XFilterEvent (&ev, None))
1074 return;
1075#endif
1076
1077 Window unused_root, unused_child; 1217 Window unused_root, unused_child;
1078 int unused_root_x, unused_root_y; 1218 int unused_root_x, unused_root_y;
1079 unsigned int unused_mask; 1219 unsigned int unused_mask;
1080
1081#ifdef DEBUG_X
1082 const char *const eventnames[] =
1083 { /* mason - this matches my system */
1084 "",
1085 "",
1086 "KeyPress",
1087 "KeyRelease",
1088 "ButtonPress",
1089 "ButtonRelease",
1090 "MotionNotify",
1091 "EnterNotify",
1092 "LeaveNotify",
1093 "FocusIn",
1094 "FocusOut",
1095 "KeymapNotify",
1096 "Expose",
1097 "GraphicsExpose",
1098 "NoExpose",
1099 "VisibilityNotify",
1100 "CreateNotify",
1101 "DestroyNotify",
1102 "UnmapNotify",
1103 "MapNotify",
1104 "MapRequest",
1105 "ReparentNotify",
1106 "ConfigureNotify",
1107 "ConfigureRequest",
1108 "GravityNotify",
1109 "ResizeRequest",
1110 "CirculateNotify",
1111 "CirculateRequest",
1112 "PropertyNotify",
1113 "SelectionClear",
1114 "SelectionRequest",
1115 "SelectionNotify",
1116 "ColormapNotify",
1117 "ClientMessage",
1118 "MappingNotify"
1119 };
1120#endif
1121
1122#ifdef DEBUG_X
1123 struct timeval tp;
1124 struct tm *ltt;
1125 (void)gettimeofday (&tp, NULL);
1126 ltt = localtime (& (tp.tv_sec));
1127 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));
1128#endif
1129 1220
1130 switch (ev.type) 1221 switch (ev.type)
1131 { 1222 {
1132 case KeyPress: 1223 case KeyPress:
1224#if ISO_14755
1225 if (!(iso14755buf & ISO_14755_52))
1226#endif
1133 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;
1134 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
1135 1292
1136#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1293#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1137 case KeyRelease:
1138 {
1139 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)
1140 mouse_slip_wheel_speed = 0; 1297 mouse_slip_wheel_speed = 0;
1141 else 1298#endif
1142 {
1143 KeySym ks;
1144
1145 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1146 if (ks == XK_Control_L || ks == XK_Control_R)
1147 mouse_slip_wheel_speed = 0;
1148 }
1149 break; 1299 break;
1150 } 1300 }
1151#endif
1152 1301
1153 case ButtonPress: 1302 case ButtonPress:
1154 button_press (ev.xbutton); 1303 button_press (ev.xbutton);
1155 break; 1304 break;
1156 1305
… …
1168 && (ev.xclient.data.l[0] == DndFile 1317 && (ev.xclient.data.l[0] == DndFile
1169 || ev.xclient.data.l[0] == DndDir 1318 || ev.xclient.data.l[0] == DndDir
1170 || ev.xclient.data.l[0] == DndLink)) 1319 || ev.xclient.data.l[0] == DndLink))
1171 { 1320 {
1172 /* Get Dnd data */ 1321 /* Get Dnd data */
1173 Atom ActualType; 1322 Atom ActualType;
1174 int ActualFormat; 1323 int ActualFormat;
1175 unsigned char *data; 1324 unsigned char *data;
1176 unsigned long Size, RemainingBytes; 1325 unsigned long Size, RemainingBytes;
1177 1326
1178 XGetWindowProperty (display->display, display->root, 1327 XGetWindowProperty (display->display, display->root,
1179 xa[XA_DNDSELECTION], 1328 xa[XA_DNDSELECTION],
1180 0L, 1000000L, 1329 0L, 1000000L,
1181 False, AnyPropertyType, 1330 False, AnyPropertyType,
1182 &ActualType, &ActualFormat, 1331 &ActualType, &ActualFormat,
1183 &Size, &RemainingBytes, 1332 &Size, &RemainingBytes,
1184 &data); 1333 &data);
1185 XChangeProperty (display->display, display->root, 1334 set_string_property (XA_CUT_BUFFER0, data);
1186 XA_CUT_BUFFER0, XA_STRING, 1335 XFree (data);
1187 8, PropModeReplace,
1188 data, STRLEN (data));
1189 selection_paste (display->root, XA_CUT_BUFFER0, True); 1336 selection_paste (display->root, XA_CUT_BUFFER0, true);
1190 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1337 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1191 } 1338 }
1192#endif /* OFFIX_DND */ 1339#endif /* OFFIX_DND */
1193 break; 1340 break;
1194 1341
1195 case MappingNotify: 1342 case MappingNotify:
1196 XRefreshKeyboardMapping (& (ev.xmapping)); 1343 XRefreshKeyboardMapping (&ev.xmapping);
1197 break; 1344 break;
1198 1345
1199 /* 1346 /*
1200 * XXX: this is not the _current_ arrangement 1347 * XXX: this is not the _current_ arrangement
1201 * Here's my conclusion: 1348 * Here's my conclusion:
… …
1226 { 1373 {
1227 TermWin.focus = 1; 1374 TermWin.focus = 1;
1228 want_refresh = 1; 1375 want_refresh = 1;
1229#ifdef USE_XIM 1376#ifdef USE_XIM
1230 if (Input_Context != NULL) 1377 if (Input_Context != NULL)
1378 {
1379 IMSetStatusPosition ();
1231 XSetICFocus (Input_Context); 1380 XSetICFocus (Input_Context);
1381 }
1232#endif 1382#endif
1233#ifdef CURSOR_BLINK 1383#ifdef CURSOR_BLINK
1234 if (Options & Opt_cursorBlink) 1384 if (options & Opt_cursorBlink)
1235 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 }
1236#endif 1393#endif
1237 1394
1238 } 1395 }
1239 break; 1396 break;
1240 1397
1241 case FocusOut: 1398 case FocusOut:
1242 if (TermWin.focus) 1399 if (TermWin.focus)
1243 { 1400 {
1244 TermWin.focus = 0; 1401 TermWin.focus = 0;
1245 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
1246#ifdef USE_XIM 1410#ifdef USE_XIM
1247 if (Input_Context != NULL) 1411 if (Input_Context != NULL)
1248 XUnsetICFocus (Input_Context); 1412 XUnsetICFocus (Input_Context);
1249#endif 1413#endif
1250#ifdef CURSOR_BLINK 1414#ifdef CURSOR_BLINK
1251 if (Options & Opt_cursorBlink) 1415 if (options & Opt_cursorBlink)
1252 cursor_blink_ev.stop (); 1416 cursor_blink_ev.stop ();
1253 hidden_cursor = 0; 1417 hidden_cursor = 0;
1254#endif 1418#endif
1255 1419#ifdef OFF_FOCUS_FADING
1420 if (rs[Rs_fade])
1421 {
1422 pix_colors = pix_colors_unfocused;
1423 scr_recolour ();
1424 }
1425#endif
1256 } 1426 }
1257 break; 1427 break;
1258 1428
1259 case ConfigureNotify: 1429 case ConfigureNotify:
1260 if (ev.xconfigure.window == TermWin.parent[0]) 1430 if (ev.xconfigure.window == TermWin.parent[0])
… …
1269 } 1439 }
1270 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1271 1441
1272 if (szHint.width != width || szHint.height != height) 1442 if (szHint.width != width || szHint.height != height)
1273 { 1443 {
1274 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1444 seen_resize = 1;
1275 resize_all_windows (width, height, 1); 1445 resize_all_windows (width, height, 1);
1276 } 1446 }
1277#ifdef DEBUG_SIZE 1447
1278 else
1279 {
1280 D_SIZE ((stderr, "Size: Not resizing"));
1281 }
1282#endif
1283#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1448#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1284 if (Options & Opt_transparent) 1449 if (options & Opt_transparent)
1285 {
1286 check_our_parents (); 1450 check_our_parents ();
1287 if (am_transparent)
1288 want_full_refresh = 1;
1289 }
1290#endif 1451#endif
1291
1292 } 1452 }
1293 break; 1453 break;
1294 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
1295 case SelectionClear: 1462 case SelectionClear:
1296 display->set_selection_owner (0); 1463 selection_clear ();
1297 break; 1464 break;
1298 1465
1299 case SelectionNotify: 1466 case SelectionNotify:
1300 if (selection_wait == Sel_normal) 1467 if (selection_wait == Sel_normal)
1301 selection_paste (ev.xselection.requestor, 1468 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1302 ev.xselection.property, True);
1303 break; 1469 break;
1304 1470
1305 case SelectionRequest: 1471 case SelectionRequest:
1306 selection_send (ev.xselectionrequest); 1472 selection_send (ev.xselectionrequest);
1307 break; 1473 break;
… …
1328 1494
1329 case GraphicsExpose: 1495 case GraphicsExpose:
1330 case Expose: 1496 case Expose:
1331 if (ev.xany.window == TermWin.vt) 1497 if (ev.xany.window == TermWin.vt)
1332 { 1498 {
1333#ifdef NO_SLOW_LINK_SUPPORT 1499 do
1334 scr_expose (ev.xexpose.x, ev.xexpose.y, 1500 scr_expose (ev.xexpose.x, ev.xexpose.y,
1335 ev.xexpose.width, ev.xexpose.height, False); 1501 ev.xexpose.width, ev.xexpose.height, False);
1336#else 1502 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1337 // 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))
1338 scr_expose (ev.xexpose.x, ev.xexpose.y, 1507 scr_expose (ev.xexpose.x, ev.xexpose.y,
1339 ev.xexpose.width, ev.xexpose.height, False); 1508 ev.xexpose.width, ev.xexpose.height, False);
1340 //scr_expose (ev.xexpose.x, 0, 1509
1341 // ev.xexpose.width, TermWin.height, False); 1510 scr_refresh (refresh_type);
1342#endif
1343 want_refresh = 1;
1344 } 1511 }
1345 else 1512 else
1346 { 1513 {
1347 XEvent unused_event; 1514 XEvent unused_event;
1348 1515
1349 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1516 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1350 Expose, 1517 ;
1351 &unused_event)) ;
1352 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1353 GraphicsExpose, 1519 ;
1354 &unused_event)) ; 1520
1355 if (isScrollbarWindow (ev.xany.window)) 1521 if (isScrollbarWindow (ev.xany.window))
1356 { 1522 {
1357 scrollBar.setIdle (); 1523 scrollBar.setIdle ();
1358 scrollbar_show (0); 1524 scrollbar_show (0);
1359 } 1525 }
1360#ifdef MENUBAR 1526#ifdef MENUBAR
1361 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1527 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1362 menubar_expose (); 1528 menubar_expose ();
1363#endif 1529#endif
1530
1531#ifdef TRANSPARENT
1532 if (am_transparent && ev.xany.window == TermWin.parent[0])
1533 XClearWindow (display->display, ev.xany.window);
1534#endif
1364 } 1535 }
1365 break; 1536 break;
1366 1537
1367 case MotionNotify: 1538 case MotionNotify:
1368#ifdef POINTER_BLANK 1539#ifdef POINTER_BLANK
… …
1374 { 1545 {
1375 menubar_control (ev.xbutton); 1546 menubar_control (ev.xbutton);
1376 break; 1547 break;
1377 } 1548 }
1378#endif 1549#endif
1379 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1550 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1380 break; 1551 break;
1381 1552
1382 if (ev.xany.window == TermWin.vt) 1553 if (ev.xany.window == TermWin.vt)
1383 { 1554 {
1384 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1555 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1385 { 1556 {
1386 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1557 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1387 ; 1558 ;
1388 1559
1389 XQueryPointer (display->display, TermWin.vt, 1560 XQueryPointer (display->display, TermWin.vt,
1390 &unused_root, &unused_child, 1561 &unused_root, &unused_child,
1391 &unused_root_x, &unused_root_y, 1562 &unused_root_x, &unused_root_y,
1392 & (ev.xbutton.x), & (ev.xbutton.y), 1563 &ev.xbutton.x, &ev.xbutton.y,
1393 &unused_mask); 1564 &ev.xbutton.state);
1394#ifdef MOUSE_THRESHOLD 1565#ifdef MOUSE_THRESHOLD
1395 /* deal with a `jumpy' mouse */ 1566 /* deal with a `jumpy' mouse */
1396 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1567 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1397 { 1568 {
1398#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
1399 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1578 selection_extend (ev.xbutton.x, ev.xbutton.y,
1400 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1579 ev.xbutton.state & Button3Mask ? 2 : 0);
1580
1401#ifdef SELECTION_SCROLLING 1581#ifdef SELECTION_SCROLLING
1402 if (ev.xbutton.y < TermWin.int_bwidth 1582 if (ev.xbutton.y < TermWin.int_bwidth
1403 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1583 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1404 { 1584 {
1405 int dist; 1585 int dist;
1406 1586
1407 pending_scroll_selection=1;
1408
1409 /* don't clobber the current delay if we are 1587 /* don't clobber the current delay if we are
1410 * already in the middle of scrolling. 1588 * already in the middle of scrolling.
1411 */ 1589 */
1412 if (scroll_selection_delay<=0) 1590 if (!sel_scroll_ev.active)
1413 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1591 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1414 1592
1415 /* save the event params so we can highlight 1593 /* save the event params so we can highlight
1416 * the selection in the pending-scroll loop 1594 * the selection in the pending-scroll loop
1417 */ 1595 */
1418 selection_save_x=ev.xbutton.x; 1596 selection_save_x = ev.xbutton.x;
1419 selection_save_y=ev.xbutton.y; 1597 selection_save_y = ev.xbutton.y;
1420 selection_save_state=
1421 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1598 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1422 1599
1423 /* calc number of lines to scroll */ 1600 /* calc number of lines to scroll */
1424 if (ev.xbutton.y<TermWin.int_bwidth) 1601 if (ev.xbutton.y < TermWin.int_bwidth)
1425 { 1602 {
1426 scroll_selection_dir = UP; 1603 scroll_selection_dir = UP;
1427 dist = TermWin.int_bwidth - ev.xbutton.y; 1604 dist = TermWin.int_bwidth - ev.xbutton.y;
1428 } 1605 }
1429 else 1606 else
1430 { 1607 {
1431 scroll_selection_dir = DN; 1608 scroll_selection_dir = DN;
1432 dist = ev.xbutton.y -
1433 (TermWin.int_bwidth + TermWin.height); 1609 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1434 } 1610 }
1611
1435 scroll_selection_lines= (Pixel2Height (dist)/ 1612 scroll_selection_lines = Pixel2Height (dist)
1436 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1613 / SELECTION_SCROLL_LINE_SPEEDUP
1614 + 1;
1437 MIN_IT (scroll_selection_lines, 1615 MIN_IT (scroll_selection_lines,
1438 SELECTION_SCROLL_MAX_LINES); 1616 SELECTION_SCROLL_MAX_LINES);
1439 } 1617 }
1440 else 1618 else
1441 { 1619 {
1442 /* we are within the text window, so we 1620 /* we are within the text window, so we
1443 * shouldn't be scrolling 1621 * shouldn't be scrolling
1444 */ 1622 */
1445 pending_scroll_selection = 0; 1623 if (sel_scroll_ev.active)
1624 sel_scroll_ev.stop();
1446 } 1625 }
1447#endif 1626#endif
1448#ifdef MOUSE_THRESHOLD 1627#ifdef MOUSE_THRESHOLD
1449
1450 } 1628 }
1451#endif 1629#endif
1452
1453 } 1630 }
1454 } 1631 }
1455 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1632 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1456 { 1633 {
1457 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1634 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1458 MotionNotify, &ev)) ; 1635 MotionNotify, &ev))
1636 ;
1637
1459 XQueryPointer (display->display, scrollBar.win, 1638 XQueryPointer (display->display, scrollBar.win,
1460 &unused_root, &unused_child, 1639 &unused_root, &unused_child,
1461 &unused_root_x, &unused_root_y, 1640 &unused_root_x, &unused_root_y,
1462 & (ev.xbutton.x), & (ev.xbutton.y), 1641 &ev.xbutton.x, &ev.xbutton.y,
1463 &unused_mask); 1642 &unused_mask);
1464 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1643 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1465 scrollbar_size ()); 1644 scrollbar_size ());
1466 scr_refresh (refresh_type); 1645 scr_refresh (refresh_type);
1467 refresh_limit = 0; 1646 refresh_limit = 0;
… …
1469 } 1648 }
1470 break; 1649 break;
1471 } 1650 }
1472} 1651}
1473 1652
1653#if TRANSPARENT
1474void 1654void
1475rxvt_term::rootwin_cb (XEvent &ev) 1655rxvt_term::rootwin_cb (XEvent &ev)
1476{ 1656{
1477 SET_R (this); 1657 SET_R (this);
1478 SET_LOCALE (locale); 1658 SET_LOCALE (locale);
1479 1659
1480 switch (ev.type) 1660 switch (ev.type)
1481 { 1661 {
1482 case PropertyNotify: 1662 case PropertyNotify:
1483 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1484 {
1485 if (ev.xproperty.state == PropertyNewValue)
1486 selection_property (ev.xproperty.window, ev.xproperty.atom);
1487 break;
1488 }
1489#ifdef TRANSPARENT
1490 else
1491 {
1492 /* 1663 /*
1493 * 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,
1494 * 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.
1495 */ 1666 */
1496 if (xa[XA_XROOTPMAPID] == 0)
1497 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1498
1499 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])
1500 return; 1669 return;
1501 }
1502 1670
1503 /* FALLTHROUGH */ 1671 /* FALLTHROUGH */
1504 case ReparentNotify: 1672 case ReparentNotify:
1505 if ((Options & Opt_transparent) && check_our_parents ()) 1673 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1506 if (am_transparent)
1507 want_full_refresh = 1; 1674 want_refresh = want_full_refresh = 1;
1508 break; 1675 break;
1509#endif
1510 } 1676 }
1511} 1677}
1678#endif
1512 1679
1513void 1680void
1514rxvt_term::button_press (XButtonEvent &ev) 1681rxvt_term::button_press (XButtonEvent &ev)
1515{ 1682{
1516 int reportmode = 0, clickintime; 1683 int reportmode = 0, clickintime;
1517 1684
1518 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1685 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1519 if (!bypass_keystate) 1686 if (!bypass_keystate)
1520 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1687 reportmode = !! (priv_modes & PrivMode_mouse_report);
1688
1521 /* 1689 /*
1522 * VT window processing of button press 1690 * VT window processing of button press
1523 */ 1691 */
1524 if (ev.window == TermWin.vt) 1692 if (ev.window == TermWin.vt)
1525 { 1693 {
1694#if ISO_14755
1695 // 5.4
1696 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1697 {
1698 iso14755_54 (ev.x, ev.y);
1699 return;
1700 }
1701#endif
1702
1526 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1703 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1704
1527 if (reportmode) 1705 if (reportmode)
1528 { 1706 {
1529 /* mouse report from vt window */ 1707 /* mouse report from vt window */
1530 /* save the xbutton state (for ButtonRelease) */ 1708 /* save the xbutton state (for ButtonRelease) */
1531 MEvent.state = ev.state; 1709 MEvent.state = ev.state;
… …
1560 } 1738 }
1561 else 1739 else
1562 { 1740 {
1563 if (ev.button != MEvent.button) 1741 if (ev.button != MEvent.button)
1564 MEvent.clicks = 0; 1742 MEvent.clicks = 0;
1743
1565 switch (ev.button) 1744 switch (ev.button)
1566 { 1745 {
1567 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
1568 /* allow shift+left click to extend selection */ 1755 /* allow shift+left click to extend selection */
1569 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1756 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1570 { 1757 {
1571 if (MEvent.button == Button1 && clickintime) 1758 if (MEvent.button == Button1 && clickintime)
1572 selection_rotate (ev.x, ev.y); 1759 selection_rotate (ev.x, ev.y);
1573 else 1760 else
1574 selection_extend (ev.x, ev.y, 1); 1761 selection_extend (ev.x, ev.y, 1);
… …
1589 case Button3: 1776 case Button3:
1590 if (MEvent.button == Button3 && clickintime) 1777 if (MEvent.button == Button3 && clickintime)
1591 selection_rotate (ev.x, ev.y); 1778 selection_rotate (ev.x, ev.y);
1592 else 1779 else
1593 selection_extend (ev.x, ev.y, 1); 1780 selection_extend (ev.x, ev.y, 1);
1781
1594 MEvent.button = Button3; 1782 MEvent.button = Button3;
1595 break; 1783 break;
1596 } 1784 }
1597 } 1785 }
1786
1598 MEvent.time = ev.time; 1787 MEvent.time = ev.time;
1599 return; 1788 return;
1600 } 1789 }
1601 1790
1602 /* 1791 /*
… …
1668 upordown = 1; /* down */ 1857 upordown = 1; /* down */
1669 } 1858 }
1670 if (upordown) 1859 if (upordown)
1671 { 1860 {
1672#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1861#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1673 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1862 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1674#endif 1863#endif
1675 if (scr_page (upordown < 0 ? UP : DN, 1)) 1864 if (scr_page (upordown < 0 ? UP : DN, 1))
1676 { 1865 {
1677 if (upordown < 0) 1866 if (upordown < 0)
1678 scrollBar.setUp (); 1867 scrollBar.setUp ();
… …
1694 break; 1883 break;
1695 case R_SB_ALIGN_BOTTOM: 1884 case R_SB_ALIGN_BOTTOM:
1696 csrO = scrollBar.bot - scrollBar.top; 1885 csrO = scrollBar.bot - scrollBar.top;
1697 break; 1886 break;
1698 } 1887 }
1888
1699 if (scrollBar.style == R_SB_XTERM 1889 if (scrollBar.style == R_SB_XTERM
1700 || scrollbar_above_slider (ev.y) 1890 || scrollbar_above_slider (ev.y)
1701 || scrollbar_below_slider (ev.y)) 1891 || scrollbar_below_slider (ev.y))
1702 scr_move_to ( scrollbar_position (ev.y) - csrO, 1892 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1703 scrollbar_size ()); 1893
1704 scrollBar.setMotion (); 1894 scrollBar.setMotion ();
1705 break; 1895 break;
1706 1896
1707 case Button1: 1897 case Button1:
1708 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1898 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1732 scr_page ((ev.button == Button1 ? DN : UP), 1922 scr_page ((ev.button == Button1 ? DN : UP),
1733 (TermWin.nrow 1923 (TermWin.nrow
1734 * scrollbar_position (ev.y) 1924 * scrollbar_position (ev.y)
1735 / scrollbar_size ())); 1925 / scrollbar_size ()));
1736 } 1926 }
1927
1737 break; 1928 break;
1738 } 1929 }
1739 } 1930 }
1740 return; 1931 return;
1741 } 1932 }
… …
1753{ 1944{
1754 int reportmode = 0; 1945 int reportmode = 0;
1755 1946
1756 csrO = 0; /* reset csr Offset */ 1947 csrO = 0; /* reset csr Offset */
1757 if (!bypass_keystate) 1948 if (!bypass_keystate)
1758 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1949 reportmode = !! (priv_modes & PrivMode_mouse_report);
1759 1950
1760 if (scrollbar_isUpDn ()) 1951 if (scrollbar_isUpDn ())
1761 { 1952 {
1762 scrollBar.setIdle (); 1953 scrollBar.setIdle ();
1763 scrollbar_show (0); 1954 scrollbar_show (0);
1764#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1955#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1765 refresh_type &= ~SMOOTH_REFRESH; 1956 refresh_type &= ~SMOOTH_REFRESH;
1766#endif 1957#endif
1767
1768 } 1958 }
1959
1769#ifdef SELECTION_SCROLLING 1960#ifdef SELECTION_SCROLLING
1770 pending_scroll_selection=0; 1961 if (sel_scroll_ev.active)
1962 sel_scroll_ev.stop();
1771#endif 1963#endif
1964
1772 if (ev.window == TermWin.vt) 1965 if (ev.window == TermWin.vt)
1773 { 1966 {
1967#if ISO_14755
1968 // 5.4
1969 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1970 return;
1971#endif
1774 if (reportmode) 1972 if (reportmode)
1775 { 1973 {
1776 /* mouse report from vt window */ 1974 /* mouse report from vt window */
1777 /* don't report release of wheel "buttons" */ 1975 /* don't report release of wheel "buttons" */
1778 if (ev.button >= 4) 1976 if (ev.button >= 4)
… …
1792 MEvent.button = AnyButton; 1990 MEvent.button = AnyButton;
1793 mouse_report (ev); 1991 mouse_report (ev);
1794#endif /* MOUSE_REPORT_DOUBLECLICK */ 1992#endif /* MOUSE_REPORT_DOUBLECLICK */
1795 return; 1993 return;
1796 } 1994 }
1995
1797 /* 1996 /*
1798 * dumb hack to compensate for the failure of click-and-drag 1997 * dumb hack to compensate for the failure of click-and-drag
1799 * when overriding mouse reporting 1998 * when overriding mouse reporting
1800 */ 1999 */
1801 if (PrivateModes & PrivMode_mouse_report 2000 if (priv_modes & PrivMode_mouse_report
1802 && bypass_keystate 2001 && bypass_keystate
1803 && ev.button == Button1 && MEvent.clicks <= 1) 2002 && ev.button == Button1 && MEvent.clicks <= 1)
1804 selection_extend (ev.x, ev.y, 0); 2003 selection_extend (ev.x, ev.y, 0);
1805 2004
1806 switch (ev.button) 2005 switch (ev.button)
… …
1817 case Button5: 2016 case Button5:
1818 { 2017 {
1819 int i; 2018 int i;
1820 page_dirn v; 2019 page_dirn v;
1821 2020
1822 v = (ev.button == Button4) ? UP : DN; 2021 v = ev.button == Button4 ? UP : DN;
2022
1823 if (ev.state & ShiftMask) 2023 if (ev.state & ShiftMask)
1824 i = 1; 2024 i = 1;
1825 else if ((Options & Opt_mouseWheelScrollPage)) 2025 else if (options & Opt_mouseWheelScrollPage)
1826 i = TermWin.nrow - 1; 2026 i = TermWin.nrow - 1;
1827 else 2027 else
1828 i = 5; 2028 i = 5;
2029
1829# ifdef MOUSE_SLIP_WHEELING 2030# ifdef MOUSE_SLIP_WHEELING
1830 if (ev.state & ControlMask) 2031 if (ev.state & ControlMask)
1831 { 2032 {
1832 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)
1833 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2038 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2039
2040 slip_wheel_ev.start ();
1834 } 2041 }
2042 else
2043 {
1835# endif 2044# endif
1836# ifdef JUMP_MOUSE_WHEEL 2045# ifdef JUMP_MOUSE_WHEEL
1837 scr_page (v, i);
1838 scr_refresh (SMOOTH_REFRESH);
1839 scrollbar_show (1);
1840# else
1841 while (i--)
1842 {
1843 scr_page (v, 1); 2046 scr_page (v, i);
1844 scr_refresh (SMOOTH_REFRESH); 2047 scr_refresh (SMOOTH_REFRESH);
1845 scrollbar_show (1); 2048 scrollbar_show (1);
2049# else
2050 while (i--)
2051 {
2052 scr_page (v, 1);
2053 scr_refresh (SMOOTH_REFRESH);
2054 scrollbar_show (1);
2055 }
2056# endif
2057# ifdef MOUSE_SLIP_WHEELING
1846 } 2058 }
1847# endif 2059#endif
1848
1849 } 2060 }
1850 break; 2061 break;
1851#endif 2062#endif
1852
1853 } 2063 }
1854 } 2064 }
1855#ifdef MENUBAR 2065#ifdef MENUBAR
1856 else if (isMenuBarWindow (ev.window)) 2066 else if (isMenuBarWindow (ev.window))
1857 menubar_control (ev); 2067 menubar_control (ev);
1858#endif 2068#endif
1859} 2069}
1860 2070
1861
1862#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
1863/* 2303/*
1864 * Check our parents are still who we think they are. 2304 * Check our parents are still who we think they are.
1865 * Do transparency updates if required 2305 * Do transparency updates if required
1866 */ 2306 */
1867int 2307int
1868rxvt_term::check_our_parents () 2308rxvt_term::check_our_parents ()
1869{ 2309{
1870 int i, pchanged, aformat, have_pixmap, rootdepth; 2310 int i, pchanged, aformat, have_pixmap, rootdepth;
1871 unsigned long nitems, bytes_after; 2311 unsigned long nitems, bytes_after;
1872 Atom atype; 2312 Atom atype;
1873 unsigned char *prop = NULL; 2313 unsigned char *prop = NULL;
1874 Window root, oldp, *list; 2314 Window root, oldp, *list;
1875 Pixmap rootpixmap = None; 2315 Pixmap rootpixmap = None;
1876 XWindowAttributes wattr, wrootattr; 2316 XWindowAttributes wattr, wrootattr;
1877 2317
1878 pchanged = 0; 2318 pchanged = 0;
1879 2319
1880 if (! (Options & Opt_transparent)) 2320 if (!(options & Opt_transparent))
1881 return pchanged; /* Don't try any more */ 2321 return pchanged; /* Don't try any more */
1882 2322
1883 XGetWindowAttributes (display->display, display->root, &wrootattr); 2323 XGetWindowAttributes (display->display, display->root, &wrootattr);
1884 rootdepth = wrootattr.depth; 2324 rootdepth = wrootattr.depth;
1885 2325
1886 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2326 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2327
1887 if (rootdepth != wattr.depth) 2328 if (rootdepth != wattr.depth)
1888 { 2329 {
1889 if (am_transparent) 2330 if (am_transparent)
1890 { 2331 {
1891 pchanged = 1; 2332 pchanged = 1;
1892 XSetWindowBackground (display->display, TermWin.vt, 2333 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1893 PixColors[Color_bg]);
1894 am_transparent = am_pixmap_trans = 0; 2334 am_transparent = am_pixmap_trans = 0;
1895 } 2335 }
2336
1896 return pchanged; /* Don't try any more */ 2337 return pchanged; /* Don't try any more */
1897 } 2338 }
1898 2339
1899 /* 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. */
1900 XSync (display->display, False); 2341 XSync (display->display, False);
… …
1902 /* 2343 /*
1903 * Make the frame window set by the window manager have 2344 * Make the frame window set by the window manager have
1904 * the root background. Some window managers put multiple nested frame 2345 * the root background. Some window managers put multiple nested frame
1905 * 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.
1906 */ 2347 */
1907 i = (xa[XA_XROOTPMAPID] != 0 2348 i = (xa[XA_XROOTPMAP_ID]
1908 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2349 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],
1909 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2350 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1910 &nitems, &bytes_after, &prop) == Success)); 2351 &nitems, &bytes_after, &prop) == Success);
2352
1911 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 )
1912 have_pixmap = 0; 2364 have_pixmap = 0;
1913 else 2365 else
1914 { 2366 {
1915 have_pixmap = 1; 2367 have_pixmap = 1;
1916 rootpixmap = * ((Pixmap *)prop); 2368 rootpixmap = *(Pixmap *)prop;
1917 XFree (prop); 2369 XFree (prop);
1918 } 2370 }
2371
1919 if (have_pixmap) 2372 if (have_pixmap)
1920 { 2373 {
1921 /* 2374 /*
1922 * Copy display->root pixmap transparency 2375 * Copy display->root pixmap transparency
1923 */ 2376 */
… …
1927 XImage *image; 2380 XImage *image;
1928 GC gc; 2381 GC gc;
1929 XGCValues gcvalue; 2382 XGCValues gcvalue;
1930 2383
1931 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2384 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1932 0, 0, &sx, &sy, &cr); 2385 0, 0, &sx, &sy, &cr);
1933 nw = (unsigned int)szHint.width; 2386 nw = (unsigned int)szHint.width;
1934 nh = (unsigned int)szHint.height; 2387 nh = (unsigned int)szHint.height;
1935 nx = ny = 0; 2388 nx = ny = 0;
1936 2389
1937 if (sx < 0) 2390 if (sx < 0)
… …
1948 sy = 0; 2401 sy = 0;
1949 } 2402 }
1950 2403
1951 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2404 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1952 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2405 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2406
2407 XSync (display->display, False);
1953 allowedxerror = -1; 2408 allowedxerror = -1;
1954 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2409 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1955 ZPixmap); 2410
1956 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2411 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1957 /* XXX: may need a delay here? */ 2412 /* XXX: may need a delay here? */
1958 allowedxerror = 0; 2413 allowedxerror = 0;
2414
1959 if (image == NULL) 2415 if (image == NULL)
1960 { 2416 {
1961 if (am_transparent && am_pixmap_trans) 2417 if (am_transparent && am_pixmap_trans)
1962 { 2418 {
1963 pchanged = 1; 2419 pchanged = 1;
… …
1965 { 2421 {
1966 XFreePixmap (display->display, TermWin.pixmap); 2422 XFreePixmap (display->display, TermWin.pixmap);
1967 TermWin.pixmap = None; 2423 TermWin.pixmap = None;
1968 } 2424 }
1969 } 2425 }
2426
1970 am_pixmap_trans = 0; 2427 am_pixmap_trans = 0;
1971 } 2428 }
1972 else 2429 else
1973 { 2430 {
1974 if (TermWin.pixmap != None) 2431 if (TermWin.pixmap != None)
1975 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
1976 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2446 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1977 (unsigned int)szHint.width,
1978 (unsigned int)szHint.height, 2447 szHint.width, szHint.height, image->depth);
1979 (unsigned int)image->depth);
1980 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2448 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1981 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2449 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1982 nx, ny, (unsigned int)image->width,
1983 (unsigned int)image->height); 2450 nx, ny, image->width, image->height);
1984 XFreeGC (display->display, gc); 2451 XFreeGC (display->display, gc);
1985 XDestroyImage (image); 2452 XDestroyImage (image);
1986 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2453 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
1987 TermWin.pixmap); 2454 XClearWindow (display->display, TermWin.parent[0]);
2455
1988 if (!am_transparent || !am_pixmap_trans) 2456 if (!am_transparent || !am_pixmap_trans)
1989 pchanged = 1; 2457 pchanged = 1;
2458
1990 am_transparent = am_pixmap_trans = 1; 2459 am_transparent = am_pixmap_trans = 1;
1991 } 2460 }
1992 } 2461 }
1993 2462
1994 if (!am_pixmap_trans) 2463 if (am_pixmap_trans)
2464 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2465 else
1995 { 2466 {
1996 unsigned int n; 2467 unsigned int n;
1997 /* 2468 /*
1998 * InheritPixmap transparency 2469 * InheritPixmap transparency
1999 */ 2470 */
2000 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2001 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2471 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2002 i++)
2003 { 2472 {
2004 oldp = TermWin.parent[i]; 2473 oldp = TermWin.parent[i];
2005 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2474 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2006 &TermWin.parent[i], &list, &n); 2475 &TermWin.parent[i], &list, &n);
2007 XFree (list); 2476 XFree (list);
2008 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2477
2009 if (TermWin.parent[i] == display->root) 2478 if (TermWin.parent[i] == display->root)
2010 { 2479 {
2011 if (oldp != None) 2480 if (oldp != None)
2012 pchanged = 1; 2481 pchanged = 1;
2482
2013 break; 2483 break;
2014 } 2484 }
2485
2015 if (oldp != TermWin.parent[i]) 2486 if (oldp != TermWin.parent[i])
2016 pchanged = 1; 2487 pchanged = 1;
2017 } 2488 }
2018 2489
2019 n = 0; 2490 n = 0;
… …
2021 if (pchanged) 2492 if (pchanged)
2022 { 2493 {
2023 for (; n < (unsigned int)i; n++) 2494 for (; n < (unsigned int)i; n++)
2024 { 2495 {
2025 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2496 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2026 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2027 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2497 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2028 { 2498 {
2029 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2499 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2030 break; 2500 break;
2031 } 2501 }
2032 } 2502 }
2033 } 2503 }
2034 2504
2035 if (n > (int) (sizeof (TermWin.parent) 2505 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2036 / sizeof (TermWin.parent[0])))
2037 { 2506 {
2038 D_X ((stderr, "InheritPixmap Turning off"));
2039 XSetWindowBackground (display->display, TermWin.parent[0], 2507 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2040 PixColors[Color_fg]);
2041 XSetWindowBackground (display->display, TermWin.vt, 2508 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2042 PixColors[Color_bg]);
2043 am_transparent = 0; 2509 am_transparent = 0;
2044 /* XXX: also turn off Opt_transparent? */ 2510 /* XXX: also turn off Opt_transparent? */
2045 } 2511 }
2046 else 2512 else
2047 { 2513 {
2514#if WAIT_FOR_WM
2048 /* wait (an arbitrary period) for the WM to do its thing 2515 /* wait (an arbitrary period) for the WM to do its thing
2049 * needed for fvwm2.2.2 (and before?) */ 2516 * needed for fvwm2.2.2 (and before?) */
2050# ifdef HAVE_NANOSLEEP
2051 struct timespec rqt;
2052
2053 rqt.tv_sec = 1;
2054 rqt.tv_nsec = 0;
2055 nanosleep (&rqt, NULL);
2056# else
2057 sleep (1); 2517 sleep (1);
2058# endif 2518#endif
2059 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2060 for (n = 0; n < (unsigned int)i; n++) 2519 for (n = 0; n < (unsigned int)i; n++)
2520 {
2061 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2521 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2062 ParentRelative); 2522 XClearWindow (display->display, TermWin.parent[n]);
2523 }
2524
2063 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2525 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2064 ParentRelative);
2065 am_transparent = 1; 2526 am_transparent = 1;
2066 } 2527 }
2067 2528
2068 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2529 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2069 TermWin.parent[i] = None; 2530 TermWin.parent[i] = None;
2070 } 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
2071 return pchanged; 2547 return pchanged;
2072} 2548}
2073#endif 2549#endif
2074 2550
2075/*}}} */ 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}
2076 2738
2077/*{{{ print pipe */ 2739/*{{{ print pipe */
2078/*----------------------------------------------------------------------*/ 2740/*----------------------------------------------------------------------*/
2079#ifdef PRINTPIPE 2741#ifdef PRINTPIPE
2080FILE * 2742FILE *
2081rxvt_term::popen_printer () 2743rxvt_term::popen_printer ()
2082{ 2744{
2083 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2745 FILE *stream = popen (rs[Rs_print_pipe], "w");
2084 2746
2085 if (stream == NULL) 2747 if (stream == NULL)
2086 rxvt_print_error ("can't open printer pipe"); 2748 rxvt_warn ("can't open printer pipe, not printing.\n");
2749
2087 return stream; 2750 return stream;
2088} 2751}
2089 2752
2090int 2753int
2091rxvt_term::pclose_printer (FILE *stream) 2754rxvt_term::pclose_printer (FILE *stream)
2092{ 2755{
2093 fflush (stream); 2756 fflush (stream);
2094 /* pclose () reported not to work on SunOS 4.1.3 */
2095# if defined (__sun__) /* TODO: RESOLVE THIS */
2096 /* pclose works provided SIGCHLD handler uses waitpid */
2097 return pclose (stream); /* return fclose (stream); */
2098# else
2099 return pclose (stream); 2757 return pclose (stream);
2100# endif
2101} 2758}
2102 2759
2103/* 2760/*
2104 * simulate attached vt100 printer 2761 * simulate attached vt100 printer
2105 */ 2762 */
2106void 2763void
2107rxvt_term::process_print_pipe () 2764rxvt_term::process_print_pipe ()
2108{ 2765{
2109 int done; 2766 int done;
2110 FILE *fd; 2767 FILE *fd;
2111 2768
2112 if ((fd = popen_printer ()) == NULL) 2769 if ((fd = popen_printer ()) == NULL)
2113 return; 2770 return;
2114 2771
2115 /* 2772 /*
2116 * 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
2117 * is received. 2774 * is received.
2118 */ 2775 */
2119 for (done = 0; !done;) 2776 for (done = 0; !done;)
2120 { 2777 {
2121 unsigned char buf[8]; 2778 unsigned char buf[8];
2122 unsigned char ch; 2779 unicode_t ch;
2123 unsigned int i, len; 2780 unsigned int i, len;
2124 2781
2125 if ((ch = cmd_getc ()) != C0_ESC) 2782 if ((ch = cmd_getc ()) != C0_ESC)
2126 { 2783 {
2127 if (putc (ch, fd) == EOF) 2784 if (putc (ch, fd) == EOF)
2128 break; /* done = 1 */ 2785 break; /* done = 1 */
… …
2143 { 2800 {
2144 if ((buf[len++] = cmd_getc ()) == 'i') 2801 if ((buf[len++] = cmd_getc ()) == 'i')
2145 break; /* done = 1 */ 2802 break; /* done = 1 */
2146 } 2803 }
2147 } 2804 }
2805
2148 for (i = 0; i < len; i++) 2806 for (i = 0; i < len; i++)
2149 if (putc (buf[i], fd) == EOF) 2807 if (putc (buf[i], fd) == EOF)
2150 { 2808 {
2151 done = 1; 2809 done = 1;
2152 break; 2810 break;
2153 } 2811 }
2154 } 2812 }
2155 } 2813 }
2814
2156 pclose_printer (fd); 2815 pclose_printer (fd);
2157} 2816}
2158#endif /* PRINTPIPE */ 2817#endif /* PRINTPIPE */
2159/*}}} */ 2818/*}}} */
2160 2819
2161/* *INDENT-OFF* */ 2820/* *INDENT-OFF* */
2162enum { 2821enum {
2163 C1_40 = 0x40, 2822 C1_40 = 0x40,
2164 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,
2165 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,
2166 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,
2167 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,
2168}; 2827};
2169/* *INDENT-ON* */ 2828/* *INDENT-ON* */
2170 2829
2171/*{{{ process non-printing single characters */ 2830/*{{{ process non-printing single characters */
2172void 2831void
2173rxvt_term::process_nonprinting (unsigned char ch) 2832rxvt_term::process_nonprinting (unicode_t ch)
2174{ 2833{
2175 switch (ch) 2834 switch (ch)
2176 { 2835 {
2836 case C0_ESC:
2837 process_escape_seq ();
2838 break;
2177 case C0_ENQ: /* terminal Status */ 2839 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2840 if (rs[Rs_answerbackstring])
2179 tt_write (
2180 (const unsigned char *)rs[Rs_answerbackstring], 2841 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2842 (unsigned int)strlen (rs[Rs_answerbackstring]));
2182 else 2843 else
2183 tt_write ((unsigned char *)VT100_ANS, 2844 tt_write ((unsigned char *)VT100_ANS,
2184 (unsigned int)STRLEN (VT100_ANS)); 2845 (unsigned int)strlen (VT100_ANS));
2185 break; 2846 break;
2186 case C0_BEL: /* bell */ 2847 case C0_BEL: /* bell */
2187 scr_bell (); 2848 scr_bell ();
2188 break; 2849 break;
2189 case C0_BS: /* backspace */ 2850 case C0_BS: /* backspace */
… …
2204 scr_charset_choose (1); 2865 scr_charset_choose (1);
2205 break; 2866 break;
2206 case C0_SI: /* shift in - acs */ 2867 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2868 scr_charset_choose (0);
2208 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
2209 } 2883 }
2210} 2884}
2211/*}}} */ 2885/*}}} */
2212 2886
2213 2887
2214/*{{{ process VT52 escape sequences */ 2888/*{{{ process VT52 escape sequences */
2215void 2889void
2216rxvt_term::process_escape_vt52 (unsigned char ch) 2890rxvt_term::process_escape_vt52 (unicode_t ch)
2217{ 2891{
2218 int row, col; 2892 int row, col;
2219 2893
2220 switch (ch) 2894 switch (ch)
2221 { 2895 {
… …
2273 2947
2274/*{{{ process escape sequences */ 2948/*{{{ process escape sequences */
2275void 2949void
2276rxvt_term::process_escape_seq () 2950rxvt_term::process_escape_seq ()
2277{ 2951{
2278 unsigned char ch = cmd_getc (); 2952 unicode_t ch = cmd_getc ();
2279 2953
2280 if (PrivateModes & PrivMode_vt52) 2954 if (priv_modes & PrivMode_vt52)
2281 { 2955 {
2282 process_escape_vt52 (ch); 2956 process_escape_vt52 (ch);
2283 return; 2957 return;
2284 } 2958 }
2285 2959
… …
2300 scr_charset_set (2, (unsigned int)cmd_getc ()); 2974 scr_charset_set (2, (unsigned int)cmd_getc ());
2301 break; 2975 break;
2302 case '+': 2976 case '+':
2303 scr_charset_set (3, (unsigned int)cmd_getc ()); 2977 scr_charset_set (3, (unsigned int)cmd_getc ());
2304 break; 2978 break;
2305#ifndef NO_FRILLS 2979#if ENABLE_FRILLS
2306 case '6': 2980 case '6':
2307 scr_backindex (); 2981 scr_backindex ();
2308 break; 2982 break;
2309#endif 2983#endif
2310 case '7': 2984 case '7':
2311 scr_cursor (SAVE); 2985 scr_cursor (SAVE);
2312 break; 2986 break;
2313 case '8': 2987 case '8':
2314 scr_cursor (RESTORE); 2988 scr_cursor (RESTORE);
2315 break; 2989 break;
2316#ifndef NO_FRILLS 2990#if ENABLE_FRILLS
2317 case '9': 2991 case '9':
2318 scr_forwardindex (); 2992 scr_forwardindex ();
2319 break; 2993 break;
2320#endif 2994#endif
2321 case '=': 2995 case '=':
… …
2331 break; 3005 break;
2332 3006
2333 /* 8.3.87: NEXT LINE */ 3007 /* 8.3.87: NEXT LINE */
2334 case C1_NEL: /* ESC E */ 3008 case C1_NEL: /* ESC E */
2335 { 3009 {
2336 uint32_t nlcr[] = { '\n', '\r' }; 3010 unicode_t nlcr[] = { C0_LF, C0_CR };
2337 scr_add_lines (nlcr, 1, 2); 3011 scr_add_lines (nlcr, 1, 2);
2338 } 3012 }
2339 break; 3013 break;
2340 3014
2341 /* kidnapped escape sequence: Should be 8.3.48 */ 3015 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2352 case C1_RI: /* ESC M */ 3026 case C1_RI: /* ESC M */
2353 scr_index (DN); 3027 scr_index (DN);
2354 break; 3028 break;
2355 3029
2356 /* 8.3.142: SINGLE-SHIFT TWO */ 3030 /* 8.3.142: SINGLE-SHIFT TWO */
2357 /*case C1_SS2: scr_single_shift (2); break; */ 3031 /*case C1_SS2: scr_single_shift (2); break; */
2358 3032
2359 /* 8.3.143: SINGLE-SHIFT THREE */ 3033 /* 8.3.143: SINGLE-SHIFT THREE */
2360 /*case C1_SS3: scr_single_shift (3); break; */ 3034 /*case C1_SS3: scr_single_shift (3); break; */
2361 3035
2362 /* 8.3.27: DEVICE CONTROL STRING */ 3036 /* 8.3.27: DEVICE CONTROL STRING */
2363 case C1_DCS: /* ESC P */ 3037 case C1_DCS: /* ESC P */
2364 process_dcs_seq (); 3038 process_dcs_seq ();
2365 break; 3039 break;
… …
2380 process_osc_seq (); 3054 process_osc_seq ();
2381 break; 3055 break;
2382 3056
2383 /* 8.3.106: RESET TO INITIAL STATE */ 3057 /* 8.3.106: RESET TO INITIAL STATE */
2384 case 'c': 3058 case 'c':
3059 mbstate.reset ();
2385 scr_poweron (); 3060 scr_poweron ();
2386 scrollbar_show (1); 3061 scrollbar_show (1);
2387 break; 3062 break;
2388 3063
2389 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3064 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2401 3076
2402/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3077/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2403/* *INDENT-OFF* */ 3078/* *INDENT-OFF* */
2404enum { 3079enum {
2405 CSI_ICH = 0x40, 3080 CSI_ICH = 0x40,
2406 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,
2407 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 ,
2408 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,
2409 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,
2410 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,
2411 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,
… …
2426 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, */
2427 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, [, \, ], ^, _, */
2428 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, */
2429 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, */
2430 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, */
2431 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, {, |, }, ~, */
2432 }; 3107 };
2433/* *INDENT-ON* */ 3108/* *INDENT-ON* */
2434 3109
2435void 3110void
2436rxvt_term::process_csi_seq () 3111rxvt_term::process_csi_seq ()
2437{ 3112{
2438 unsigned char ch, priv, i; 3113 unicode_t ch, priv, i;
2439 unsigned int nargs, p; 3114 unsigned int nargs, p;
2440 int n, ndef; 3115 int n, ndef;
2441 int arg[ESC_ARGS]; 3116 int arg[ESC_ARGS];
2442 3117
2443 for (nargs = ESC_ARGS; nargs > 0;) 3118 for (nargs = ESC_ARGS; nargs > 0;)
2444 arg[--nargs] = 0; 3119 arg[--nargs] = 0;
2445 3120
2446 priv = 0; 3121 priv = 0;
… …
2448 if (ch >= '<' && ch <= '?') 3123 if (ch >= '<' && ch <= '?')
2449 { /* '<' '=' '>' '?' */ 3124 { /* '<' '=' '>' '?' */
2450 priv = ch; 3125 priv = ch;
2451 ch = cmd_getc (); 3126 ch = cmd_getc ();
2452 } 3127 }
3128
2453 /* read any numerical arguments */ 3129 /* read any numerical arguments */
2454 for (n = -1; ch < CSI_ICH; ) 3130 for (n = -1; ch < CSI_ICH; )
2455 { 3131 {
2456 if (isdigit (ch)) 3132 if (isdigit (ch))
2457 { 3133 {
… …
2464 { 3140 {
2465 if (nargs < ESC_ARGS) 3141 if (nargs < ESC_ARGS)
2466 arg[nargs++] = n; 3142 arg[nargs++] = n;
2467 n = -1; 3143 n = -1;
2468 } 3144 }
2469 else if (ch == '\b') 3145 else if (IS_CONTROL (ch))
2470 {
2471 scr_backspace ();
2472 }
2473 else if (ch == C0_ESC)
2474 {
2475 process_escape_seq ();
2476 return;
2477 }
2478 else if (ch < ' ')
2479 {
2480 process_nonprinting (ch); 3146 process_nonprinting (ch);
2481 } 3147
2482 ch = cmd_getc (); 3148 ch = cmd_getc ();
2483 } 3149 }
2484 3150
2485 if (ch > CSI_7F) 3151 if (ch > CSI_7F)
2486 return; 3152 return;
… …
2628 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3294 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2629 break; 3295 break;
2630 3296
2631 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3297 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2632 tt_write ((const unsigned char *)VT100_ANS, 3298 tt_write ((const unsigned char *)VT100_ANS,
2633 (unsigned int) (sizeof (VT100_ANS) - 1)); 3299 (unsigned int) (sizeof (VT100_ANS) - 1));
2634 break; 3300 break;
2635 3301
2636 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3302 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2637 process_sgr_mode (nargs, arg); 3303 process_sgr_mode (nargs, arg);
2638 break; 3304 break;
… …
2644 tt_printf ("\033[0n"); 3310 tt_printf ("\033[0n");
2645 break; 3311 break;
2646 case 6: /* CPR requested */ 3312 case 6: /* CPR requested */
2647 scr_report_position (); 3313 scr_report_position ();
2648 break; 3314 break;
2649#if defined (ENABLE_DISPLAY_ANSWER)
2650 case 7: /* unofficial extension */ 3315 case 7: /* unofficial extension */
3316 if (options & Opt_insecure)
2651 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3317 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2652 break; 3318 break;
2653#endif
2654 case 8: /* unofficial extension */ 3319 case 8: /* unofficial extension */
2655 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3320 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2656 break; 3321 break;
2657 } 3322 }
2658 break; 3323 break;
2659 3324
2660 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3325 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2693 break; 3358 break;
2694 3359
2695 case CSI_RM: /* 8.3.107: RESET MODE */ 3360 case CSI_RM: /* 8.3.107: RESET MODE */
2696 if (arg[0] == 4) 3361 if (arg[0] == 4)
2697 scr_insert_mode (0); 3362 scr_insert_mode (0);
3363 else if (arg[0] == 20)
3364 priv_modes &= ~PrivMode_LFNL;
2698 break; 3365 break;
2699 3366
2700 case CSI_SM: /* 8.3.126: SET MODE */ 3367 case CSI_SM: /* 8.3.126: SET MODE */
2701 if (arg[0] == 4) 3368 if (arg[0] == 4)
2702 scr_insert_mode (1); 3369 scr_insert_mode (1);
3370 else if (arg[0] == 20)
3371 priv_modes |= PrivMode_LFNL;
2703 break; 3372 break;
2704 3373
2705 /* 3374 /*
2706 * PRIVATE USE beyond this point. All CSI_7? sequences here 3375 * PRIVATE USE beyond this point. All CSI_7? sequences here
2707 */ 3376 */
… …
2719 break; 3388 break;
2720 case CSI_75: 3389 case CSI_75:
2721 scr_cursor (RESTORE); 3390 scr_cursor (RESTORE);
2722 break; 3391 break;
2723 3392
2724#ifndef NO_FRILLS 3393#if ENABLE_FRILLS
2725 case CSI_74: 3394 case CSI_74:
2726 process_window_ops (arg, nargs); 3395 process_window_ops (arg, nargs);
2727 break; 3396 break;
2728#endif 3397#endif
2729 3398
2730 case CSI_78: /* DECREQTPARM */ 3399 case CSI_78: /* DECREQTPARM */
2731 if (arg[0] == 0 || arg[0] == 1) 3400 if (arg[0] == 0 || arg[0] == 1)
2732 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);
2733 /* FALLTHROUGH */ 3402 break;
2734 3403
2735 default: 3404 default:
2736 break; 3405 break;
2737 } 3406 }
2738} 3407}
2739/*}}} */ 3408/*}}} */
2740 3409
2741#ifndef NO_FRILLS 3410#if ENABLE_FRILLS
2742/* ARGSUSED */ 3411/* ARGSUSED */
2743void 3412void
2744rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3413rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2745{ 3414{
2746 int x, y; 3415 int x, y;
2747#if 0
2748 char *s;
2749#endif
2750 XWindowAttributes wattr; 3416 XWindowAttributes wattr;
2751 Window wdummy; 3417 Window wdummy;
2752 3418
2753 if (nargs == 0) 3419 if (nargs == 0)
2754 return; 3420 return;
3421
2755 switch (args[0]) 3422 switch (args[0])
2756 { 3423 {
2757 /* 3424 /*
2758 * commands 3425 * commands
2759 */ 3426 */
2760 case 1: /* deiconify window */ 3427 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3428 XMapWindow (display->display, TermWin.parent[0]);
2762 break; 3429 break;
2763 case 2: /* iconify window */ 3430 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3431 XIconifyWindow (display->display, TermWin.parent[0],
… …
2781 break; 3448 break;
2782 case 8: /* set size (chars) */ 3449 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3450 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3451 (unsigned int) (args[1] * TermWin.fheight));
2785 break; 3452 break;
3453
3454 //case 9: NYI, TODO, restore maximized window or maximize window
2786 default: 3455 default:
2787 if (args[0] >= 24) /* set height (chars) */ 3456 if (args[0] >= 24) /* set height (chars) */
2788 set_widthheight ((unsigned int)TermWin.width, 3457 set_widthheight ((unsigned int)TermWin.width,
2789 (unsigned int) (args[1] * TermWin.fheight)); 3458 (unsigned int) (args[1] * TermWin.fheight));
2790 break; 3459 break;
3460
3461
2791 /* 3462 /*
2792 * reports - some output format copied from XTerm 3463 * reports - some output format copied from XTerm
2793 */ 3464 */
2794 case 11: /* report window state */ 3465 case 11: /* report window state */
2795 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3466 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2796 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3467 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2797 break; 3468 break;
2798 case 13: /* report window position */ 3469 case 13: /* report window position */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3470 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2800 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3471 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2801 -wattr.border_width, -wattr.border_width, 3472 -wattr.border_width, -wattr.border_width,
2802 &x, &y, &wdummy); 3473 &x, &y, &wdummy);
2803 tt_printf ("\033[3;%d;%dt", x, y); 3474 tt_printf ("\033[3;%d;%dt", x, y);
2804 break; 3475 break;
2805 case 14: /* report window size (pixels) */ 3476 case 14: /* report window size (pixels) */
2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3477 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2807 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3478 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2808 break; 3479 break;
2809 case 18: /* report window size (chars) */ 3480 case 18: /* report text area size (chars) */
2810 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3481 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2811 break; 3482 break;
2812#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;
2813 case 20: /* report icon label */ 3486 case 20: /* report icon label */
3487 {
3488 char *s;
2814 XGetIconName (display->display, TermWin.parent[0], &s); 3489 XGetIconName (display->display, TermWin.parent[0], &s);
2815 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 }
2816 break; 3493 break;
2817 case 21: /* report window title */ 3494 case 21: /* report window title */
3495 {
3496 char *s;
2818 XFetchName (display->display, TermWin.parent[0], &s); 3497 XFetchName (display->display, TermWin.parent[0], &s);
2819 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 }
2820 break; 3501 break;
2821#endif
2822
2823 } 3502 }
2824} 3503}
2825#endif 3504#endif
2826 3505
2827/*----------------------------------------------------------------------*/ 3506/*----------------------------------------------------------------------*/
2828/* 3507/*
2829 * get input up until STRING TERMINATOR (or BEL) 3508 * get input up until STRING TERMINATOR (or BEL)
2830 * ends_how is terminator used. returned input must be free ()d 3509 * ends_how is terminator used. returned input must be free()'d
2831 */ 3510 */
2832unsigned char * 3511unsigned char *
2833rxvt_term::get_to_st (unsigned char *ends_how) 3512rxvt_term::get_to_st (unicode_t &ends_how)
2834{ 3513{
2835 int seen_esc = 0; /* seen escape? */ 3514 unicode_t ch;
3515 bool seen_esc = false;
2836 unsigned int n = 0; 3516 unsigned int n = 0;
2837 unsigned char *s; 3517 wchar_t string[STRING_MAX];
2838 unsigned char ch, string[STRING_MAX];
2839 3518
2840 for (; (ch = cmd_getc ());) 3519 while ((ch = cmd_getc ()) != NOCHAR)
2841 { 3520 {
2842 if (ch == C0_BEL 3521 if (seen_esc)
2843 || ch == CHAR_ST 3522 {
2844 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3523 if (ch == 0x5c) /* 7bit ST */
2845 break; 3524 break;
3525 else
3526 return NULL;
3527 }
2846 if (ch == C0_ESC) 3528 else if (ch == C0_ESC)
2847 { 3529 {
2848 seen_esc = 1; 3530 seen_esc = true;
2849 continue; 3531 continue;
2850 } 3532 }
2851 else if (ch == '\t') 3533 else if (ch == C0_BEL || ch == CHAR_ST)
2852 ch = ' '; /* translate '\t' to space */ 3534 break;
2853 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3535 else if (ch < 0x20)
2854 return NULL; /* other control character - exit */ 3536 return NULL; /* other control character - exit */
3537
3538 seen_esc = false;
3539
2855 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
2856 string[n++] = ch; 3547 string[n++] = ch;
2857 seen_esc = 0;
2858 } 3548 }
3549
2859 string[n++] = '\0'; 3550 string[n++] = '\0';
2860 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3551
2861 return NULL;
2862 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3552 ends_how = (ch == 0x5c ? C0_ESC : ch);
2863 STRNCPY (s, string, n); 3553
2864 return s; 3554 return (unsigned char *)rxvt_wcstombs (string);
2865} 3555}
2866 3556
2867/*----------------------------------------------------------------------*/ 3557/*----------------------------------------------------------------------*/
2868/* 3558/*
2869 * 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)'
2870 */ 3560 */
2871void 3561void
2872rxvt_term::process_dcs_seq () 3562rxvt_term::process_dcs_seq ()
2873{ 3563{
2874 unsigned char eh, *s; 3564 unsigned char *s;
3565 unicode_t eh;
3566
2875 /* 3567 /*
2876 * Not handled yet 3568 * Not handled yet
2877 */ 3569 */
2878 s = get_to_st (&eh); 3570 s = get_to_st (eh);
2879 if (s) 3571 if (s)
2880 free (s); 3572 free (s);
3573
2881 return; 3574 return;
2882} 3575}
2883 3576
2884/*----------------------------------------------------------------------*/ 3577/*----------------------------------------------------------------------*/
2885/* 3578/*
2886 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3579 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2887 */ 3580 */
2888void 3581void
2889rxvt_term::process_osc_seq () 3582rxvt_term::process_osc_seq ()
2890{ 3583{
2891 unsigned char ch, eh, *s; 3584 unicode_t ch, eh;
2892 int arg; 3585 int arg;
2893 3586
2894 ch = cmd_getc (); 3587 ch = cmd_getc ();
2895 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3588 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2896 arg = arg * 10 + (ch - '0'); 3589 arg = arg * 10 + (ch - '0');
2897 3590
2898 if (ch == ';') 3591 if (ch == ';')
2899 { 3592 {
2900 s = get_to_st (&eh); 3593 unsigned char *s = get_to_st (eh);
3594
2901 if (s) 3595 if (s)
2902 { 3596 {
2903 /*
2904 * rxvt_menubar_dispatch () violates the constness of the string,
2905 * so do it here
2906 */
2907 if (arg == XTerm_Menu)
2908#if 0 /* XXX: currently disabled due to security concerns */
2909 menubar_dispatch ((char *)s);
2910#else
2911 (void)0;
2912#endif
2913 else
2914 xterm_seq (arg, (char *)s, eh); 3597 process_xterm_seq (arg, (char *)s, eh);
2915 free (s); 3598 free (s);
2916 } 3599 }
2917 } 3600 }
2918} 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
2919/* 3616/*
2920 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3617 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2921 * 0 = change iconName/title 3618 * 0 = change iconName/title
2922 * 1 = change iconName 3619 * 1 = change iconName
2923 * 2 = change title 3620 * 2 = change title
2924 * 4 = change color 3621 * 4 = change color
3622 * 10 = change fg color
3623 * 11 = change bg color
2925 * 12 = change text color 3624 * 12 = change text color
2926 * 13 = change mouse foreground color 3625 * 13 = change mouse foreground color
2927 * 17 = change highlight character colour 3626 * 17 = change highlight character colour
2928 * 18 = change bold character color 3627 * 18 = change bold character color
2929 * 19 = change underlined character color 3628 * 19 = change underlined character color
2930 * 46 = change logfile (not implemented) 3629 * 46 = change logfile (not implemented)
2931 * 50 = change font 3630 * 50 = change font
2932 * 3631 *
2933 * rxvt extensions: 3632 * rxvt extensions:
2934 * 10 = menu (may change in future)
2935 * 20 = bg pixmap 3633 * 20 = bg pixmap
2936 * 39 = change default fg color 3634 * 39 = change default fg color
2937 * 49 = change default bg color 3635 * 49 = change default bg color
2938 * 55 = dump scrollback buffer and all of screen 3636 * 55 = dump scrollback buffer and all of screen
2939 * 701 = change locale 3637 * 701 = change locale
2940 * 702 = find font 3638 * 702 = find font
3639 * 703 = menu
2941 */ 3640 */
2942void 3641void
2943rxvt_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)
2944{ 3643{
2945 int changed = 0; 3644 int changed = 0;
2946 int color; 3645 int color;
2947 char *buf, *name; 3646 char *buf, *name;
3647 bool query = str[0] == '?' && !str[1];
3648 int saveop = op;
2948 3649
2949 assert (str != NULL); 3650 assert (str != NULL);
2950 switch (op) 3651 switch (op)
2951 { 3652 {
2952 case XTerm_name: 3653 case XTerm_name:
2953 set_title (str); 3654 set_title (str);
2954 /* FALLTHROUGH */ 3655 /* FALLTHROUGH */
2955 case XTerm_iconName: 3656 case XTerm_iconName:
2956 set_iconName (str); 3657 set_icon_name (str);
2957 break; 3658 break;
2958 case XTerm_title: 3659 case XTerm_title:
2959 set_title (str); 3660 set_title (str);
2960 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
2961 case XTerm_Color: 3701 case XTerm_Color:
2962 for (buf = (char *)str; buf && *buf;) 3702 for (buf = (char *)str; buf && *buf;)
2963 { 3703 {
2964 if ((name = STRCHR (buf, ';')) == NULL) 3704 if ((name = strchr (buf, ';')) == NULL)
2965 break; 3705 break;
3706
2966 *name++ = '\0'; 3707 *name++ = '\0';
2967 color = atoi (buf); 3708 color = atoi (buf);
3709
2968 if (color < 0 || color >= TOTAL_COLORS) 3710 if (color < 0 || color >= TOTAL_COLORS)
2969 break; 3711 break;
3712
2970 if ((buf = STRCHR (name, ';')) != NULL) 3713 if ((buf = strchr (name, ';')) != NULL)
2971 *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
2972 set_window_color (color + minCOLOR, name); 3723 set_window_color (color + minCOLOR, name);
2973 } 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);
2974 break; 3731 break;
2975#ifndef NO_CURSORCOLOR 3732#ifndef NO_CURSORCOLOR
2976 case XTerm_Color_cursor: 3733 case XTerm_Color_cursor:
2977 set_window_color (Color_cursor, str); 3734 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
2978 break; 3735 break;
2979#endif 3736#endif
2980 case XTerm_Color_pointer: 3737 case XTerm_Color_pointer_fg:
2981 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);
2982 break; 3742 break;
2983#ifndef NO_BOLD_UNDERLINE_REVERSE 3743#ifndef NO_BOLD_UNDERLINE_REVERSE
2984 case XTerm_Color_BD: 3744 case XTerm_Color_BD:
2985 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);
2986 break; 3749 break;
2987 case XTerm_Color_UL: 3750 case XTerm_Color_UL:
2988 set_window_color (Color_UL, str); 3751 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
2989 break; 3752 break;
2990 case XTerm_Color_RV: 3753 case XTerm_Color_RV:
2991 set_window_color (Color_RV, str); 3754 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
2992 break; 3755 break;
2993#endif 3756#endif
2994 3757#if TRANSPARENT && TINTING
2995 case XTerm_Menu: 3758 case XTerm_Color_tint:
2996 /* 3759 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
2997 * rxvt_menubar_dispatch () violates the constness of the string, 3760 check_our_parents ();
2998 * so DON'T do it here 3761 if (am_transparent)
2999 */ 3762 want_full_refresh = want_refresh = 1;
3000 break; 3763 break;
3764#endif
3765
3001 case XTerm_Pixmap: 3766 case XTerm_Pixmap:
3002 if (*str != ';') 3767 if (*str != ';')
3003 { 3768 {
3004#if XPM_BACKGROUND 3769#if XPM_BACKGROUND
3005 scale_pixmap (""); /* reset to default scaling */ 3770 scale_pixmap (""); /* reset to default scaling */
3006 set_bgPixmap (str); /* change pixmap */ 3771 set_bgPixmap (str); /* change pixmap */
3007#endif 3772#endif
3008 scr_touch (true); 3773 scr_touch (true);
3009 } 3774 }
3010 while ((str = STRCHR (str, ';')) != NULL) 3775 while ((str = strchr (str, ';')) != NULL)
3011 { 3776 {
3012 str++; 3777 str++;
3013#if XPM_BACKGROUND 3778#if XPM_BACKGROUND
3014 changed += scale_pixmap (str); 3779 changed += scale_pixmap (str);
3015#endif 3780#endif
3016
3017 } 3781 }
3782
3018 if (changed) 3783 if (changed)
3019 { 3784 {
3020#ifdef XPM_BACKGROUND 3785#ifdef XPM_BACKGROUND
3021 resize_pixmap (); 3786 resize_pixmap ();
3022#endif 3787#endif
… …
3028 set_window_color (Color_fg, str); 3793 set_window_color (Color_fg, str);
3029 break; 3794 break;
3030 case XTerm_restoreBG: 3795 case XTerm_restoreBG:
3031 set_window_color (Color_bg, str); 3796 set_window_color (Color_bg, str);
3032 break; 3797 break;
3798
3033 case XTerm_logfile: 3799 case XTerm_logfile:
3800 // TODO, when secure mode?
3034 break; 3801 break;
3802
3035 case XTerm_font: 3803 case XTerm_font:
3036 change_font (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 }
3037 break; 3824 break;
3038#ifndef NO_FRILLS 3825
3826#if ENABLE_FRILLS
3039 case XTerm_locale: 3827 case XTerm_locale:
3040 if (str[0] == '?' && !str[1]) 3828 if (query)
3041 tt_printf ("%-.250s\n", locale); 3829 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3042 else 3830 else
3043 { 3831 {
3044 set_locale (str); 3832 set_locale (str);
3833 pty.set_utf8_mode (enc_utf8);
3045# ifdef USE_XIM 3834# ifdef USE_XIM
3046 im_cb (); 3835 im_cb ();
3047# endif 3836# endif
3048 } 3837 }
3049 break; 3838 break;
3839#endif
3840
3841#ifdef MENUBAR
3050 case XTerm_findfont: 3842 case XTerm_Menu:
3051 { 3843 if (options & Opt_insecure)
3052 int fid = TermWin.fontset->find_font (atoi (str)); 3844 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3053 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3054 }
3055 break; 3845 break;
3056#endif 3846#endif
3057#if 0 3847#if 0
3058 case XTerm_dumpscreen: /* no error notices */ 3848 case XTerm_dumpscreen: /* no error notices */
3059 { 3849 {
3060 int fd; 3850 int fd;
3061 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)
3062 { 3852 {
3063 scr_dump (fd); 3853 scr_dump (fd);
3064 close (fd); 3854 close (fd);
3065 } 3855 }
3066 } 3856 }
3067 break; 3857 break;
3068#endif 3858#endif
3069
3070 } 3859 }
3071} 3860}
3072/*----------------------------------------------------------------------*/ 3861/*----------------------------------------------------------------------*/
3073 3862
3074/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3863/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3082 * so no need for fancy checking 3871 * so no need for fancy checking
3083 */ 3872 */
3084int 3873int
3085rxvt_term::privcases (int mode, unsigned long bit) 3874rxvt_term::privcases (int mode, unsigned long bit)
3086{ 3875{
3087 int state; 3876 int state;
3088 3877
3089 if (mode == 's') 3878 if (mode == 's')
3090 { 3879 {
3091 SavedModes |= (PrivateModes & bit); 3880 SavedModes |= (priv_modes & bit);
3092 return -1; 3881 return -1;
3093 } 3882 }
3094 else 3883 else
3095 { 3884 {
3096 if (mode == 'r') 3885 if (mode == 'r')
3097 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3886 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3098 else 3887 else
3099 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3888 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3100 PrivMode (state, bit); 3889 PrivMode (state, bit);
3101 } 3890 }
3891
3102 return state; 3892 return state;
3103} 3893}
3104 3894
3105/* we're not using priv _yet_ */ 3895/* we're not using priv _yet_ */
3106void 3896void
3107rxvt_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)
3108{ 3898{
3109 unsigned int i, j; 3899 unsigned int i, j;
3110 int state; 3900 int state;
3901
3111 static const struct 3902 static const struct
3112 { 3903 {
3113 const int argval; 3904 const int argval;
3114 const unsigned long bit; 3905 const unsigned long bit;
3115 } 3906 }
3907
3116 argtopriv[] = { 3908 argtopriv[] = {
3117 { 1, PrivMode_aplCUR }, 3909 { 1, PrivMode_aplCUR },
3118 { 2, PrivMode_vt52 }, 3910 { 2, PrivMode_vt52 },
3119 { 3, PrivMode_132 }, 3911 { 3, PrivMode_132 },
3120 { 4, PrivMode_smoothScroll }, 3912 { 4, PrivMode_smoothScroll },
3121 { 5, PrivMode_rVideo }, 3913 { 5, PrivMode_rVideo },
3122 { 6, PrivMode_relOrigin }, 3914 { 6, PrivMode_relOrigin },
3123 { 7, PrivMode_Autowrap }, 3915 { 7, PrivMode_Autowrap },
3916 // 8, bi-directional support mode
3124 { 9, PrivMode_MouseX10 }, 3917 { 9, PrivMode_MouseX10 },
3125#ifdef menuBar_esc 3918#ifdef menuBar_esc
3126 { menuBar_esc, PrivMode_menuBar }, 3919 { menuBar_esc, PrivMode_menuBar },
3127#endif 3920#endif
3921 // 18, 19 printing-related
3922 { 25, PrivMode_VisibleCursor },
3128#ifdef scrollBar_esc 3923#ifdef scrollBar_esc
3129 { scrollBar_esc, PrivMode_scrollBar }, 3924 { scrollBar_esc, PrivMode_scrollBar },
3130#endif 3925#endif
3131 { 25, PrivMode_VisibleCursor },
3132 { 35, PrivMode_ShiftKeys }, 3926 { 35, PrivMode_ShiftKeys }, // rxvt extension
3133 { 40, PrivMode_132OK }, 3927 { 40, PrivMode_132OK },
3928 // 41 xterm more fixes NYI
3929 // 45 margin bell NYI
3930 // 46 start logging
3134 { 47, PrivMode_Screen }, 3931 { 47, PrivMode_Screen },
3135 { 66, PrivMode_aplKP }, 3932 { 66, PrivMode_aplKP },
3136#ifndef NO_BACKSPACE_KEY 3933#ifndef NO_BACKSPACE_KEY
3137 { 67, PrivMode_BackSpace }, 3934 { 67, PrivMode_BackSpace },
3138#endif 3935#endif
3139 { 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
3140 { 1010, PrivMode_TtyOutputInh }, 3940 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3141 { 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
3142 { 1047, PrivMode_Screen }, 3945 { 1047, PrivMode_Screen },
3946 // 1048 save and restore cursor
3143 { 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
3144 }; 3949 };
3145 3950
3146 if (nargs == 0) 3951 if (nargs == 0)
3147 return; 3952 return;
3148 3953
… …
3163 state = privcases (mode, argtopriv[j].bit); 3968 state = privcases (mode, argtopriv[j].bit);
3164 break; 3969 break;
3165 } 3970 }
3166 3971
3167 /* extra handling for values with state unkept */ 3972 /* extra handling for values with state unkept */
3168 if (state == -1)
3169 switch (arg[i]) 3973 switch (arg[i])
3170 { 3974 {
3171 case 1048: /* alternative cursor save */ 3975 case 1048: /* alternative cursor save */
3976 case 1049:
3977 if (options & Opt_secondaryScreen)
3172 if (mode == 0) 3978 if (mode == 0)
3173 scr_cursor (RESTORE); 3979 scr_cursor (RESTORE);
3174 else if (mode == 1) 3980 else if (mode == 1)
3175 scr_cursor (SAVE); 3981 scr_cursor (SAVE);
3176 /* FALLTHROUGH */
3177 default:
3178 continue; /* for (;i;) */
3179 }
3180
3181 /* extra handling for values with valid 0 or 1 state */
3182 switch (arg[i])
3183 {
3184 /* case 1: - application cursor keys */
3185 case 2: /* VT52 mode */
3186 /* oddball mode. should be set regardless of set/reset
3187 * parameter. Return from VT52 mode with an ESC < from
3188 * within VT52 mode
3189 */
3190 PrivMode (1, PrivMode_vt52);
3191 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;
3192 case 3: /* 80/132 */ 3997 case 3: /* 80/132 */
3193 if (PrivateModes & PrivMode_132OK) 3998 if (priv_modes & PrivMode_132OK)
3194 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3999 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3195 break; 4000 break;
3196 case 4: /* smooth scrolling */ 4001 case 4: /* smooth scrolling */
3197 if (state) 4002 if (state)
3198 Options &= ~Opt_jumpScroll; 4003 options &= ~Opt_jumpScroll;
3199 else 4004 else
3200 Options |= Opt_jumpScroll; 4005 options |= Opt_jumpScroll;
3201 break; 4006 break;
3202 case 5: /* reverse video */ 4007 case 5: /* reverse video */
3203 scr_rvideo_mode (state); 4008 scr_rvideo_mode (state);
3204 break; 4009 break;
3205 case 6: /* relative/absolute origins */ 4010 case 6: /* relative/absolute origins */
3206 scr_relative_origin (state); 4011 scr_relative_origin (state);
3207 break; 4012 break;
3208 case 7: /* autowrap */ 4013 case 7: /* autowrap */
3209 scr_autowrap (state); 4014 scr_autowrap (state);
3210 break; 4015 break;
3211 /* 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 */
3212 case 9: /* X10 mouse reporting */ 4017 case 9: /* X10 mouse reporting */
3213 if (state) /* orthogonal */ 4018 if (state) /* orthogonal */
3214 PrivateModes &= ~ (PrivMode_MouseX11); 4019 priv_modes &= ~PrivMode_MouseX11;
3215 break; 4020 break;
3216#ifdef menuBar_esc 4021#ifdef menuBar_esc
3217 case menuBar_esc: 4022 case menuBar_esc:
3218#ifdef MENUBAR 4023#ifdef MENUBAR
3219 map_menuBar (state); 4024 map_menuBar (state);
3220#endif 4025#endif
3221 break; 4026 break;
3222#endif 4027#endif
3223#ifdef scrollBar_esc 4028#ifdef scrollBar_esc
3224 case scrollBar_esc: 4029 case scrollBar_esc:
3225 if (scrollbar_mapping (state)) 4030 if (scrollbar_mapping (state))
3226 { 4031 {
3227 resize_all_windows (0, 0, 0); 4032 resize_all_windows (0, 0, 0);
3228 scr_touch (true); 4033 scr_touch (true);
3229 } 4034 }
3230 break; 4035 break;
3231#endif 4036#endif
3232 case 25: /* visible/invisible cursor */ 4037 case 25: /* visible/invisible cursor */
3233 scr_cursor_visible (state); 4038 scr_cursor_visible (state);
3234 break; 4039 break;
3235 /* case 35: - shift keys */ 4040 /* case 35: - shift keys */
3236 /* case 40: - 80 <--> 132 mode */ 4041 /* case 40: - 80 <--> 132 mode */
3237 case 47: /* secondary screen */ 4042 case 47: /* secondary screen */
3238 scr_change_screen (state); 4043 scr_change_screen (state);
3239 break; 4044 break;
3240 /* case 66: - application key pad */ 4045 /* case 66: - application key pad */
3241 /* case 67: - backspace key */ 4046 /* case 67: - backspace key */
3242 case 1000: /* X11 mouse reporting */ 4047 case 1000: /* X11 mouse reporting */
3243 if (state) /* orthogonal */ 4048 if (state) /* orthogonal */
3244 PrivateModes &= ~ (PrivMode_MouseX10); 4049 priv_modes &= ~PrivMode_MouseX10;
3245 break; 4050 break;
3246#if 0 4051#if 0
3247 case 1001: 4052 case 1001:
3248 break; /* X11 mouse highlighting */ 4053 break; /* X11 mouse highlighting */
3249#endif 4054#endif
3250 case 1010: /* scroll to bottom on TTY output inhibit */ 4055 case 1010: /* scroll to bottom on TTY output inhibit */
3251 if (state) 4056 if (state)
3252 Options &= ~Opt_scrollTtyOutput; 4057 options &= ~Opt_scrollTtyOutput;
3253 else 4058 else
3254 Options |= Opt_scrollTtyOutput; 4059 options |= Opt_scrollTtyOutput;
3255 break; 4060 break;
3256 case 1011: /* scroll to bottom on key press */ 4061 case 1011: /* scroll to bottom on key press */
3257 if (state) 4062 if (state)
3258 Options |= Opt_scrollTtyKeypress; 4063 options |= Opt_scrollTtyKeypress;
3259 else 4064 else
3260 Options &= ~Opt_scrollTtyKeypress; 4065 options &= ~Opt_scrollTtyKeypress;
3261 break; 4066 break;
3262 case 1047: /* secondary screen w/ clearing */ 4067 case 1047: /* secondary screen w/ clearing last */
3263 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4068 if (options & Opt_secondaryScreen)
3264 if (current_screen != PRIMARY) 4069 if (current_screen != PRIMARY)
3265 scr_erase_screen (2); 4070 scr_erase_screen (2);
3266 scr_change_screen (state); 4071 scr_change_screen (state);
3267 /* FALLTHROUGH */
3268 default:
3269 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;
3270 } 4081 }
3271 } 4082 }
3272} 4083}
3273/*}}} */ 4084/*}}} */
3274 4085
3275/*{{{ process sgr sequences */ 4086/*{{{ process sgr sequences */
3276void 4087void
3277rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4088rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3278{ 4089{
3279 unsigned int i; 4090 unsigned int i;
3280 short rendset; 4091 short rendset;
3281 int rendstyle; 4092 int rendstyle;
3282 4093
3283 if (nargs == 0) 4094 if (nargs == 0)
3284 { 4095 {
3285 scr_rendition (0, ~RS_None); 4096 scr_rendition (0, ~RS_None);
3286 return; 4097 return;
3287 } 4098 }
4099
3288 for (i = 0; i < nargs; i++) 4100 for (i = 0; i < nargs; i++)
3289 { 4101 {
3290 rendset = -1; 4102 rendset = -1;
3291 switch (arg[i]) 4103 switch (arg[i])
3292 { 4104 {
… …
3294 rendset = 0, rendstyle = ~RS_None; 4106 rendset = 0, rendstyle = ~RS_None;
3295 break; 4107 break;
3296 case 1: 4108 case 1:
3297 rendset = 1, rendstyle = RS_Bold; 4109 rendset = 1, rendstyle = RS_Bold;
3298 break; 4110 break;
4111 //case 2: // low intensity
4112 case 3:
4113 rendset = 1, rendstyle = RS_Italic;
4114 break;
3299 case 4: 4115 case 4:
3300 rendset = 1, rendstyle = RS_Uline; 4116 rendset = 1, rendstyle = RS_Uline;
3301 break; 4117 break;
3302 case 5: 4118 case 5: // slowly blinking
4119 case 6: // rapidly blinking
3303 rendset = 1, rendstyle = RS_Blink; 4120 rendset = 1, rendstyle = RS_Blink;
3304 break; 4121 break;
4122 //case 6: // scoansi light background
3305 case 7: 4123 case 7:
3306 rendset = 1, rendstyle = RS_RVid; 4124 rendset = 1, rendstyle = RS_RVid;
3307 break; 4125 break;
3308 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)
3309 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;
3310 break; 4144 break;
3311 case 24: 4145 case 24:
3312 rendset = 0, rendstyle = RS_Uline; 4146 rendset = 0, rendstyle = RS_Uline;
3313 break; 4147 break;
3314 case 25: 4148 case 25:
3315 rendset = 0, rendstyle = RS_Blink; 4149 rendset = 0, rendstyle = RS_Blink;
3316 break; 4150 break;
4151 case 26: // variable spacing (iso 8613)
4152 rendset = 0, rendstyle = RS_Blink;
4153 break;
3317 case 27: 4154 case 27:
3318 rendset = 0, rendstyle = RS_RVid; 4155 rendset = 0, rendstyle = RS_RVid;
3319 break; 4156 break;
4157 //case 28: // visible. NYI
4158 //case 29: // not crossed-out
3320 } 4159 }
4160
3321 if (rendset != -1) 4161 if (rendset != -1)
3322 { 4162 {
3323 scr_rendition (rendset, rendstyle); 4163 scr_rendition (rendset, rendstyle);
3324 continue; /* for (;i;) */ 4164 continue; /* for (;i;) */
3325 } 4165 }
… …
3332 case 33: 4172 case 33:
3333 case 34: 4173 case 34:
3334 case 35: 4174 case 35:
3335 case 36: 4175 case 36:
3336 case 37: 4176 case 37:
3337 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4177 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3338 Color_fg);
3339 break; 4178 break;
3340#ifdef TTY_256COLOR 4179 case 38: // set fg color, ISO 8613-6
3341 case 38:
3342 if (nargs > i + 2 && arg[i + 1] == 5) 4180 if (nargs > i + 2 && arg[i + 1] == 5)
3343 { 4181 {
3344 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4182 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3345 Color_fg);
3346 i += 2; 4183 i += 2;
3347 } 4184 }
3348 break; 4185 break;
3349#endif
3350 case 39: /* default fg */ 4186 case 39: /* default fg */
3351 scr_color (Color_fg, Color_fg); 4187 scr_color (Color_fg, Color_fg);
3352 break; 4188 break;
3353 4189
3354 case 40: 4190 case 40:
… …
3357 case 43: 4193 case 43:
3358 case 44: 4194 case 44:
3359 case 45: 4195 case 45:
3360 case 46: 4196 case 46:
3361 case 47: 4197 case 47:
3362 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4198 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3363 Color_bg);
3364 break; 4199 break;
3365#ifdef TTY_256COLOR 4200 case 48: // set bg color, ISO 8613-6
3366 case 48:
3367 if (nargs > i + 2 && arg[i + 1] == 5) 4201 if (nargs > i + 2 && arg[i + 1] == 5)
3368 { 4202 {
3369 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4203 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3370 Color_bg);
3371 i += 2; 4204 i += 2;
3372 } 4205 }
3373 break; 4206 break;
3374#endif
3375 case 49: /* default bg */ 4207 case 49: /* default bg */
3376 scr_color (Color_bg, Color_bg); 4208 scr_color (Color_bg, Color_bg);
3377 break; 4209 break;
4210
4211 //case 50: // not variable spacing
3378 4212
3379#ifndef NO_BRIGHTCOLOR 4213#ifndef NO_BRIGHTCOLOR
3380 case 90: 4214 case 90:
3381 case 91: /* set bright fg color */ 4215 case 91: /* set bright fg color */
3382 case 92: 4216 case 92:
3383 case 93: 4217 case 93:
3384 case 94: 4218 case 94:
3385 case 95: 4219 case 95:
3386 case 96: 4220 case 96:
3387 case 97: 4221 case 97:
3388 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4222 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3389 Color_fg);
3390 break; 4223 break;
3391 case 100: 4224 case 100:
3392 case 101: /* set bright bg color */ 4225 case 101: /* set bright bg color */
3393 case 102: 4226 case 102:
3394 case 103: 4227 case 103:
3395 case 104: 4228 case 104:
3396 case 105: 4229 case 105:
3397 case 106: 4230 case 106:
3398 case 107: 4231 case 107:
3399 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4232 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3400 Color_bg);
3401 break; 4233 break;
3402#endif 4234#endif
3403 4235
3404 } 4236 }
3405 } 4237 }
3406} 4238}
3407/*}}} */ 4239/*}}} */
3408 4240
3409/*{{{ process Rob Nation's own graphics mode sequences */ 4241/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3410void 4242void
3411rxvt_term::process_graphics () 4243rxvt_term::process_graphics ()
3412{ 4244{
3413 unsigned char ch, cmd = cmd_getc (); 4245 unicode_t ch, cmd = cmd_getc ();
3414 4246
3415 if (cmd == 'Q') 4247 if (cmd == 'Q')
3416 { /* query graphics */ 4248 { /* query graphics */
3417 tt_printf ("\033G0\n"); /* no graphics */ 4249 tt_printf ("\033G0\012"); /* no graphics */
3418 return; 4250 return;
3419 } 4251 }
3420 /* swallow other graphics sequences until terminating ':' */ 4252 /* swallow other graphics sequences until terminating ':' */
3421 do 4253 do
3422 ch = cmd_getc (); 4254 ch = cmd_getc ();
… …
3437 unsigned char buf[256]; 4269 unsigned char buf[256];
3438 4270
3439 va_start (arg_ptr, fmt); 4271 va_start (arg_ptr, fmt);
3440 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4272 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3441 va_end (arg_ptr); 4273 va_end (arg_ptr);
3442 tt_write (buf, STRLEN (buf)); 4274 tt_write (buf, strlen (buf));
3443} 4275}
3444 4276
3445/* ---------------------------------------------------------------------- */ 4277/* ---------------------------------------------------------------------- */
3446/* 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,
3447 * or generated by us in response to a query ESC sequence. 4279 * or generated by us in response to a query ESC sequence.
3448 */ 4280 */
4281const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4282
3449void 4283void
3450rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4284rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3451{ 4285{
3452 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));
3453 4289
3454 if (len) 4290 if ((unsigned int)written == len)
4291 return;
4292
4293 data += written;
4294 len -= written;
3455 { 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
3456 if (v_buflen == 0) 4313 if (v_buflen == 0)
3457 { 4314 {
3458 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3459
3460 if ((unsigned int)written == len)
3461 return;
3462
3463 data += written;
3464 len -= written;
3465 }
3466
3467
3468 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3469
3470 memcpy (v_buffer + v_buflen, data, len);
3471 v_buflen += len;
3472 }
3473
3474 for (;;)
3475 {
3476 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3477
3478 if (written > 0)
3479 {
3480 v_buflen -= written;
3481
3482 if (v_buflen == 0)
3483 {
3484 free (v_buffer); 4315 free (v_buffer);
3485 v_buffer = 0; 4316 v_buffer = 0;
3486 v_buflen = 0; 4317 v_buflen = 0;
3487 4318
3488 pty_ev.set (EVENT_READ); 4319 pty_ev.set (EVENT_READ);
3489 return;
3490 }
3491
3492 memmove (v_buffer, v_buffer + written, v_buflen);
3493 }
3494 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3495 // original code just ignores this...
3496 destroy ();
3497 else
3498 {
3499 pty_ev.set (EVENT_READ | EVENT_WRITE);
3500 return; 4320 return;
3501 } 4321 }
4322
4323 memmove (v_buffer, v_buffer + written, v_buflen);
3502 } 4324 }
4325 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4326 // original code just ignores this...
4327 destroy ();
3503} 4328}
3504 4329
3505/*----------------------- end-of-file (C source) -----------------------*/ 4330/*----------------------- end-of-file (C source) -----------------------*/
3506 4331

Diff Legend

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