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.192 by root, Fri Feb 4 11:41:23 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)
… …
1037 1182
1038/*{{{ process an X event */ 1183/*{{{ process an X event */
1039void 1184void
1040rxvt_term::x_cb (XEvent &ev) 1185rxvt_term::x_cb (XEvent &ev)
1041{ 1186{
1187 dDisp;
1188
1042 SET_R (this); 1189 SET_R (this);
1043 SET_LOCALE (locale); 1190 SET_LOCALE (locale);
1044 1191
1045#if defined(CURSOR_BLINK) 1192#if defined(CURSOR_BLINK)
1046 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1193 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1047 { 1194 {
1048 if (hidden_cursor) 1195 if (hidden_cursor)
1049 { 1196 {
1050 hidden_cursor = 0; 1197 hidden_cursor = 0;
1051 want_refresh = 1; 1198 want_refresh = 1;
… …
1054 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1201 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1055 } 1202 }
1056#endif 1203#endif
1057 1204
1058#if defined(POINTER_BLANK) 1205#if defined(POINTER_BLANK)
1059 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1206 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1060 { 1207 {
1061 if (ev.type == MotionNotify 1208 if (ev.type == MotionNotify
1062 || ev.type == ButtonPress 1209 || ev.type == ButtonPress
1063 || ev.type == ButtonRelease) 1210 || ev.type == ButtonRelease)
1064 if (hidden_pointer) 1211 if (hidden_pointer)
… …
1067 if (ev.type == KeyPress && hidden_pointer == 0) 1214 if (ev.type == KeyPress && hidden_pointer == 0)
1068 pointer_blank (); 1215 pointer_blank ();
1069 } 1216 }
1070#endif 1217#endif
1071 1218
1072#ifdef USE_XIM
1073 if (XFilterEvent (&ev, None))
1074 return;
1075#endif
1076
1077 Window unused_root, unused_child; 1219 Window unused_root, unused_child;
1078 int unused_root_x, unused_root_y; 1220 int unused_root_x, unused_root_y;
1079 unsigned int unused_mask; 1221 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 1222
1130 switch (ev.type) 1223 switch (ev.type)
1131 { 1224 {
1132 case KeyPress: 1225 case KeyPress:
1226#if ISO_14755
1227 if (!(iso14755buf & ISO_14755_52))
1228#endif
1133 lookup_key (ev.xkey); 1229 lookup_key (ev.xkey);
1230
1231 break;
1232
1233 case KeyRelease:
1234 {
1235#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1236 KeySym ks;
1237
1238 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1239#endif
1240
1241#if ENABLE_FRILLS || ISO_14755
1242 // ISO 14755 support
1243 if (iso14755buf)
1244 if (iso14755buf & ISO_14755_52)
1245 {
1246# if ENABLE_OVERLAY
1247 scr_overlay_off ();
1248# endif
1249# if ISO_14755
1250 // iso14755 part 5.2 handling: release time
1251 // first: controls
1252 if ((ev.xkey.state & ControlMask)
1253 && ((ks >= 0x40 && ks <= 0x5f)
1254 || (ks >= 0x61 && ks <= 0x7f)))
1255 {
1256 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1257 commit_iso14755 ();
1258 return; // case-break;
1259 }
1260
1261 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1262 if (i[0] == ks)
1263 {
1264 iso14755buf = ISO_14755_51 | i[1];
1265 commit_iso14755 ();
1266 return; // case-break;
1267 }
1268
1269 scr_bell ();
1270# endif
1271 iso14755buf = 0;
1134 break; 1272 break;
1273 }
1274 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1275 {
1276# if ENABLE_OVERLAY
1277 scr_overlay_off ();
1278# endif
1279 if (iso14755buf & ISO_14755_51)
1280 commit_iso14755 ();
1281#if ISO_14755
1282 else if (iso14755buf & ISO_14755_STARTED)
1283 {
1284 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1285
1286 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1287 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1288 }
1289# endif
1290 else
1291 iso14755buf = 0;
1292 }
1293#endif
1135 1294
1136#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1295#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1137 case KeyRelease:
1138 {
1139 if (! (ev.xkey.state & ControlMask)) 1296 if (!(ev.xkey.state & ControlMask))
1297 slip_wheel_ev.stop ();
1298 else if (ks == XK_Control_L || ks == XK_Control_R)
1140 mouse_slip_wheel_speed = 0; 1299 mouse_slip_wheel_speed = 0;
1141 else 1300#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; 1301 break;
1150 } 1302 }
1151#endif
1152 1303
1153 case ButtonPress: 1304 case ButtonPress:
1154 button_press (ev.xbutton); 1305 button_press (ev.xbutton);
1155 break; 1306 break;
1156 1307
… …
1168 && (ev.xclient.data.l[0] == DndFile 1319 && (ev.xclient.data.l[0] == DndFile
1169 || ev.xclient.data.l[0] == DndDir 1320 || ev.xclient.data.l[0] == DndDir
1170 || ev.xclient.data.l[0] == DndLink)) 1321 || ev.xclient.data.l[0] == DndLink))
1171 { 1322 {
1172 /* Get Dnd data */ 1323 /* Get Dnd data */
1173 Atom ActualType; 1324 Atom ActualType;
1174 int ActualFormat; 1325 int ActualFormat;
1175 unsigned char *data; 1326 unsigned char *data;
1176 unsigned long Size, RemainingBytes; 1327 unsigned long Size, RemainingBytes;
1177 1328
1178 XGetWindowProperty (display->display, display->root, 1329 XGetWindowProperty (disp, display->root,
1179 xa[XA_DNDSELECTION], 1330 xa[XA_DNDSELECTION],
1180 0L, 1000000L, 1331 0L, 1000000L,
1181 False, AnyPropertyType, 1332 False, AnyPropertyType,
1182 &ActualType, &ActualFormat, 1333 &ActualType, &ActualFormat,
1183 &Size, &RemainingBytes, 1334 &Size, &RemainingBytes,
1184 &data); 1335 &data);
1185 XChangeProperty (display->display, display->root, 1336 set_string_property (XA_CUT_BUFFER0, data);
1186 XA_CUT_BUFFER0, XA_STRING, 1337 XFree (data);
1187 8, PropModeReplace,
1188 data, STRLEN (data));
1189 selection_paste (display->root, XA_CUT_BUFFER0, True); 1338 selection_paste (display->root, XA_CUT_BUFFER0, true);
1190 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1339 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1191 } 1340 }
1192#endif /* OFFIX_DND */ 1341#endif /* OFFIX_DND */
1193 break; 1342 break;
1194 1343
1195 case MappingNotify: 1344 case MappingNotify:
1196 XRefreshKeyboardMapping (& (ev.xmapping)); 1345 XRefreshKeyboardMapping (&ev.xmapping);
1197 break; 1346 break;
1198 1347
1199 /* 1348 /*
1200 * XXX: this is not the _current_ arrangement 1349 * XXX: this is not the _current_ arrangement
1201 * Here's my conclusion: 1350 * Here's my conclusion:
… …
1226 { 1375 {
1227 TermWin.focus = 1; 1376 TermWin.focus = 1;
1228 want_refresh = 1; 1377 want_refresh = 1;
1229#ifdef USE_XIM 1378#ifdef USE_XIM
1230 if (Input_Context != NULL) 1379 if (Input_Context != NULL)
1380 {
1381 IMSetStatusPosition ();
1231 XSetICFocus (Input_Context); 1382 XSetICFocus (Input_Context);
1383 }
1232#endif 1384#endif
1233#ifdef CURSOR_BLINK 1385#ifdef CURSOR_BLINK
1234 if (Options & Opt_cursorBlink) 1386 if (options & Opt_cursorBlink)
1235 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1387 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1388#endif
1389#ifdef OFF_FOCUS_FADING
1390 if (rs[Rs_fade])
1391 {
1392 pix_colors = pix_colors_focused;
1393 scr_recolour ();
1394 }
1236#endif 1395#endif
1237 1396
1238 } 1397 }
1239 break; 1398 break;
1240 1399
1241 case FocusOut: 1400 case FocusOut:
1242 if (TermWin.focus) 1401 if (TermWin.focus)
1243 { 1402 {
1244 TermWin.focus = 0; 1403 TermWin.focus = 0;
1245 want_refresh = 1; 1404 want_refresh = 1;
1405
1406#if ENABLE_FRILLS || ISO_14755
1407 iso14755buf = 0;
1408#endif
1409#if ENABLE_OVERLAY
1410 scr_overlay_off ();
1411#endif
1246#ifdef USE_XIM 1412#ifdef USE_XIM
1247 if (Input_Context != NULL) 1413 if (Input_Context != NULL)
1248 XUnsetICFocus (Input_Context); 1414 XUnsetICFocus (Input_Context);
1249#endif 1415#endif
1250#ifdef CURSOR_BLINK 1416#ifdef CURSOR_BLINK
1251 if (Options & Opt_cursorBlink) 1417 if (options & Opt_cursorBlink)
1252 cursor_blink_ev.stop (); 1418 cursor_blink_ev.stop ();
1253 hidden_cursor = 0; 1419 hidden_cursor = 0;
1254#endif 1420#endif
1255 1421#ifdef OFF_FOCUS_FADING
1422 if (rs[Rs_fade])
1423 {
1424 pix_colors = pix_colors_unfocused;
1425 scr_recolour ();
1426 }
1427#endif
1256 } 1428 }
1257 break; 1429 break;
1258 1430
1259 case ConfigureNotify: 1431 case ConfigureNotify:
1260 if (ev.xconfigure.window == TermWin.parent[0]) 1432 if (ev.xconfigure.window == TermWin.parent[0])
… …
1265 { /* Wrap lots of configures into one */ 1437 { /* Wrap lots of configures into one */
1266 width = ev.xconfigure.width; 1438 width = ev.xconfigure.width;
1267 height = ev.xconfigure.height; 1439 height = ev.xconfigure.height;
1268 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1440 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1269 } 1441 }
1270 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1442 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1271 1443
1272 if (szHint.width != width || szHint.height != height) 1444 if (szHint.width != width || szHint.height != height)
1273 { 1445 {
1274 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1446 seen_resize = 1;
1275 resize_all_windows (width, height, 1); 1447 resize_all_windows (width, height, 1);
1276 } 1448 }
1277#ifdef DEBUG_SIZE 1449
1278 else
1279 {
1280 D_SIZE ((stderr, "Size: Not resizing"));
1281 }
1282#endif
1283#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1284 if (Options & Opt_transparent) 1451 if (options & Opt_transparent)
1285 {
1286 check_our_parents (); 1452 check_our_parents ();
1287 if (am_transparent)
1288 want_full_refresh = 1;
1289 }
1290#endif 1453#endif
1291
1292 } 1454 }
1293 break; 1455 break;
1294 1456
1457 case PropertyNotify:
1458 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1459 && ev.xproperty.state == PropertyNewValue)
1460 selection_property (ev.xproperty.window, ev.xproperty.atom);
1461
1462 break;
1463
1295 case SelectionClear: 1464 case SelectionClear:
1296 display->set_selection_owner (0); 1465 selection_clear ();
1297 break; 1466 break;
1298 1467
1299 case SelectionNotify: 1468 case SelectionNotify:
1300 if (selection_wait == Sel_normal) 1469 if (selection_wait == Sel_normal)
1301 selection_paste (ev.xselection.requestor, 1470 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1302 ev.xselection.property, True);
1303 break; 1471 break;
1304 1472
1305 case SelectionRequest: 1473 case SelectionRequest:
1306 selection_send (ev.xselectionrequest); 1474 selection_send (ev.xselectionrequest);
1307 break; 1475 break;
… …
1328 1496
1329 case GraphicsExpose: 1497 case GraphicsExpose:
1330 case Expose: 1498 case Expose:
1331 if (ev.xany.window == TermWin.vt) 1499 if (ev.xany.window == TermWin.vt)
1332 { 1500 {
1333#ifdef NO_SLOW_LINK_SUPPORT 1501 do
1334 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1335 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1336#else 1504 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1337 // don't understand this, so commented it out 1505
1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507
1508 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1338 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1339 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1340 //scr_expose (ev.xexpose.x, 0, 1511
1341 // ev.xexpose.width, TermWin.height, False); 1512 scr_refresh (refresh_type);
1342#endif
1343 want_refresh = 1;
1344 } 1513 }
1345 else 1514 else
1346 { 1515 {
1347 XEvent unused_event; 1516 XEvent unused_event;
1348 1517
1349 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1518 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1350 Expose, 1519 ;
1351 &unused_event)) ; 1520 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1352 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1521 ;
1353 GraphicsExpose, 1522
1354 &unused_event)) ;
1355 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1356 { 1524 {
1357 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
1358 scrollbar_show (0); 1526 scrollbar_show (0);
1359 } 1527 }
1360#ifdef MENUBAR 1528#ifdef MENUBAR
1361 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1529 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1362 menubar_expose (); 1530 menubar_expose ();
1363#endif 1531#endif
1532
1533#ifdef TRANSPARENT
1534 if (am_transparent && ev.xany.window == TermWin.parent[0])
1535 XClearWindow (disp, ev.xany.window);
1536#endif
1364 } 1537 }
1365 break; 1538 break;
1366 1539
1367 case MotionNotify: 1540 case MotionNotify:
1368#ifdef POINTER_BLANK 1541#ifdef POINTER_BLANK
… …
1374 { 1547 {
1375 menubar_control (ev.xbutton); 1548 menubar_control (ev.xbutton);
1376 break; 1549 break;
1377 } 1550 }
1378#endif 1551#endif
1379 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1552 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1380 break; 1553 break;
1381 1554
1382 if (ev.xany.window == TermWin.vt) 1555 if (ev.xany.window == TermWin.vt)
1383 { 1556 {
1384 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1557 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1385 { 1558 {
1386 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1559 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1387 ; 1560 ;
1388 1561
1389 XQueryPointer (display->display, TermWin.vt, 1562 XQueryPointer (disp, TermWin.vt,
1390 &unused_root, &unused_child, 1563 &unused_root, &unused_child,
1391 &unused_root_x, &unused_root_y, 1564 &unused_root_x, &unused_root_y,
1392 & (ev.xbutton.x), & (ev.xbutton.y), 1565 &ev.xbutton.x, &ev.xbutton.y,
1393 &unused_mask); 1566 &ev.xbutton.state);
1394#ifdef MOUSE_THRESHOLD 1567#ifdef MOUSE_THRESHOLD
1395 /* deal with a `jumpy' mouse */ 1568 /* deal with a `jumpy' mouse */
1396 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1569 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1397 { 1570 {
1398#endif 1571#endif
1572#if ISO_14755
1573 // 5.4
1574 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1575 {
1576 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1577 break;
1578 }
1579#endif
1399 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1580 selection_extend (ev.xbutton.x, ev.xbutton.y,
1400 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1581 ev.xbutton.state & Button3Mask ? 2 : 0);
1582
1401#ifdef SELECTION_SCROLLING 1583#ifdef SELECTION_SCROLLING
1402 if (ev.xbutton.y < TermWin.int_bwidth 1584 if (ev.xbutton.y < TermWin.int_bwidth
1403 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1585 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1404 { 1586 {
1405 int dist; 1587 int dist;
1406 1588
1407 pending_scroll_selection=1;
1408
1409 /* don't clobber the current delay if we are 1589 /* don't clobber the current delay if we are
1410 * already in the middle of scrolling. 1590 * already in the middle of scrolling.
1411 */ 1591 */
1412 if (scroll_selection_delay<=0) 1592 if (!sel_scroll_ev.active)
1413 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1593 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1414 1594
1415 /* save the event params so we can highlight 1595 /* save the event params so we can highlight
1416 * the selection in the pending-scroll loop 1596 * the selection in the pending-scroll loop
1417 */ 1597 */
1418 selection_save_x=ev.xbutton.x; 1598 selection_save_x = ev.xbutton.x;
1419 selection_save_y=ev.xbutton.y; 1599 selection_save_y = ev.xbutton.y;
1420 selection_save_state=
1421 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1600 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1422 1601
1423 /* calc number of lines to scroll */ 1602 /* calc number of lines to scroll */
1424 if (ev.xbutton.y<TermWin.int_bwidth) 1603 if (ev.xbutton.y < TermWin.int_bwidth)
1425 { 1604 {
1426 scroll_selection_dir = UP; 1605 scroll_selection_dir = UP;
1427 dist = TermWin.int_bwidth - ev.xbutton.y; 1606 dist = TermWin.int_bwidth - ev.xbutton.y;
1428 } 1607 }
1429 else 1608 else
1430 { 1609 {
1431 scroll_selection_dir = DN; 1610 scroll_selection_dir = DN;
1432 dist = ev.xbutton.y -
1433 (TermWin.int_bwidth + TermWin.height); 1611 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1434 } 1612 }
1613
1435 scroll_selection_lines= (Pixel2Height (dist)/ 1614 scroll_selection_lines = Pixel2Height (dist)
1436 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1615 / SELECTION_SCROLL_LINE_SPEEDUP
1616 + 1;
1437 MIN_IT (scroll_selection_lines, 1617 MIN_IT (scroll_selection_lines,
1438 SELECTION_SCROLL_MAX_LINES); 1618 SELECTION_SCROLL_MAX_LINES);
1439 } 1619 }
1440 else 1620 else
1441 { 1621 {
1442 /* we are within the text window, so we 1622 /* we are within the text window, so we
1443 * shouldn't be scrolling 1623 * shouldn't be scrolling
1444 */ 1624 */
1445 pending_scroll_selection = 0; 1625 if (sel_scroll_ev.active)
1626 sel_scroll_ev.stop();
1446 } 1627 }
1447#endif 1628#endif
1448#ifdef MOUSE_THRESHOLD 1629#ifdef MOUSE_THRESHOLD
1449
1450 } 1630 }
1451#endif 1631#endif
1452
1453 } 1632 }
1454 } 1633 }
1455 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1634 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1456 { 1635 {
1457 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1636 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1458 MotionNotify, &ev)) ; 1637 MotionNotify, &ev))
1638 ;
1639
1459 XQueryPointer (display->display, scrollBar.win, 1640 XQueryPointer (disp, scrollBar.win,
1460 &unused_root, &unused_child, 1641 &unused_root, &unused_child,
1461 &unused_root_x, &unused_root_y, 1642 &unused_root_x, &unused_root_y,
1462 & (ev.xbutton.x), & (ev.xbutton.y), 1643 &ev.xbutton.x, &ev.xbutton.y,
1463 &unused_mask); 1644 &unused_mask);
1464 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1645 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1465 scrollbar_size ()); 1646 scrollbar_size ());
1466 scr_refresh (refresh_type); 1647 scr_refresh (refresh_type);
1467 refresh_limit = 0; 1648 refresh_limit = 0;
… …
1469 } 1650 }
1470 break; 1651 break;
1471 } 1652 }
1472} 1653}
1473 1654
1655#if TRANSPARENT
1474void 1656void
1475rxvt_term::rootwin_cb (XEvent &ev) 1657rxvt_term::rootwin_cb (XEvent &ev)
1476{ 1658{
1477 SET_R (this); 1659 SET_R (this);
1478 SET_LOCALE (locale); 1660 SET_LOCALE (locale);
1479 1661
1480 switch (ev.type) 1662 switch (ev.type)
1481 { 1663 {
1482 case PropertyNotify: 1664 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 /* 1665 /*
1493 * if user used some Esetroot compatible prog to set the root bg, 1666 * 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. 1667 * use the property to determine the pixmap. We use it later on.
1495 */ 1668 */
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]) 1669 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1670 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1500 return; 1671 return;
1501 }
1502 1672
1503 /* FALLTHROUGH */ 1673 /* FALLTHROUGH */
1504 case ReparentNotify: 1674 case ReparentNotify:
1505 if ((Options & Opt_transparent) && check_our_parents ()) 1675 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1506 if (am_transparent)
1507 want_full_refresh = 1; 1676 want_refresh = want_full_refresh = 1;
1508 break; 1677 break;
1509#endif
1510 } 1678 }
1511} 1679}
1680#endif
1512 1681
1513void 1682void
1514rxvt_term::button_press (XButtonEvent &ev) 1683rxvt_term::button_press (XButtonEvent &ev)
1515{ 1684{
1516 int reportmode = 0, clickintime; 1685 int reportmode = 0, clickintime;
1517 1686
1518 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1687 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1519 if (!bypass_keystate) 1688 if (!bypass_keystate)
1520 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1689 reportmode = !! (priv_modes & PrivMode_mouse_report);
1690
1521 /* 1691 /*
1522 * VT window processing of button press 1692 * VT window processing of button press
1523 */ 1693 */
1524 if (ev.window == TermWin.vt) 1694 if (ev.window == TermWin.vt)
1525 { 1695 {
1696#if ISO_14755
1697 // 5.4
1698 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1699 {
1700 iso14755_54 (ev.x, ev.y);
1701 return;
1702 }
1703#endif
1704
1526 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1705 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1706
1527 if (reportmode) 1707 if (reportmode)
1528 { 1708 {
1529 /* mouse report from vt window */ 1709 /* mouse report from vt window */
1530 /* save the xbutton state (for ButtonRelease) */ 1710 /* save the xbutton state (for ButtonRelease) */
1531 MEvent.state = ev.state; 1711 MEvent.state = ev.state;
… …
1560 } 1740 }
1561 else 1741 else
1562 { 1742 {
1563 if (ev.button != MEvent.button) 1743 if (ev.button != MEvent.button)
1564 MEvent.clicks = 0; 1744 MEvent.clicks = 0;
1745
1565 switch (ev.button) 1746 switch (ev.button)
1566 { 1747 {
1567 case Button1: 1748 case Button1:
1749 /* allow meta + click to select rectangular areas */
1750 /* should be done in screen.C */
1751#if ENABLE_FRILLS
1752 selection.rect = !!(ev.state & ModMetaMask);
1753#else
1754 selection.rect = false;
1755#endif
1756
1568 /* allow shift+left click to extend selection */ 1757 /* allow shift+left click to extend selection */
1569 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1758 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1570 { 1759 {
1571 if (MEvent.button == Button1 && clickintime) 1760 if (MEvent.button == Button1 && clickintime)
1572 selection_rotate (ev.x, ev.y); 1761 selection_rotate (ev.x, ev.y);
1573 else 1762 else
1574 selection_extend (ev.x, ev.y, 1); 1763 selection_extend (ev.x, ev.y, 1);
… …
1589 case Button3: 1778 case Button3:
1590 if (MEvent.button == Button3 && clickintime) 1779 if (MEvent.button == Button3 && clickintime)
1591 selection_rotate (ev.x, ev.y); 1780 selection_rotate (ev.x, ev.y);
1592 else 1781 else
1593 selection_extend (ev.x, ev.y, 1); 1782 selection_extend (ev.x, ev.y, 1);
1783
1594 MEvent.button = Button3; 1784 MEvent.button = Button3;
1595 break; 1785 break;
1596 } 1786 }
1597 } 1787 }
1788
1598 MEvent.time = ev.time; 1789 MEvent.time = ev.time;
1599 return; 1790 return;
1600 } 1791 }
1601 1792
1602 /* 1793 /*
… …
1668 upordown = 1; /* down */ 1859 upordown = 1; /* down */
1669 } 1860 }
1670 if (upordown) 1861 if (upordown)
1671 { 1862 {
1672#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1863#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1673 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1864 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1674#endif 1865#endif
1675 if (scr_page (upordown < 0 ? UP : DN, 1)) 1866 if (scr_page (upordown < 0 ? UP : DN, 1))
1676 { 1867 {
1677 if (upordown < 0) 1868 if (upordown < 0)
1678 scrollBar.setUp (); 1869 scrollBar.setUp ();
… …
1694 break; 1885 break;
1695 case R_SB_ALIGN_BOTTOM: 1886 case R_SB_ALIGN_BOTTOM:
1696 csrO = scrollBar.bot - scrollBar.top; 1887 csrO = scrollBar.bot - scrollBar.top;
1697 break; 1888 break;
1698 } 1889 }
1890
1699 if (scrollBar.style == R_SB_XTERM 1891 if (scrollBar.style == R_SB_XTERM
1700 || scrollbar_above_slider (ev.y) 1892 || scrollbar_above_slider (ev.y)
1701 || scrollbar_below_slider (ev.y)) 1893 || scrollbar_below_slider (ev.y))
1702 scr_move_to ( scrollbar_position (ev.y) - csrO, 1894 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1703 scrollbar_size ()); 1895
1704 scrollBar.setMotion (); 1896 scrollBar.setMotion ();
1705 break; 1897 break;
1706 1898
1707 case Button1: 1899 case Button1:
1708 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1900 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1732 scr_page ((ev.button == Button1 ? DN : UP), 1924 scr_page ((ev.button == Button1 ? DN : UP),
1733 (TermWin.nrow 1925 (TermWin.nrow
1734 * scrollbar_position (ev.y) 1926 * scrollbar_position (ev.y)
1735 / scrollbar_size ())); 1927 / scrollbar_size ()));
1736 } 1928 }
1929
1737 break; 1930 break;
1738 } 1931 }
1739 } 1932 }
1740 return; 1933 return;
1741 } 1934 }
… …
1753{ 1946{
1754 int reportmode = 0; 1947 int reportmode = 0;
1755 1948
1756 csrO = 0; /* reset csr Offset */ 1949 csrO = 0; /* reset csr Offset */
1757 if (!bypass_keystate) 1950 if (!bypass_keystate)
1758 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1951 reportmode = !! (priv_modes & PrivMode_mouse_report);
1759 1952
1760 if (scrollbar_isUpDn ()) 1953 if (scrollbar_isUpDn ())
1761 { 1954 {
1762 scrollBar.setIdle (); 1955 scrollBar.setIdle ();
1763 scrollbar_show (0); 1956 scrollbar_show (0);
1764#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1957#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1765 refresh_type &= ~SMOOTH_REFRESH; 1958 refresh_type &= ~SMOOTH_REFRESH;
1766#endif 1959#endif
1767
1768 } 1960 }
1961
1769#ifdef SELECTION_SCROLLING 1962#ifdef SELECTION_SCROLLING
1770 pending_scroll_selection=0; 1963 if (sel_scroll_ev.active)
1964 sel_scroll_ev.stop();
1771#endif 1965#endif
1966
1772 if (ev.window == TermWin.vt) 1967 if (ev.window == TermWin.vt)
1773 { 1968 {
1969#if ISO_14755
1970 // 5.4
1971 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1972 return;
1973#endif
1774 if (reportmode) 1974 if (reportmode)
1775 { 1975 {
1776 /* mouse report from vt window */ 1976 /* mouse report from vt window */
1777 /* don't report release of wheel "buttons" */ 1977 /* don't report release of wheel "buttons" */
1778 if (ev.button >= 4) 1978 if (ev.button >= 4)
… …
1792 MEvent.button = AnyButton; 1992 MEvent.button = AnyButton;
1793 mouse_report (ev); 1993 mouse_report (ev);
1794#endif /* MOUSE_REPORT_DOUBLECLICK */ 1994#endif /* MOUSE_REPORT_DOUBLECLICK */
1795 return; 1995 return;
1796 } 1996 }
1997
1797 /* 1998 /*
1798 * dumb hack to compensate for the failure of click-and-drag 1999 * dumb hack to compensate for the failure of click-and-drag
1799 * when overriding mouse reporting 2000 * when overriding mouse reporting
1800 */ 2001 */
1801 if (PrivateModes & PrivMode_mouse_report 2002 if (priv_modes & PrivMode_mouse_report
1802 && bypass_keystate 2003 && bypass_keystate
1803 && ev.button == Button1 && MEvent.clicks <= 1) 2004 && ev.button == Button1 && MEvent.clicks <= 1)
1804 selection_extend (ev.x, ev.y, 0); 2005 selection_extend (ev.x, ev.y, 0);
1805 2006
1806 switch (ev.button) 2007 switch (ev.button)
… …
1817 case Button5: 2018 case Button5:
1818 { 2019 {
1819 int i; 2020 int i;
1820 page_dirn v; 2021 page_dirn v;
1821 2022
1822 v = (ev.button == Button4) ? UP : DN; 2023 v = ev.button == Button4 ? UP : DN;
2024
1823 if (ev.state & ShiftMask) 2025 if (ev.state & ShiftMask)
1824 i = 1; 2026 i = 1;
1825 else if ((Options & Opt_mouseWheelScrollPage)) 2027 else if (options & Opt_mouseWheelScrollPage)
1826 i = TermWin.nrow - 1; 2028 i = TermWin.nrow - 1;
1827 else 2029 else
1828 i = 5; 2030 i = 5;
2031
1829# ifdef MOUSE_SLIP_WHEELING 2032# ifdef MOUSE_SLIP_WHEELING
1830 if (ev.state & ControlMask) 2033 if (ev.state & ControlMask)
1831 { 2034 {
1832 mouse_slip_wheel_speed += (v ? -1 : 1); 2035 mouse_slip_wheel_speed += v ? -1 : 1;
2036 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2037 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2038
2039 if (slip_wheel_ev.at < NOW)
1833 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2040 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2041
2042 slip_wheel_ev.start ();
1834 } 2043 }
2044 else
2045 {
1835# endif 2046# endif
1836# ifdef JUMP_MOUSE_WHEEL 2047# 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); 2048 scr_page (v, i);
1844 scr_refresh (SMOOTH_REFRESH); 2049 scr_refresh (SMOOTH_REFRESH);
1845 scrollbar_show (1); 2050 scrollbar_show (1);
2051# else
2052 while (i--)
2053 {
2054 scr_page (v, 1);
2055 scr_refresh (SMOOTH_REFRESH);
2056 scrollbar_show (1);
2057 }
2058# endif
2059# ifdef MOUSE_SLIP_WHEELING
1846 } 2060 }
1847# endif 2061#endif
1848
1849 } 2062 }
1850 break; 2063 break;
1851#endif 2064#endif
1852
1853 } 2065 }
1854 } 2066 }
1855#ifdef MENUBAR 2067#ifdef MENUBAR
1856 else if (isMenuBarWindow (ev.window)) 2068 else if (isMenuBarWindow (ev.window))
1857 menubar_control (ev); 2069 menubar_control (ev);
1858#endif 2070#endif
1859} 2071}
1860 2072
1861
1862#ifdef TRANSPARENT 2073#ifdef TRANSPARENT
2074#if TINTING
2075/* taken from aterm-0.4.2 */
2076
2077typedef uint32_t RUINT32T;
2078
2079void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2080{
2081 int sh_r, sh_g, sh_b;
2082 RUINT32T mask_r, mask_g, mask_b;
2083 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2084 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2085 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2086 int i;
2087
2088 Visual *visual = display->visual;
2089
2090 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2091
2092 /* for convenience */
2093 mask_r = visual->red_mask;
2094 mask_g = visual->green_mask;
2095 mask_b = visual->blue_mask;
2096
2097 /* boring lookup table pre-initialization */
2098 switch (srcImage->bits_per_pixel) {
2099 case 15:
2100 if ((mask_r != 0x7c00) ||
2101 (mask_g != 0x03e0) ||
2102 (mask_b != 0x001f))
2103 return;
2104 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2105 lookup_r = lookup;
2106 lookup_g = lookup+32;
2107 lookup_b = lookup+32+32;
2108 sh_r = 10;
2109 sh_g = 5;
2110 sh_b = 0;
2111 break;
2112 case 16:
2113 if ((mask_r != 0xf800) ||
2114 (mask_g != 0x07e0) ||
2115 (mask_b != 0x001f))
2116 return;
2117 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2118 lookup_r = lookup;
2119 lookup_g = lookup+32;
2120 lookup_b = lookup+32+64;
2121 sh_r = 11;
2122 sh_g = 5;
2123 sh_b = 0;
2124 break;
2125 case 24:
2126 if ((mask_r != 0xff0000) ||
2127 (mask_g != 0x00ff00) ||
2128 (mask_b != 0x0000ff))
2129 return;
2130 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2131 lookup_r = lookup;
2132 lookup_g = lookup+256;
2133 lookup_b = lookup+256+256;
2134 sh_r = 16;
2135 sh_g = 8;
2136 sh_b = 0;
2137 break;
2138 case 32:
2139 if ((mask_r != 0xff0000) ||
2140 (mask_g != 0x00ff00) ||
2141 (mask_b != 0x0000ff))
2142 return;
2143 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2144 lookup_r = lookup;
2145 lookup_g = lookup+256;
2146 lookup_b = lookup+256+256;
2147 sh_r = 16;
2148 sh_g = 8;
2149 sh_b = 0;
2150 break;
2151 default:
2152 return; /* we do not support this color depth */
2153 }
2154
2155 /* prepare limits for color transformation (each channel is handled separately) */
2156 if (shade < 0) {
2157 shade = -shade;
2158 if (shade < 0) shade = 0;
2159 if (shade > 100) shade = 100;
2160
2161 lower_lim_r = 65535-rm;
2162 lower_lim_g = 65535-gm;
2163 lower_lim_b = 65535-bm;
2164
2165 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2166 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2167 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2168
2169 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2170 } else {
2171 if (shade < 0) shade = 0;
2172 if (shade > 100) shade = 100;
2173
2174 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2175
2176 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2177 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2178 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2179 }
2180
2181 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2182 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2183 {
2184 unsigned int tmp;
2185
2186 tmp = lower_lim_r;
2187 lower_lim_r = lower_lim_b;
2188 lower_lim_b = tmp;
2189
2190 tmp = upper_lim_r;
2191 upper_lim_r = upper_lim_b;
2192 upper_lim_b = tmp;
2193 }
2194
2195 /* fill our lookup tables */
2196 for (i = 0; i <= mask_r>>sh_r; i++)
2197 {
2198 RUINT32T tmp;
2199 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2200 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2201 lookup_r[i] = (tmp/65535)<<sh_r;
2202 }
2203 for (i = 0; i <= mask_g>>sh_g; i++)
2204 {
2205 RUINT32T tmp;
2206 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2207 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2208 lookup_g[i] = (tmp/65535)<<sh_g;
2209 }
2210 for (i = 0; i <= mask_b>>sh_b; i++)
2211 {
2212 RUINT32T tmp;
2213 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2214 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2215 lookup_b[i] = (tmp/65535)<<sh_b;
2216 }
2217
2218 /* apply table to input image (replacing colors by newly calculated ones) */
2219 switch (srcImage->bits_per_pixel)
2220 {
2221 case 15:
2222 {
2223 unsigned short *p1, *pf, *p, *pl;
2224 p1 = (unsigned short *) srcImage->data;
2225 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2226 while (p1 < pf)
2227 {
2228 p = p1;
2229 pl = p1 + srcImage->width;
2230 for (; p < pl; p++)
2231 {
2232 *p = lookup_r[(*p & 0x7c00)>>10] |
2233 lookup_g[(*p & 0x03e0)>> 5] |
2234 lookup_b[(*p & 0x001f)];
2235 }
2236 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2237 }
2238 break;
2239 }
2240 case 16:
2241 {
2242 unsigned short *p1, *pf, *p, *pl;
2243 p1 = (unsigned short *) srcImage->data;
2244 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2245 while (p1 < pf)
2246 {
2247 p = p1;
2248 pl = p1 + srcImage->width;
2249 for (; p < pl; p++)
2250 {
2251 *p = lookup_r[(*p & 0xf800)>>11] |
2252 lookup_g[(*p & 0x07e0)>> 5] |
2253 lookup_b[(*p & 0x001f)];
2254 }
2255 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2256 }
2257 break;
2258 }
2259 case 24:
2260 {
2261 unsigned char *p1, *pf, *p, *pl;
2262 p1 = (unsigned char *) srcImage->data;
2263 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2264 while (p1 < pf)
2265 {
2266 p = p1;
2267 pl = p1 + srcImage->width * 3;
2268 for (; p < pl; p += 3)
2269 {
2270 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2271 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2272 p[2] = lookup_r[(p[2] & 0x0000ff)];
2273 }
2274 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2275 }
2276 break;
2277 }
2278 case 32:
2279 {
2280 RUINT32T *p1, *pf, *p, *pl;
2281 p1 = (RUINT32T *) srcImage->data;
2282 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2283
2284 while (p1 < pf)
2285 {
2286 p = p1;
2287 pl = p1 + srcImage->width;
2288 for (; p < pl; p++)
2289 {
2290 *p = lookup_r[(*p & 0xff0000)>>16] |
2291 lookup_g[(*p & 0x00ff00)>> 8] |
2292 lookup_b[(*p & 0x0000ff)] |
2293 (*p & ~0xffffff);
2294 }
2295 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2296 }
2297 break;
2298 }
2299 }
2300
2301 free (lookup);
2302}
2303#endif
2304
1863/* 2305/*
1864 * Check our parents are still who we think they are. 2306 * Check our parents are still who we think they are.
1865 * Do transparency updates if required 2307 * Do transparency updates if required
1866 */ 2308 */
1867int 2309int
1868rxvt_term::check_our_parents () 2310rxvt_term::check_our_parents ()
1869{ 2311{
1870 int i, pchanged, aformat, have_pixmap, rootdepth; 2312 int i, pchanged, aformat, have_pixmap, rootdepth;
1871 unsigned long nitems, bytes_after; 2313 unsigned long nitems, bytes_after;
1872 Atom atype; 2314 Atom atype;
1873 unsigned char *prop = NULL; 2315 unsigned char *prop = NULL;
1874 Window root, oldp, *list; 2316 Window root, oldp, *list;
1875 Pixmap rootpixmap = None; 2317 Pixmap rootpixmap = None;
1876 XWindowAttributes wattr, wrootattr; 2318 XWindowAttributes wattr, wrootattr;
2319 dDisp;
1877 2320
1878 pchanged = 0; 2321 pchanged = 0;
1879 2322
1880 if (! (Options & Opt_transparent)) 2323 if (!(options & Opt_transparent))
1881 return pchanged; /* Don't try any more */ 2324 return pchanged; /* Don't try any more */
1882 2325
1883 XGetWindowAttributes (display->display, display->root, &wrootattr); 2326 XGetWindowAttributes (disp, display->root, &wrootattr);
1884 rootdepth = wrootattr.depth; 2327 rootdepth = wrootattr.depth;
1885 2328
1886 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2329 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2330
1887 if (rootdepth != wattr.depth) 2331 if (rootdepth != wattr.depth)
1888 { 2332 {
1889 if (am_transparent) 2333 if (am_transparent)
1890 { 2334 {
1891 pchanged = 1; 2335 pchanged = 1;
1892 XSetWindowBackground (display->display, TermWin.vt, 2336 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
1893 PixColors[Color_bg]);
1894 am_transparent = am_pixmap_trans = 0; 2337 am_transparent = am_pixmap_trans = 0;
1895 } 2338 }
2339
1896 return pchanged; /* Don't try any more */ 2340 return pchanged; /* Don't try any more */
1897 } 2341 }
1898 2342
1899 /* Get all X ops out of the queue so that our information is up-to-date. */ 2343 /* Get all X ops out of the queue so that our information is up-to-date. */
1900 XSync (display->display, False); 2344 XSync (disp, False);
1901 2345
1902 /* 2346 /*
1903 * Make the frame window set by the window manager have 2347 * Make the frame window set by the window manager have
1904 * the root background. Some window managers put multiple nested frame 2348 * the root background. Some window managers put multiple nested frame
1905 * windows for each client, so we have to take care about that. 2349 * windows for each client, so we have to take care about that.
1906 */ 2350 */
1907 i = (xa[XA_XROOTPMAPID] != 0 2351 i = (xa[XA_XROOTPMAP_ID]
1908 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2352 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1909 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2353 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1910 &nitems, &bytes_after, &prop) == Success)); 2354 &nitems, &bytes_after, &prop) == Success);
2355
1911 if (!i || prop == NULL) 2356 if (!i || prop == NULL)
2357 i = (xa[XA_ESETROOT_PMAP_ID]
2358 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2359 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2360 &nitems, &bytes_after, &prop) == Success);
2361
2362 if (!i || prop == NULL
2363#if TINTING
2364 || !rs[Rs_color + Color_tint]
2365#endif
2366 )
1912 have_pixmap = 0; 2367 have_pixmap = 0;
1913 else 2368 else
1914 { 2369 {
1915 have_pixmap = 1; 2370 have_pixmap = 1;
1916 rootpixmap = * ((Pixmap *)prop); 2371 rootpixmap = *(Pixmap *)prop;
1917 XFree (prop); 2372 XFree (prop);
1918 } 2373 }
2374
1919 if (have_pixmap) 2375 if (have_pixmap)
1920 { 2376 {
1921 /* 2377 /*
1922 * Copy display->root pixmap transparency 2378 * Copy display->root pixmap transparency
1923 */ 2379 */
… …
1926 Window cr; 2382 Window cr;
1927 XImage *image; 2383 XImage *image;
1928 GC gc; 2384 GC gc;
1929 XGCValues gcvalue; 2385 XGCValues gcvalue;
1930 2386
1931 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2387 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
1932 0, 0, &sx, &sy, &cr); 2388 0, 0, &sx, &sy, &cr);
1933 nw = (unsigned int)szHint.width; 2389 nw = (unsigned int)szHint.width;
1934 nh = (unsigned int)szHint.height; 2390 nh = (unsigned int)szHint.height;
1935 nx = ny = 0; 2391 nx = ny = 0;
1936 2392
1937 if (sx < 0) 2393 if (sx < 0)
… …
1948 sy = 0; 2404 sy = 0;
1949 } 2405 }
1950 2406
1951 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2407 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1952 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2408 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2409
2410 XSync (disp, False);
1953 allowedxerror = -1; 2411 allowedxerror = -1;
1954 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2412 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1955 ZPixmap); 2413
1956 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2414 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1957 /* XXX: may need a delay here? */ 2415 /* XXX: may need a delay here? */
1958 allowedxerror = 0; 2416 allowedxerror = 0;
2417
1959 if (image == NULL) 2418 if (image == NULL)
1960 { 2419 {
1961 if (am_transparent && am_pixmap_trans) 2420 if (am_transparent && am_pixmap_trans)
1962 { 2421 {
1963 pchanged = 1; 2422 pchanged = 1;
1964 if (TermWin.pixmap != None) 2423 if (TermWin.pixmap != None)
1965 { 2424 {
1966 XFreePixmap (display->display, TermWin.pixmap); 2425 XFreePixmap (disp, TermWin.pixmap);
1967 TermWin.pixmap = None; 2426 TermWin.pixmap = None;
1968 } 2427 }
1969 } 2428 }
2429
1970 am_pixmap_trans = 0; 2430 am_pixmap_trans = 0;
1971 } 2431 }
1972 else 2432 else
1973 { 2433 {
1974 if (TermWin.pixmap != None) 2434 if (TermWin.pixmap != None)
1975 XFreePixmap (display->display, TermWin.pixmap); 2435 XFreePixmap (disp, TermWin.pixmap);
2436
2437#if TINTING
2438 if (ISSET_PIXCOLOR (Color_tint))
2439 {
2440 unsigned short rm, gm, bm;
2441 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2442
2443 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2444
2445 ShadeXImage (display, image, shade, rm, gm, bm);
2446 }
2447#endif
2448
1976 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2449 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
1977 (unsigned int)szHint.width,
1978 (unsigned int)szHint.height, 2450 szHint.width, szHint.height, image->depth);
1979 (unsigned int)image->depth);
1980 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2451 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
1981 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2452 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
1982 nx, ny, (unsigned int)image->width,
1983 (unsigned int)image->height); 2453 nx, ny, image->width, image->height);
1984 XFreeGC (display->display, gc); 2454 XFreeGC (disp, gc);
1985 XDestroyImage (image); 2455 XDestroyImage (image);
1986 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2456 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
1987 TermWin.pixmap); 2457 XClearWindow (disp, TermWin.parent[0]);
2458
1988 if (!am_transparent || !am_pixmap_trans) 2459 if (!am_transparent || !am_pixmap_trans)
1989 pchanged = 1; 2460 pchanged = 1;
2461
1990 am_transparent = am_pixmap_trans = 1; 2462 am_transparent = am_pixmap_trans = 1;
1991 } 2463 }
1992 } 2464 }
1993 2465
1994 if (!am_pixmap_trans) 2466 if (am_pixmap_trans)
2467 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2468 else
1995 { 2469 {
1996 unsigned int n; 2470 unsigned int n;
1997 /* 2471 /*
1998 * InheritPixmap transparency 2472 * InheritPixmap transparency
1999 */ 2473 */
2000 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2001 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2474 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2002 i++)
2003 { 2475 {
2004 oldp = TermWin.parent[i]; 2476 oldp = TermWin.parent[i];
2005 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2477 XQueryTree (disp, TermWin.parent[i - 1], &root,
2006 &TermWin.parent[i], &list, &n); 2478 &TermWin.parent[i], &list, &n);
2007 XFree (list); 2479 XFree (list);
2008 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2480
2009 if (TermWin.parent[i] == display->root) 2481 if (TermWin.parent[i] == display->root)
2010 { 2482 {
2011 if (oldp != None) 2483 if (oldp != None)
2012 pchanged = 1; 2484 pchanged = 1;
2485
2013 break; 2486 break;
2014 } 2487 }
2488
2015 if (oldp != TermWin.parent[i]) 2489 if (oldp != TermWin.parent[i])
2016 pchanged = 1; 2490 pchanged = 1;
2017 } 2491 }
2018 2492
2019 n = 0; 2493 n = 0;
2020 2494
2021 if (pchanged) 2495 if (pchanged)
2022 { 2496 {
2023 for (; n < (unsigned int)i; n++) 2497 for (; n < (unsigned int)i; n++)
2024 { 2498 {
2025 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2499 XGetWindowAttributes (disp, 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) 2500 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2028 { 2501 {
2029 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2502 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2030 break; 2503 break;
2031 } 2504 }
2032 } 2505 }
2033 } 2506 }
2034 2507
2035 if (n > (int) (sizeof (TermWin.parent) 2508 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2036 / sizeof (TermWin.parent[0])))
2037 { 2509 {
2038 D_X ((stderr, "InheritPixmap Turning off")); 2510 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2039 XSetWindowBackground (display->display, TermWin.parent[0], 2511 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2040 PixColors[Color_fg]);
2041 XSetWindowBackground (display->display, TermWin.vt,
2042 PixColors[Color_bg]);
2043 am_transparent = 0; 2512 am_transparent = 0;
2044 /* XXX: also turn off Opt_transparent? */ 2513 /* XXX: also turn off Opt_transparent? */
2045 } 2514 }
2046 else 2515 else
2047 { 2516 {
2517#if WAIT_FOR_WM
2048 /* wait (an arbitrary period) for the WM to do its thing 2518 /* wait (an arbitrary period) for the WM to do its thing
2049 * needed for fvwm2.2.2 (and before?) */ 2519 * 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); 2520 sleep (1);
2058# endif 2521#endif
2059 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2060 for (n = 0; n < (unsigned int)i; n++) 2522 for (n = 0; n < (unsigned int)i; n++)
2523 {
2061 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2524 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2062 ParentRelative); 2525 XClearWindow (disp, TermWin.parent[n]);
2526 }
2527
2063 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2528 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2064 ParentRelative);
2065 am_transparent = 1; 2529 am_transparent = 1;
2066 } 2530 }
2067 2531
2068 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2532 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2069 TermWin.parent[i] = None; 2533 TermWin.parent[i] = None;
2070 } 2534 }
2535
2536 if (scrollBar.win)
2537 {
2538 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2539 scrollBar.setIdle ();
2540 scrollbar_show (0);
2541 }
2542
2543 if (am_transparent)
2544 {
2545 want_refresh = want_full_refresh = 1;
2546 if (am_pixmap_trans)
2547 flush ();
2548 }
2549
2071 return pchanged; 2550 return pchanged;
2072} 2551}
2073#endif 2552#endif
2074 2553
2075/*}}} */ 2554/*}}} */
2555
2556bool
2557rxvt_term::cmd_parse ()
2558{
2559 bool flag = false;
2560 unicode_t ch = NOCHAR;
2561 unsigned char *seq_begin; // remember start of esc-sequence here
2562
2563 for (;;)
2564 {
2565 if (ch == NOCHAR)
2566 {
2567 seq_begin = cmdbuf_ptr;
2568 ch = next_char ();
2569 }
2570
2571 if (ch == NOCHAR) // TODO: improve
2572 break;
2573
2574 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2575 {
2576 if (!seen_input)
2577 {
2578 seen_input = 1;
2579 // many badly-written programs (e.g. jed) contain a race condition:
2580 // they first read the screensize and then install a SIGWINCH handler.
2581 // some window managers resize the window early, and these programs
2582 // then sometimes get the size wrong.
2583 // unfortunately other programs are even more buggy and dislike
2584 // being sent SIGWINCH, so only do it when we were in fact being
2585 // resized.
2586 if (seen_resize)
2587 kill (-cmd_pid, SIGWINCH);
2588 }
2589
2590 /* Read a text string from the input buffer */
2591 unicode_t buf[UBUFSIZ];
2592 bool refreshnow = false;
2593 int nlines = 0;
2594 unicode_t *str = buf;
2595
2596 for (;;)
2597 {
2598 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2599 break;
2600
2601 *str++ = ch;
2602
2603 if (ch == C0_LF)
2604 {
2605 nlines++;
2606 refresh_count++;
2607
2608 if (!(options & Opt_jumpScroll)
2609 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2610 {
2611 refreshnow = true;
2612 ch = NOCHAR;
2613 break;
2614 }
2615
2616 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2617 if (nlines >= TermWin.nrow - 1)
2618 {
2619 scr_add_lines (buf, nlines, str - buf);
2620 nlines = 0;
2621 str = buf;
2622 }
2623 }
2624
2625 if (str >= buf + UBUFSIZ)
2626 {
2627 ch = NOCHAR;
2628 break;
2629 }
2630
2631 seq_begin = cmdbuf_ptr;
2632 ch = next_char ();
2633 }
2634
2635 scr_add_lines (buf, nlines, str - buf);
2636
2637 /*
2638 * If there have been a lot of new lines, then update the screen
2639 * What the heck I'll cheat and only refresh less than every page-full.
2640 * the number of pages between refreshes is refresh_limit, which
2641 * is incremented here because we must be doing flat-out scrolling.
2642 */
2643 if (refreshnow)
2644 {
2645 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2646 refresh_limit++;
2647 else
2648 {
2649 flag = true;
2650 scr_refresh (refresh_type);
2651 }
2652 }
2653
2654 }
2655 else
2656 {
2657 try
2658 {
2659 process_nonprinting (ch);
2660 }
2661 catch (const class out_of_input &o)
2662 {
2663 // we ran out of input, retry later
2664 cmdbuf_ptr = seq_begin;
2665 break;
2666 }
2667
2668 ch = NOCHAR;
2669 }
2670 }
2671
2672 return flag;
2673}
2674
2675// read the next octet
2676unicode_t
2677rxvt_term::next_octet ()
2678{
2679 return cmdbuf_ptr < cmdbuf_endp
2680 ? *cmdbuf_ptr++
2681 : NOCHAR;
2682}
2683
2684// read the next character
2685unicode_t
2686rxvt_term::next_char ()
2687{
2688 while (cmdbuf_ptr < cmdbuf_endp)
2689 {
2690 // assume 7-bit to be ascii ALWAYS
2691 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2692 return *cmdbuf_ptr++;
2693
2694 wchar_t wc;
2695 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2696
2697 if (len == (size_t)-2)
2698 {
2699 // the mbstate stores incomplete sequences. didn't know this :/
2700 cmdbuf_ptr = cmdbuf_endp;
2701 break;
2702 }
2703
2704 if (len == (size_t)-1)
2705 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2706
2707 // assume wchar == unicode
2708 cmdbuf_ptr += len;
2709 return wc & UNICODE_MASK;
2710 }
2711
2712 return NOCHAR;
2713}
2714
2715/* rxvt_cmd_getc () - Return next input character */
2716/*
2717 * Return the next input character after first passing any keyboard input
2718 * to the command.
2719 */
2720unicode_t
2721rxvt_term::cmd_getc ()
2722{
2723 unicode_t c = next_char ();
2724
2725 if (c == NOCHAR)
2726 throw out_of_input;
2727
2728 return c;
2729}
2730
2731unicode_t
2732rxvt_term::cmd_get8 ()
2733{
2734 unicode_t c = next_octet ();
2735
2736 if (c == NOCHAR)
2737 throw out_of_input;
2738
2739 return c;
2740}
2076 2741
2077/*{{{ print pipe */ 2742/*{{{ print pipe */
2078/*----------------------------------------------------------------------*/ 2743/*----------------------------------------------------------------------*/
2079#ifdef PRINTPIPE 2744#ifdef PRINTPIPE
2080FILE * 2745FILE *
2081rxvt_term::popen_printer () 2746rxvt_term::popen_printer ()
2082{ 2747{
2083 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2748 FILE *stream = popen (rs[Rs_print_pipe], "w");
2084 2749
2085 if (stream == NULL) 2750 if (stream == NULL)
2086 rxvt_print_error ("can't open printer pipe"); 2751 rxvt_warn ("can't open printer pipe, not printing.\n");
2752
2087 return stream; 2753 return stream;
2088} 2754}
2089 2755
2090int 2756int
2091rxvt_term::pclose_printer (FILE *stream) 2757rxvt_term::pclose_printer (FILE *stream)
2092{ 2758{
2093 fflush (stream); 2759 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); 2760 return pclose (stream);
2100# endif
2101} 2761}
2102 2762
2103/* 2763/*
2104 * simulate attached vt100 printer 2764 * simulate attached vt100 printer
2105 */ 2765 */
2106void 2766void
2107rxvt_term::process_print_pipe () 2767rxvt_term::process_print_pipe ()
2108{ 2768{
2109 int done; 2769 int done;
2110 FILE *fd; 2770 FILE *fd;
2111 2771
2112 if ((fd = popen_printer ()) == NULL) 2772 if ((fd = popen_printer ()) == NULL)
2113 return; 2773 return;
2114 2774
2115 /* 2775 /*
2116 * Send all input to the printer until either ESC[4i or ESC[?4i 2776 * Send all input to the printer until either ESC[4i or ESC[?4i
2117 * is received. 2777 * is received.
2118 */ 2778 */
2119 for (done = 0; !done;) 2779 for (done = 0; !done;)
2120 { 2780 {
2121 unsigned char buf[8]; 2781 unsigned char buf[8];
2122 unsigned char ch; 2782 unicode_t ch;
2123 unsigned int i, len; 2783 unsigned int i, len;
2124 2784
2125 if ((ch = cmd_getc ()) != C0_ESC) 2785 if ((ch = cmd_getc ()) != C0_ESC)
2126 { 2786 {
2127 if (putc (ch, fd) == EOF) 2787 if (putc (ch, fd) == EOF)
2128 break; /* done = 1 */ 2788 break; /* done = 1 */
… …
2143 { 2803 {
2144 if ((buf[len++] = cmd_getc ()) == 'i') 2804 if ((buf[len++] = cmd_getc ()) == 'i')
2145 break; /* done = 1 */ 2805 break; /* done = 1 */
2146 } 2806 }
2147 } 2807 }
2808
2148 for (i = 0; i < len; i++) 2809 for (i = 0; i < len; i++)
2149 if (putc (buf[i], fd) == EOF) 2810 if (putc (buf[i], fd) == EOF)
2150 { 2811 {
2151 done = 1; 2812 done = 1;
2152 break; 2813 break;
2153 } 2814 }
2154 } 2815 }
2155 } 2816 }
2817
2156 pclose_printer (fd); 2818 pclose_printer (fd);
2157} 2819}
2158#endif /* PRINTPIPE */ 2820#endif /* PRINTPIPE */
2159/*}}} */ 2821/*}}} */
2160 2822
2161/* *INDENT-OFF* */ 2823/* *INDENT-OFF* */
2162enum { 2824enum {
2163 C1_40 = 0x40, 2825 C1_40 = 0x40,
2164 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2826 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, 2827 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, 2828 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 2829 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2168}; 2830};
2169/* *INDENT-ON* */ 2831/* *INDENT-ON* */
2170 2832
2171/*{{{ process non-printing single characters */ 2833/*{{{ process non-printing single characters */
2172void 2834void
2173rxvt_term::process_nonprinting (unsigned char ch) 2835rxvt_term::process_nonprinting (unicode_t ch)
2174{ 2836{
2175 switch (ch) 2837 switch (ch)
2176 { 2838 {
2839 case C0_ESC:
2840 process_escape_seq ();
2841 break;
2177 case C0_ENQ: /* terminal Status */ 2842 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2843 if (rs[Rs_answerbackstring])
2179 tt_write (
2180 (const unsigned char *)rs[Rs_answerbackstring], 2844 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2845 (unsigned int)strlen (rs[Rs_answerbackstring]));
2182 else 2846 else
2183 tt_write ((unsigned char *)VT100_ANS, 2847 tt_write ((unsigned char *)VT100_ANS,
2184 (unsigned int)STRLEN (VT100_ANS)); 2848 (unsigned int)strlen (VT100_ANS));
2185 break; 2849 break;
2186 case C0_BEL: /* bell */ 2850 case C0_BEL: /* bell */
2187 scr_bell (); 2851 scr_bell ();
2188 break; 2852 break;
2189 case C0_BS: /* backspace */ 2853 case C0_BS: /* backspace */
… …
2204 scr_charset_choose (1); 2868 scr_charset_choose (1);
2205 break; 2869 break;
2206 case C0_SI: /* shift in - acs */ 2870 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2871 scr_charset_choose (0);
2208 break; 2872 break;
2873
2874#ifdef EIGHT_BIT_CONTROLS
2875 // 8-bit controls
2876 case 0x90: /* DCS */
2877 process_dcs_seq ();
2878 break;
2879 case 0x9b: /* CSI */
2880 process_csi_seq ();
2881 break;
2882 case 0x9d: /* CSI */
2883 process_osc_seq ();
2884 break;
2885#endif
2209 } 2886 }
2210} 2887}
2211/*}}} */ 2888/*}}} */
2212 2889
2213 2890
2214/*{{{ process VT52 escape sequences */ 2891/*{{{ process VT52 escape sequences */
2215void 2892void
2216rxvt_term::process_escape_vt52 (unsigned char ch) 2893rxvt_term::process_escape_vt52 (unicode_t ch)
2217{ 2894{
2218 int row, col; 2895 int row, col;
2219 2896
2220 switch (ch) 2897 switch (ch)
2221 { 2898 {
… …
2273 2950
2274/*{{{ process escape sequences */ 2951/*{{{ process escape sequences */
2275void 2952void
2276rxvt_term::process_escape_seq () 2953rxvt_term::process_escape_seq ()
2277{ 2954{
2278 unsigned char ch = cmd_getc (); 2955 unicode_t ch = cmd_getc ();
2279 2956
2280 if (PrivateModes & PrivMode_vt52) 2957 if (priv_modes & PrivMode_vt52)
2281 { 2958 {
2282 process_escape_vt52 (ch); 2959 process_escape_vt52 (ch);
2283 return; 2960 return;
2284 } 2961 }
2285 2962
… …
2300 scr_charset_set (2, (unsigned int)cmd_getc ()); 2977 scr_charset_set (2, (unsigned int)cmd_getc ());
2301 break; 2978 break;
2302 case '+': 2979 case '+':
2303 scr_charset_set (3, (unsigned int)cmd_getc ()); 2980 scr_charset_set (3, (unsigned int)cmd_getc ());
2304 break; 2981 break;
2305#ifndef NO_FRILLS 2982#if ENABLE_FRILLS
2306 case '6': 2983 case '6':
2307 scr_backindex (); 2984 scr_backindex ();
2308 break; 2985 break;
2309#endif 2986#endif
2310 case '7': 2987 case '7':
2311 scr_cursor (SAVE); 2988 scr_cursor (SAVE);
2312 break; 2989 break;
2313 case '8': 2990 case '8':
2314 scr_cursor (RESTORE); 2991 scr_cursor (RESTORE);
2315 break; 2992 break;
2316#ifndef NO_FRILLS 2993#if ENABLE_FRILLS
2317 case '9': 2994 case '9':
2318 scr_forwardindex (); 2995 scr_forwardindex ();
2319 break; 2996 break;
2320#endif 2997#endif
2321 case '=': 2998 case '=':
… …
2331 break; 3008 break;
2332 3009
2333 /* 8.3.87: NEXT LINE */ 3010 /* 8.3.87: NEXT LINE */
2334 case C1_NEL: /* ESC E */ 3011 case C1_NEL: /* ESC E */
2335 { 3012 {
2336 uint32_t nlcr[] = { '\n', '\r' }; 3013 unicode_t nlcr[] = { C0_LF, C0_CR };
2337 scr_add_lines (nlcr, 1, 2); 3014 scr_add_lines (nlcr, 1, 2);
2338 } 3015 }
2339 break; 3016 break;
2340 3017
2341 /* kidnapped escape sequence: Should be 8.3.48 */ 3018 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2352 case C1_RI: /* ESC M */ 3029 case C1_RI: /* ESC M */
2353 scr_index (DN); 3030 scr_index (DN);
2354 break; 3031 break;
2355 3032
2356 /* 8.3.142: SINGLE-SHIFT TWO */ 3033 /* 8.3.142: SINGLE-SHIFT TWO */
2357 /*case C1_SS2: scr_single_shift (2); break; */ 3034 /*case C1_SS2: scr_single_shift (2); break; */
2358 3035
2359 /* 8.3.143: SINGLE-SHIFT THREE */ 3036 /* 8.3.143: SINGLE-SHIFT THREE */
2360 /*case C1_SS3: scr_single_shift (3); break; */ 3037 /*case C1_SS3: scr_single_shift (3); break; */
2361 3038
2362 /* 8.3.27: DEVICE CONTROL STRING */ 3039 /* 8.3.27: DEVICE CONTROL STRING */
2363 case C1_DCS: /* ESC P */ 3040 case C1_DCS: /* ESC P */
2364 process_dcs_seq (); 3041 process_dcs_seq ();
2365 break; 3042 break;
… …
2380 process_osc_seq (); 3057 process_osc_seq ();
2381 break; 3058 break;
2382 3059
2383 /* 8.3.106: RESET TO INITIAL STATE */ 3060 /* 8.3.106: RESET TO INITIAL STATE */
2384 case 'c': 3061 case 'c':
3062 mbstate.reset ();
2385 scr_poweron (); 3063 scr_poweron ();
2386 scrollbar_show (1); 3064 scrollbar_show (1);
2387 break; 3065 break;
2388 3066
2389 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3067 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2401 3079
2402/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3080/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2403/* *INDENT-OFF* */ 3081/* *INDENT-OFF* */
2404enum { 3082enum {
2405 CSI_ICH = 0x40, 3083 CSI_ICH = 0x40,
2406 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3084 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 , 3085 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, 3086 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, 3087 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, 3088 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, 3089 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, */ 3104 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, [, \, ], ^, _, */ 3105 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, */ 3106 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, */ 3107 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, */ 3108 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, {, |, }, ~, */ 3109 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2432 }; 3110 };
2433/* *INDENT-ON* */ 3111/* *INDENT-ON* */
2434 3112
2435void 3113void
2436rxvt_term::process_csi_seq () 3114rxvt_term::process_csi_seq ()
2437{ 3115{
2438 unsigned char ch, priv, i; 3116 unicode_t ch, priv, i;
2439 unsigned int nargs, p; 3117 unsigned int nargs, p;
2440 int n, ndef; 3118 int n, ndef;
2441 int arg[ESC_ARGS]; 3119 int arg[ESC_ARGS];
2442 3120
2443 for (nargs = ESC_ARGS; nargs > 0;) 3121 for (nargs = ESC_ARGS; nargs > 0;)
2444 arg[--nargs] = 0; 3122 arg[--nargs] = 0;
2445 3123
2446 priv = 0; 3124 priv = 0;
… …
2448 if (ch >= '<' && ch <= '?') 3126 if (ch >= '<' && ch <= '?')
2449 { /* '<' '=' '>' '?' */ 3127 { /* '<' '=' '>' '?' */
2450 priv = ch; 3128 priv = ch;
2451 ch = cmd_getc (); 3129 ch = cmd_getc ();
2452 } 3130 }
3131
2453 /* read any numerical arguments */ 3132 /* read any numerical arguments */
2454 for (n = -1; ch < CSI_ICH; ) 3133 for (n = -1; ch < CSI_ICH; )
2455 { 3134 {
2456 if (isdigit (ch)) 3135 if (isdigit (ch))
2457 { 3136 {
… …
2464 { 3143 {
2465 if (nargs < ESC_ARGS) 3144 if (nargs < ESC_ARGS)
2466 arg[nargs++] = n; 3145 arg[nargs++] = n;
2467 n = -1; 3146 n = -1;
2468 } 3147 }
2469 else if (ch == '\b') 3148 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); 3149 process_nonprinting (ch);
2481 } 3150
2482 ch = cmd_getc (); 3151 ch = cmd_getc ();
2483 } 3152 }
2484 3153
2485 if (ch > CSI_7F) 3154 if (ch > CSI_7F)
2486 return; 3155 return;
… …
2628 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3297 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2629 break; 3298 break;
2630 3299
2631 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3300 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2632 tt_write ((const unsigned char *)VT100_ANS, 3301 tt_write ((const unsigned char *)VT100_ANS,
2633 (unsigned int) (sizeof (VT100_ANS) - 1)); 3302 (unsigned int) (sizeof (VT100_ANS) - 1));
2634 break; 3303 break;
2635 3304
2636 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3305 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2637 process_sgr_mode (nargs, arg); 3306 process_sgr_mode (nargs, arg);
2638 break; 3307 break;
… …
2644 tt_printf ("\033[0n"); 3313 tt_printf ("\033[0n");
2645 break; 3314 break;
2646 case 6: /* CPR requested */ 3315 case 6: /* CPR requested */
2647 scr_report_position (); 3316 scr_report_position ();
2648 break; 3317 break;
2649#if defined (ENABLE_DISPLAY_ANSWER)
2650 case 7: /* unofficial extension */ 3318 case 7: /* unofficial extension */
3319 if (options & Opt_insecure)
2651 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3320 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2652 break; 3321 break;
2653#endif
2654 case 8: /* unofficial extension */ 3322 case 8: /* unofficial extension */
2655 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3323 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2656 break; 3324 break;
2657 } 3325 }
2658 break; 3326 break;
2659 3327
2660 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3328 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2693 break; 3361 break;
2694 3362
2695 case CSI_RM: /* 8.3.107: RESET MODE */ 3363 case CSI_RM: /* 8.3.107: RESET MODE */
2696 if (arg[0] == 4) 3364 if (arg[0] == 4)
2697 scr_insert_mode (0); 3365 scr_insert_mode (0);
3366 else if (arg[0] == 20)
3367 priv_modes &= ~PrivMode_LFNL;
2698 break; 3368 break;
2699 3369
2700 case CSI_SM: /* 8.3.126: SET MODE */ 3370 case CSI_SM: /* 8.3.126: SET MODE */
2701 if (arg[0] == 4) 3371 if (arg[0] == 4)
2702 scr_insert_mode (1); 3372 scr_insert_mode (1);
3373 else if (arg[0] == 20)
3374 priv_modes |= PrivMode_LFNL;
2703 break; 3375 break;
2704 3376
2705 /* 3377 /*
2706 * PRIVATE USE beyond this point. All CSI_7? sequences here 3378 * PRIVATE USE beyond this point. All CSI_7? sequences here
2707 */ 3379 */
… …
2719 break; 3391 break;
2720 case CSI_75: 3392 case CSI_75:
2721 scr_cursor (RESTORE); 3393 scr_cursor (RESTORE);
2722 break; 3394 break;
2723 3395
2724#ifndef NO_FRILLS 3396#if ENABLE_FRILLS
2725 case CSI_74: 3397 case CSI_74:
2726 process_window_ops (arg, nargs); 3398 process_window_ops (arg, nargs);
2727 break; 3399 break;
2728#endif 3400#endif
2729 3401
2730 case CSI_78: /* DECREQTPARM */ 3402 case CSI_78: /* DECREQTPARM */
2731 if (arg[0] == 0 || arg[0] == 1) 3403 if (arg[0] == 0 || arg[0] == 1)
2732 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3404 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2733 /* FALLTHROUGH */ 3405 break;
2734 3406
2735 default: 3407 default:
2736 break; 3408 break;
2737 } 3409 }
2738} 3410}
2739/*}}} */ 3411/*}}} */
2740 3412
2741#ifndef NO_FRILLS 3413#if ENABLE_FRILLS
2742/* ARGSUSED */ 3414/* ARGSUSED */
2743void 3415void
2744rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3416rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2745{ 3417{
2746 int x, y; 3418 int x, y;
2747#if 0
2748 char *s;
2749#endif
2750 XWindowAttributes wattr; 3419 XWindowAttributes wattr;
2751 Window wdummy; 3420 Window wdummy;
3421 dDisp;
2752 3422
2753 if (nargs == 0) 3423 if (nargs == 0)
2754 return; 3424 return;
3425
2755 switch (args[0]) 3426 switch (args[0])
2756 { 3427 {
2757 /* 3428 /*
2758 * commands 3429 * commands
2759 */ 3430 */
2760 case 1: /* deiconify window */ 3431 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3432 XMapWindow (disp, TermWin.parent[0]);
2762 break; 3433 break;
2763 case 2: /* iconify window */ 3434 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3435 XIconifyWindow (disp, TermWin.parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3436 break;
2767 case 3: /* set position (pixels) */ 3437 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3438 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
2769 break; 3439 break;
2770 case 4: /* set size (pixels) */ 3440 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3441 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3442 break;
2773 case 5: /* raise window */ 3443 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3444 XRaiseWindow (disp, TermWin.parent[0]);
2775 break; 3445 break;
2776 case 6: /* lower window */ 3446 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3447 XLowerWindow (disp, TermWin.parent[0]);
2778 break; 3448 break;
2779 case 7: /* refresh window */ 3449 case 7: /* refresh window */
2780 scr_touch (true); 3450 scr_touch (true);
2781 break; 3451 break;
2782 case 8: /* set size (chars) */ 3452 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3453 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3454 (unsigned int) (args[1] * TermWin.fheight));
2785 break; 3455 break;
3456
3457 //case 9: NYI, TODO, restore maximized window or maximize window
2786 default: 3458 default:
2787 if (args[0] >= 24) /* set height (chars) */ 3459 if (args[0] >= 24) /* set height (chars) */
2788 set_widthheight ((unsigned int)TermWin.width, 3460 set_widthheight ((unsigned int)TermWin.width,
2789 (unsigned int) (args[1] * TermWin.fheight)); 3461 (unsigned int) (args[1] * TermWin.fheight));
2790 break; 3462 break;
3463
3464
2791 /* 3465 /*
2792 * reports - some output format copied from XTerm 3466 * reports - some output format copied from XTerm
2793 */ 3467 */
2794 case 11: /* report window state */ 3468 case 11: /* report window state */
2795 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3469 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2796 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3470 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2797 break; 3471 break;
2798 case 13: /* report window position */ 3472 case 13: /* report window position */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3473 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2800 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3474 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
2801 -wattr.border_width, -wattr.border_width, 3475 -wattr.border_width, -wattr.border_width,
2802 &x, &y, &wdummy); 3476 &x, &y, &wdummy);
2803 tt_printf ("\033[3;%d;%dt", x, y); 3477 tt_printf ("\033[3;%d;%dt", x, y);
2804 break; 3478 break;
2805 case 14: /* report window size (pixels) */ 3479 case 14: /* report window size (pixels) */
2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3480 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2807 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3481 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2808 break; 3482 break;
2809 case 18: /* report window size (chars) */ 3483 case 18: /* report text area size (chars) */
2810 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3484 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2811 break; 3485 break;
2812#if 0 /* XXX: currently disabled due to security concerns */ 3486 case 19: /* report window size (chars) */
3487 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3488 break;
2813 case 20: /* report icon label */ 3489 case 20: /* report icon label */
3490 {
3491 char *s;
2814 XGetIconName (display->display, TermWin.parent[0], &s); 3492 XGetIconName (disp, TermWin.parent[0], &s);
2815 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3493 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3494 XFree (s);
3495 }
2816 break; 3496 break;
2817 case 21: /* report window title */ 3497 case 21: /* report window title */
3498 {
3499 char *s;
2818 XFetchName (display->display, TermWin.parent[0], &s); 3500 XFetchName (disp, TermWin.parent[0], &s);
2819 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3501 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3502 XFree (s);
3503 }
2820 break; 3504 break;
2821#endif
2822
2823 } 3505 }
2824} 3506}
2825#endif 3507#endif
2826 3508
2827/*----------------------------------------------------------------------*/ 3509/*----------------------------------------------------------------------*/
2828/* 3510/*
2829 * get input up until STRING TERMINATOR (or BEL) 3511 * get input up until STRING TERMINATOR (or BEL)
2830 * ends_how is terminator used. returned input must be free ()d 3512 * ends_how is terminator used. returned input must be free()'d
2831 */ 3513 */
2832unsigned char * 3514unsigned char *
2833rxvt_term::get_to_st (unsigned char *ends_how) 3515rxvt_term::get_to_st (unicode_t &ends_how)
2834{ 3516{
2835 int seen_esc = 0; /* seen escape? */ 3517 unicode_t ch;
3518 bool seen_esc = false;
2836 unsigned int n = 0; 3519 unsigned int n = 0;
2837 unsigned char *s; 3520 wchar_t string[STRING_MAX];
2838 unsigned char ch, string[STRING_MAX];
2839 3521
2840 for (; (ch = cmd_getc ());) 3522 while ((ch = cmd_getc ()) != NOCHAR)
2841 { 3523 {
2842 if (ch == C0_BEL 3524 if (seen_esc)
2843 || ch == CHAR_ST 3525 {
2844 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3526 if (ch == 0x5c) /* 7bit ST */
2845 break; 3527 break;
3528 else
3529 return NULL;
3530 }
2846 if (ch == C0_ESC) 3531 else if (ch == C0_ESC)
2847 { 3532 {
2848 seen_esc = 1; 3533 seen_esc = true;
2849 continue; 3534 continue;
2850 } 3535 }
2851 else if (ch == '\t') 3536 else if (ch == C0_BEL || ch == CHAR_ST)
2852 ch = ' '; /* translate '\t' to space */ 3537 break;
2853 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3538 else if (ch < 0x20)
2854 return NULL; /* other control character - exit */ 3539 return NULL; /* other control character - exit */
3540
3541 seen_esc = false;
3542
2855 if (n < sizeof (string) - 1) 3543 if (n >= sizeof (string) - 1)
3544 // stop at some sane length
3545 return NULL;
3546
3547 if (ch == C0_SYN)
3548 string[n++] = cmd_get8 ();
3549 else
2856 string[n++] = ch; 3550 string[n++] = ch;
2857 seen_esc = 0;
2858 } 3551 }
3552
2859 string[n++] = '\0'; 3553 string[n++] = '\0';
2860 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3554
2861 return NULL;
2862 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3555 ends_how = (ch == 0x5c ? C0_ESC : ch);
2863 STRNCPY (s, string, n); 3556
2864 return s; 3557 return (unsigned char *)rxvt_wcstombs (string);
2865} 3558}
2866 3559
2867/*----------------------------------------------------------------------*/ 3560/*----------------------------------------------------------------------*/
2868/* 3561/*
2869 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3562 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2870 */ 3563 */
2871void 3564void
2872rxvt_term::process_dcs_seq () 3565rxvt_term::process_dcs_seq ()
2873{ 3566{
2874 unsigned char eh, *s; 3567 unsigned char *s;
3568 unicode_t eh;
3569
2875 /* 3570 /*
2876 * Not handled yet 3571 * Not handled yet
2877 */ 3572 */
2878 s = get_to_st (&eh); 3573 s = get_to_st (eh);
2879 if (s) 3574 if (s)
2880 free (s); 3575 free (s);
3576
2881 return; 3577 return;
2882} 3578}
2883 3579
2884/*----------------------------------------------------------------------*/ 3580/*----------------------------------------------------------------------*/
2885/* 3581/*
2886 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3582 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2887 */ 3583 */
2888void 3584void
2889rxvt_term::process_osc_seq () 3585rxvt_term::process_osc_seq ()
2890{ 3586{
2891 unsigned char ch, eh, *s; 3587 unicode_t ch, eh;
2892 int arg; 3588 int arg;
2893 3589
2894 ch = cmd_getc (); 3590 ch = cmd_getc ();
2895 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3591 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2896 arg = arg * 10 + (ch - '0'); 3592 arg = arg * 10 + (ch - '0');
2897 3593
2898 if (ch == ';') 3594 if (ch == ';')
2899 { 3595 {
2900 s = get_to_st (&eh); 3596 unsigned char *s = get_to_st (eh);
3597
2901 if (s) 3598 if (s)
2902 { 3599 {
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); 3600 process_xterm_seq (arg, (char *)s, eh);
2915 free (s); 3601 free (s);
2916 } 3602 }
2917 } 3603 }
2918} 3604}
3605
3606void
3607rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3608{
3609 if (str[0] == '?' && !str[1])
3610 {
3611 unsigned short r, g, b;
3612 pix_colors_focused[color].get (display, r, g, b);
3613 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3614 }
3615 else
3616 set_window_color (color, str);
3617}
3618
2919/* 3619/*
2920 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3620 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2921 * 0 = change iconName/title 3621 * 0 = change iconName/title
2922 * 1 = change iconName 3622 * 1 = change iconName
2923 * 2 = change title 3623 * 2 = change title
2924 * 4 = change color 3624 * 4 = change color
3625 * 10 = change fg color
3626 * 11 = change bg color
2925 * 12 = change text color 3627 * 12 = change text color
2926 * 13 = change mouse foreground color 3628 * 13 = change mouse foreground color
2927 * 17 = change highlight character colour 3629 * 17 = change highlight character colour
2928 * 18 = change bold character color 3630 * 18 = change bold character color
2929 * 19 = change underlined character color 3631 * 19 = change underlined character color
2930 * 46 = change logfile (not implemented) 3632 * 46 = change logfile (not implemented)
2931 * 50 = change font 3633 * 50 = change font
2932 * 3634 *
2933 * rxvt extensions: 3635 * rxvt extensions:
2934 * 10 = menu (may change in future)
2935 * 20 = bg pixmap 3636 * 20 = bg pixmap
2936 * 39 = change default fg color 3637 * 39 = change default fg color
2937 * 49 = change default bg color 3638 * 49 = change default bg color
2938 * 55 = dump scrollback buffer and all of screen 3639 * 55 = dump scrollback buffer and all of screen
2939 * 701 = change locale 3640 * 701 = change locale
2940 * 702 = find font 3641 * 702 = find font
3642 * 703 = menu
2941 */ 3643 */
2942void 3644void
2943rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3645rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2944{ 3646{
2945 int changed = 0; 3647 int changed = 0;
2946 int color; 3648 int color;
2947 char *buf, *name; 3649 char *buf, *name;
3650 bool query = str[0] == '?' && !str[1];
3651 int saveop = op;
3652 dDisp;
2948 3653
2949 assert (str != NULL); 3654 assert (str != NULL);
2950 switch (op) 3655 switch (op)
2951 { 3656 {
2952 case XTerm_name: 3657 case XTerm_name:
2953 set_title (str); 3658 set_title (str);
2954 /* FALLTHROUGH */ 3659 /* FALLTHROUGH */
2955 case XTerm_iconName: 3660 case XTerm_iconName:
2956 set_iconName (str); 3661 set_icon_name (str);
2957 break; 3662 break;
2958 case XTerm_title: 3663 case XTerm_title:
2959 set_title (str); 3664 set_title (str);
2960 break; 3665 break;
3666 case XTerm_property:
3667 if (str[0] == '?')
3668 {
3669 Atom prop = display->atom (str + 1);
3670 Atom actual_type;
3671 int actual_format;
3672 unsigned long nitems;
3673 unsigned long bytes_after;
3674 unsigned char *value = 0;
3675 const char *str = "";
3676
3677 if (prop
3678 && XGetWindowProperty (disp, TermWin.parent[0],
3679 prop, 0, 1<<16, 0, AnyPropertyType,
3680 &actual_type, &actual_format,
3681 &nitems, &bytes_after, &value) == Success
3682 && actual_type != None
3683 && actual_format == 8)
3684 str = (const char *)(value);
3685
3686 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3687
3688 XFree (value);
3689 }
3690 else
3691 {
3692 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3693
3694 if (eq)
3695 {
3696 *eq = 0;
3697 set_utf8_property (display->atom (str), eq + 1);
3698 }
3699 else
3700 XDeleteProperty (disp, TermWin.parent[0],
3701 display->atom (str));
3702 }
3703 break;
3704
2961 case XTerm_Color: 3705 case XTerm_Color:
2962 for (buf = (char *)str; buf && *buf;) 3706 for (buf = (char *)str; buf && *buf;)
2963 { 3707 {
2964 if ((name = STRCHR (buf, ';')) == NULL) 3708 if ((name = strchr (buf, ';')) == NULL)
2965 break; 3709 break;
3710
2966 *name++ = '\0'; 3711 *name++ = '\0';
2967 color = atoi (buf); 3712 color = atoi (buf);
3713
2968 if (color < 0 || color >= TOTAL_COLORS) 3714 if (color < 0 || color >= TOTAL_COLORS)
2969 break; 3715 break;
3716
2970 if ((buf = STRCHR (name, ';')) != NULL) 3717 if ((buf = strchr (name, ';')) != NULL)
2971 *buf++ = '\0'; 3718 *buf++ = '\0';
3719
3720 if (name[0] == '?' && !name[1])
3721 {
3722 unsigned short r, g, b;
3723 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3724 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3725 }
3726 else
2972 set_window_color (color + minCOLOR, name); 3727 set_window_color (color + minCOLOR, name);
2973 } 3728 }
3729 break;
3730 case XTerm_Color00:
3731 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3732 break;
3733 case XTerm_Color01:
3734 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2974 break; 3735 break;
2975#ifndef NO_CURSORCOLOR 3736#ifndef NO_CURSORCOLOR
2976 case XTerm_Color_cursor: 3737 case XTerm_Color_cursor:
2977 set_window_color (Color_cursor, str); 3738 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
2978 break; 3739 break;
2979#endif 3740#endif
2980 case XTerm_Color_pointer: 3741 case XTerm_Color_pointer_fg:
2981 set_window_color (Color_pointer, str); 3742 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3743 break;
3744 case XTerm_Color_pointer_bg:
3745 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
2982 break; 3746 break;
2983#ifndef NO_BOLD_UNDERLINE_REVERSE 3747#ifndef NO_BOLD_UNDERLINE_REVERSE
2984 case XTerm_Color_BD: 3748 case XTerm_Color_BD:
2985 set_window_color (Color_BD, str); 3749 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3750 break;
3751 case XTerm_Color_IT:
3752 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
2986 break; 3753 break;
2987 case XTerm_Color_UL: 3754 case XTerm_Color_UL:
2988 set_window_color (Color_UL, str); 3755 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
2989 break; 3756 break;
2990 case XTerm_Color_RV: 3757 case XTerm_Color_RV:
2991 set_window_color (Color_RV, str); 3758 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
2992 break; 3759 break;
2993#endif 3760#endif
2994 3761#if TRANSPARENT && TINTING
2995 case XTerm_Menu: 3762 case XTerm_Color_tint:
2996 /* 3763 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
2997 * rxvt_menubar_dispatch () violates the constness of the string, 3764 check_our_parents ();
2998 * so DON'T do it here 3765 if (am_transparent)
2999 */ 3766 want_full_refresh = want_refresh = 1;
3000 break; 3767 break;
3768#endif
3769
3001 case XTerm_Pixmap: 3770 case XTerm_Pixmap:
3002 if (*str != ';') 3771 if (*str != ';')
3003 { 3772 {
3004#if XPM_BACKGROUND 3773#if XPM_BACKGROUND
3005 scale_pixmap (""); /* reset to default scaling */ 3774 scale_pixmap (""); /* reset to default scaling */
3006 set_bgPixmap (str); /* change pixmap */ 3775 set_bgPixmap (str); /* change pixmap */
3007#endif 3776#endif
3008 scr_touch (true); 3777 scr_touch (true);
3009 } 3778 }
3010 while ((str = STRCHR (str, ';')) != NULL) 3779 while ((str = strchr (str, ';')) != NULL)
3011 { 3780 {
3012 str++; 3781 str++;
3013#if XPM_BACKGROUND 3782#if XPM_BACKGROUND
3014 changed += scale_pixmap (str); 3783 changed += scale_pixmap (str);
3015#endif 3784#endif
3016
3017 } 3785 }
3786
3018 if (changed) 3787 if (changed)
3019 { 3788 {
3020#ifdef XPM_BACKGROUND 3789#ifdef XPM_BACKGROUND
3021 resize_pixmap (); 3790 resize_pixmap ();
3022#endif 3791#endif
… …
3028 set_window_color (Color_fg, str); 3797 set_window_color (Color_fg, str);
3029 break; 3798 break;
3030 case XTerm_restoreBG: 3799 case XTerm_restoreBG:
3031 set_window_color (Color_bg, str); 3800 set_window_color (Color_bg, str);
3032 break; 3801 break;
3802
3033 case XTerm_logfile: 3803 case XTerm_logfile:
3804 // TODO, when secure mode?
3034 break; 3805 break;
3806
3035 case XTerm_font: 3807 case XTerm_font:
3036 change_font (str); 3808 op = URxvt_font;
3809 case URxvt_font:
3810#if ENABLE_STYLES
3811 case URxvt_boldFont:
3812 case URxvt_italicFont:
3813 case URxvt_boldItalicFont:
3814#endif
3815 if (query)
3816 tt_printf ("\33]%d;%-.250s%c", saveop,
3817 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3818 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3819 resp);
3820 else
3821 {
3822 const char *&res = rs[Rs_font + (op - URxvt_font)];
3823
3824 res = strdup (str);
3825 allocated.push_back ((void *)res);
3826 set_fonts ();
3827 }
3037 break; 3828 break;
3038#ifndef NO_FRILLS 3829
3830#if ENABLE_FRILLS
3039 case XTerm_locale: 3831 case XTerm_locale:
3040 if (str[0] == '?' && !str[1]) 3832 if (query)
3041 tt_printf ("%-.250s\n", locale); 3833 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3042 else 3834 else
3043 { 3835 {
3044 set_locale (str); 3836 set_locale (str);
3837 pty.set_utf8_mode (enc_utf8);
3045# ifdef USE_XIM 3838# ifdef USE_XIM
3046 im_cb (); 3839 im_cb ();
3047# endif 3840# endif
3048 } 3841 }
3049 break; 3842 break;
3843#endif
3844
3845#ifdef MENUBAR
3050 case XTerm_findfont: 3846 case XTerm_Menu:
3051 { 3847 if (options & Opt_insecure)
3052 int fid = TermWin.fontset->find_font (atoi (str)); 3848 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; 3849 break;
3056#endif 3850#endif
3057#if 0 3851#if 0
3058 case XTerm_dumpscreen: /* no error notices */ 3852 case XTerm_dumpscreen: /* no error notices */
3059 { 3853 {
3060 int fd; 3854 int fd;
3061 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3855 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3062 { 3856 {
3063 scr_dump (fd); 3857 scr_dump (fd);
3064 close (fd); 3858 close (fd);
3065 } 3859 }
3066 } 3860 }
3067 break; 3861 break;
3068#endif 3862#endif
3069
3070 } 3863 }
3071} 3864}
3072/*----------------------------------------------------------------------*/ 3865/*----------------------------------------------------------------------*/
3073 3866
3074/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3867/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3082 * so no need for fancy checking 3875 * so no need for fancy checking
3083 */ 3876 */
3084int 3877int
3085rxvt_term::privcases (int mode, unsigned long bit) 3878rxvt_term::privcases (int mode, unsigned long bit)
3086{ 3879{
3087 int state; 3880 int state;
3088 3881
3089 if (mode == 's') 3882 if (mode == 's')
3090 { 3883 {
3091 SavedModes |= (PrivateModes & bit); 3884 SavedModes |= (priv_modes & bit);
3092 return -1; 3885 return -1;
3093 } 3886 }
3094 else 3887 else
3095 { 3888 {
3096 if (mode == 'r') 3889 if (mode == 'r')
3097 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3890 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3098 else 3891 else
3099 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3892 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3100 PrivMode (state, bit); 3893 PrivMode (state, bit);
3101 } 3894 }
3895
3102 return state; 3896 return state;
3103} 3897}
3104 3898
3105/* we're not using priv _yet_ */ 3899/* we're not using priv _yet_ */
3106void 3900void
3107rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3901rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3108{ 3902{
3109 unsigned int i, j; 3903 unsigned int i, j;
3110 int state; 3904 int state;
3905
3111 static const struct 3906 static const struct
3112 { 3907 {
3113 const int argval; 3908 const int argval;
3114 const unsigned long bit; 3909 const unsigned long bit;
3115 } 3910 }
3911
3116 argtopriv[] = { 3912 argtopriv[] = {
3117 { 1, PrivMode_aplCUR }, 3913 { 1, PrivMode_aplCUR },
3118 { 2, PrivMode_vt52 }, 3914 { 2, PrivMode_vt52 },
3119 { 3, PrivMode_132 }, 3915 { 3, PrivMode_132 },
3120 { 4, PrivMode_smoothScroll }, 3916 { 4, PrivMode_smoothScroll },
3121 { 5, PrivMode_rVideo }, 3917 { 5, PrivMode_rVideo },
3122 { 6, PrivMode_relOrigin }, 3918 { 6, PrivMode_relOrigin },
3123 { 7, PrivMode_Autowrap }, 3919 { 7, PrivMode_Autowrap },
3920 // 8, bi-directional support mode
3124 { 9, PrivMode_MouseX10 }, 3921 { 9, PrivMode_MouseX10 },
3125#ifdef menuBar_esc 3922#ifdef menuBar_esc
3126 { menuBar_esc, PrivMode_menuBar }, 3923 { menuBar_esc, PrivMode_menuBar },
3127#endif 3924#endif
3925 // 18, 19 printing-related
3926 { 25, PrivMode_VisibleCursor },
3128#ifdef scrollBar_esc 3927#ifdef scrollBar_esc
3129 { scrollBar_esc, PrivMode_scrollBar }, 3928 { scrollBar_esc, PrivMode_scrollBar },
3130#endif 3929#endif
3131 { 25, PrivMode_VisibleCursor },
3132 { 35, PrivMode_ShiftKeys }, 3930 { 35, PrivMode_ShiftKeys }, // rxvt extension
3133 { 40, PrivMode_132OK }, 3931 { 40, PrivMode_132OK },
3932 // 41 xterm more fixes NYI
3933 // 45 margin bell NYI
3934 // 46 start logging
3134 { 47, PrivMode_Screen }, 3935 { 47, PrivMode_Screen },
3135 { 66, PrivMode_aplKP }, 3936 { 66, PrivMode_aplKP },
3136#ifndef NO_BACKSPACE_KEY 3937#ifndef NO_BACKSPACE_KEY
3137 { 67, PrivMode_BackSpace }, 3938 { 67, PrivMode_BackSpace },
3138#endif 3939#endif
3139 { 1000, PrivMode_MouseX11 }, 3940 { 1000, PrivMode_MouseX11 },
3941 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3942 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3943 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3140 { 1010, PrivMode_TtyOutputInh }, 3944 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3141 { 1011, PrivMode_Keypress }, 3945 { 1011, PrivMode_Keypress }, // rxvt extension
3946 // 1035 enable modifiers for alt, numlock NYI
3947 // 1036 send ESC for meta keys NYI
3948 // 1037 send DEL for keypad delete NYI
3142 { 1047, PrivMode_Screen }, 3949 { 1047, PrivMode_Screen },
3950 // 1048 save and restore cursor
3143 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3951 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3952 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3144 }; 3953 };
3145 3954
3146 if (nargs == 0) 3955 if (nargs == 0)
3147 return; 3956 return;
3148 3957
… …
3163 state = privcases (mode, argtopriv[j].bit); 3972 state = privcases (mode, argtopriv[j].bit);
3164 break; 3973 break;
3165 } 3974 }
3166 3975
3167 /* extra handling for values with state unkept */ 3976 /* extra handling for values with state unkept */
3168 if (state == -1)
3169 switch (arg[i]) 3977 switch (arg[i])
3170 { 3978 {
3171 case 1048: /* alternative cursor save */ 3979 case 1048: /* alternative cursor save */
3980 case 1049:
3981 if (options & Opt_secondaryScreen)
3172 if (mode == 0) 3982 if (mode == 0)
3173 scr_cursor (RESTORE); 3983 scr_cursor (RESTORE);
3174 else if (mode == 1) 3984 else if (mode == 1)
3175 scr_cursor (SAVE); 3985 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; 3986 break;
3987 }
3988
3989 if (state >= 0)
3990 /* extra handling for values with valid 0 or 1 state */
3991 switch (arg[i])
3992 {
3993 /* case 1: - application cursor keys */
3994 case 2: /* VT52 mode */
3995 /* oddball mode. should be set regardless of set/reset
3996 * parameter. Return from VT52 mode with an ESC < from
3997 * within VT52 mode
3998 */
3999 PrivMode (1, PrivMode_vt52);
4000 break;
3192 case 3: /* 80/132 */ 4001 case 3: /* 80/132 */
3193 if (PrivateModes & PrivMode_132OK) 4002 if (priv_modes & PrivMode_132OK)
3194 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4003 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3195 break; 4004 break;
3196 case 4: /* smooth scrolling */ 4005 case 4: /* smooth scrolling */
3197 if (state) 4006 if (state)
3198 Options &= ~Opt_jumpScroll; 4007 options &= ~Opt_jumpScroll;
3199 else 4008 else
3200 Options |= Opt_jumpScroll; 4009 options |= Opt_jumpScroll;
3201 break; 4010 break;
3202 case 5: /* reverse video */ 4011 case 5: /* reverse video */
3203 scr_rvideo_mode (state); 4012 scr_rvideo_mode (state);
3204 break; 4013 break;
3205 case 6: /* relative/absolute origins */ 4014 case 6: /* relative/absolute origins */
3206 scr_relative_origin (state); 4015 scr_relative_origin (state);
3207 break; 4016 break;
3208 case 7: /* autowrap */ 4017 case 7: /* autowrap */
3209 scr_autowrap (state); 4018 scr_autowrap (state);
3210 break; 4019 break;
3211 /* case 8: - auto repeat, can't do on a per window basis */ 4020 /* case 8: - auto repeat, can't do on a per window basis */
3212 case 9: /* X10 mouse reporting */ 4021 case 9: /* X10 mouse reporting */
3213 if (state) /* orthogonal */ 4022 if (state) /* orthogonal */
3214 PrivateModes &= ~ (PrivMode_MouseX11); 4023 priv_modes &= ~PrivMode_MouseX11;
3215 break; 4024 break;
3216#ifdef menuBar_esc 4025#ifdef menuBar_esc
3217 case menuBar_esc: 4026 case menuBar_esc:
3218#ifdef MENUBAR 4027#ifdef MENUBAR
3219 map_menuBar (state); 4028 map_menuBar (state);
3220#endif 4029#endif
3221 break; 4030 break;
3222#endif 4031#endif
3223#ifdef scrollBar_esc 4032#ifdef scrollBar_esc
3224 case scrollBar_esc: 4033 case scrollBar_esc:
3225 if (scrollbar_mapping (state)) 4034 if (scrollbar_mapping (state))
3226 { 4035 {
3227 resize_all_windows (0, 0, 0); 4036 resize_all_windows (0, 0, 0);
3228 scr_touch (true); 4037 scr_touch (true);
3229 } 4038 }
3230 break; 4039 break;
3231#endif 4040#endif
3232 case 25: /* visible/invisible cursor */ 4041 case 25: /* visible/invisible cursor */
3233 scr_cursor_visible (state); 4042 scr_cursor_visible (state);
3234 break; 4043 break;
3235 /* case 35: - shift keys */ 4044 /* case 35: - shift keys */
3236 /* case 40: - 80 <--> 132 mode */ 4045 /* case 40: - 80 <--> 132 mode */
3237 case 47: /* secondary screen */ 4046 case 47: /* secondary screen */
3238 scr_change_screen (state); 4047 scr_change_screen (state);
3239 break; 4048 break;
3240 /* case 66: - application key pad */ 4049 /* case 66: - application key pad */
3241 /* case 67: - backspace key */ 4050 /* case 67: - backspace key */
3242 case 1000: /* X11 mouse reporting */ 4051 case 1000: /* X11 mouse reporting */
3243 if (state) /* orthogonal */ 4052 if (state) /* orthogonal */
3244 PrivateModes &= ~ (PrivMode_MouseX10); 4053 priv_modes &= ~PrivMode_MouseX10;
3245 break; 4054 break;
3246#if 0 4055#if 0
3247 case 1001: 4056 case 1001:
3248 break; /* X11 mouse highlighting */ 4057 break; /* X11 mouse highlighting */
3249#endif 4058#endif
3250 case 1010: /* scroll to bottom on TTY output inhibit */ 4059 case 1010: /* scroll to bottom on TTY output inhibit */
3251 if (state) 4060 if (state)
3252 Options &= ~Opt_scrollTtyOutput; 4061 options &= ~Opt_scrollTtyOutput;
3253 else 4062 else
3254 Options |= Opt_scrollTtyOutput; 4063 options |= Opt_scrollTtyOutput;
3255 break; 4064 break;
3256 case 1011: /* scroll to bottom on key press */ 4065 case 1011: /* scroll to bottom on key press */
3257 if (state) 4066 if (state)
3258 Options |= Opt_scrollTtyKeypress; 4067 options |= Opt_scrollTtyKeypress;
3259 else 4068 else
3260 Options &= ~Opt_scrollTtyKeypress; 4069 options &= ~Opt_scrollTtyKeypress;
3261 break; 4070 break;
3262 case 1047: /* secondary screen w/ clearing */ 4071 case 1047: /* secondary screen w/ clearing last */
3263 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4072 if (options & Opt_secondaryScreen)
3264 if (current_screen != PRIMARY) 4073 if (current_screen != PRIMARY)
3265 scr_erase_screen (2); 4074 scr_erase_screen (2);
3266 scr_change_screen (state); 4075 scr_change_screen (state);
3267 /* FALLTHROUGH */
3268 default:
3269 break; 4076 break;
4077 case 1049: /* secondary screen w/ clearing first */
4078 scr_change_screen (state);
4079 if (options & Opt_secondaryScreen)
4080 if (current_screen != PRIMARY)
4081 scr_erase_screen (2);
4082 break;
4083 default:
4084 break;
3270 } 4085 }
3271 } 4086 }
3272} 4087}
3273/*}}} */ 4088/*}}} */
3274 4089
3275/*{{{ process sgr sequences */ 4090/*{{{ process sgr sequences */
3276void 4091void
3277rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4092rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3278{ 4093{
3279 unsigned int i; 4094 unsigned int i;
3280 short rendset; 4095 short rendset;
3281 int rendstyle; 4096 int rendstyle;
3282 4097
3283 if (nargs == 0) 4098 if (nargs == 0)
3284 { 4099 {
3285 scr_rendition (0, ~RS_None); 4100 scr_rendition (0, ~RS_None);
3286 return; 4101 return;
3287 } 4102 }
4103
3288 for (i = 0; i < nargs; i++) 4104 for (i = 0; i < nargs; i++)
3289 { 4105 {
3290 rendset = -1; 4106 rendset = -1;
3291 switch (arg[i]) 4107 switch (arg[i])
3292 { 4108 {
… …
3294 rendset = 0, rendstyle = ~RS_None; 4110 rendset = 0, rendstyle = ~RS_None;
3295 break; 4111 break;
3296 case 1: 4112 case 1:
3297 rendset = 1, rendstyle = RS_Bold; 4113 rendset = 1, rendstyle = RS_Bold;
3298 break; 4114 break;
4115 //case 2: // low intensity
4116 case 3:
4117 rendset = 1, rendstyle = RS_Italic;
4118 break;
3299 case 4: 4119 case 4:
3300 rendset = 1, rendstyle = RS_Uline; 4120 rendset = 1, rendstyle = RS_Uline;
3301 break; 4121 break;
3302 case 5: 4122 case 5: // slowly blinking
4123 case 6: // rapidly blinking
3303 rendset = 1, rendstyle = RS_Blink; 4124 rendset = 1, rendstyle = RS_Blink;
3304 break; 4125 break;
4126 //case 6: // scoansi light background
3305 case 7: 4127 case 7:
3306 rendset = 1, rendstyle = RS_RVid; 4128 rendset = 1, rendstyle = RS_RVid;
3307 break; 4129 break;
3308 case 22: 4130 case 8:
4131 // invisible. NYI
4132 break;
4133 //case 9: // crossed out
4134 //case 10: // scoansi acs off, primary font
4135 //case 11: // scoansi acs on, first alt font
4136 //case 12: // scoansi acs on, |0x80, second alt font
4137 //...
4138 //case 19: // ninth alt font
4139 //case 20: // gothic
4140 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3309 rendset = 0, rendstyle = RS_Bold; 4141 rendset = 0, rendstyle = RS_Bold;
4142 break;
4143 case 22: // normal intensity
4144 rendset = 0, rendstyle = RS_Bold;
4145 break;
4146 case 23: // disable italic
4147 rendset = 0, rendstyle = RS_Italic;
3310 break; 4148 break;
3311 case 24: 4149 case 24:
3312 rendset = 0, rendstyle = RS_Uline; 4150 rendset = 0, rendstyle = RS_Uline;
3313 break; 4151 break;
3314 case 25: 4152 case 25:
3315 rendset = 0, rendstyle = RS_Blink; 4153 rendset = 0, rendstyle = RS_Blink;
3316 break; 4154 break;
4155 case 26: // variable spacing (iso 8613)
4156 rendset = 0, rendstyle = RS_Blink;
4157 break;
3317 case 27: 4158 case 27:
3318 rendset = 0, rendstyle = RS_RVid; 4159 rendset = 0, rendstyle = RS_RVid;
3319 break; 4160 break;
4161 //case 28: // visible. NYI
4162 //case 29: // not crossed-out
3320 } 4163 }
4164
3321 if (rendset != -1) 4165 if (rendset != -1)
3322 { 4166 {
3323 scr_rendition (rendset, rendstyle); 4167 scr_rendition (rendset, rendstyle);
3324 continue; /* for (;i;) */ 4168 continue; /* for (;i;) */
3325 } 4169 }
… …
3332 case 33: 4176 case 33:
3333 case 34: 4177 case 34:
3334 case 35: 4178 case 35:
3335 case 36: 4179 case 36:
3336 case 37: 4180 case 37:
3337 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4181 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3338 Color_fg);
3339 break; 4182 break;
3340#ifdef TTY_256COLOR 4183 case 38: // set fg color, ISO 8613-6
3341 case 38:
3342 if (nargs > i + 2 && arg[i + 1] == 5) 4184 if (nargs > i + 2 && arg[i + 1] == 5)
3343 { 4185 {
3344 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4186 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3345 Color_fg);
3346 i += 2; 4187 i += 2;
3347 } 4188 }
3348 break; 4189 break;
3349#endif
3350 case 39: /* default fg */ 4190 case 39: /* default fg */
3351 scr_color (Color_fg, Color_fg); 4191 scr_color (Color_fg, Color_fg);
3352 break; 4192 break;
3353 4193
3354 case 40: 4194 case 40:
… …
3357 case 43: 4197 case 43:
3358 case 44: 4198 case 44:
3359 case 45: 4199 case 45:
3360 case 46: 4200 case 46:
3361 case 47: 4201 case 47:
3362 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4202 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3363 Color_bg);
3364 break; 4203 break;
3365#ifdef TTY_256COLOR 4204 case 48: // set bg color, ISO 8613-6
3366 case 48:
3367 if (nargs > i + 2 && arg[i + 1] == 5) 4205 if (nargs > i + 2 && arg[i + 1] == 5)
3368 { 4206 {
3369 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4207 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3370 Color_bg);
3371 i += 2; 4208 i += 2;
3372 } 4209 }
3373 break; 4210 break;
3374#endif
3375 case 49: /* default bg */ 4211 case 49: /* default bg */
3376 scr_color (Color_bg, Color_bg); 4212 scr_color (Color_bg, Color_bg);
3377 break; 4213 break;
4214
4215 //case 50: // not variable spacing
3378 4216
3379#ifndef NO_BRIGHTCOLOR 4217#ifndef NO_BRIGHTCOLOR
3380 case 90: 4218 case 90:
3381 case 91: /* set bright fg color */ 4219 case 91: /* set bright fg color */
3382 case 92: 4220 case 92:
3383 case 93: 4221 case 93:
3384 case 94: 4222 case 94:
3385 case 95: 4223 case 95:
3386 case 96: 4224 case 96:
3387 case 97: 4225 case 97:
3388 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4226 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3389 Color_fg);
3390 break; 4227 break;
3391 case 100: 4228 case 100:
3392 case 101: /* set bright bg color */ 4229 case 101: /* set bright bg color */
3393 case 102: 4230 case 102:
3394 case 103: 4231 case 103:
3395 case 104: 4232 case 104:
3396 case 105: 4233 case 105:
3397 case 106: 4234 case 106:
3398 case 107: 4235 case 107:
3399 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4236 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3400 Color_bg);
3401 break; 4237 break;
3402#endif 4238#endif
3403 4239
3404 } 4240 }
3405 } 4241 }
3406} 4242}
3407/*}}} */ 4243/*}}} */
3408 4244
3409/*{{{ process Rob Nation's own graphics mode sequences */ 4245/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3410void 4246void
3411rxvt_term::process_graphics () 4247rxvt_term::process_graphics ()
3412{ 4248{
3413 unsigned char ch, cmd = cmd_getc (); 4249 unicode_t ch, cmd = cmd_getc ();
3414 4250
3415 if (cmd == 'Q') 4251 if (cmd == 'Q')
3416 { /* query graphics */ 4252 { /* query graphics */
3417 tt_printf ("\033G0\n"); /* no graphics */ 4253 tt_printf ("\033G0\012"); /* no graphics */
3418 return; 4254 return;
3419 } 4255 }
3420 /* swallow other graphics sequences until terminating ':' */ 4256 /* swallow other graphics sequences until terminating ':' */
3421 do 4257 do
3422 ch = cmd_getc (); 4258 ch = cmd_getc ();
… …
3437 unsigned char buf[256]; 4273 unsigned char buf[256];
3438 4274
3439 va_start (arg_ptr, fmt); 4275 va_start (arg_ptr, fmt);
3440 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4276 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3441 va_end (arg_ptr); 4277 va_end (arg_ptr);
3442 tt_write (buf, STRLEN (buf)); 4278 tt_write (buf, strlen (buf));
3443} 4279}
3444 4280
3445/* ---------------------------------------------------------------------- */ 4281/* ---------------------------------------------------------------------- */
3446/* Write data to the pty as typed by the user, pasted with the mouse, 4282/* 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. 4283 * or generated by us in response to a query ESC sequence.
3448 */ 4284 */
4285const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4286
3449void 4287void
3450rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4288rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3451{ 4289{
3452 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4290 if (v_buflen == 0)
4291 {
4292 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3453 4293
3454 if (len) 4294 if ((unsigned int)written == len)
4295 return;
4296
4297 data += written;
4298 len -= written;
3455 { 4299 }
4300
4301 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4302
4303 memcpy (v_buffer + v_buflen, data, len);
4304 v_buflen += len;
4305
4306 pty_ev.set (EVENT_READ | EVENT_WRITE);
4307}
4308
4309void rxvt_term::pty_write ()
4310{
4311 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4312
4313 if (written > 0)
4314 {
4315 v_buflen -= written;
4316
3456 if (v_buflen == 0) 4317 if (v_buflen == 0)
3457 { 4318 {
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); 4319 free (v_buffer);
3485 v_buffer = 0; 4320 v_buffer = 0;
3486 v_buflen = 0; 4321 v_buflen = 0;
3487 4322
3488 pty_ev.set (EVENT_READ); 4323 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; 4324 return;
3501 } 4325 }
4326
4327 memmove (v_buffer, v_buffer + written, v_buflen);
3502 } 4328 }
4329 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4330 // original code just ignores this...
4331 destroy ();
3503} 4332}
3504 4333
3505/*----------------------- end-of-file (C source) -----------------------*/ 4334/*----------------------- end-of-file (C source) -----------------------*/
3506 4335

Diff Legend

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