ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.64 by pcg, Wed Mar 3 04:07:52 2004 UTC vs.
Revision 1.192 by root, Fri Feb 4 11:41:23 2005 UTC

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

Diff Legend

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