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.64 by pcg, Wed Mar 3 04:07:52 2004 UTC vs.
Revision 1.170 by root, Sun Nov 21 20:19:24 2004 UTC

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

Diff Legend

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