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

Diff Legend

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