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.57 by pcg, Tue Feb 24 16:25:44 2004 UTC vs.
Revision 1.168 by root, Sun Sep 5 09:32:59 2004 UTC

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

Diff Legend

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