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.51 by pcg, Sun Feb 22 08:28:36 2004 UTC vs.
Revision 1.170 by root, Sun Nov 21 20:19:24 2004 UTC

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

Diff Legend

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