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.32 by pcg, Thu Jan 29 23:31:45 2004 UTC vs.
Revision 1.73 by pcg, Mon Mar 15 00:08:11 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.32 2004/01/29 23:31:45 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * 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>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
26 * - extensive modifications 25 * - extensive modifications
27 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
28 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
29 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
30 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
53#include <wchar.h> 53#include <wchar.h>
54 54
55/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
56 56
57/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
58/* INTPROTO */
59void 58void
60rxvt_lookup_key(pR_ XKeyEvent *ev) 59rxvt_term::lookup_key (XKeyEvent &ev)
61{ 60{
62 int ctrl, meta, shft, len; 61 int ctrl, meta, shft, len;
63 unsigned int newlen; 62 unsigned int newlen;
64 KeySym keysym; 63 KeySym keysym;
65#ifdef DEBUG_CMD 64#ifdef DEBUG_CMD
66 static int debug_key = 1; /* accessible by a debugger only */ 65 static int debug_key = 1; /* accessible by a debugger only */
67#endif 66#endif
68 int valid_keysym; 67 int valid_keysym;
69 unsigned char kbuf[KBUFSZ]; 68 unsigned char kbuf[KBUFSZ];
70 69
71/* 70 /*
72 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
73 * escape sequence to toggle the Keypad. 72 * escape sequence to toggle the Keypad.
74 * 73 *
75 * Always permit `shift' to override the current setting 74 * Always permit `shift' to override the current setting
76 */ 75 */
77 shft = (ev->state & ShiftMask); 76 shft = (ev.state & ShiftMask);
78 ctrl = (ev->state & ControlMask); 77 ctrl = (ev.state & ControlMask);
79 meta = (ev->state & R->ModMetaMask); 78 meta = (ev.state & ModMetaMask);
80 79
81 if (R->numlock_state || (ev->state & R->ModNumLockMask)) 80 if (numlock_state || (ev.state & ModNumLockMask))
82 { 81 {
83 R->numlock_state = (ev->state & R->ModNumLockMask); 82 numlock_state = (ev.state & ModNumLockMask);
84 PrivMode((!R->numlock_state), PrivMode_aplKP); 83 PrivMode ((!numlock_state), PrivMode_aplKP);
85 } 84 }
86 85
87 kbuf[0] = 0; 86 kbuf[0] = 0;
88 87
89#ifdef USE_XIM 88#ifdef USE_XIM
90 if (R->Input_Context) 89 if (Input_Context)
91 { 90 {
92 Status status_return; 91 Status status_return;
93 92
94#ifdef X_HAVE_UTF8_STRING 93#ifdef X_HAVE_UTF8_STRING
95 if (R->enc_utf8 && 0) 94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
96 len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf, 95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
97 KBUFSZ, &keysym, &status_return); 96 KBUFSZ, &keysym, &status_return);
98 else 97 else
99#endif 98#endif
100 { 99 {
101 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
102 101
103 // the XOpenIM manpage lies about hardcoding the locale 102 // the XOpenIM manpage lies about hardcoding the locale
104 // at the point of XOpenIM, so temporarily switch locales 103 // at the point of XOpenIM, so temporarily switch locales
105 if (R->rs[Rs_imLocale]) 104 if (rs[Rs_imLocale])
106 SET_LOCALE (R->rs[Rs_imLocale]); 105 SET_LOCALE (rs[Rs_imLocale]);
107 // assume wchar_t == unicode or better 106 // assume wchar_t == unicode or better
108 len = XwcLookupString (R->Input_Context, ev, wkbuf, 107 len = XwcLookupString (Input_Context, &ev, wkbuf,
109 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
110 if (R->rs[Rs_imLocale]) 109 if (rs[Rs_imLocale])
111 SET_LOCALE (R->locale); 110 SET_LOCALE (locale);
112 111
113 if (status_return == XLookupChars 112 if (status_return == XLookupChars
114 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
114 {
115 /* make sure the user can type ctrl-@, i.e. NUL */
116 if (len == 1 && *wkbuf == 0)
115 { 117 {
118 kbuf[0] = 0;
119 len = 1;
120 }
121 else
122 {
116 wkbuf[len] = 0; 123 wkbuf[len] = 0;
117 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 124 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
118 if (len < 0) 125 if (len < 0)
119 len = 0; 126 len = 0;
120 } 127 }
128 }
121 else 129 else
122 len = 0; 130 len = 0;
123 } 131 }
124 132
125 valid_keysym = status_return == XLookupKeySym 133 valid_keysym = status_return == XLookupKeySym
126 || status_return == XLookupBoth; 134 || status_return == XLookupBoth;
127 } 135 }
128 else 136 else
129#endif 137#endif
130 { 138 {
131 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose); 139 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
132 valid_keysym = !len; 140 valid_keysym = keysym != NoSymbol;
133 } 141 }
134 142
135 if (valid_keysym) 143 if (valid_keysym)
144 {
145 if (TermWin.saveLines)
136 { 146 {
137/* for some backwards compatibility */ 147#ifdef UNSHIFTED_SCROLLKEYS
138#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 148 if (!ctrl && !meta)
139# ifdef HOTKEY_CTRL 149 {
140 if (ctrl)
141# else 150#else
142 if (meta) 151 if (IS_SCROLL_MOD)
152 {
153#endif
154 int lnsppg;
155
156#ifdef PAGING_CONTEXT_LINES
157 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
158#else
159 lnsppg = TermWin.nrow * 4 / 5;
160#endif
161 if (keysym == XK_Prior)
162 {
163 scr_page (UP, lnsppg);
164 return;
165 }
166 else if (keysym == XK_Next)
167 {
168 scr_page (DN, lnsppg);
169 return;
170 }
171 }
172#ifdef SCROLL_ON_UPDOWN_KEYS
173 if (IS_SCROLL_MOD)
174 {
175 if (keysym == XK_Up)
176 {
177 scr_page (UP, 1);
178 return;
179 }
180 else if (keysym == XK_Down)
181 {
182 scr_page (DN, 1);
183 return;
184 }
185 }
186#endif
187#ifdef SCROLL_ON_HOMEEND_KEYS
188 if (IS_SCROLL_MOD)
189 {
190 if (keysym == XK_Home)
191 {
192 scr_move_to (0, 1);
193 return;
194 }
195 else if (keysym == XK_End)
196 {
197 scr_move_to (1, 0);
198 return;
199 }
200 }
201#endif
202 }
203
204 if (shft)
205 {
206 /* Shift + F1 - F10 generates F11 - F20 */
207 if (keysym >= XK_F1 && keysym <= XK_F10)
208 {
209 keysym += (XK_F11 - XK_F1);
210 shft = 0; /* turn off Shift */
211 }
212 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys))
213 {
214 switch (keysym)
215 {
216 /* normal XTerm key bindings */
217 case XK_Insert: /* Shift+Insert = paste mouse selection */
218 selection_request (ev.time, 0, 0);
219 return;
220 /* rxvt extras */
221 case XK_KP_Add: /* Shift+KP_Add = bigger font */
222 change_font (FONT_UP);
223 return;
224 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
225 change_font (FONT_DN);
226 return;
227 }
228 }
229 }
230#ifdef PRINTPIPE
231 if (keysym == XK_Print)
232 {
233 scr_printscreen (ctrl | shft);
234 return;
235 }
236#endif
237
238 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
239 {
240#ifdef KEYSYM_RESOURCE
241 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
242 {
243 unsigned int l;
244 const unsigned char *kbuf0;
245
246 kbuf0 = (Keysym_map[keysym & 0xFF]);
247 l = (unsigned int)*kbuf0++;
248
249 /* escape prefix */
250 if (meta
251# ifdef META8_OPTION
252 && meta_char == C0_ESC
143# endif 253# endif
144 { 254 )
145 if (keysym == R->ks_bigfont)
146 { 255 {
147 rxvt_change_font(aR_ 0, FONT_UP); 256 const unsigned char ch = C0_ESC;
148 return; 257 tt_write (&ch, 1);
149 } 258 }
150 else if (keysym == R->ks_smallfont) 259
260 tt_write (kbuf0, l);
261 return;
262 }
263 else
264#endif
265 {
266 newlen = 1;
267 switch (keysym)
151 { 268 {
152 rxvt_change_font(aR_ 0, FONT_DN);
153 return;
154 }
155 }
156#endif
157
158 if (R->TermWin.saveLines) {
159#ifdef UNSHIFTED_SCROLLKEYS
160 if (!ctrl && !meta) {
161#else
162 if (IS_SCROLL_MOD) {
163#endif
164 int lnsppg;
165
166#ifdef PAGING_CONTEXT_LINES
167 lnsppg = R->TermWin.nrow - PAGING_CONTEXT_LINES;
168#else
169 lnsppg = R->TermWin.nrow * 4 / 5;
170#endif
171 if (keysym == XK_Prior) {
172 rxvt_scr_page(aR_ UP, lnsppg);
173 return;
174 } else if (keysym == XK_Next) {
175 rxvt_scr_page(aR_ DN, lnsppg);
176 return;
177 }
178 }
179#ifdef SCROLL_ON_UPDOWN_KEYS
180 if (IS_SCROLL_MOD) {
181 if (keysym == XK_Up) {
182 rxvt_scr_page(aR_ UP, 1);
183 return;
184 } else if (keysym == XK_Down) {
185 rxvt_scr_page(aR_ DN, 1);
186 return;
187 }
188 }
189#endif
190#ifdef SCROLL_ON_HOMEEND_KEYS
191 if (IS_SCROLL_MOD) {
192 if (keysym == XK_Home) {
193 rxvt_scr_move_to(aR_ 0, 1);
194 return;
195 } else if (keysym == XK_End) {
196 rxvt_scr_move_to(aR_ 1, 0);
197 return;
198 }
199 }
200#endif
201 }
202
203 if (shft) {
204 /* Shift + F1 - F10 generates F11 - F20 */
205 if (keysym >= XK_F1 && keysym <= XK_F10) {
206 keysym += (XK_F11 - XK_F1);
207 shft = 0; /* turn off Shift */
208 } else if (!ctrl && !meta && (R->PrivateModes & PrivMode_ShiftKeys)) {
209 switch (keysym) {
210 /* normal XTerm key bindings */
211 case XK_Insert: /* Shift+Insert = paste mouse selection */
212 rxvt_selection_request(aR_ ev->time, 0, 0);
213 return;
214 /* rxvt extras */
215 case XK_KP_Add: /* Shift+KP_Add = bigger font */
216 rxvt_change_font(aR_ 0, FONT_UP);
217 return;
218 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
219 rxvt_change_font(aR_ 0, FONT_DN);
220 return;
221 }
222 }
223 }
224#ifdef PRINTPIPE
225 if (keysym == XK_Print) {
226 rxvt_scr_printscreen(aR_ ctrl | shft);
227 return;
228 }
229#endif
230#ifdef GREEK_SUPPORT
231 if (keysym == R->ks_greekmodeswith) {
232 R->greek_mode = !R->greek_mode;
233 if (R->greek_mode) {
234 rxvt_xterm_seq(aR_ XTerm_title,
235 (greek_getmode() == GREEK_ELOT928
236 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
237 greek_reset();
238 } else
239 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
240 return;
241 }
242#endif
243
244 if (keysym >= 0xFF00 && keysym <= 0xFFFF) {
245#ifdef KEYSYM_RESOURCE
246 if (!(shft | ctrl) && R->Keysym_map[keysym & 0xFF] != NULL) {
247 unsigned int l;
248 const unsigned char *kbuf0;
249 const unsigned char ch = C0_ESC;
250
251 kbuf0 = (R->Keysym_map[keysym & 0xFF]);
252 l = (unsigned int)*kbuf0++;
253
254 /* escape prefix */
255 if (meta)
256# ifdef META8_OPTION
257 if (R->meta_char == C0_ESC)
258# endif
259 R->tt_write (&ch, 1);
260 R->tt_write (kbuf0, l);
261 return;
262 } else
263#endif
264 {
265 newlen = 1;
266 switch (keysym) {
267#ifndef NO_BACKSPACE_KEY 269#ifndef NO_BACKSPACE_KEY
268 case XK_BackSpace: 270 case XK_BackSpace:
269 if (R->PrivateModes & PrivMode_HaveBackSpace) { 271 if (PrivateModes & PrivMode_HaveBackSpace)
272 {
270 kbuf[0] = (!!(R->PrivateModes & PrivMode_BackSpace) 273 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
271 ^ !!ctrl) ? '\b' : '\177'; 274 ^ !!ctrl) ? '\b' : '\177';
272 kbuf[1] = '\0'; 275 kbuf[1] = '\0';
273 } else 276 }
274 STRCPY(kbuf, R->key_backspace); 277 else
275# ifdef MULTICHAR_SET 278 STRCPY (kbuf, key_backspace);
276 if ((R->Options & Opt_mc_hack) && R->screen.cur.col > 0) { 279 break;
277 int col, row;
278
279 newlen = STRLEN(kbuf);
280 col = R->screen.cur.col - 1;
281 row = R->screen.cur.row + R->TermWin.saveLines;
282 if (IS_MULTI2(R->screen.rend[row][col]))
283 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
284 }
285# endif
286 break;
287#endif 280#endif
288#ifndef NO_DELETE_KEY 281#ifndef NO_DELETE_KEY
289 case XK_Delete: 282 case XK_Delete:
290 STRCPY(kbuf, R->key_delete); 283 STRCPY (kbuf, key_delete);
291# ifdef MULTICHAR_SET 284 break;
292 if (R->Options & Opt_mc_hack) {
293 int col, row;
294
295 newlen = STRLEN(kbuf);
296 col = R->screen.cur.col;
297 row = R->screen.cur.row + R->TermWin.saveLines;
298 if (IS_MULTI1(R->screen.rend[row][col]))
299 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
300 }
301# endif 285#endif
302 break; 286 case XK_Tab:
303#endif 287 if (shft)
304 case XK_Tab: 288 STRCPY (kbuf, "\033[Z");
305 if (shft) 289 else
306 STRCPY(kbuf, "\033[Z"); 290 {
307 else {
308#ifdef CTRL_TAB_MAKES_META 291#ifdef CTRL_TAB_MAKES_META
309 if (ctrl) 292 if (ctrl)
310 meta = 1; 293 meta = 1;
311#endif 294#endif
312#ifdef MOD4_TAB_MAKES_META 295#ifdef MOD4_TAB_MAKES_META
313 if (ev->state & Mod4Mask) 296 if (ev.state & Mod4Mask)
314 meta = 1; 297 meta = 1;
315#endif 298#endif
316 newlen = 0; 299 newlen = 0;
317 } 300 }
318 break; 301 break;
319
320 302
321#ifdef XK_KP_Left 303#ifdef XK_KP_Left
322 case XK_KP_Up: /* \033Ox or standard */ 304 case XK_KP_Up: /* \033Ox or standard */
323 case XK_KP_Down: /* \033Or or standard */ 305 case XK_KP_Down: /* \033Or or standard */
324 case XK_KP_Right: /* \033Ov or standard */ 306 case XK_KP_Right: /* \033Ov or standard */
325 case XK_KP_Left: /* \033Ot or standard */ 307 case XK_KP_Left: /* \033Ot or standard */
326 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 308 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
327 STRCPY(kbuf, "\033OZ"); 309 {
328 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 310 STRCPY (kbuf, "\033OZ");
329 break; 311 kbuf[2] = "txvr"[keysym - XK_KP_Left];
330 } else 312 break;
313 }
314 else
331 /* translate to std. cursor key */ 315 /* translate to std. cursor key */
332 keysym = XK_Left + (keysym - XK_KP_Left); 316 keysym = XK_Left + (keysym - XK_KP_Left);
333 /* FALLTHROUGH */ 317 /* FALLTHROUGH */
334#endif 318#endif
335 case XK_Up: /* "\033[A" */ 319 case XK_Up: /* "\033[A" */
336 case XK_Down: /* "\033[B" */ 320 case XK_Down: /* "\033[B" */
337 case XK_Right: /* "\033[C" */ 321 case XK_Right: /* "\033[C" */
338 case XK_Left: /* "\033[D" */ 322 case XK_Left: /* "\033[D" */
339 STRCPY(kbuf, "\033[Z"); 323 STRCPY (kbuf, "\033[Z");
340 kbuf[2] = ("DACB"[keysym - XK_Left]); 324 kbuf[2] = "DACB"[keysym - XK_Left];
341 /* do Shift first */ 325 /* do Shift first */
342 if (shft) 326 if (shft)
343 kbuf[2] = ("dacb"[keysym - XK_Left]); 327 kbuf[2] = "dacb"[keysym - XK_Left];
344 else if (ctrl) { 328 else if (ctrl)
345 kbuf[1] = 'O';
346 kbuf[2] = ("dacb"[keysym - XK_Left]);
347 } else if (R->PrivateModes & PrivMode_aplCUR)
348 kbuf[1] = 'O';
349#ifdef MULTICHAR_SET
350 //TODO: ?? 329 {
351 if (R->Options & Opt_mc_hack) { 330 kbuf[1] = 'O';
352 int col, row, m; 331 kbuf[2] = "dacb"[keysym - XK_Left];
353 332 }
354 col = R->screen.cur.col; 333 else if (PrivateModes & PrivMode_aplCUR)
355 row = R->screen.cur.row + R->TermWin.saveLines; 334 kbuf[1] = 'O';
356 m = 0; 335 break;
357 if (keysym == XK_Right
358 && IS_MULTI1(R->screen.rend[row][col]))
359 m = 1;
360 else if (keysym == XK_Left) {
361 if (col > 0) {
362 if (IS_MULTI2(R->screen.rend[row][col - 1]))
363 m = 1;
364 } else if (R->screen.cur.row > 0) {
365 col = R->screen.tlen[--row];
366 if (col == -1)
367 col = R->TermWin.ncol - 1;
368 else
369 col--;
370 if (col > 0
371 && IS_MULTI2(R->screen.rend[row][col]))
372 m = 1;
373 }
374 }
375 if (m)
376 MEMMOVE(kbuf + 3, kbuf, 3 + 1);
377 }
378#endif
379 break;
380 336
381#ifndef UNSHIFTED_SCROLLKEYS 337#ifndef UNSHIFTED_SCROLLKEYS
382# ifdef XK_KP_Prior 338# ifdef XK_KP_Prior
383 case XK_KP_Prior: 339 case XK_KP_Prior:
384 /* allow shift to override */ 340 /* allow shift to override */
385 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 341 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
386 STRCPY(kbuf, "\033Oy"); 342 {
387 break; 343 STRCPY (kbuf, "\033Oy");
388 } 344 break;
389 /* FALLTHROUGH */ 345 }
346 /* FALLTHROUGH */
390# endif 347# endif
391 case XK_Prior: 348 case XK_Prior:
392 STRCPY(kbuf, "\033[5~"); 349 STRCPY (kbuf, "\033[5~");
393 break; 350 break;
394# ifdef XK_KP_Next 351# ifdef XK_KP_Next
395 case XK_KP_Next: 352 case XK_KP_Next:
396 /* allow shift to override */ 353 /* allow shift to override */
397 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 354 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
398 STRCPY(kbuf, "\033Os"); 355 {
399 break; 356 STRCPY (kbuf, "\033Os");
400 } 357 break;
401 /* FALLTHROUGH */ 358 }
359 /* FALLTHROUGH */
402# endif 360# endif
403 case XK_Next: 361 case XK_Next:
404 STRCPY(kbuf, "\033[6~"); 362 STRCPY (kbuf, "\033[6~");
405 break; 363 break;
406#endif 364#endif
407 case XK_KP_Enter: 365 case XK_KP_Enter:
408 /* allow shift to override */ 366 /* allow shift to override */
409 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 367 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
410 STRCPY(kbuf, "\033OM"); 368 {
411 } else { 369 STRCPY (kbuf, "\033OM");
412 kbuf[0] = '\r'; 370 }
413 kbuf[1] = '\0'; 371 else
414 } 372 {
415 break; 373 kbuf[0] = '\r';
374 kbuf[1] = '\0';
375 }
376 break;
416 377
417#ifdef XK_KP_Begin 378#ifdef XK_KP_Begin
418 case XK_KP_Begin: 379 case XK_KP_Begin:
419 STRCPY(kbuf, "\033Ou"); 380 STRCPY (kbuf, "\033Ou");
420 break; 381 break;
421 382
422 case XK_KP_Insert: 383 case XK_KP_Insert:
423 STRCPY(kbuf, "\033Op"); 384 STRCPY (kbuf, "\033Op");
424 break; 385 break;
425 386
426 case XK_KP_Delete: 387 case XK_KP_Delete:
427 STRCPY(kbuf, "\033On"); 388 STRCPY (kbuf, "\033On");
428 break; 389 break;
429#endif 390#endif
430 case XK_KP_F1: /* "\033OP" */ 391 case XK_KP_F1: /* "\033OP" */
431 case XK_KP_F2: /* "\033OQ" */ 392 case XK_KP_F2: /* "\033OQ" */
432 case XK_KP_F3: /* "\033OR" */ 393 case XK_KP_F3: /* "\033OR" */
433 case XK_KP_F4: /* "\033OS" */ 394 case XK_KP_F4: /* "\033OS" */
434 STRCPY(kbuf, "\033OP"); 395 STRCPY (kbuf, "\033OP");
435 kbuf[2] += (keysym - XK_KP_F1); 396 kbuf[2] += (keysym - XK_KP_F1);
436 break; 397 break;
437 398
438 case XK_KP_Multiply: /* "\033Oj" : "*" */ 399 case XK_KP_Multiply: /* "\033Oj" : "*" */
439 case XK_KP_Add: /* "\033Ok" : "+" */ 400 case XK_KP_Add: /* "\033Ok" : "+" */
440 case XK_KP_Separator: /* "\033Ol" : "," */ 401 case XK_KP_Separator: /* "\033Ol" : "," */
441 case XK_KP_Subtract: /* "\033Om" : "-" */ 402 case XK_KP_Subtract: /* "\033Om" : "-" */
442 case XK_KP_Decimal: /* "\033On" : "." */ 403 case XK_KP_Decimal: /* "\033On" : "." */
443 case XK_KP_Divide: /* "\033Oo" : "/" */ 404 case XK_KP_Divide: /* "\033Oo" : "/" */
444 case XK_KP_0: /* "\033Op" : "0" */ 405 case XK_KP_0: /* "\033Op" : "0" */
445 case XK_KP_1: /* "\033Oq" : "1" */ 406 case XK_KP_1: /* "\033Oq" : "1" */
446 case XK_KP_2: /* "\033Or" : "2" */ 407 case XK_KP_2: /* "\033Or" : "2" */
447 case XK_KP_3: /* "\033Os" : "3" */ 408 case XK_KP_3: /* "\033Os" : "3" */
448 case XK_KP_4: /* "\033Ot" : "4" */ 409 case XK_KP_4: /* "\033Ot" : "4" */
449 case XK_KP_5: /* "\033Ou" : "5" */ 410 case XK_KP_5: /* "\033Ou" : "5" */
450 case XK_KP_6: /* "\033Ov" : "6" */ 411 case XK_KP_6: /* "\033Ov" : "6" */
451 case XK_KP_7: /* "\033Ow" : "7" */ 412 case XK_KP_7: /* "\033Ow" : "7" */
452 case XK_KP_8: /* "\033Ox" : "8" */ 413 case XK_KP_8: /* "\033Ox" : "8" */
453 case XK_KP_9: /* "\033Oy" : "9" */ 414 case XK_KP_9: /* "\033Oy" : "9" */
454 /* allow shift to override */ 415 /* allow shift to override */
455 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 416 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
456 STRCPY(kbuf, "\033Oj"); 417 {
457 kbuf[2] += (keysym - XK_KP_Multiply); 418 STRCPY (kbuf, "\033Oj");
458 } else { 419 kbuf[2] += (keysym - XK_KP_Multiply);
420 }
421 else
422 {
459 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 423 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
460 kbuf[1] = '\0'; 424 kbuf[1] = '\0';
461 } 425 }
462 break; 426 break;
463 427
464 case XK_Find: 428 case XK_Find:
465 STRCPY(kbuf, "\033[1~"); 429 STRCPY (kbuf, "\033[1~");
466 break; 430 break;
467 case XK_Insert: 431 case XK_Insert:
468 STRCPY(kbuf, "\033[2~"); 432 STRCPY (kbuf, "\033[2~");
469 break; 433 break;
470#ifdef DXK_Remove /* support for DEC remove like key */ 434#ifdef DXK_Remove /* support for DEC remove like key */
471 case DXK_Remove: 435 case DXK_Remove:
472 /* FALLTHROUGH */ 436 /* FALLTHROUGH */
473#endif 437#endif
474 case XK_Execute: 438 case XK_Execute:
475 STRCPY(kbuf, "\033[3~"); 439 STRCPY (kbuf, "\033[3~");
476 break; 440 break;
477 case XK_Select: 441 case XK_Select:
478 STRCPY(kbuf, "\033[4~"); 442 STRCPY (kbuf, "\033[4~");
479 break; 443 break;
480#ifdef XK_KP_End 444#ifdef XK_KP_End
481 case XK_KP_End: 445 case XK_KP_End:
482 /* allow shift to override */ 446 /* allow shift to override */
483 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 447 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
484 STRCPY(kbuf, "\033Oq"); 448 {
485 break; 449 STRCPY (kbuf, "\033Oq");
486 } 450 break;
487 /* FALLTHROUGH */ 451 }
452 /* FALLTHROUGH */
488#endif 453#endif
489 case XK_End: 454 case XK_End:
490 STRCPY(kbuf, KS_END); 455 STRCPY (kbuf, KS_END);
491 break; 456 break;
492#ifdef XK_KP_Home 457#ifdef XK_KP_Home
493 case XK_KP_Home: 458 case XK_KP_Home:
494 /* allow shift to override */ 459 /* allow shift to override */
495 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 460 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
496 STRCPY(kbuf, "\033Ow"); 461 {
497 break; 462 STRCPY (kbuf, "\033Ow");
498 } 463 break;
499 /* FALLTHROUGH */ 464 }
465 /* FALLTHROUGH */
500#endif 466#endif
501 case XK_Home: 467 case XK_Home:
502 STRCPY(kbuf, KS_HOME); 468 STRCPY (kbuf, KS_HOME);
503 break; 469 break;
504 470
505#define FKEY(n, fkey) \ 471#define FKEY(n, fkey) \
506 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 472 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
507 473
508 case XK_F1: /* "\033[11~" */ 474 case XK_F1: /* "\033[11~" */
509 case XK_F2: /* "\033[12~" */ 475 case XK_F2: /* "\033[12~" */
510 case XK_F3: /* "\033[13~" */ 476 case XK_F3: /* "\033[13~" */
511 case XK_F4: /* "\033[14~" */ 477 case XK_F4: /* "\033[14~" */
512 case XK_F5: /* "\033[15~" */ 478 case XK_F5: /* "\033[15~" */
513 FKEY(11, XK_F1); 479 FKEY (11, XK_F1);
514 break; 480 break;
515 case XK_F6: /* "\033[17~" */ 481 case XK_F6: /* "\033[17~" */
516 case XK_F7: /* "\033[18~" */ 482 case XK_F7: /* "\033[18~" */
517 case XK_F8: /* "\033[19~" */ 483 case XK_F8: /* "\033[19~" */
518 case XK_F9: /* "\033[20~" */ 484 case XK_F9: /* "\033[20~" */
519 case XK_F10: /* "\033[21~" */ 485 case XK_F10: /* "\033[21~" */
520 FKEY(17, XK_F6); 486 FKEY (17, XK_F6);
521 break; 487 break;
522 case XK_F11: /* "\033[23~" */ 488 case XK_F11: /* "\033[23~" */
523 case XK_F12: /* "\033[24~" */ 489 case XK_F12: /* "\033[24~" */
524 case XK_F13: /* "\033[25~" */ 490 case XK_F13: /* "\033[25~" */
525 case XK_F14: /* "\033[26~" */ 491 case XK_F14: /* "\033[26~" */
526 FKEY(23, XK_F11); 492 FKEY (23, XK_F11);
527 break; 493 break;
528 case XK_F15: /* "\033[28~" */ 494 case XK_F15: /* "\033[28~" */
529 case XK_F16: /* "\033[29~" */ 495 case XK_F16: /* "\033[29~" */
530 FKEY(28, XK_F15); 496 FKEY (28, XK_F15);
531 break; 497 break;
532 case XK_Help: /* "\033[28~" */ 498 case XK_Help: /* "\033[28~" */
533 FKEY(28, XK_Help); 499 FKEY (28, XK_Help);
534 break; 500 break;
535 case XK_Menu: /* "\033[29~" */ 501 case XK_Menu: /* "\033[29~" */
536 FKEY(29, XK_Menu); 502 FKEY (29, XK_Menu);
537 break; 503 break;
538 case XK_F17: /* "\033[31~" */ 504 case XK_F17: /* "\033[31~" */
539 case XK_F18: /* "\033[32~" */ 505 case XK_F18: /* "\033[32~" */
540 case XK_F19: /* "\033[33~" */ 506 case XK_F19: /* "\033[33~" */
541 case XK_F20: /* "\033[34~" */ 507 case XK_F20: /* "\033[34~" */
542 case XK_F21: /* "\033[35~" */ 508 case XK_F21: /* "\033[35~" */
543 case XK_F22: /* "\033[36~" */ 509 case XK_F22: /* "\033[36~" */
544 case XK_F23: /* "\033[37~" */ 510 case XK_F23: /* "\033[37~" */
545 case XK_F24: /* "\033[38~" */ 511 case XK_F24: /* "\033[38~" */
546 case XK_F25: /* "\033[39~" */ 512 case XK_F25: /* "\033[39~" */
547 case XK_F26: /* "\033[40~" */ 513 case XK_F26: /* "\033[40~" */
548 case XK_F27: /* "\033[41~" */ 514 case XK_F27: /* "\033[41~" */
549 case XK_F28: /* "\033[42~" */ 515 case XK_F28: /* "\033[42~" */
550 case XK_F29: /* "\033[43~" */ 516 case XK_F29: /* "\033[43~" */
551 case XK_F30: /* "\033[44~" */ 517 case XK_F30: /* "\033[44~" */
552 case XK_F31: /* "\033[45~" */ 518 case XK_F31: /* "\033[45~" */
553 case XK_F32: /* "\033[46~" */ 519 case XK_F32: /* "\033[46~" */
554 case XK_F33: /* "\033[47~" */ 520 case XK_F33: /* "\033[47~" */
555 case XK_F34: /* "\033[48~" */ 521 case XK_F34: /* "\033[48~" */
556 case XK_F35: /* "\033[49~" */ 522 case XK_F35: /* "\033[49~" */
557 FKEY(31, XK_F17); 523 FKEY (31, XK_F17);
558 break; 524 break;
559#undef FKEY 525#undef FKEY
560 default: 526 default:
561 newlen = 0; 527 newlen = 0;
562 break; 528 break;
563 } 529 }
564 if (newlen) 530 if (newlen)
565 len = STRLEN(kbuf); 531 len = STRLEN (kbuf);
566 } 532 }
567 /* 533
534 /*
568 * Pass meta for all function keys, if 'meta' option set 535 * Pass meta for all function keys, if 'meta' option set
569 */ 536 */
570#ifdef META8_OPTION 537#ifdef META8_OPTION
571 if (meta && (R->meta_char == 0x80) && len > 0) 538 if (meta && (meta_char == 0x80) && len > 0)
572 kbuf[len - 1] |= 0x80; 539 kbuf[len - 1] |= 0x80;
573#endif 540#endif
541
542 }
574 } else if (ctrl && keysym == XK_minus) { 543 else if (ctrl && keysym == XK_minus)
544 {
575 len = 1; 545 len = 1;
576 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 546 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
577 } else { 547 }
548 else
549 {
578#ifdef META8_OPTION 550#ifdef META8_OPTION
579 /* set 8-bit on */ 551 /* set 8-bit on */
580 if (meta && (R->meta_char == 0x80)) { 552 if (meta && (meta_char == 0x80))
581 unsigned char *ch; 553 {
554 unsigned char *ch;
582 555
583 for (ch = kbuf; ch < kbuf + len; ch++) 556 for (ch = kbuf; ch < kbuf + len; ch++)
584 *ch |= 0x80; 557 *ch |= 0x80;
585 meta = 0; 558
559 meta = 0;
560 }
561#endif
562 /* nil */ ;
563 }
586 } 564 }
587#endif 565
588#ifdef GREEK_SUPPORT 566 if (len <= 0)
589 if (R->greek_mode) 567 return; /* not mapped */
590 len = greek_xlat(kbuf, len); 568
591#endif 569 if (Options & Opt_scrollTtyKeypress)
592 /* nil */ ; 570 if (TermWin.view_start)
593 } 571 {
572 TermWin.view_start = 0;
573 want_refresh = 1;
594 } 574 }
595 575
596 if (len <= 0) 576 /*
597 return; /* not mapped */
598
599 if (R->Options & Opt_scrollTtyKeypress)
600 if (R->TermWin.view_start) {
601 R->TermWin.view_start = 0;
602 R->want_refresh = 1;
603 }
604
605/*
606 * these modifications only affect the static keybuffer 577 * these modifications only affect the static keybuffer
607 * pass Shift/Control indicators for function keys ending with `~' 578 * pass Shift/Control indicators for function keys ending with `~'
608 * 579 *
609 * eg, 580 * eg,
610 * Prior = "ESC[5~" 581 * Prior = "ESC[5~"
611 * Shift+Prior = "ESC[5$" 582 * Shift+Prior = "ESC[5$"
612 * Ctrl+Prior = "ESC[5^" 583 * Ctrl+Prior = "ESC[5^"
613 * Ctrl+Shift+Prior = "ESC[5@" 584 * Ctrl+Shift+Prior = "ESC[5@"
614 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 585 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
615 */ 586 */
616 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~') 587 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
617 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 588 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
618 589
619/* escape prefix */ 590 /* escape prefix */
620 if (meta 591 if (meta
621#ifdef META8_OPTION 592#ifdef META8_OPTION
622 && (R->meta_char == C0_ESC) 593 && meta_char == C0_ESC
623#endif 594#endif
624 ) { 595 )
596 {
625 const unsigned char ch = C0_ESC; 597 const unsigned char ch = C0_ESC;
626
627 R->tt_write(&ch, 1); 598 tt_write (&ch, 1);
628 } 599 }
600
629#ifdef DEBUG_CMD 601#if defined(DEBUG_CMD)
630 if (debug_key) { /* Display keyboard buffer contents */ 602 /* Display keyboard buffer contents */
631 char *p; 603 unsigned char *p;
632 int i; 604 int i;
633 605
634 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 606 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
635 for (i = 0, p = kbuf; i < len; i++, p++) 607 for (i = 0, p = kbuf; i < len; i++, p++)
636 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 608 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
637 fprintf(stderr, "'\n"); 609 fprintf (stderr, "'\n");
638 }
639#endif /* DEBUG_CMD */ 610#endif /* DEBUG_CMD */
640 R->tt_write (kbuf, (unsigned int)len); 611 tt_write (kbuf, (unsigned int)len);
641} 612}
642/*}}} */ 613/*}}} */
643 614
644#if (MENUBAR_MAX) 615#if (MENUBAR_MAX)
645/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 616/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
646/* attempt to `write' count to the input buffer */ 617/* attempt to `write' count to the input buffer */
647/* EXTPROTO */
648unsigned int 618unsigned int
649rxvt_cmd_write(pR_ const unsigned char *str, unsigned int count) 619rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
650{ 620{
651 unsigned int n, s; 621 unsigned int n, s;
652 unsigned char *cmdbuf_base = R->cmdbuf_base,
653 *cmdbuf_endp = R->cmdbuf_endp,
654 *cmdbuf_ptr = R->cmdbuf_ptr;
655 622
656 n = cmdbuf_ptr - cmdbuf_base; 623 n = cmdbuf_ptr - cmdbuf_base;
657 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 624 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
625
658 if (n > 0 && s < count) { 626 if (n > 0 && s < count)
627 {
659 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 628 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
660 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 629 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
661 cmdbuf_ptr = cmdbuf_base; 630 cmdbuf_ptr = cmdbuf_base;
662 cmdbuf_endp -= n; 631 cmdbuf_endp -= n;
663 s += n; 632 s += n;
664 } 633 }
634
665 if (count > s) { 635 if (count > s)
636 {
666 rxvt_print_error("data loss: cmd_write too large"); 637 rxvt_print_error ("data loss: cmd_write too large");
667 count = s; 638 count = s;
668 } 639 }
640
669 for (; count--;) 641 for (; count--;)
670 *cmdbuf_endp++ = *str++; 642 *cmdbuf_endp++ = *str++;
671 R->cmdbuf_ptr = cmdbuf_ptr; 643
672 R->cmdbuf_endp = cmdbuf_endp; 644 cmd_parse ();
645
673 return 0; 646 return 0;
674} 647}
675#endif /* MENUBAR_MAX */ 648#endif /* MENUBAR_MAX */
676 649
677void 650void
678rxvt_term::flush () 651rxvt_term::flush ()
… …
688#endif 661#endif
689 662
690 if (want_refresh) 663 if (want_refresh)
691 { 664 {
692 scr_refresh (refresh_type); 665 scr_refresh (refresh_type);
693 rxvt_scrollbar_show (this, 1); 666 scrollbar_show (1);
694#ifdef USE_XIM 667#ifdef USE_XIM
695 rxvt_IMSendSpot (this); 668 IMSendSpot ();
696#endif 669#endif
697 }
698 670
699 XFlush (Xdisplay); 671 }
672
673 display->flush ();
700} 674}
701 675
702void 676void
703rxvt_term::check_cb (check_watcher &w) 677rxvt_term::check_cb (check_watcher &w)
704{ 678{
705 SET_R (this); 679 SET_R (this);
706 SET_LOCALE (locale); 680 SET_LOCALE (locale);
707 681
708 flush (); 682 flush ();
709}
710
711void
712rxvt_term::process_x_events ()
713{
714 do
715 {
716 XEvent xev;
717
718 XNextEvent (Xdisplay, &xev);
719
720#if defined(CURSOR_BLINK)
721 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
722 {
723 if (hidden_cursor)
724 {
725 hidden_cursor = 0;
726 want_refresh = 1;
727 }
728
729 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
730 }
731#endif
732
733#if defined(POINTER_BLANK)
734 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
735 {
736 if (xev.type == MotionNotify
737 || xev.type == ButtonPress
738 || xev.type == ButtonRelease)
739 if (hidden_pointer)
740 pointer_unblank ();
741
742 if (xev.type == KeyPress && hidden_pointer == 0)
743 pointer_blank ();
744 }
745#endif
746
747#ifdef USE_XIM
748 if (!XFilterEvent (&xev, xev.xany.window))
749#endif
750 rxvt_process_x_event (this, &xev);
751 }
752 while (XPending (Xdisplay));
753} 683}
754 684
755#ifdef CURSOR_BLINK 685#ifdef CURSOR_BLINK
756void 686void
757rxvt_term::cursor_blink_cb (time_watcher &w) 687rxvt_term::cursor_blink_cb (time_watcher &w)
… …
774 w.start (w.at + TEXT_BLINK_INTERVAL); 704 w.start (w.at + TEXT_BLINK_INTERVAL);
775 } 705 }
776} 706}
777#endif 707#endif
778 708
779void
780rxvt_term::x_cb (io_watcher &w, short revents)
781{
782 SET_R (this);
783 SET_LOCALE (locale);
784
785 process_x_events ();
786}
787
788bool 709bool
789rxvt_term::pty_fill () 710rxvt_term::pty_fill ()
790{ 711{
791 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 712 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
792 713
793 memmove (cmdbuf_base, cmdbuf_ptr, n); 714 memmove (cmdbuf_base, cmdbuf_ptr, n);
794 cmdbuf_ptr = cmdbuf_base; 715 cmdbuf_ptr = cmdbuf_base;
795 cmdbuf_endp = cmdbuf_ptr + n; 716 cmdbuf_endp = cmdbuf_ptr + n;
796 717
797 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 718 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
798 719
799 if (n > 0) 720 if (n > 0)
800 { 721 {
801 cmdbuf_endp += n; 722 cmdbuf_endp += n;
802 return true; 723 return true;
803 } 724 }
804 else if (n < 0 && errno != EAGAIN) 725 else if (n < 0 && errno != EAGAIN)
805 destroy (); 726 destroy ();
806 727
807 return false; 728 return false;
808} 729}
809 730
810void 731void
811rxvt_term::pty_cb (io_watcher &w, short revents) 732rxvt_term::pty_cb (io_watcher &w, short revents)
… …
828 seen_input = 1; 749 seen_input = 1;
829 /* once we know the shell is running, send the screen size. Again! */ 750 /* once we know the shell is running, send the screen size. Again! */
830 tt_winch (); 751 tt_winch ();
831 } 752 }
832 753
833 uint32_t ch = NOCHAR; 754 if (cmd_parse ())
755 break;
756 }
757 }
758}
759
760bool
761rxvt_term::cmd_parse ()
762{
763 bool flag = false;
764 unicode_t ch = NOCHAR;
765
766 for (;;)
767 {
768 if (ch == NOCHAR)
769 ch = next_char ();
770
771 if (ch == NOCHAR) // TODO: improve
772 break;
773
774 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
775 {
776 /* Read a text string from the input buffer */
777 unicode_t buf[BUFSIZ];
778 bool refreshnow = false;
779 int nlines = 0;
780 unicode_t *str = buf;
781
782 *str++ = ch;
834 783
835 for (;;) 784 for (;;)
836 { 785 {
837 if (ch == NOCHAR)
838 ch = next_char (); 786 ch = next_char ();
839 787
840 if (ch == NOCHAR) // TODO: improve 788 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
841 break; 789 break;
842 790 else
843 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
844 { 791 {
845 /* Read a text string from the input buffer */
846 uint32_t buf[BUFSIZ];
847 bool refreshnow = false;
848 int nlines = 0;
849 uint32_t *str = buf;
850
851 *str++ = ch; 792 *str++ = ch;
852 793
853 for (;;) 794 if (ch == '\n')
854 { 795 {
855 ch = next_char ();
856
857 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
858 break;
859 else 796 nlines++;
797 refresh_count++;
798
799 if (! (Options & Opt_jumpScroll)
800 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
860 { 801 {
861 *str++ = ch;
862
863 if (ch == '\n')
864 {
865 nlines++;
866 refresh_count++;
867
868 if (!(Options & Opt_jumpScroll)
869 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
870 {
871 refreshnow = true; 802 refreshnow = true;
872 flag = false; 803 flag = false;
873 ch = NOCHAR;
874 break;
875 }
876 }
877
878 if (str >= buf + BUFSIZ)
879 {
880 ch = NOCHAR; 804 ch = NOCHAR;
881 break; 805 break;
882 } 806 }
807
808 // scr_add_lines only works for nlines < TermWin.nrow - 1.
809 if (nlines >= TermWin.nrow - 1)
810 {
811 scr_add_lines (buf, nlines, str - buf);
812 nlines = 0;
813 str = buf;
883 } 814 }
884 } 815 }
885 816
886 rxvt_scr_add_lines (this, buf, nlines, str - buf); 817 if (str >= buf + BUFSIZ)
887
888 /*
889 * If there have been a lot of new lines, then update the screen
890 * What the heck I'll cheat and only refresh less than every page-full.
891 * the number of pages between refreshes is refresh_limit, which
892 * is incremented here because we must be doing flat-out scrolling.
893 *
894 * refreshing should be correct for small scrolls, because of the
895 * time-out
896 */
897 if (refreshnow)
898 { 818 {
899 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 819 ch = NOCHAR;
900 refresh_limit++; 820 break;
901
902 scr_refresh (refresh_type);
903 } 821 }
904
905 }
906 else
907 {
908 switch (ch)
909 {
910 default:
911 rxvt_process_nonprinting (this, ch);
912 break;
913 case C0_ESC: /* escape char */
914 rxvt_process_escape_seq (this);
915 break;
916 /*case 0x9b: */ /* CSI */
917 /* rxvt_process_csi_seq (this); */
918 }
919
920 ch = NOCHAR;
921 } 822 }
922 } 823 }
824
825 scr_add_lines (buf, nlines, str - buf);
826
827 /*
828 * If there have been a lot of new lines, then update the screen
829 * What the heck I'll cheat and only refresh less than every page-full.
830 * the number of pages between refreshes is refresh_limit, which
831 * is incremented here because we must be doing flat-out scrolling.
832 *
833 * refreshing should be correct for small scrolls, because of the
834 * time-out
835 */
836 if (refreshnow)
837 {
838 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
839 refresh_limit++;
840
841 scr_refresh (refresh_type);
842 }
843
844 }
845 else
923 } 846 {
847 switch (ch)
848 {
849 default:
850 process_nonprinting (ch);
851 break;
852 case C0_ESC: /* escape char */
853 process_escape_seq ();
854 break;
855 /*case 0x9b: */ /* CSI */
856 /* process_csi_seq (); */
857 }
858
859 ch = NOCHAR;
860 }
924 } 861 }
862
863 return flag;
925} 864}
926 865
927// read the next character, currently handles UTF-8 866// read the next character, currently handles UTF-8
928// will probably handle all sorts of other stuff in the future 867// will probably handle all sorts of other stuff in the future
929uint32_t 868unicode_t
930rxvt_term::next_char () 869rxvt_term::next_char ()
931{ 870{
932 while (cmdbuf_ptr < cmdbuf_endp) 871 while (cmdbuf_ptr < cmdbuf_endp)
933 { 872 {
934 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 873 // assume 0x20 .. 0x7f to be ascii ALWAYS (all shift-states etc.) uh-oh
874 if ((*cmdbuf_ptr <= 0x7f && 0x20 <= *cmdbuf_ptr)
875 || !*cmdbuf_ptr)
935 return *cmdbuf_ptr++; 876 return *cmdbuf_ptr++;
936 877
937 wchar_t wc; 878 wchar_t wc;
938 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 879 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
939 880
940 if (len == (size_t)-2) 881 if (len == (size_t)-2)
941 return NOCHAR; 882 {
883 // the mbstate stores incomplete sequences. didn't know this :/
884 cmdbuf_ptr = cmdbuf_endp;
885 break;
886 }
942 887
943 if (len == (size_t)-1) 888 if (len == (size_t)-1)
944 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 889 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
945 890
946 // assume wchar == unicode 891 // assume wchar == unicode
… …
949 } 894 }
950 895
951 return NOCHAR; 896 return NOCHAR;
952} 897}
953 898
954/* rxvt_cmd_getc() - Return next input character */ 899/* rxvt_cmd_getc () - Return next input character */
955/* 900/*
956 * Return the next input character after first passing any keyboard input 901 * Return the next input character after first passing any keyboard input
957 * to the command. 902 * to the command.
958 */ 903 */
959/* INTPROTO */ 904unicode_t
960uint32_t
961rxvt_cmd_getc(pR) 905rxvt_term::cmd_getc ()
962{ 906{
963 for (;;) 907 for (;;)
964 { 908 {
965 uint32_t c = R->next_char (); 909 unicode_t c = next_char ();
966 if (c != NOCHAR) 910 if (c != NOCHAR)
967 return c; 911 return c;
968 912
969 // incomplete sequences should occur rarely, still, a better solution 913 // incomplete sequences should occur rarely, still, a better solution
970 // would be preferred. either setjmp/longjmp or better design. 914 // would be preferred. either setjmp/longjmp or better design.
971 fcntl (R->cmd_fd, F_SETFL, 0); 915 fcntl (cmd_fd, F_SETFL, 0);
972 R->pty_fill (); 916 pty_fill ();
973 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 917 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
974 }
975
976#if 0
977#define TIMEOUT_USEC 5000
978 fd_set readfds;
979 int quick_timeout, select_res;
980 int want_motion_time, want_keypress_time;
981 struct timeval value;
982#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
983 struct timeval tp;
984#endif
985
986 for (;;) {
987 /* loop until we can return something */
988
989 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
990 R->tt_write(NULL, 0);
991
992#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
993 if (R->mouse_slip_wheel_speed) {
994 quick_timeout = 1;
995 if (!R->mouse_slip_wheel_delay--
996 && rxvt_scr_page(aR_ R->mouse_slip_wheel_speed > 0 ? UP : DN,
997 abs(R->mouse_slip_wheel_speed))) {
998 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
999 R->refresh_type |= SMOOTH_REFRESH;
1000 R->want_refresh = 1;
1001 } 918 }
1002 }
1003#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
1004#ifdef SELECTION_SCROLLING
1005 if (R->pending_scroll_selection) {
1006 quick_timeout = 1;
1007 if (!R->scroll_selection_delay--
1008 && rxvt_scr_page(aR_ R->scroll_selection_dir,
1009 R->scroll_selection_lines)) {
1010 R->selection_extend (R->selection_save_x,
1011 R->selection_save_y, R->selection_save_state);
1012 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1013 R->refresh_type |= SMOOTH_REFRESH;
1014 R->want_refresh = 1;
1015 }
1016 }
1017#endif
1018#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1019 if (scrollbar_isUp() || scrollbar_isDn()) {
1020 quick_timeout = 1;
1021 if (!R->scroll_arrow_delay--
1022 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) {
1023 R->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1024 R->refresh_type |= SMOOTH_REFRESH;
1025 R->want_refresh = 1;
1026 }
1027 }
1028#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1029
1030#ifdef TRANSPARENT
1031 quick_timeout |= R->want_full_refresh;
1032#endif
1033#endif
1034} 919}
1035 920
1036#ifdef POINTER_BLANK 921#ifdef POINTER_BLANK
1037void 922void
1038rxvt_term::pointer_unblank () 923rxvt_term::pointer_unblank ()
1039{ 924{
1040 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 925 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1041 recolour_cursor (); 926 recolour_cursor ();
1042 927
1043 hidden_pointer = 0; 928 hidden_pointer = 0;
1044 929
1045 if (Options & Opt_pointerBlank) 930 if (Options & Opt_pointerBlank)
… …
1047} 932}
1048 933
1049void 934void
1050rxvt_term::pointer_blank () 935rxvt_term::pointer_blank ()
1051{ 936{
1052 if (!(Options & Opt_pointerBlank)) 937 if (! (Options & Opt_pointerBlank))
1053 return; 938 return;
1054 939
1055 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 940 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1056 XFlush (Xdisplay); 941 XFlush (display->display);
1057 942
1058 hidden_pointer = 1; 943 hidden_pointer = 1;
1059} 944}
1060 945
1061void 946void
… …
1066 951
1067 pointer_blank (); 952 pointer_blank ();
1068} 953}
1069#endif 954#endif
1070 955
1071/* INTPROTO */
1072void 956void
1073rxvt_mouse_report(pR_ const XButtonEvent *ev) 957rxvt_term::mouse_report (XButtonEvent &ev)
1074{ 958{
1075 int button_number, key_state = 0; 959 int button_number, key_state = 0;
1076 int x, y; 960 int x, y;
1077 961
1078 x = ev->x; 962 x = ev.x;
1079 y = ev->y; 963 y = ev.y;
1080 R->pixel_position (&x, &y); 964 pixel_position (&x, &y);
1081 965
1082 if (R->MEvent.button == AnyButton) { 966 if (MEvent.button == AnyButton)
967 {
1083 button_number = 3; 968 button_number = 3;
1084 } else { 969 }
970 else
971 {
1085 button_number = R->MEvent.button - Button1; 972 button_number = MEvent.button - Button1;
1086 /* add 0x3D for wheel events, like xterm does */ 973 /* add 0x3D for wheel events, like xterm does */
1087 if (button_number >= 3) 974 if (button_number >= 3)
1088 button_number += (64 - 3); 975 button_number += (64 - 3);
1089 } 976 }
1090 977
1091 if (R->PrivateModes & PrivMode_MouseX10) { 978 if (PrivateModes & PrivMode_MouseX10)
979 {
1092 /* 980 /*
1093 * do not report ButtonRelease 981 * do not report ButtonRelease
1094 * no state info allowed 982 * no state info allowed
1095 */ 983 */
1096 key_state = 0; 984 key_state = 0;
1097 if (button_number == 3) 985 if (button_number == 3)
1098 return; 986 return;
1099 } else { 987 }
988 else
989 {
1100 /* XTerm mouse reporting needs these values: 990 /* XTerm mouse reporting needs these values:
1101 * 4 = Shift 991 * 4 = Shift
1102 * 8 = Meta 992 * 8 = Meta
1103 * 16 = Control 993 * 16 = Control
1104 * plus will add in our own Double-Click reporting 994 * plus will add in our own Double-Click reporting
1105 * 32 = Double Click 995 * 32 = Double Click
1106 */ 996 */
1107 key_state = ((R->MEvent.state & ShiftMask) ? 4 : 0) 997 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1108 + ((R->MEvent.state & R->ModMetaMask) ? 8 : 0) 998 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1109 + ((R->MEvent.state & ControlMask) ? 16 : 0); 999 + ((MEvent.state & ControlMask) ? 16 : 0);
1110#ifdef MOUSE_REPORT_DOUBLECLICK 1000#ifdef MOUSE_REPORT_DOUBLECLICK
1111 key_state += ((R->MEvent.clicks > 1) ? 32 : 0); 1001 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1112#endif 1002#endif
1003
1113 } 1004 }
1114 1005
1115#ifdef DEBUG_MOUSEREPORT 1006#ifdef DEBUG_MOUSEREPORT
1116 fprintf(stderr, "Mouse ["); 1007 fprintf (stderr, "Mouse [");
1117 if (key_state & 16) 1008 if (key_state & 16)
1118 fputc('C', stderr); 1009 fputc ('C', stderr);
1119 if (key_state & 4) 1010 if (key_state & 4)
1120 fputc('S', stderr); 1011 fputc ('S', stderr);
1121 if (key_state & 8) 1012 if (key_state & 8)
1122 fputc('A', stderr); 1013 fputc ('A', stderr);
1123 if (key_state & 32) 1014 if (key_state & 32)
1124 fputc('2', stderr); 1015 fputc ('2', stderr);
1125 fprintf(stderr, "]: <%d>, %d/%d\n", 1016 fprintf (stderr, "]: <%d>, %d/%d\n",
1126 button_number, 1017 button_number,
1127 x + 1, 1018 x + 1,
1128 y + 1); 1019 y + 1);
1129#else 1020#else
1130 R->tt_printf("\033[M%c%c%c", 1021 tt_printf ("\033[M%c%c%c",
1131 (32 + button_number + key_state), 1022 (32 + button_number + key_state),
1132 (32 + x + 1), 1023 (32 + x + 1),
1133 (32 + y + 1)); 1024 (32 + y + 1));
1134#endif 1025#endif
1135} 1026}
1136 1027
1137#ifdef USING_W11LIB 1028#ifdef USING_W11LIB
1138/* EXTPROTO */
1139void 1029void
1140rxvt_W11_process_x_event(XEvent *ev) 1030rxvt_W11_process_x_event (XEvent *ev)
1141{ 1031{
1142 rxvt_t *r = rxvt_get_r(); 1032 rxvt_t *r = rxvt_get_r ();
1143 1033
1144 rxvt_process_x_event(aR_ ev); 1034 x_cb (*ev);
1145} 1035}
1146#endif 1036#endif
1147 1037
1148/*{{{ process an X event */ 1038/*{{{ process an X event */
1149/* INTPROTO */
1150void 1039void
1151rxvt_process_x_event(pR_ XEvent *ev) 1040rxvt_term::x_cb (XEvent &ev)
1152{ 1041{
1153 int i, want_timeout; 1042 SET_R (this);
1043 SET_LOCALE (locale);
1044
1045#if defined(CURSOR_BLINK)
1046 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1047 {
1048 if (hidden_cursor)
1049 {
1050 hidden_cursor = 0;
1051 want_refresh = 1;
1052 }
1053
1054 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1055 }
1056#endif
1057
1058#if defined(POINTER_BLANK)
1059 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1060 {
1061 if (ev.type == MotionNotify
1062 || ev.type == ButtonPress
1063 || ev.type == ButtonRelease)
1064 if (hidden_pointer)
1065 pointer_unblank ();
1066
1067 if (ev.type == KeyPress && hidden_pointer == 0)
1068 pointer_blank ();
1069 }
1070#endif
1071
1072#ifdef USE_XIM
1073 if (XFilterEvent (&ev, None))
1074 return;
1075#endif
1076
1154 Window unused_root, unused_child; 1077 Window unused_root, unused_child;
1155 int unused_root_x, unused_root_y; 1078 int unused_root_x, unused_root_y;
1156 unsigned int unused_mask; 1079 unsigned int unused_mask;
1157 1080
1158#ifdef DEBUG_X 1081#ifdef DEBUG_X
1159 const char *const eventnames[] = 1082 const char *const eventnames[] =
1160 { /* mason - this matches my system */ 1083 { /* mason - this matches my system */
1161 "", 1084 "",
1162 "", 1085 "",
1163 "KeyPress", 1086 "KeyPress",
1164 "KeyRelease", 1087 "KeyRelease",
1165 "ButtonPress", 1088 "ButtonPress",
1166 "ButtonRelease", 1089 "ButtonRelease",
1167 "MotionNotify", 1090 "MotionNotify",
1168 "EnterNotify", 1091 "EnterNotify",
1169 "LeaveNotify", 1092 "LeaveNotify",
1170 "FocusIn", 1093 "FocusIn",
1171 "FocusOut", 1094 "FocusOut",
1172 "KeymapNotify", 1095 "KeymapNotify",
1173 "Expose", 1096 "Expose",
1174 "GraphicsExpose", 1097 "GraphicsExpose",
1175 "NoExpose", 1098 "NoExpose",
1176 "VisibilityNotify", 1099 "VisibilityNotify",
1177 "CreateNotify", 1100 "CreateNotify",
1178 "DestroyNotify", 1101 "DestroyNotify",
1179 "UnmapNotify", 1102 "UnmapNotify",
1180 "MapNotify", 1103 "MapNotify",
1181 "MapRequest", 1104 "MapRequest",
1182 "ReparentNotify", 1105 "ReparentNotify",
1183 "ConfigureNotify", 1106 "ConfigureNotify",
1184 "ConfigureRequest", 1107 "ConfigureRequest",
1185 "GravityNotify", 1108 "GravityNotify",
1186 "ResizeRequest", 1109 "ResizeRequest",
1187 "CirculateNotify", 1110 "CirculateNotify",
1188 "CirculateRequest", 1111 "CirculateRequest",
1189 "PropertyNotify", 1112 "PropertyNotify",
1190 "SelectionClear", 1113 "SelectionClear",
1191 "SelectionRequest", 1114 "SelectionRequest",
1192 "SelectionNotify", 1115 "SelectionNotify",
1193 "ColormapNotify", 1116 "ColormapNotify",
1194 "ClientMessage", 1117 "ClientMessage",
1195 "MappingNotify" 1118 "MappingNotify"
1196 }; 1119 };
1197#endif 1120#endif
1198 1121
1199#ifdef DEBUG_X 1122#ifdef DEBUG_X
1200 struct timeval tp; 1123 struct timeval tp;
1201 struct tm *ltt; 1124 struct tm *ltt;
1202 (void)gettimeofday(&tp, NULL); 1125 (void)gettimeofday (&tp, NULL);
1203 ltt = localtime(&(tp.tv_sec)); 1126 ltt = localtime (& (tp.tv_sec));
1204 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->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)); 1127 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));
1205#endif 1128#endif
1206 1129
1207 switch (ev->type) { 1130 switch (ev.type)
1131 {
1208 case KeyPress: 1132 case KeyPress:
1209 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1133 lookup_key (ev.xkey);
1210 break; 1134 break;
1211 1135
1212#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1136#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1213 case KeyRelease: 1137 case KeyRelease:
1214 { 1138 {
1215 if (!(ev->xkey.state & ControlMask)) 1139 if (! (ev.xkey.state & ControlMask))
1216 R->mouse_slip_wheel_speed = 0; 1140 mouse_slip_wheel_speed = 0;
1217 else { 1141 else
1218 KeySym ks; 1142 {
1219 1143 KeySym ks;
1144
1220 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0); 1145 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1221 if (ks == XK_Control_L || ks == XK_Control_R) 1146 if (ks == XK_Control_L || ks == XK_Control_R)
1222 R->mouse_slip_wheel_speed = 0; 1147 mouse_slip_wheel_speed = 0;
1223 } 1148 }
1224 break; 1149 break;
1225 } 1150 }
1226#endif 1151#endif
1227 1152
1228 case ButtonPress: 1153 case ButtonPress:
1229 rxvt_button_press(aR_ (XButtonEvent *)ev); 1154 button_press (ev.xbutton);
1230 break; 1155 break;
1231 1156
1232 case ButtonRelease: 1157 case ButtonRelease:
1233 rxvt_button_release(aR_ (XButtonEvent *)ev); 1158 button_release (ev.xbutton);
1234 break; 1159 break;
1235 1160
1236 case ClientMessage: 1161 case ClientMessage:
1237 if (ev->xclient.format == 32 1162 if (ev.xclient.format == 32
1238 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1163 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1239 R->destroy (); 1164 destroy ();
1240#ifdef OFFIX_DND 1165#ifdef OFFIX_DND
1241 /* OffiX Dnd (drag 'n' drop) protocol */ 1166 /* OffiX Dnd (drag 'n' drop) protocol */
1242 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1167 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1243 && (ev->xclient.data.l[0] == DndFile 1168 && (ev.xclient.data.l[0] == DndFile
1244 || ev->xclient.data.l[0] == DndDir 1169 || ev.xclient.data.l[0] == DndDir
1245 || ev->xclient.data.l[0] == DndLink)) { 1170 || ev.xclient.data.l[0] == DndLink))
1246 /* Get Dnd data */ 1171 {
1172 /* Get Dnd data */
1247 Atom ActualType; 1173 Atom ActualType;
1248 int ActualFormat; 1174 int ActualFormat;
1249 unsigned char *data; 1175 unsigned char *data;
1250 unsigned long Size, RemainingBytes; 1176 unsigned long Size, RemainingBytes;
1251 1177
1252 XGetWindowProperty(R->Xdisplay, Xroot, 1178 XGetWindowProperty (display->display, display->root,
1253 R->xa[XA_DNDSELECTION], 1179 xa[XA_DNDSELECTION],
1254 0L, 1000000L, 1180 0L, 1000000L,
1255 False, AnyPropertyType, 1181 False, AnyPropertyType,
1256 &ActualType, &ActualFormat, 1182 &ActualType, &ActualFormat,
1257 &Size, &RemainingBytes, 1183 &Size, &RemainingBytes,
1258 &data); 1184 &data);
1259 XChangeProperty(R->Xdisplay, Xroot, 1185 XChangeProperty (display->display, display->root,
1260 XA_CUT_BUFFER0, XA_STRING, 1186 XA_CUT_BUFFER0, XA_STRING,
1261 8, PropModeReplace, 1187 8, PropModeReplace,
1262 data, STRLEN(data)); 1188 data, STRLEN (data));
1263 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, True); 1189 selection_paste (display->root, XA_CUT_BUFFER0, True);
1264 XSetInputFocus(R->Xdisplay, Xroot, RevertToNone, CurrentTime); 1190 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1265 } 1191 }
1266#endif /* OFFIX_DND */ 1192#endif /* OFFIX_DND */
1267 break; 1193 break;
1268 1194
1269 case MappingNotify: 1195 case MappingNotify:
1270 XRefreshKeyboardMapping(&(ev->xmapping)); 1196 XRefreshKeyboardMapping (& (ev.xmapping));
1271 break; 1197 break;
1272 1198
1273 /* 1199 /*
1274 * XXX: this is not the _current_ arrangement 1200 * XXX: this is not the _current_ arrangement
1275 * Here's my conclusion: 1201 * Here's my conclusion:
1276 * If the window is completely unobscured, use bitblt's 1202 * If the window is completely unobscured, use bitblt's
1277 * to scroll. Even then, they're only used when doing partial 1203 * to scroll. Even then, they're only used when doing partial
1278 * screen scrolling. When partially obscured, we have to fill 1204 * screen scrolling. When partially obscured, we have to fill
1279 * in the GraphicsExpose parts, which means that after each refresh, 1205 * in the GraphicsExpose parts, which means that after each refresh,
1280 * we need to wait for the graphics expose or Noexpose events, 1206 * we need to wait for the graphics expose or Noexpose events,
1281 * which ought to make things real slow! 1207 * which ought to make things real slow!
1282 */ 1208 */
1283 case VisibilityNotify: 1209 case VisibilityNotify:
1284 switch (ev->xvisibility.state) 1210 switch (ev.xvisibility.state)
1285 { 1211 {
1286 case VisibilityUnobscured: 1212 case VisibilityUnobscured:
1287 R->refresh_type = FAST_REFRESH; 1213 refresh_type = FAST_REFRESH;
1288 break; 1214 break;
1289 case VisibilityPartiallyObscured: 1215 case VisibilityPartiallyObscured:
1290 R->refresh_type = SLOW_REFRESH; 1216 refresh_type = SLOW_REFRESH;
1291 break; 1217 break;
1292 default: 1218 default:
1293 R->refresh_type = NO_REFRESH; 1219 refresh_type = NO_REFRESH;
1294 break; 1220 break;
1295 } 1221 }
1296 break; 1222 break;
1297 1223
1298 case FocusIn: 1224 case FocusIn:
1299 if (!R->TermWin.focus) { 1225 if (!TermWin.focus)
1300 R->TermWin.focus = 1; 1226 {
1301 R->want_refresh = 1; 1227 TermWin.focus = 1;
1228 want_refresh = 1;
1302#ifdef USE_XIM 1229#ifdef USE_XIM
1303 if (R->Input_Context != NULL) 1230 if (Input_Context != NULL)
1304 XSetICFocus(R->Input_Context); 1231 XSetICFocus (Input_Context);
1305#endif 1232#endif
1306#ifdef CURSOR_BLINK 1233#ifdef CURSOR_BLINK
1307 if (R->Options & Opt_cursorBlink) 1234 if (Options & Opt_cursorBlink)
1308 R->cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1235 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1309#endif 1236#endif
1310 }
1311 break;
1312 1237
1238 }
1239 break;
1240
1313 case FocusOut: 1241 case FocusOut:
1314 if (R->TermWin.focus) { 1242 if (TermWin.focus)
1315 R->TermWin.focus = 0; 1243 {
1316 R->want_refresh = 1; 1244 TermWin.focus = 0;
1245 want_refresh = 1;
1317#ifdef USE_XIM 1246#ifdef USE_XIM
1318 if (R->Input_Context != NULL) 1247 if (Input_Context != NULL)
1319 XUnsetICFocus(R->Input_Context); 1248 XUnsetICFocus (Input_Context);
1320#endif 1249#endif
1321#ifdef CURSOR_BLINK 1250#ifdef CURSOR_BLINK
1322 if (R->Options & Opt_cursorBlink) 1251 if (Options & Opt_cursorBlink)
1323 R->cursor_blink_ev.stop (); 1252 cursor_blink_ev.stop ();
1324 R->hidden_cursor = 0; 1253 hidden_cursor = 0;
1325#endif 1254#endif
1326 }
1327 break;
1328 1255
1256 }
1257 break;
1258
1329 case ConfigureNotify: 1259 case ConfigureNotify:
1330 if (ev->xconfigure.window == R->TermWin.parent[0]) { 1260 if (ev.xconfigure.window == TermWin.parent[0])
1331 int height, width; 1261 {
1262 int height, width;
1332 1263
1264 do
1333 do { /* Wrap lots of configures into one */ 1265 { /* Wrap lots of configures into one */
1334 width = ev->xconfigure.width; 1266 width = ev.xconfigure.width;
1335 height = ev->xconfigure.height; 1267 height = ev.xconfigure.height;
1336 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1268 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1337 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1269 }
1338 ConfigureNotify, ev)); 1270 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1271
1339 if (R->szHint.width != width || R->szHint.height != height) { 1272 if (szHint.width != width || szHint.height != height)
1273 {
1340 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); 1274 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1341 R->resize_all_windows (width, height, 1); 1275 resize_all_windows (width, height, 1);
1342 } 1276 }
1343#ifdef DEBUG_SIZE 1277#ifdef DEBUG_SIZE
1344 else { 1278 else
1279 {
1345 D_SIZE((stderr, "Size: Not resizing")); 1280 D_SIZE ((stderr, "Size: Not resizing"));
1346 } 1281 }
1347#endif 1282#endif
1348#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1283#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1349 if (R->Options & Opt_transparent) { 1284 if (Options & Opt_transparent)
1350 rxvt_check_our_parents(aR); 1285 {
1351 if (R->am_transparent) 1286 check_our_parents ();
1352 R->want_full_refresh = 1; 1287 if (am_transparent)
1353 } 1288 want_full_refresh = 1;
1289 }
1354#endif 1290#endif
1355 }
1356 break;
1357 1291
1292 }
1293 break;
1294
1358 case SelectionClear: 1295 case SelectionClear:
1359 rxvt_selection_clear(aR); 1296 display->set_selection_owner (0);
1360 break; 1297 break;
1361 1298
1362 case SelectionNotify: 1299 case SelectionNotify:
1363 if (R->selection_wait == Sel_normal) 1300 if (selection_wait == Sel_normal)
1364 rxvt_selection_paste(aR_ ev->xselection.requestor, 1301 selection_paste (ev.xselection.requestor,
1365 ev->xselection.property, True); 1302 ev.xselection.property, True);
1366 break; 1303 break;
1367 1304
1368 case SelectionRequest: 1305 case SelectionRequest:
1369 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1306 selection_send (ev.xselectionrequest);
1370 break; 1307 break;
1371 1308
1372 case UnmapNotify: 1309 case UnmapNotify:
1373 R->TermWin.mapped = 0; 1310 TermWin.mapped = 0;
1374#ifdef TEXT_BLINK 1311#ifdef TEXT_BLINK
1375 R->text_blink_ev.stop (); 1312 text_blink_ev.stop ();
1376#endif 1313#endif
1377 break; 1314 break;
1378 1315
1379 case MapNotify: 1316 case MapNotify:
1380 R->TermWin.mapped = 1; 1317 TermWin.mapped = 1;
1381#ifdef TEXT_BLINK 1318#ifdef TEXT_BLINK
1382 R->text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1319 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1383#endif 1320#endif
1384 break;
1385
1386 case PropertyNotify:
1387 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1388 if (ev->xproperty.state == PropertyNewValue)
1389 rxvt_selection_property(aR_ ev->xproperty.window,
1390 ev->xproperty.atom);
1391 break; 1321 break;
1392 } 1322
1393#ifdef TRANSPARENT 1323#ifdef TRANSPARENT
1394 /*
1395 * if user used some Esetroot compatible prog to set the root bg,
1396 * use the property to determine the pixmap. We use it later on.
1397 */
1398 if (R->xa[XA_XROOTPMAPID] == 0)
1399 R->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay,
1400 "_XROOTPMAP_ID", False);
1401 if (ev->xproperty.atom != R->xa[XA_XROOTPMAPID])
1402 break;
1403 /* FALLTHROUGH */
1404 case ReparentNotify: 1324 case ReparentNotify:
1405 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) { 1325 rootwin_cb (ev);
1406 if (R->am_transparent) 1326 break;
1407 R->want_full_refresh = 1;
1408 }
1409#endif /* TRANSPARENT */ 1327#endif /* TRANSPARENT */
1410 break;
1411 1328
1412 case GraphicsExpose: 1329 case GraphicsExpose:
1413 case Expose: 1330 case Expose:
1414 if (ev->xany.window == R->TermWin.vt) { 1331 if (ev.xany.window == TermWin.vt)
1332 {
1415#ifdef NO_SLOW_LINK_SUPPORT 1333#ifdef NO_SLOW_LINK_SUPPORT
1416 R->scr_expose (ev->xexpose.x, ev->xexpose.y, 1334 scr_expose (ev.xexpose.x, ev.xexpose.y,
1417 ev->xexpose.width, ev->xexpose.height, False); 1335 ev.xexpose.width, ev.xexpose.height, False);
1418#else 1336#else
1419 // don't understand this, so commented it out 1337 // don't understand this, so commented it out
1420 R->scr_expose (ev->xexpose.x, ev->xexpose.y, 1338 scr_expose (ev.xexpose.x, ev.xexpose.y,
1421 ev->xexpose.width, ev->xexpose.height, False); 1339 ev.xexpose.width, ev.xexpose.height, False);
1422 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1340 //scr_expose (ev.xexpose.x, 0,
1423 // ev->xexpose.width, R->TermWin.height, False); 1341 // ev.xexpose.width, TermWin.height, False);
1424#endif 1342#endif
1425 R->want_refresh = 1; 1343 want_refresh = 1;
1426 } else { 1344 }
1427 XEvent unused_xevent; 1345 else
1346 {
1347 XEvent unused_event;
1428 1348
1429 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1349 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1430 Expose, 1350 Expose,
1431 &unused_xevent)) ; 1351 &unused_event)) ;
1432 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1352 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1433 GraphicsExpose, 1353 GraphicsExpose,
1434 &unused_xevent)) ; 1354 &unused_event)) ;
1435 if (isScrollbarWindow(ev->xany.window)) { 1355 if (isScrollbarWindow (ev.xany.window))
1436 R->scrollBar.setIdle(); 1356 {
1437 rxvt_scrollbar_show(aR_ 0); 1357 scrollBar.setIdle ();
1438 } 1358 scrollbar_show (0);
1359 }
1439#ifdef MENUBAR 1360#ifdef MENUBAR
1440 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1361 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1441 rxvt_menubar_expose(aR); 1362 menubar_expose ();
1442#endif 1363#endif
1443#ifdef RXVT_GRAPHICS 1364 }
1444 rxvt_Gr_expose(aR_ ev->xany.window); 1365 break;
1445#endif
1446 }
1447 break;
1448 1366
1449 case MotionNotify: 1367 case MotionNotify:
1450#ifdef POINTER_BLANK 1368#ifdef POINTER_BLANK
1451 if (R->hidden_pointer) 1369 if (hidden_pointer)
1452 R->pointer_unblank (); 1370 pointer_unblank ();
1453#endif 1371#endif
1454#if MENUBAR 1372#if MENUBAR
1455 if (isMenuBarWindow(ev->xany.window)) { 1373 if (isMenuBarWindow (ev.xany.window))
1456 rxvt_menubar_control(aR_ &(ev->xbutton)); 1374 {
1457 break; 1375 menubar_control (ev.xbutton);
1458 } 1376 break;
1377 }
1459#endif 1378#endif
1460 if ((R->PrivateModes & PrivMode_mouse_report) && !(R->bypass_keystate)) 1379 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1461 break; 1380 break;
1462 1381
1463 if (ev->xany.window == R->TermWin.vt) { 1382 if (ev.xany.window == TermWin.vt)
1383 {
1464 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1384 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1465 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt, 1385 {
1466 MotionNotify, ev)) ; 1386 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1467 XQueryPointer(R->Xdisplay, R->TermWin.vt, 1387 ;
1468 &unused_root, &unused_child, 1388
1469 &unused_root_x, &unused_root_y, 1389 XQueryPointer (display->display, TermWin.vt,
1470 &(ev->xbutton.x), &(ev->xbutton.y), 1390 &unused_root, &unused_child,
1471 &unused_mask); 1391 &unused_root_x, &unused_root_y,
1392 & (ev.xbutton.x), & (ev.xbutton.y),
1393 &unused_mask);
1472#ifdef MOUSE_THRESHOLD 1394#ifdef MOUSE_THRESHOLD
1473 /* deal with a `jumpy' mouse */ 1395 /* deal with a `jumpy' mouse */
1474 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1396 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1397 {
1475#endif 1398#endif
1476 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1399 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1477 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1400 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1478#ifdef SELECTION_SCROLLING 1401#ifdef SELECTION_SCROLLING
1479 if (ev->xbutton.y<R->TermWin.int_bwidth || 1402 if (ev.xbutton.y < TermWin.int_bwidth
1480 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1403 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1481 int dist;
1482
1483 R->pending_scroll_selection=1;
1484
1485 /* don't clobber the current delay if we are
1486 * already in the middle of scrolling.
1487 */
1488 if (R->scroll_selection_delay<=0)
1489 R->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1490
1491 /* save the event params so we can highlight
1492 * the selection in the pending-scroll loop
1493 */
1494 R->selection_save_x=ev->xbutton.x;
1495 R->selection_save_y=ev->xbutton.y;
1496 R->selection_save_state=
1497 (ev->xbutton.state & Button3Mask) ? 2 : 0;
1498
1499 /* calc number of lines to scroll */
1500 if (ev->xbutton.y<R->TermWin.int_bwidth) {
1501 R->scroll_selection_dir = UP;
1502 dist = R->TermWin.int_bwidth - ev->xbutton.y;
1503 }
1504 else {
1505 R->scroll_selection_dir = DN;
1506 dist = ev->xbutton.y -
1507 (R->TermWin.int_bwidth + R->TermWin.height);
1508 }
1509 R->scroll_selection_lines=(Pixel2Height(dist)/
1510 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1511 MIN_IT(R->scroll_selection_lines,
1512 SELECTION_SCROLL_MAX_LINES);
1513 }
1514 else {
1515 /* we are within the text window, so we
1516 * shouldn't be scrolling
1517 */
1518 R->pending_scroll_selection = 0;
1519 }
1520#endif
1521#ifdef MOUSE_THRESHOLD
1522 }
1523#endif
1524 }
1525 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1526 while (XCheckTypedWindowEvent(R->Xdisplay, R->scrollBar.win,
1527 MotionNotify, ev)) ;
1528 XQueryPointer(R->Xdisplay, R->scrollBar.win,
1529 &unused_root, &unused_child,
1530 &unused_root_x, &unused_root_y,
1531 &(ev->xbutton.x), &(ev->xbutton.y),
1532 &unused_mask);
1533 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1534 scrollbar_size());
1535 R->scr_refresh (R->refresh_type);
1536 R->refresh_limit = 0;
1537 rxvt_scrollbar_show(aR_ 1);
1538 }
1539 break;
1540 }
1541}
1542
1543/* INTPROTO */
1544void
1545rxvt_button_press(pR_ XButtonEvent *ev)
1546{
1547 int reportmode = 0, clickintime;
1548
1549 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1550 if (!R->bypass_keystate)
1551 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1552/*
1553 * VT window processing of button press
1554 */
1555 if (ev->window == R->TermWin.vt)
1556 {
1557#if RXVT_GRAPHICS
1558 if (ev->subwindow != None)
1559 rxvt_Gr_ButtonPress (ev->x, ev->y);
1560 else
1561#endif
1562 {
1563 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1564 if (reportmode)
1565 {
1566 /* mouse report from vt window */
1567 /* save the xbutton state (for ButtonRelease) */
1568 R->MEvent.state = ev->state;
1569#ifdef MOUSE_REPORT_DOUBLECLICK
1570 if (ev->button == R->MEvent.button && clickintime)
1571 {
1572 /* same button, within alloted time */
1573 R->MEvent.clicks++;
1574 if (R->MEvent.clicks > 1)
1575 { 1404 {
1576 /* only report double clicks */ 1405 int dist;
1577 R->MEvent.clicks = 2;
1578 rxvt_mouse_report(aR_ ev);
1579 1406
1580 /* don't report the release */ 1407 pending_scroll_selection=1;
1581 R->MEvent.clicks = 0; 1408
1582 R->MEvent.button = AnyButton; 1409 /* don't clobber the current delay if we are
1583 } 1410 * already in the middle of scrolling.
1584 }
1585 else
1586 { 1411 */
1587 /* different button, or time expired */ 1412 if (scroll_selection_delay<=0)
1588 R->MEvent.clicks = 1; 1413 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1589 R->MEvent.button = ev->button; 1414
1590 rxvt_mouse_report(aR_ ev); 1415 /* save the event params so we can highlight
1591 } 1416 * the selection in the pending-scroll loop
1592#else
1593 R->MEvent.button = ev->button;
1594 rxvt_mouse_report(aR_ ev);
1595#endif /* MOUSE_REPORT_DOUBLECLICK */
1596 }
1597 else
1598 {
1599 if (ev->button != R->MEvent.button)
1600 R->MEvent.clicks = 0;
1601 switch (ev->button)
1602 { 1417 */
1603 case Button1: 1418 selection_save_x=ev.xbutton.x;
1604 /* allow shift+left click to extend selection */ 1419 selection_save_y=ev.xbutton.y;
1605 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report)) 1420 selection_save_state=
1421 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1422
1423 /* calc number of lines to scroll */
1424 if (ev.xbutton.y<TermWin.int_bwidth)
1606 { 1425 {
1607 if (R->MEvent.button == Button1 && clickintime) 1426 scroll_selection_dir = UP;
1608 R->selection_rotate (ev->x, ev->y); 1427 dist = TermWin.int_bwidth - ev.xbutton.y;
1609 else
1610 R->selection_extend (ev->x, ev->y, 1);
1611 } 1428 }
1612 else 1429 else
1613 { 1430 {
1614 if (R->MEvent.button == Button1 && clickintime) 1431 scroll_selection_dir = DN;
1615 R->MEvent.clicks++; 1432 dist = ev.xbutton.y -
1616 else 1433 (TermWin.int_bwidth + TermWin.height);
1617 R->MEvent.clicks = 1;
1618
1619 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1620 } 1434 }
1435 scroll_selection_lines= (Pixel2Height (dist)/
1436 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1437 MIN_IT (scroll_selection_lines,
1438 SELECTION_SCROLL_MAX_LINES);
1439 }
1440 else
1441 {
1442 /* we are within the text window, so we
1443 * shouldn't be scrolling
1444 */
1445 pending_scroll_selection = 0;
1446 }
1447#endif
1448#ifdef MOUSE_THRESHOLD
1621 1449
1450 }
1451#endif
1452
1453 }
1454 }
1455 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1456 {
1457 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1458 MotionNotify, &ev)) ;
1459 XQueryPointer (display->display, scrollBar.win,
1460 &unused_root, &unused_child,
1461 &unused_root_x, &unused_root_y,
1462 & (ev.xbutton.x), & (ev.xbutton.y),
1463 &unused_mask);
1464 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1465 scrollbar_size ());
1466 scr_refresh (refresh_type);
1467 refresh_limit = 0;
1468 scrollbar_show (1);
1469 }
1470 break;
1471 }
1472}
1473
1474void
1475rxvt_term::rootwin_cb (XEvent &ev)
1476{
1477 SET_R (this);
1478 SET_LOCALE (locale);
1479
1480 switch (ev.type)
1481 {
1482 case PropertyNotify:
1483 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1484 {
1485 if (ev.xproperty.state == PropertyNewValue)
1486 selection_property (ev.xproperty.window, ev.xproperty.atom);
1487 break;
1488 }
1489#ifdef TRANSPARENT
1490 else
1491 {
1492 /*
1493 * if user used some Esetroot compatible prog to set the root bg,
1494 * use the property to determine the pixmap. We use it later on.
1495 */
1496 if (xa[XA_XROOTPMAPID] == 0)
1497 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1498
1499 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1500 return;
1501 }
1502
1503 /* FALLTHROUGH */
1504 case ReparentNotify:
1505 if ((Options & Opt_transparent) && check_our_parents ())
1506 if (am_transparent)
1507 want_full_refresh = 1;
1508 break;
1509#endif
1510 }
1511}
1512
1513void
1514rxvt_term::button_press (XButtonEvent &ev)
1515{
1516 int reportmode = 0, clickintime;
1517
1518 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1519 if (!bypass_keystate)
1520 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1521 /*
1522 * VT window processing of button press
1523 */
1524 if (ev.window == TermWin.vt)
1525 {
1526 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1527 if (reportmode)
1528 {
1529 /* mouse report from vt window */
1530 /* save the xbutton state (for ButtonRelease) */
1531 MEvent.state = ev.state;
1532#ifdef MOUSE_REPORT_DOUBLECLICK
1533 if (ev.button == MEvent.button && clickintime)
1534 {
1535 /* same button, within alloted time */
1536 MEvent.clicks++;
1537 if (MEvent.clicks > 1)
1538 {
1539 /* only report double clicks */
1540 MEvent.clicks = 2;
1541 mouse_report (ev);
1542
1543 /* don't report the release */
1544 MEvent.clicks = 0;
1545 MEvent.button = AnyButton;
1546 }
1547 }
1548 else
1549 {
1550 /* different button, or time expired */
1551 MEvent.clicks = 1;
1552 MEvent.button = ev.button;
1553 mouse_report (ev);
1554 }
1555#else
1556 MEvent.button = ev.button;
1557 mouse_report (ev);
1558#endif /* MOUSE_REPORT_DOUBLECLICK */
1559
1560 }
1561 else
1562 {
1563 if (ev.button != MEvent.button)
1564 MEvent.clicks = 0;
1565 switch (ev.button)
1566 {
1567 case Button1:
1568 /* allow shift+left click to extend selection */
1569 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1570 {
1571 if (MEvent.button == Button1 && clickintime)
1572 selection_rotate (ev.x, ev.y);
1573 else
1574 selection_extend (ev.x, ev.y, 1);
1575 }
1576 else
1577 {
1578 if (MEvent.button == Button1 && clickintime)
1579 MEvent.clicks++;
1580 else
1581 MEvent.clicks = 1;
1582
1583 selection_click (MEvent.clicks, ev.x, ev.y);
1584 }
1585
1622 R->MEvent.button = Button1; 1586 MEvent.button = Button1;
1587 break;
1588
1589 case Button3:
1590 if (MEvent.button == Button3 && clickintime)
1591 selection_rotate (ev.x, ev.y);
1592 else
1593 selection_extend (ev.x, ev.y, 1);
1594 MEvent.button = Button3;
1595 break;
1596 }
1597 }
1598 MEvent.time = ev.time;
1599 return;
1600 }
1601
1602 /*
1603 * Scrollbar window processing of button press
1604 */
1605 if (isScrollbarWindow (ev.window))
1606 {
1607 scrollBar.setIdle ();
1608 /*
1609 * Rxvt-style scrollbar:
1610 * move up if mouse is above slider
1611 * move dn if mouse is below slider
1612 *
1613 * XTerm-style scrollbar:
1614 * Move display proportional to pointer location
1615 * pointer near top -> scroll one line
1616 * pointer near bot -> scroll full page
1617 */
1618#ifndef NO_SCROLLBAR_REPORT
1619 if (reportmode)
1620 {
1621 /*
1622 * Mouse report disabled scrollbar:
1623 * arrow buttons - send up/down
1624 * click on scrollbar - send pageup/down
1625 */
1626 if ((scrollBar.style == R_SB_NEXT
1627 && scrollbarnext_upButton (ev.y))
1628 || (scrollBar.style == R_SB_RXVT
1629 && scrollbarrxvt_upButton (ev.y)))
1630 tt_printf ("\033[A");
1631 else if ((scrollBar.style == R_SB_NEXT
1632 && scrollbarnext_dnButton (ev.y))
1633 || (scrollBar.style == R_SB_RXVT
1634 && scrollbarrxvt_dnButton (ev.y)))
1635 tt_printf ("\033[B");
1636 else
1637 switch (ev.button)
1638 {
1639 case Button2:
1640 tt_printf ("\014");
1641 break;
1642 case Button1:
1643 tt_printf ("\033[6~");
1644 break;
1645 case Button3:
1646 tt_printf ("\033[5~");
1647 break;
1648 }
1649 }
1650 else
1651#endif /* NO_SCROLLBAR_REPORT */
1652
1653 {
1654 char upordown = 0;
1655
1656 if (scrollBar.style == R_SB_NEXT)
1657 {
1658 if (scrollbarnext_upButton (ev.y))
1659 upordown = -1; /* up */
1660 else if (scrollbarnext_dnButton (ev.y))
1661 upordown = 1; /* down */
1662 }
1663 else if (scrollBar.style == R_SB_RXVT)
1664 {
1665 if (scrollbarrxvt_upButton (ev.y))
1666 upordown = -1; /* up */
1667 else if (scrollbarrxvt_dnButton (ev.y))
1668 upordown = 1; /* down */
1669 }
1670 if (upordown)
1671 {
1672#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1673 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1674#endif
1675 if (scr_page (upordown < 0 ? UP : DN, 1))
1676 {
1677 if (upordown < 0)
1678 scrollBar.setUp ();
1679 else
1680 scrollBar.setDn ();
1681 }
1682 }
1683 else
1684 switch (ev.button)
1685 {
1686 case Button2:
1687 switch (scrollbar_align)
1688 {
1689 case R_SB_ALIGN_TOP:
1690 csrO = 0;
1623 break; 1691 break;
1624 1692 case R_SB_ALIGN_CENTRE:
1625 case Button3: 1693 csrO = (scrollBar.bot - scrollBar.top) / 2;
1626 if (R->MEvent.button == Button3 && clickintime)
1627 R->selection_rotate (ev->x, ev->y);
1628 else
1629 R->selection_extend (ev->x, ev->y, 1);
1630 R->MEvent.button = Button3;
1631 break; 1694 break;
1695 case R_SB_ALIGN_BOTTOM:
1696 csrO = scrollBar.bot - scrollBar.top;
1697 break;
1698 }
1699 if (scrollBar.style == R_SB_XTERM
1700 || scrollbar_above_slider (ev.y)
1701 || scrollbar_below_slider (ev.y))
1702 scr_move_to ( scrollbar_position (ev.y) - csrO,
1703 scrollbar_size ());
1704 scrollBar.setMotion ();
1705 break;
1706
1707 case Button1:
1708 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1709 csrO = ev.y - scrollBar.top;
1710 /* FALLTHROUGH */
1711
1712 case Button3:
1713 if (scrollBar.style != R_SB_XTERM)
1714 {
1715 if (scrollbar_above_slider (ev.y))
1716# ifdef RXVT_SCROLL_FULL
1717 scr_page (UP, TermWin.nrow - 1);
1718# else
1719 scr_page (UP, TermWin.nrow / 4);
1720# endif
1721 else if (scrollbar_below_slider (ev.y))
1722# ifdef RXVT_SCROLL_FULL
1723 scr_page (DN, TermWin.nrow - 1);
1724# else
1725 scr_page (DN, TermWin.nrow / 4);
1726# endif
1727 else
1728 scrollBar.setMotion ();
1729 }
1730 else
1731 {
1732 scr_page ((ev.button == Button1 ? DN : UP),
1733 (TermWin.nrow
1734 * scrollbar_position (ev.y)
1735 / scrollbar_size ()));
1736 }
1737 break;
1738 }
1632 } 1739 }
1633 }
1634 R->MEvent.time = ev->time;
1635 return; 1740 return;
1636 }
1637 }
1638
1639/*
1640 * Scrollbar window processing of button press
1641 */
1642 if (isScrollbarWindow(ev->window))
1643 {
1644 R->scrollBar.setIdle ();
1645 /*
1646 * Rxvt-style scrollbar:
1647 * move up if mouse is above slider
1648 * move dn if mouse is below slider
1649 *
1650 * XTerm-style scrollbar:
1651 * Move display proportional to pointer location
1652 * pointer near top -> scroll one line
1653 * pointer near bot -> scroll full page
1654 */
1655#ifndef NO_SCROLLBAR_REPORT
1656 if (reportmode) {
1657 /*
1658 * Mouse report disabled scrollbar:
1659 * arrow buttons - send up/down
1660 * click on scrollbar - send pageup/down
1661 */
1662 if ((R->scrollBar.style == R_SB_NEXT
1663 && scrollbarnext_upButton(ev->y))
1664 || (R->scrollBar.style == R_SB_RXVT
1665 && scrollbarrxvt_upButton(ev->y)))
1666 R->tt_printf("\033[A");
1667 else if ((R->scrollBar.style == R_SB_NEXT
1668 && scrollbarnext_dnButton(ev->y))
1669 || (R->scrollBar.style == R_SB_RXVT
1670 && scrollbarrxvt_dnButton(ev->y)))
1671 R->tt_printf("\033[B");
1672 else
1673 switch (ev->button) {
1674 case Button2:
1675 R->tt_printf("\014");
1676 break;
1677 case Button1:
1678 R->tt_printf("\033[6~");
1679 break;
1680 case Button3:
1681 R->tt_printf("\033[5~");
1682 break;
1683 }
1684 }
1685 else
1686#endif /* NO_SCROLLBAR_REPORT */
1687 {
1688 char upordown = 0;
1689
1690 if (R->scrollBar.style == R_SB_NEXT) {
1691 if (scrollbarnext_upButton(ev->y))
1692 upordown = -1; /* up */
1693 else if (scrollbarnext_dnButton(ev->y))
1694 upordown = 1; /* down */
1695 } else if (R->scrollBar.style == R_SB_RXVT) {
1696 if (scrollbarrxvt_upButton(ev->y))
1697 upordown = -1; /* up */
1698 else if (scrollbarrxvt_dnButton(ev->y))
1699 upordown = 1; /* down */
1700 } 1741 }
1701 if (upordown) { 1742#if MENUBAR
1743 /*
1744 * Menubar window processing of button press
1745 */
1746 if (isMenuBarWindow (ev.window))
1747 menubar_control (ev);
1748#endif
1749}
1750
1751void
1752rxvt_term::button_release (XButtonEvent &ev)
1753{
1754 int reportmode = 0;
1755
1756 csrO = 0; /* reset csr Offset */
1757 if (!bypass_keystate)
1758 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1759
1760 if (scrollbar_isUpDn ())
1761 {
1762 scrollBar.setIdle ();
1763 scrollbar_show (0);
1702#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1764#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1703 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1765 refresh_type &= ~SMOOTH_REFRESH;
1704#endif
1705 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1706 if (upordown < 0)
1707 R->scrollBar.setUp ();
1708 else
1709 R->scrollBar.setDn ();
1710 }
1711 } else
1712 switch (ev->button) {
1713 case Button2:
1714 switch (R->scrollbar_align) {
1715 case R_SB_ALIGN_TOP:
1716 R->csrO = 0;
1717 break;
1718 case R_SB_ALIGN_CENTRE:
1719 R->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2;
1720 break;
1721 case R_SB_ALIGN_BOTTOM:
1722 R->csrO = R->scrollBar.bot - R->scrollBar.top;
1723 break;
1724 }
1725 if (R->scrollBar.style == R_SB_XTERM
1726 || scrollbar_above_slider(ev->y)
1727 || scrollbar_below_slider(ev->y))
1728 rxvt_scr_move_to(aR_
1729 scrollbar_position(ev->y) - R->csrO,
1730 scrollbar_size());
1731 R->scrollBar.setMotion ();
1732 break;
1733
1734 case Button1:
1735 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1736 R->csrO = ev->y - R->scrollBar.top;
1737 /* FALLTHROUGH */
1738
1739 case Button3:
1740 if (R->scrollBar.style != R_SB_XTERM) {
1741 if (scrollbar_above_slider(ev->y))
1742# ifdef RXVT_SCROLL_FULL
1743 rxvt_scr_page(aR_ UP, R->TermWin.nrow - 1);
1744# else
1745 rxvt_scr_page(aR_ UP, R->TermWin.nrow / 4);
1746# endif 1766#endif
1747 else if (scrollbar_below_slider(ev->y))
1748# ifdef RXVT_SCROLL_FULL
1749 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1750# else
1751 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1752# endif
1753 else
1754 R->scrollBar.setMotion ();
1755 } else {
1756 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1757 (R->TermWin.nrow
1758 * scrollbar_position(ev->y)
1759 / scrollbar_size()));
1760 }
1761 break;
1762 }
1763 }
1764 return;
1765 }
1766#if MENUBAR
1767 /*
1768 * Menubar window processing of button press
1769 */
1770 if (isMenuBarWindow(ev->window))
1771 rxvt_menubar_control(aR_ ev);
1772#endif
1773}
1774 1767
1775/* INTPROTO */
1776void
1777rxvt_button_release(pR_ XButtonEvent *ev)
1778{
1779 int reportmode = 0;
1780
1781 R->csrO = 0; /* reset csr Offset */
1782 if (!R->bypass_keystate)
1783 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1784
1785 if (scrollbar_isUpDn()) {
1786 R->scrollBar.setIdle ();
1787 rxvt_scrollbar_show(aR_ 0);
1788#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1789 R->refresh_type &= ~SMOOTH_REFRESH;
1790#endif
1791 } 1768 }
1792#ifdef SELECTION_SCROLLING 1769#ifdef SELECTION_SCROLLING
1793 R->pending_scroll_selection=0; 1770 pending_scroll_selection=0;
1794#endif 1771#endif
1795 if (ev->window == R->TermWin.vt) 1772 if (ev.window == TermWin.vt)
1796 { 1773 {
1797#ifdef RXVT_GRAPHICS
1798 if (ev->subwindow != None)
1799 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1800 else
1801#endif
1802 {
1803 if (reportmode) 1774 if (reportmode)
1804 { 1775 {
1805 /* mouse report from vt window */ 1776 /* mouse report from vt window */
1806 /* don't report release of wheel "buttons" */ 1777 /* don't report release of wheel "buttons" */
1807 if (ev->button >= 4) 1778 if (ev.button >= 4)
1808 return; 1779 return;
1809#ifdef MOUSE_REPORT_DOUBLECLICK 1780#ifdef MOUSE_REPORT_DOUBLECLICK
1810 /* only report the release of 'slow' single clicks */ 1781 /* only report the release of 'slow' single clicks */
1811 if (R->MEvent.button != AnyButton 1782 if (MEvent.button != AnyButton
1812 && (ev->button != R->MEvent.button 1783 && (ev.button != MEvent.button
1813 || (ev->time - R->MEvent.time 1784 || (ev.time - MEvent.time
1814 > MULTICLICK_TIME / 2))) 1785 > MULTICLICK_TIME / 2)))
1815 { 1786 {
1816 R->MEvent.clicks = 0; 1787 MEvent.clicks = 0;
1817 R->MEvent.button = AnyButton; 1788 MEvent.button = AnyButton;
1818 rxvt_mouse_report(aR_ ev); 1789 mouse_report (ev);
1819 } 1790 }
1820#else /* MOUSE_REPORT_DOUBLECLICK */ 1791#else /* MOUSE_REPORT_DOUBLECLICK */
1821 R->MEvent.button = AnyButton; 1792 MEvent.button = AnyButton;
1822 rxvt_mouse_report(aR_ ev); 1793 mouse_report (ev);
1823#endif /* MOUSE_REPORT_DOUBLECLICK */ 1794#endif /* MOUSE_REPORT_DOUBLECLICK */
1824 return; 1795 return;
1825 } 1796 }
1826 /* 1797 /*
1827 * dumb hack to compensate for the failure of click-and-drag 1798 * dumb hack to compensate for the failure of click-and-drag
1828 * when overriding mouse reporting 1799 * when overriding mouse reporting
1829 */ 1800 */
1830 if (R->PrivateModes & PrivMode_mouse_report 1801 if (PrivateModes & PrivMode_mouse_report
1831 && R->bypass_keystate 1802 && bypass_keystate
1832 && ev->button == Button1 && R->MEvent.clicks <= 1) 1803 && ev.button == Button1 && MEvent.clicks <= 1)
1833 R->selection_extend (ev->x, ev->y, 0); 1804 selection_extend (ev.x, ev.y, 0);
1834 1805
1835 switch (ev->button) { 1806 switch (ev.button)
1807 {
1836 case Button1: 1808 case Button1:
1837 case Button3: 1809 case Button3:
1838 rxvt_selection_make(aR_ ev->time); 1810 selection_make (ev.time);
1839 break; 1811 break;
1840 case Button2: 1812 case Button2:
1841 rxvt_selection_request(aR_ ev->time, ev->x, ev->y); 1813 selection_request (ev.time, ev.x, ev.y);
1842 break; 1814 break;
1843#ifdef MOUSE_WHEEL 1815#ifdef MOUSE_WHEEL
1844 case Button4: 1816 case Button4:
1845 case Button5: 1817 case Button5:
1846 { 1818 {
1847 int i; 1819 int i;
1848 page_dirn v; 1820 page_dirn v;
1849 1821
1850 v = (ev->button == Button4) ? UP : DN; 1822 v = (ev.button == Button4) ? UP : DN;
1851 if (ev->state & ShiftMask) 1823 if (ev.state & ShiftMask)
1852 i = 1; 1824 i = 1;
1853 else if ((R->Options & Opt_mouseWheelScrollPage)) 1825 else if ((Options & Opt_mouseWheelScrollPage))
1854 i = R->TermWin.nrow - 1; 1826 i = TermWin.nrow - 1;
1855 else 1827 else
1856 i = 5; 1828 i = 5;
1857# ifdef MOUSE_SLIP_WHEELING 1829# ifdef MOUSE_SLIP_WHEELING
1858 if (ev->state & ControlMask) 1830 if (ev.state & ControlMask)
1859 { 1831 {
1860 R->mouse_slip_wheel_speed += (v ? -1 : 1); 1832 mouse_slip_wheel_speed += (v ? -1 : 1);
1861 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1833 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1862 } 1834 }
1863# endif 1835# endif
1864# ifdef JUMP_MOUSE_WHEEL 1836# ifdef JUMP_MOUSE_WHEEL
1865 rxvt_scr_page(aR_ v, i); 1837 scr_page (v, i);
1866 R->scr_refresh (SMOOTH_REFRESH); 1838 scr_refresh (SMOOTH_REFRESH);
1867 rxvt_scrollbar_show(aR_ 1); 1839 scrollbar_show (1);
1868# else 1840# else
1869 while (i--) 1841 while (i--)
1870 { 1842 {
1871 rxvt_scr_page(aR_ v, 1); 1843 scr_page (v, 1);
1872 R->scr_refresh (SMOOTH_REFRESH); 1844 scr_refresh (SMOOTH_REFRESH);
1873 rxvt_scrollbar_show(aR_ 1); 1845 scrollbar_show (1);
1874 } 1846 }
1875# endif 1847# endif
1876 } 1848
1877 break; 1849 }
1850 break;
1878#endif 1851#endif
1879 } 1852
1880 }
1881 } 1853 }
1854 }
1882#ifdef MENUBAR 1855#ifdef MENUBAR
1883 else if (isMenuBarWindow(ev->window)) 1856 else if (isMenuBarWindow (ev.window))
1884 rxvt_menubar_control(aR_ ev); 1857 menubar_control (ev);
1885#endif 1858#endif
1886} 1859}
1887 1860
1888 1861
1889#ifdef TRANSPARENT 1862#ifdef TRANSPARENT
1890/* 1863/*
1891 * Check our parents are still who we think they are. 1864 * Check our parents are still who we think they are.
1892 * Do transparency updates if required 1865 * Do transparency updates if required
1893 */ 1866 */
1894/* EXTPROTO */
1895int 1867int
1896rxvt_check_our_parents(pR) 1868rxvt_term::check_our_parents ()
1897{ 1869{
1898 int i, pchanged, aformat, have_pixmap, rootdepth; 1870 int i, pchanged, aformat, have_pixmap, rootdepth;
1899 unsigned long nitems, bytes_after; 1871 unsigned long nitems, bytes_after;
1900 Atom atype; 1872 Atom atype;
1901 unsigned char *prop = NULL; 1873 unsigned char *prop = NULL;
1902 Window root, oldp, *list; 1874 Window root, oldp, *list;
1903 Pixmap rootpixmap = None; 1875 Pixmap rootpixmap = None;
1904 XWindowAttributes wattr, wrootattr; 1876 XWindowAttributes wattr, wrootattr;
1905 1877
1906 pchanged = 0; 1878 pchanged = 0;
1907 1879
1908 if (!(R->Options & Opt_transparent)) 1880 if (! (Options & Opt_transparent))
1909 return pchanged; /* Don't try any more */ 1881 return pchanged; /* Don't try any more */
1910 1882
1911 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr); 1883 XGetWindowAttributes (display->display, display->root, &wrootattr);
1912 rootdepth = wrootattr.depth; 1884 rootdepth = wrootattr.depth;
1913 1885
1914 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 1886 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1915 if (rootdepth != wattr.depth) { 1887 if (rootdepth != wattr.depth)
1888 {
1916 if (R->am_transparent) { 1889 if (am_transparent)
1890 {
1917 pchanged = 1; 1891 pchanged = 1;
1918 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1892 XSetWindowBackground (display->display, TermWin.vt,
1919 R->PixColors[Color_bg]); 1893 PixColors[Color_bg]);
1920 R->am_transparent = R->am_pixmap_trans = 0; 1894 am_transparent = am_pixmap_trans = 0;
1921 } 1895 }
1922 return pchanged; /* Don't try any more */ 1896 return pchanged; /* Don't try any more */
1923 } 1897 }
1924 1898
1925/* Get all X ops out of the queue so that our information is up-to-date. */ 1899 /* Get all X ops out of the queue so that our information is up-to-date. */
1926 XSync(R->Xdisplay, False); 1900 XSync (display->display, False);
1927 1901
1928/* 1902 /*
1929 * Make the frame window set by the window manager have 1903 * Make the frame window set by the window manager have
1930 * the root background. Some window managers put multiple nested frame 1904 * the root background. Some window managers put multiple nested frame
1931 * windows for each client, so we have to take care about that. 1905 * windows for each client, so we have to take care about that.
1932 */ 1906 */
1933 i = (R->xa[XA_XROOTPMAPID] != 0 1907 i = (xa[XA_XROOTPMAPID] != 0
1934 && (XGetWindowProperty(R->Xdisplay, Xroot, R->xa[XA_XROOTPMAPID], 1908 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1935 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1909 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1936 &nitems, &bytes_after, &prop) == Success)); 1910 &nitems, &bytes_after, &prop) == Success));
1937 if (!i || prop == NULL) 1911 if (!i || prop == NULL)
1938 have_pixmap = 0; 1912 have_pixmap = 0;
1939 else { 1913 else
1914 {
1940 have_pixmap = 1; 1915 have_pixmap = 1;
1941 rootpixmap = *((Pixmap *)prop); 1916 rootpixmap = * ((Pixmap *)prop);
1942 XFree(prop); 1917 XFree (prop);
1943 } 1918 }
1944 if (have_pixmap) { 1919 if (have_pixmap)
1945/* 1920 {
1921 /*
1946 * Copy Xroot pixmap transparency 1922 * Copy display->root pixmap transparency
1947 */ 1923 */
1948 int sx, sy, nx, ny; 1924 int sx, sy, nx, ny;
1949 unsigned int nw, nh; 1925 unsigned int nw, nh;
1950 Window cr; 1926 Window cr;
1951 XImage *image; 1927 XImage *image;
1952 GC gc; 1928 GC gc;
1953 XGCValues gcvalue; 1929 XGCValues gcvalue;
1954 1930
1955 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 1931 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1956 0, 0, &sx, &sy, &cr); 1932 0, 0, &sx, &sy, &cr);
1957 nw = (unsigned int)R->szHint.width; 1933 nw = (unsigned int)szHint.width;
1958 nh = (unsigned int)R->szHint.height; 1934 nh = (unsigned int)szHint.height;
1959 nx = ny = 0; 1935 nx = ny = 0;
1960 if (sx < 0) { 1936
1937 if (sx < 0)
1938 {
1961 nw += sx; 1939 nw += sx;
1962 nx = -sx; 1940 nx = -sx;
1963 sx = 0; 1941 sx = 0;
1964 } 1942 }
1965 if (sy < 0) { 1943
1944 if (sy < 0)
1945 {
1966 nh += sy; 1946 nh += sy;
1967 ny = -sy; 1947 ny = -sy;
1968 sy = 0; 1948 sy = 0;
1969 } 1949 }
1950
1970 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 1951 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1971 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 1952 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1972 R->allowedxerror = -1; 1953 allowedxerror = -1;
1973 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 1954 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1974 ZPixmap); 1955 ZPixmap);
1975 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 1956 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1976 /* XXX: may need a delay here? */ 1957 /* XXX: may need a delay here? */
1977 R->allowedxerror = 0; 1958 allowedxerror = 0;
1978 if (image == NULL) { 1959 if (image == NULL)
1960 {
1979 if (R->am_transparent && R->am_pixmap_trans) { 1961 if (am_transparent && am_pixmap_trans)
1980 pchanged = 1; 1962 {
1963 pchanged = 1;
1964 if (TermWin.pixmap != None)
1965 {
1966 XFreePixmap (display->display, TermWin.pixmap);
1967 TermWin.pixmap = None;
1968 }
1969 }
1970 am_pixmap_trans = 0;
1971 }
1972 else
1973 {
1981 if (R->TermWin.pixmap != None) { 1974 if (TermWin.pixmap != None)
1982 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 1975 XFreePixmap (display->display, TermWin.pixmap);
1983 R->TermWin.pixmap = None; 1976 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1984 } 1977 (unsigned int)szHint.width,
1978 (unsigned int)szHint.height,
1979 (unsigned int)image->depth);
1980 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1981 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1982 nx, ny, (unsigned int)image->width,
1983 (unsigned int)image->height);
1984 XFreeGC (display->display, gc);
1985 XDestroyImage (image);
1986 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
1987 TermWin.pixmap);
1988 if (!am_transparent || !am_pixmap_trans)
1989 pchanged = 1;
1990 am_transparent = am_pixmap_trans = 1;
1991 }
1985 } 1992 }
1986 R->am_pixmap_trans = 0; 1993
1987 } else {
1988 if (R->TermWin.pixmap != None)
1989 XFreePixmap(R->Xdisplay, R->TermWin.pixmap);
1990 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt,
1991 (unsigned int)R->szHint.width,
1992 (unsigned int)R->szHint.height,
1993 (unsigned int)image->depth);
1994 gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 0UL, &gcvalue);
1995 XPutImage(R->Xdisplay, R->TermWin.pixmap, gc, image, 0, 0,
1996 nx, ny, (unsigned int)image->width,
1997 (unsigned int)image->height);
1998 XFreeGC(R->Xdisplay, gc);
1999 XDestroyImage(image);
2000 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt,
2001 R->TermWin.pixmap);
2002 if (!R->am_transparent || !R->am_pixmap_trans)
2003 pchanged = 1;
2004 R->am_transparent = R->am_pixmap_trans = 1;
2005 }
2006 }
2007 if (!R->am_pixmap_trans) { 1994 if (!am_pixmap_trans)
1995 {
2008 unsigned int n; 1996 unsigned int n;
2009/* 1997 /*
2010 * InheritPixmap transparency 1998 * InheritPixmap transparency
2011 */ 1999 */
2012 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2000 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2013 for (i = 1; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); 2001 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
2014 i++) { 2002 i++)
2003 {
2015 oldp = R->TermWin.parent[i]; 2004 oldp = TermWin.parent[i];
2016 XQueryTree(R->Xdisplay, R->TermWin.parent[i - 1], &root, 2005 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2017 &R->TermWin.parent[i], &list, &n); 2006 &TermWin.parent[i], &list, &n);
2018 XFree(list); 2007 XFree (list);
2019 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, R->TermWin.parent[i])); 2008 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2020 if (R->TermWin.parent[i] == Xroot) { 2009 if (TermWin.parent[i] == display->root)
2021 if (oldp != None) 2010 {
2022 pchanged = 1; 2011 if (oldp != None)
2023 break; 2012 pchanged = 1;
2024 } 2013 break;
2014 }
2025 if (oldp != R->TermWin.parent[i]) 2015 if (oldp != TermWin.parent[i])
2026 pchanged = 1; 2016 pchanged = 1;
2027 } 2017 }
2028 n = 0; 2018
2029 if (pchanged) { 2019 n = 0;
2020
2021 if (pchanged)
2022 {
2030 for (; n < (unsigned int)i; n++) { 2023 for (; n < (unsigned int)i; n++)
2024 {
2031 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2025 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2032 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2026 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2033 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { 2027 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2028 {
2034 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2029 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2035 break; 2030 break;
2036 } 2031 }
2037 } 2032 }
2038 } 2033 }
2034
2039 if (n > (int)(sizeof(R->TermWin.parent) 2035 if (n > (int) (sizeof (TermWin.parent)
2040 / sizeof(R->TermWin.parent[0]))) { 2036 / sizeof (TermWin.parent[0])))
2037 {
2041 D_X((stderr, "InheritPixmap Turning off")); 2038 D_X ((stderr, "InheritPixmap Turning off"));
2042 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0], 2039 XSetWindowBackground (display->display, TermWin.parent[0],
2043 R->PixColors[Color_fg]); 2040 PixColors[Color_fg]);
2044 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 2041 XSetWindowBackground (display->display, TermWin.vt,
2045 R->PixColors[Color_bg]); 2042 PixColors[Color_bg]);
2046 R->am_transparent = 0; 2043 am_transparent = 0;
2047 /* XXX: also turn off Opt_transparent? */ 2044 /* XXX: also turn off Opt_transparent? */
2048 } else { 2045 }
2046 else
2047 {
2049 /* wait (an arbitrary period) for the WM to do its thing 2048 /* wait (an arbitrary period) for the WM to do its thing
2050 * needed for fvwm2.2.2 (and before?) */ 2049 * needed for fvwm2.2.2 (and before?) */
2051# ifdef HAVE_NANOSLEEP 2050# ifdef HAVE_NANOSLEEP
2052 struct timespec rqt; 2051 struct timespec rqt;
2053 2052
2054 rqt.tv_sec = 1; 2053 rqt.tv_sec = 1;
2055 rqt.tv_nsec = 0; 2054 rqt.tv_nsec = 0;
2056 nanosleep(&rqt, NULL); 2055 nanosleep (&rqt, NULL);
2057# else 2056# else
2058 sleep(1); 2057 sleep (1);
2059# endif 2058# endif
2060 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2059 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2061 for (n = 0; n < (unsigned int)i; n++) 2060 for (n = 0; n < (unsigned int)i; n++)
2062 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n], 2061 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2063 ParentRelative); 2062 ParentRelative);
2064 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 2063 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2065 ParentRelative); 2064 ParentRelative);
2066 R->am_transparent = 1; 2065 am_transparent = 1;
2067 } 2066 }
2067
2068 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++) 2068 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2069 R->TermWin.parent[i] = None; 2069 TermWin.parent[i] = None;
2070 } 2070 }
2071 return pchanged; 2071 return pchanged;
2072} 2072}
2073#endif 2073#endif
2074 2074
2075/*}}} */ 2075/*}}} */
2076 2076
2077/*{{{ print pipe */ 2077/*{{{ print pipe */
2078/*----------------------------------------------------------------------*/ 2078/*----------------------------------------------------------------------*/
2079#ifdef PRINTPIPE 2079#ifdef PRINTPIPE
2080/* EXTPROTO */ 2080FILE *
2081FILE *
2082rxvt_popen_printer(pR) 2081rxvt_term::popen_printer ()
2083{ 2082{
2084 FILE *stream = popen(R->rs[Rs_print_pipe], "w"); 2083 FILE *stream = popen (rs[Rs_print_pipe], "w");
2085 2084
2086 if (stream == NULL) 2085 if (stream == NULL)
2087 rxvt_print_error("can't open printer pipe"); 2086 rxvt_print_error ("can't open printer pipe");
2088 return stream; 2087 return stream;
2089} 2088}
2090 2089
2091/* EXTPROTO */
2092int 2090int
2093rxvt_pclose_printer (FILE *stream) 2091rxvt_term::pclose_printer (FILE *stream)
2094{ 2092{
2095 fflush (stream); 2093 fflush (stream);
2096/* pclose() reported not to work on SunOS 4.1.3 */ 2094 /* pclose () reported not to work on SunOS 4.1.3 */
2097# if defined (__sun__) /* TODO: RESOLVE THIS */ 2095# if defined (__sun__) /* TODO: RESOLVE THIS */
2098/* pclose works provided SIGCHLD handler uses waitpid */ 2096 /* pclose works provided SIGCHLD handler uses waitpid */
2099 return pclose (stream); /* return fclose (stream); */ 2097 return pclose (stream); /* return fclose (stream); */
2100# else 2098# else
2101 return pclose (stream); 2099 return pclose (stream);
2102# endif 2100# endif
2103} 2101}
2104 2102
2105/* 2103/*
2106 * simulate attached vt100 printer 2104 * simulate attached vt100 printer
2107 */ 2105 */
2108/* INTPROTO */
2109void 2106void
2110rxvt_process_print_pipe(pR) 2107rxvt_term::process_print_pipe ()
2111{ 2108{
2112 int done; 2109 int done;
2113 FILE *fd; 2110 FILE *fd;
2114 2111
2115 if ((fd = rxvt_popen_printer(aR)) == NULL) 2112 if ((fd = popen_printer ()) == NULL)
2116 return; 2113 return;
2117 2114
2118/* 2115 /*
2119 * Send all input to the printer until either ESC[4i or ESC[?4i 2116 * Send all input to the printer until either ESC[4i or ESC[?4i
2120 * is received. 2117 * is received.
2121 */ 2118 */
2122 for (done = 0; !done;) { 2119 for (done = 0; !done;)
2120 {
2123 unsigned char buf[8]; 2121 unsigned char buf[8];
2124 unsigned char ch; 2122 unsigned char ch;
2125 unsigned int i, len; 2123 unsigned int i, len;
2126 2124
2127 if ((ch = rxvt_cmd_getc(aR)) != C0_ESC) { 2125 if ((ch = cmd_getc ()) != C0_ESC)
2126 {
2128 if (putc(ch, fd) == EOF) 2127 if (putc (ch, fd) == EOF)
2129 break; /* done = 1 */ 2128 break; /* done = 1 */
2130 } else { 2129 }
2130 else
2131 {
2131 len = 0; 2132 len = 0;
2132 buf[len++] = ch; 2133 buf[len++] = ch;
2133 2134
2134 if ((buf[len++] = rxvt_cmd_getc(aR)) == '[') { 2135 if ((buf[len++] = cmd_getc ()) == '[')
2135 if ((ch = rxvt_cmd_getc(aR)) == '?') { 2136 {
2136 buf[len++] = '?'; 2137 if ((ch = cmd_getc ()) == '?')
2137 ch = rxvt_cmd_getc(aR); 2138 {
2138 } 2139 buf[len++] = '?';
2140 ch = cmd_getc ();
2141 }
2139 if ((buf[len++] = ch) == '4') { 2142 if ((buf[len++] = ch) == '4')
2143 {
2140 if ((buf[len++] = rxvt_cmd_getc(aR)) == 'i') 2144 if ((buf[len++] = cmd_getc ()) == 'i')
2141 break; /* done = 1 */ 2145 break; /* done = 1 */
2142 } 2146 }
2147 }
2148 for (i = 0; i < len; i++)
2149 if (putc (buf[i], fd) == EOF)
2150 {
2151 done = 1;
2152 break;
2153 }
2154 }
2143 } 2155 }
2144 for (i = 0; i < len; i++)
2145 if (putc(buf[i], fd) == EOF) {
2146 done = 1;
2147 break;
2148 }
2149 }
2150 }
2151 rxvt_pclose_printer(fd); 2156 pclose_printer (fd);
2152} 2157}
2153#endif /* PRINTPIPE */ 2158#endif /* PRINTPIPE */
2154/*}}} */ 2159/*}}} */
2155 2160
2156/* *INDENT-OFF* */ 2161/* *INDENT-OFF* */
2157enum { 2162enum {
2158 C1_40 = 0x40, 2163 C1_40 = 0x40,
2159 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2164 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2160 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2165 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2161 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2166 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2162 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2167 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC
2163}; 2168};
2164/* *INDENT-ON* */ 2169/* *INDENT-ON* */
2165 2170
2166/*{{{ process non-printing single characters */ 2171/*{{{ process non-printing single characters */
2167/* INTPROTO */
2168void 2172void
2169rxvt_process_nonprinting(pR_ unsigned char ch) 2173rxvt_term::process_nonprinting (unsigned char ch)
2170{ 2174{
2171 switch (ch) { 2175 switch (ch)
2176 {
2172 case C0_ENQ: /* terminal Status */ 2177 case C0_ENQ: /* terminal Status */
2173 if (R->rs[Rs_answerbackstring]) 2178 if (rs[Rs_answerbackstring])
2174 R->tt_write( 2179 tt_write (
2175 (const unsigned char *)R->rs[Rs_answerbackstring], 2180 (const unsigned char *)rs[Rs_answerbackstring],
2176 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2181 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2177 else 2182 else
2178 R->tt_write((unsigned char *)VT100_ANS, 2183 tt_write ((unsigned char *)VT100_ANS,
2179 (unsigned int)STRLEN(VT100_ANS)); 2184 (unsigned int)STRLEN (VT100_ANS));
2180 break; 2185 break;
2181 case C0_BEL: /* bell */ 2186 case C0_BEL: /* bell */
2182 rxvt_scr_bell(aR); 2187 scr_bell ();
2183 break; 2188 break;
2184 case C0_BS: /* backspace */ 2189 case C0_BS: /* backspace */
2185 rxvt_scr_backspace(aR); 2190 scr_backspace ();
2186 break; 2191 break;
2187 case C0_HT: /* tab */ 2192 case C0_HT: /* tab */
2188 rxvt_scr_tab(aR_ 1); 2193 scr_tab (1);
2189 break; 2194 break;
2190 case C0_CR: /* carriage return */ 2195 case C0_CR: /* carriage return */
2191 rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); 2196 scr_gotorc (0, 0, R_RELATIVE);
2192 break; 2197 break;
2193 case C0_VT: /* vertical tab, form feed */ 2198 case C0_VT: /* vertical tab, form feed */
2194 case C0_FF: 2199 case C0_FF:
2195 case C0_LF: /* line feed */ 2200 case C0_LF: /* line feed */
2196 rxvt_scr_index(aR_ UP); 2201 scr_index (UP);
2197 break; 2202 break;
2198 case C0_SO: /* shift out - acs */ 2203 case C0_SO: /* shift out - acs */
2199 rxvt_scr_charset_choose(aR_ 1); 2204 scr_charset_choose (1);
2200 break; 2205 break;
2201 case C0_SI: /* shift in - acs */ 2206 case C0_SI: /* shift in - acs */
2202 rxvt_scr_charset_choose(aR_ 0); 2207 scr_charset_choose (0);
2203 break; 2208 break;
2204 } 2209 }
2205} 2210}
2206/*}}} */ 2211/*}}} */
2207 2212
2208 2213
2209/*{{{ process VT52 escape sequences */ 2214/*{{{ process VT52 escape sequences */
2210/* INTPROTO */
2211void 2215void
2212rxvt_process_escape_vt52(pR_ unsigned char ch) 2216rxvt_term::process_escape_vt52 (unsigned char ch)
2213{ 2217{
2214 int row, col; 2218 int row, col;
2219
2220 switch (ch)
2215 2221 {
2216 switch (ch) {
2217 case 'A': /* cursor up */ 2222 case 'A': /* cursor up */
2218 rxvt_scr_gotorc(aR_ -1, 0, R_RELATIVE | C_RELATIVE); 2223 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2219 break; 2224 break;
2220 case 'B': /* cursor down */ 2225 case 'B': /* cursor down */
2221 rxvt_scr_gotorc(aR_ 1, 0, R_RELATIVE | C_RELATIVE); 2226 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2222 break; 2227 break;
2223 case 'C': /* cursor right */ 2228 case 'C': /* cursor right */
2224 rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); 2229 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2225 break; 2230 break;
2226 case 'D': /* cursor left */ 2231 case 'D': /* cursor left */
2227 rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); 2232 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2228 break; 2233 break;
2229 case 'H': /* cursor home */ 2234 case 'H': /* cursor home */
2230 rxvt_scr_gotorc(aR_ 0, 0, 0); 2235 scr_gotorc (0, 0, 0);
2231 break; 2236 break;
2232 case 'I': /* cursor up and scroll down if needed */ 2237 case 'I': /* cursor up and scroll down if needed */
2233 rxvt_scr_index(aR_ DN); 2238 scr_index (DN);
2234 break; 2239 break;
2235 case 'J': /* erase to end of screen */ 2240 case 'J': /* erase to end of screen */
2236 R->scr_erase_screen (0); 2241 scr_erase_screen (0);
2237 break; 2242 break;
2238 case 'K': /* erase to end of line */ 2243 case 'K': /* erase to end of line */
2239 rxvt_scr_erase_line(aR_ 0); 2244 scr_erase_line (0);
2240 break; 2245 break;
2241 case 'Y': /* move to specified row and col */ 2246 case 'Y': /* move to specified row and col */
2242 /* full command is 'ESC Y row col' where row and col 2247 /* full command is 'ESC Y row col' where row and col
2243 * are encoded by adding 32 and sending the ascii 2248 * are encoded by adding 32 and sending the ascii
2244 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2249 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2245 * etc. */ 2250 * etc. */
2246 row = rxvt_cmd_getc(aR) - ' '; 2251 row = cmd_getc () - ' ';
2247 col = rxvt_cmd_getc(aR) - ' '; 2252 col = cmd_getc () - ' ';
2248 rxvt_scr_gotorc(aR_ row, col, 0); 2253 scr_gotorc (row, col, 0);
2249 break; 2254 break;
2250 case 'Z': /* identify the terminal type */ 2255 case 'Z': /* identify the terminal type */
2251 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2256 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2252 break; 2257 break;
2253 case '<': /* turn off VT52 mode */ 2258 case '<': /* turn off VT52 mode */
2254 PrivMode(0, PrivMode_vt52); 2259 PrivMode (0, PrivMode_vt52);
2255 break; 2260 break;
2256 case 'F': /* use special graphics character set */ 2261 case 'F': /* use special graphics character set */
2257 case 'G': /* use regular character set */ 2262 case 'G': /* use regular character set */
2258 /* unimplemented */ 2263 /* unimplemented */
2259 break; 2264 break;
2260 case '=': /* use alternate keypad mode */ 2265 case '=': /* use alternate keypad mode */
2261 case '>': /* use regular keypad mode */ 2266 case '>': /* use regular keypad mode */
2262 /* unimplemented */ 2267 /* unimplemented */
2263 break; 2268 break;
2264 } 2269 }
2265} 2270}
2266/*}}} */ 2271/*}}} */
2267 2272
2268 2273
2269/*{{{ process escape sequences */ 2274/*{{{ process escape sequences */
2270/* INTPROTO */
2271void 2275void
2272rxvt_process_escape_seq(pR) 2276rxvt_term::process_escape_seq ()
2273{ 2277{
2274 unsigned char ch = rxvt_cmd_getc(aR); 2278 unsigned char ch = cmd_getc ();
2275 2279
2276 if (R->PrivateModes & PrivMode_vt52) { 2280 if (PrivateModes & PrivMode_vt52)
2277 rxvt_process_escape_vt52(aR_ ch);
2278 return;
2279 }
2280 2281 {
2282 process_escape_vt52 (ch);
2283 return;
2284 }
2285
2281 switch (ch) { 2286 switch (ch)
2287 {
2282 /* case 1: do_tek_mode (); break; */ 2288 /* case 1: do_tek_mode (); break; */
2283 case '#': 2289 case '#':
2284 if (rxvt_cmd_getc(aR) == '8') 2290 if (cmd_getc () == '8')
2285 rxvt_scr_E(aR); 2291 scr_E ();
2286 break; 2292 break;
2287 case '(': 2293 case '(':
2288 rxvt_scr_charset_set(aR_ 0, (unsigned int)rxvt_cmd_getc(aR)); 2294 scr_charset_set (0, (unsigned int)cmd_getc ());
2289 break; 2295 break;
2290 case ')': 2296 case ')':
2291 rxvt_scr_charset_set(aR_ 1, (unsigned int)rxvt_cmd_getc(aR)); 2297 scr_charset_set (1, (unsigned int)cmd_getc ());
2292 break; 2298 break;
2293 case '*': 2299 case '*':
2294 rxvt_scr_charset_set(aR_ 2, (unsigned int)rxvt_cmd_getc(aR)); 2300 scr_charset_set (2, (unsigned int)cmd_getc ());
2295 break; 2301 break;
2296 case '+': 2302 case '+':
2297 rxvt_scr_charset_set(aR_ 3, (unsigned int)rxvt_cmd_getc(aR)); 2303 scr_charset_set (3, (unsigned int)cmd_getc ());
2298 break; 2304 break;
2299#ifdef MULTICHAR_SET
2300 case '$':
2301 rxvt_scr_charset_set(aR_ -2, (unsigned int)rxvt_cmd_getc(aR));
2302 break;
2303#endif
2304#ifndef NO_FRILLS 2305#ifndef NO_FRILLS
2305 case '6': 2306 case '6':
2306 rxvt_scr_backindex(aR); 2307 scr_backindex ();
2307 break; 2308 break;
2308#endif 2309#endif
2309 case '7': 2310 case '7':
2310 rxvt_scr_cursor(aR_ SAVE); 2311 scr_cursor (SAVE);
2311 break; 2312 break;
2312 case '8': 2313 case '8':
2313 rxvt_scr_cursor(aR_ RESTORE); 2314 scr_cursor (RESTORE);
2314 break; 2315 break;
2315#ifndef NO_FRILLS 2316#ifndef NO_FRILLS
2316 case '9': 2317 case '9':
2317 rxvt_scr_forwardindex(aR); 2318 scr_forwardindex ();
2318 break; 2319 break;
2319#endif 2320#endif
2320 case '=': 2321 case '=':
2321 case '>': 2322 case '>':
2322 PrivMode((ch == '='), PrivMode_aplKP); 2323 PrivMode ((ch == '='), PrivMode_aplKP);
2323 break; 2324 break;
2324 2325
2325 case C1_40: 2326 case C1_40:
2326 rxvt_cmd_getc(aR); 2327 cmd_getc ();
2327 break; 2328 break;
2328 case C1_44: 2329 case C1_44:
2329 rxvt_scr_index(aR_ UP); 2330 scr_index (UP);
2330 break; 2331 break;
2331 2332
2332 /* 8.3.87: NEXT LINE */ 2333 /* 8.3.87: NEXT LINE */
2333 case C1_NEL: /* ESC E */ 2334 case C1_NEL: /* ESC E */
2334 {
2335 uint32_t nlcr[] = { '\n', '\r' };
2336 rxvt_scr_add_lines(aR_ nlcr, 1, 2);
2337 } 2335 {
2338 break; 2336 unicode_t nlcr[] = { L'\n', L'\r' };
2337 scr_add_lines (nlcr, 1, 2);
2338 }
2339 break;
2339 2340
2340 /* kidnapped escape sequence: Should be 8.3.48 */ 2341 /* kidnapped escape sequence: Should be 8.3.48 */
2341 case C1_ESA: /* ESC G */ 2342 case C1_ESA: /* ESC G */
2342 rxvt_process_graphics(aR); 2343 process_graphics ();
2343 break; 2344 break;
2344 2345
2345 /* 8.3.63: CHARACTER TABULATION SET */ 2346 /* 8.3.63: CHARACTER TABULATION SET */
2346 case C1_HTS: /* ESC H */ 2347 case C1_HTS: /* ESC H */
2347 rxvt_scr_set_tab(aR_ 1); 2348 scr_set_tab (1);
2348 break; 2349 break;
2349 2350
2350 /* 8.3.105: REVERSE LINE FEED */ 2351 /* 8.3.105: REVERSE LINE FEED */
2351 case C1_RI: /* ESC M */ 2352 case C1_RI: /* ESC M */
2352 rxvt_scr_index(aR_ DN); 2353 scr_index (DN);
2353 break; 2354 break;
2354 2355
2355 /* 8.3.142: SINGLE-SHIFT TWO */ 2356 /* 8.3.142: SINGLE-SHIFT TWO */
2356 /*case C1_SS2: scr_single_shift (2); break; */ 2357 /*case C1_SS2: scr_single_shift (2); break; */
2357 2358
2358 /* 8.3.143: SINGLE-SHIFT THREE */ 2359 /* 8.3.143: SINGLE-SHIFT THREE */
2359 /*case C1_SS3: scr_single_shift (3); break; */ 2360 /*case C1_SS3: scr_single_shift (3); break; */
2360 2361
2361 /* 8.3.27: DEVICE CONTROL STRING */ 2362 /* 8.3.27: DEVICE CONTROL STRING */
2362 case C1_DCS: /* ESC P */ 2363 case C1_DCS: /* ESC P */
2363 rxvt_process_dcs_seq(aR); 2364 process_dcs_seq ();
2364 break; 2365 break;
2365 2366
2366 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2367 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2367 case C1_SCI: /* ESC Z */ 2368 case C1_SCI: /* ESC Z */
2368 R->tt_write((const unsigned char *)ESCZ_ANSWER, 2369 tt_write ((const unsigned char *)ESCZ_ANSWER,
2369 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2370 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2370 break; /* steal obsolete ESC [ c */ 2371 break; /* steal obsolete ESC [ c */
2371 2372
2372 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2373 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2373 case C1_CSI: /* ESC [ */ 2374 case C1_CSI: /* ESC [ */
2374 rxvt_process_csi_seq(aR); 2375 process_csi_seq ();
2375 break; 2376 break;
2376 2377
2377 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2378 /* 8.3.90: OPERATING SYSTEM COMMAND */
2378 case C1_OSC: /* ESC ] */ 2379 case C1_OSC: /* ESC ] */
2379 rxvt_process_osc_seq(aR); 2380 process_osc_seq ();
2380 break; 2381 break;
2381 2382
2382 /* 8.3.106: RESET TO INITIAL STATE */ 2383 /* 8.3.106: RESET TO INITIAL STATE */
2383 case 'c': 2384 case 'c':
2384 rxvt_scr_poweron(aR); 2385 scr_poweron ();
2385 rxvt_scrollbar_show(aR_ 1); 2386 scrollbar_show (1);
2386 break; 2387 break;
2387 2388
2388 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2389 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2389 case 'n': 2390 case 'n':
2390 rxvt_scr_charset_choose(aR_ 2); 2391 scr_charset_choose (2);
2391 break; 2392 break;
2392 2393
2393 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2394 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2394 case 'o': 2395 case 'o':
2395 rxvt_scr_charset_choose(aR_ 3); 2396 scr_charset_choose (3);
2396 break; 2397 break;
2397 } 2398 }
2398} 2399}
2399/*}}} */ 2400/*}}} */
2400 2401
2401/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2402/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2402/* *INDENT-OFF* */ 2403/* *INDENT-OFF* */
2403enum { 2404enum {
2404 CSI_ICH = 0x40, 2405 CSI_ICH = 0x40,
2405 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2406 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2406 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2407 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2407 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2408 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2408 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2409 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2409 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2410 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2410 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2411 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2411 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2412 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2412 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2413 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2413}; 2414};
2414 2415
2415#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2416#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2416 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2417 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2417 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2418 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2418#define get_byte_array_bit(array, bit) \ 2419#define get_byte_array_bit(array, bit) \
2419 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2420 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2420 2421
2421const unsigned char csi_defaults[] = { 2422const unsigned char csi_defaults[] =
2423 {
2422 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2424 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2423 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2425 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2424 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2426 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2425 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2427 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2426 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2428 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2427 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2429 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2428 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2430 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2429 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2431 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2430}; 2432 };
2431/* *INDENT-ON* */ 2433/* *INDENT-ON* */
2432 2434
2433/* INTPROTO */
2434void 2435void
2435rxvt_process_csi_seq(pR) 2436rxvt_term::process_csi_seq ()
2436{ 2437{
2437 unsigned char ch, priv, i; 2438 unsigned char ch, priv, i;
2438 unsigned int nargs, p; 2439 unsigned int nargs, p;
2439 int n, ndef; 2440 int n, ndef;
2440 int arg[ESC_ARGS]; 2441 int arg[ESC_ARGS];
2441 2442
2442 for (nargs = ESC_ARGS; nargs > 0;) 2443 for (nargs = ESC_ARGS; nargs > 0;)
2443 arg[--nargs] = 0; 2444 arg[--nargs] = 0;
2444 2445
2445 priv = 0; 2446 priv = 0;
2447 ch = cmd_getc ();
2448 if (ch >= '<' && ch <= '?')
2449 { /* '<' '=' '>' '?' */
2450 priv = ch;
2446 ch = rxvt_cmd_getc(aR); 2451 ch = cmd_getc ();
2447 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2448 priv = ch;
2449 ch = rxvt_cmd_getc(aR);
2450 } 2452 }
2451/* read any numerical arguments */ 2453 /* read any numerical arguments */
2452 for (n = -1; ch < CSI_ICH; ) { 2454 for (n = -1; ch < CSI_ICH; )
2455 {
2453 if (isdigit(ch)) { 2456 if (isdigit (ch))
2457 {
2454 if (n < 0) 2458 if (n < 0)
2455 n = ch - '0'; 2459 n = ch - '0';
2456 else 2460 else
2457 n = n * 10 + ch - '0'; 2461 n = n * 10 + ch - '0';
2462 }
2458 } else if (ch == ';') { 2463 else if (ch == ';')
2464 {
2459 if (nargs < ESC_ARGS) 2465 if (nargs < ESC_ARGS)
2460 arg[nargs++] = n; 2466 arg[nargs++] = n;
2461 n = -1; 2467 n = -1;
2468 }
2462 } else if (ch == '\b') { 2469 else if (ch == '\b')
2463 rxvt_scr_backspace(aR); 2470 {
2471 scr_backspace ();
2472 }
2464 } else if (ch == C0_ESC) { 2473 else if (ch == C0_ESC)
2465 rxvt_process_escape_seq(aR); 2474 {
2475 process_escape_seq ();
2476 return;
2477 }
2478 else if (ch < ' ')
2479 {
2480 process_nonprinting (ch);
2481 }
2482 ch = cmd_getc ();
2483 }
2484
2485 if (ch > CSI_7F)
2466 return; 2486 return;
2467 } else if (ch < ' ') {
2468 rxvt_process_nonprinting(aR_ ch);
2469 }
2470 ch = rxvt_cmd_getc(aR);
2471 }
2472 2487
2473 if (ch > CSI_7F)
2474 return;
2475
2476 if (nargs < ESC_ARGS) 2488 if (nargs < ESC_ARGS)
2477 arg[nargs++] = n; 2489 arg[nargs++] = n;
2478 2490
2479 i = ch - CSI_ICH; 2491 i = ch - CSI_ICH;
2480 ndef = get_byte_array_bit(csi_defaults, i); 2492 ndef = get_byte_array_bit (csi_defaults, i);
2481 for (p = 0; p < nargs; p++) 2493 for (p = 0; p < nargs; p++)
2482 if (arg[p] == -1) 2494 if (arg[p] == -1)
2483 arg[p] = ndef; 2495 arg[p] = ndef;
2484 2496
2485#ifdef DEBUG_CMD 2497#ifdef DEBUG_CMD
2486 fprintf(stderr, "CSI "); 2498 fprintf (stderr, "CSI ");
2487 for (p = 0; p < nargs; p++) 2499 for (p = 0; p < nargs; p++)
2488 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2500 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2489 fprintf(stderr, "%c\n", ch); 2501 fprintf (stderr, "%c\n", ch);
2490#endif 2502#endif
2491 2503
2492/* 2504 /*
2493 * private mode handling 2505 * private mode handling
2494 */ 2506 */
2495 if (priv) { 2507 if (priv)
2496 switch (priv) { 2508 {
2497 case '>': 2509 switch (priv)
2510 {
2511 case '>':
2498 if (ch == CSI_DA) /* secondary device attributes */ 2512 if (ch == CSI_DA) /* secondary device attributes */
2499 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2513 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2500 break; 2514 break;
2501 case '?': 2515 case '?':
2502 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2516 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2503 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2517 process_terminal_mode (ch, priv, nargs, arg);
2504 break; 2518 break;
2505 } 2519 }
2506 return; 2520 return;
2507 } 2521 }
2508 2522
2509 switch (ch) { 2523 switch (ch)
2510/* 2524 {
2525 /*
2511 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2526 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2512 */ 2527 */
2513#ifdef PRINTPIPE 2528#ifdef PRINTPIPE
2514 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2529 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2515 switch (arg[0]) { 2530 switch (arg[0])
2531 {
2516 case 0: /* initiate transfer to primary aux device */ 2532 case 0: /* initiate transfer to primary aux device */
2517 rxvt_scr_printscreen(aR_ 0); 2533 scr_printscreen (0);
2518 break; 2534 break;
2519 case 5: /* start relay to primary aux device */ 2535 case 5: /* start relay to primary aux device */
2520 rxvt_process_print_pipe(aR); 2536 process_print_pipe ();
2537 break;
2538 }
2521 break; 2539 break;
2522 }
2523 break;
2524#endif 2540#endif
2525 2541
2526 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2542 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2527 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2543 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2528 arg[0] = -arg[0]; 2544 arg[0] = -arg[0];
2529 /* FALLTHROUGH */ 2545 /* FALLTHROUGH */
2530 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2546 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2531 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2547 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2532 rxvt_scr_gotorc(aR_ arg[0], 0, RELATIVE); 2548 scr_gotorc (arg[0], 0, RELATIVE);
2533 break; 2549 break;
2534 2550
2535 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2551 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2536 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2552 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2537#ifdef ISO6429 2553#ifdef ISO6429
2538 arg[0] = -arg[0]; 2554 arg[0] = -arg[0];
2539#else /* emulate common DEC VTs */ 2555#else /* emulate common DEC VTs */
2540 arg[0] = arg[0] ? -arg[0] : -1; 2556 arg[0] = arg[0] ? -arg[0] : -1;
2541#endif 2557#endif
2542 /* FALLTHROUGH */ 2558 /* FALLTHROUGH */
2543 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2559 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2544 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2560 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2545#ifdef ISO6429 2561#ifdef ISO6429
2546 rxvt_scr_gotorc(aR_ 0, arg[0], RELATIVE); 2562 scr_gotorc (0, arg[0], RELATIVE);
2547#else /* emulate common DEC VTs */ 2563#else /* emulate common DEC VTs */
2548 rxvt_scr_gotorc(aR_ 0, arg[0] ? arg[0] : 1, RELATIVE); 2564 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2549#endif 2565#endif
2550 break; 2566 break;
2551 2567
2552 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2568 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2553 arg[0] = -arg[0]; 2569 arg[0] = -arg[0];
2554 /* FALLTHROUGH */ 2570 /* FALLTHROUGH */
2555 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2571 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2556 rxvt_scr_gotorc(aR_ arg[0], 0, R_RELATIVE); 2572 scr_gotorc (arg[0], 0, R_RELATIVE);
2557 break; 2573 break;
2558 2574
2559 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2575 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2560 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2576 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2561 rxvt_scr_gotorc(aR_ 0, arg[0] - 1, R_RELATIVE); 2577 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2562 break; 2578 break;
2563 2579
2564 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2580 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2565 rxvt_scr_gotorc(aR_ arg[0] - 1, 0, C_RELATIVE); 2581 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2566 break; 2582 break;
2567 2583
2568 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2584 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2569 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */ 2585 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
2570 rxvt_scr_gotorc(aR_ arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0); 2586 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
2571 break; 2587 break;
2572 2588
2573 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2589 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2574 arg[0] = -arg[0]; 2590 arg[0] = -arg[0];
2575 /* FALLTHROUGH */ 2591 /* FALLTHROUGH */
2576 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2592 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2577 rxvt_scr_tab(aR_ arg[0]); 2593 scr_tab (arg[0]);
2578 break; 2594 break;
2579 2595
2580 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2596 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2581 R->scr_erase_screen (arg[0]); 2597 scr_erase_screen (arg[0]);
2582 break; 2598 break;
2583 2599
2584 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2600 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2585 rxvt_scr_erase_line(aR_ arg[0]); 2601 scr_erase_line (arg[0]);
2586 break; 2602 break;
2587 2603
2588 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2604 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2589 rxvt_scr_insdel_chars(aR_ arg[0], INSERT); 2605 scr_insdel_chars (arg[0], INSERT);
2590 break; 2606 break;
2591 2607
2592 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2608 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2593 rxvt_scr_insdel_lines(aR_ arg[0], INSERT); 2609 scr_insdel_lines (arg[0], INSERT);
2594 break; 2610 break;
2595 2611
2596 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2612 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2597 rxvt_scr_insdel_lines(aR_ arg[0], DELETE); 2613 scr_insdel_lines (arg[0], DELETE);
2598 break; 2614 break;
2599 2615
2600 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2616 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2601 rxvt_scr_insdel_chars(aR_ arg[0], ERASE); 2617 scr_insdel_chars (arg[0], ERASE);
2602 break; 2618 break;
2603 2619
2604 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2620 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2605 rxvt_scr_insdel_chars(aR_ arg[0], DELETE); 2621 scr_insdel_chars (arg[0], DELETE);
2606 break; 2622 break;
2607 2623
2608 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2624 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2609 arg[0] = -arg[0]; 2625 arg[0] = -arg[0];
2610 /* FALLTHROUGH */ 2626 /* FALLTHROUGH */
2611 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2627 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2612 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2628 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2613 break; 2629 break;
2614 2630
2615 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2631 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2616 R->tt_write((const unsigned char *)VT100_ANS, 2632 tt_write ((const unsigned char *)VT100_ANS,
2617 (unsigned int)(sizeof(VT100_ANS) - 1)); 2633 (unsigned int) (sizeof (VT100_ANS) - 1));
2618 break; 2634 break;
2619 2635
2620 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2636 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2621 rxvt_process_sgr_mode(aR_ nargs, arg); 2637 process_sgr_mode (nargs, arg);
2622 break; 2638 break;
2623 2639
2624 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2640 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2625 switch (arg[0]) { 2641 switch (arg[0])
2642 {
2626 case 5: /* DSR requested */ 2643 case 5: /* DSR requested */
2627 R->tt_printf("\033[0n"); 2644 tt_printf ("\033[0n");
2628 break; 2645 break;
2629 case 6: /* CPR requested */ 2646 case 6: /* CPR requested */
2630 rxvt_scr_report_position(aR); 2647 scr_report_position ();
2631 break; 2648 break;
2632#if defined (ENABLE_DISPLAY_ANSWER) 2649#if defined (ENABLE_DISPLAY_ANSWER)
2633 case 7: /* unofficial extension */ 2650 case 7: /* unofficial extension */
2634 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]); 2651 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2635 break; 2652 break;
2636#endif 2653#endif
2637 case 8: /* unofficial extension */ 2654 case 8: /* unofficial extension */
2638 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2655 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2656 break;
2657 }
2639 break; 2658 break;
2640 }
2641 break;
2642 2659
2643 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2660 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2644 switch (arg[0]) { 2661 switch (arg[0])
2662 {
2645 case 0: /* char tab stop cleared at active position */ 2663 case 0: /* char tab stop cleared at active position */
2646 rxvt_scr_set_tab(aR_ 0); 2664 scr_set_tab (0);
2647 break; 2665 break;
2648 /* case 1: */ /* line tab stop cleared in active line */ 2666 /* case 1: */ /* line tab stop cleared in active line */
2649 /* case 2: */ /* char tab stops cleared in active line */ 2667 /* case 2: */ /* char tab stops cleared in active line */
2650 case 3: /* all char tab stops are cleared */ 2668 case 3: /* all char tab stops are cleared */
2651 /* case 4: */ /* all line tab stops are cleared */ 2669 /* case 4: */ /* all line tab stops are cleared */
2652 case 5: /* all tab stops are cleared */ 2670 case 5: /* all tab stops are cleared */
2653 rxvt_scr_set_tab(aR_ -1); 2671 scr_set_tab (-1);
2672 break;
2673 }
2654 break; 2674 break;
2655 }
2656 break;
2657 2675
2658 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2676 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2659 switch (arg[0]) { 2677 switch (arg[0])
2678 {
2660 case 0: /* char tab stop set at active position */ 2679 case 0: /* char tab stop set at active position */
2661 rxvt_scr_set_tab(aR_ 1); 2680 scr_set_tab (1);
2662 break; /* = ESC H */ 2681 break; /* = ESC H */
2663 /* case 1: */ /* line tab stop set at active line */ 2682 /* case 1: */ /* line tab stop set at active line */
2664 case 2: /* char tab stop cleared at active position */ 2683 case 2: /* char tab stop cleared at active position */
2665 rxvt_scr_set_tab(aR_ 0); 2684 scr_set_tab (0);
2666 break; /* = ESC [ 0 g */ 2685 break; /* = ESC [ 0 g */
2667 /* case 3: */ /* line tab stop cleared at active line */ 2686 /* case 3: */ /* line tab stop cleared at active line */
2668 /* case 4: */ /* char tab stops cleared at active line */ 2687 /* case 4: */ /* char tab stops cleared at active line */
2669 case 5: /* all char tab stops are cleared */ 2688 case 5: /* all char tab stops are cleared */
2670 rxvt_scr_set_tab(aR_ -1); 2689 scr_set_tab (-1);
2671 break; /* = ESC [ 3 g */ 2690 break; /* = ESC [ 3 g */
2672 /* case 6: */ /* all line tab stops are cleared */ 2691 /* case 6: */ /* all line tab stops are cleared */
2673 } 2692 }
2674 break; 2693 break;
2675 2694
2676 case CSI_RM: /* 8.3.107: RESET MODE */ 2695 case CSI_RM: /* 8.3.107: RESET MODE */
2677 if (arg[0] == 4) 2696 if (arg[0] == 4)
2678 rxvt_scr_insert_mode(aR_ 0); 2697 scr_insert_mode (0);
2679 break; 2698 break;
2680 2699
2681 case CSI_SM: /* 8.3.126: SET MODE */ 2700 case CSI_SM: /* 8.3.126: SET MODE */
2682 if (arg[0] == 4) 2701 if (arg[0] == 4)
2683 rxvt_scr_insert_mode(aR_ 1); 2702 scr_insert_mode (1);
2684 break; 2703 break;
2685 2704
2686/* 2705 /*
2687 * PRIVATE USE beyond this point. All CSI_7? sequences here 2706 * PRIVATE USE beyond this point. All CSI_7? sequences here
2688 */ 2707 */
2689 case CSI_72: /* DECSTBM: set top and bottom margins */ 2708 case CSI_72: /* DECSTBM: set top and bottom margins */
2690 if (nargs == 1) 2709 if (nargs == 1)
2691 rxvt_scr_scroll_region(aR_ arg[0] - 1, MAX_ROWS - 1); 2710 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2692 else if (nargs == 0 || arg[0] >= arg[1]) 2711 else if (nargs == 0 || arg[0] >= arg[1])
2693 rxvt_scr_scroll_region(aR_ 0, MAX_ROWS - 1); 2712 scr_scroll_region (0, MAX_ROWS - 1);
2694 else 2713 else
2695 rxvt_scr_scroll_region(aR_ arg[0] - 1, arg[1] - 1); 2714 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2696 break; 2715 break;
2697 2716
2698 case CSI_73: 2717 case CSI_73:
2699 rxvt_scr_cursor(aR_ SAVE); 2718 scr_cursor (SAVE);
2700 break; 2719 break;
2701 case CSI_75: 2720 case CSI_75:
2702 rxvt_scr_cursor(aR_ RESTORE); 2721 scr_cursor (RESTORE);
2703 break; 2722 break;
2704 2723
2705#ifndef NO_FRILLS 2724#ifndef NO_FRILLS
2706 case CSI_74: 2725 case CSI_74:
2707 rxvt_process_window_ops(aR_ arg, nargs); 2726 process_window_ops (arg, nargs);
2708 break; 2727 break;
2709#endif 2728#endif
2710 2729
2711 case CSI_78: /* DECREQTPARM */ 2730 case CSI_78: /* DECREQTPARM */
2712 if (arg[0] == 0 || arg[0] == 1) 2731 if (arg[0] == 0 || arg[0] == 1)
2713 R->tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2732 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2714 /* FALLTHROUGH */ 2733 /* FALLTHROUGH */
2715 2734
2716 default: 2735 default:
2717 break; 2736 break;
2718 } 2737 }
2719} 2738}
2720/*}}} */ 2739/*}}} */
2721 2740
2722#ifndef NO_FRILLS 2741#ifndef NO_FRILLS
2723/* ARGSUSED */ 2742/* ARGSUSED */
2724/* INTPROTO */
2725void 2743void
2726rxvt_process_window_ops(pR_ const int *args, unsigned int nargs) 2744rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2727{ 2745{
2728 int x, y; 2746 int x, y;
2729#if 0 2747#if 0
2730 char *s; 2748 char *s;
2731#endif 2749#endif
2732 XWindowAttributes wattr; 2750 XWindowAttributes wattr;
2733 Window wdummy; 2751 Window wdummy;
2734 2752
2735 if (nargs == 0) 2753 if (nargs == 0)
2736 return; 2754 return;
2737 switch (args[0]) { 2755 switch (args[0])
2756 {
2738 /* 2757 /*
2739 * commands 2758 * commands
2740 */ 2759 */
2741 case 1: /* deiconify window */ 2760 case 1: /* deiconify window */
2742 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 2761 XMapWindow (display->display, TermWin.parent[0]);
2743 break; 2762 break;
2744 case 2: /* iconify window */ 2763 case 2: /* iconify window */
2745 XIconifyWindow(R->Xdisplay, R->TermWin.parent[0], 2764 XIconifyWindow (display->display, TermWin.parent[0],
2746 DefaultScreen(R->Xdisplay)); 2765 DefaultScreen (display->display));
2747 break; 2766 break;
2748 case 3: /* set position (pixels) */ 2767 case 3: /* set position (pixels) */
2749 XMoveWindow(R->Xdisplay, R->TermWin.parent[0], args[1], args[2]); 2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2750 break; 2769 break;
2751 case 4: /* set size (pixels) */ 2770 case 4: /* set size (pixels) */
2752 rxvt_set_widthheight(aR_ (unsigned int)args[2], (unsigned int)args[1]); 2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2753 break; 2772 break;
2754 case 5: /* raise window */ 2773 case 5: /* raise window */
2755 XRaiseWindow(R->Xdisplay, R->TermWin.parent[0]); 2774 XRaiseWindow (display->display, TermWin.parent[0]);
2756 break; 2775 break;
2757 case 6: /* lower window */ 2776 case 6: /* lower window */
2758 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2777 XLowerWindow (display->display, TermWin.parent[0]);
2759 break; 2778 break;
2760 case 7: /* refresh window */ 2779 case 7: /* refresh window */
2761 R->scr_touch (true); 2780 scr_touch (true);
2762 break; 2781 break;
2763 case 8: /* set size (chars) */ 2782 case 8: /* set size (chars) */
2764 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2765 (unsigned int)(args[1] * R->TermWin.fheight)); 2784 (unsigned int) (args[1] * TermWin.fheight));
2766 break; 2785 break;
2767 default: 2786 default:
2768 if (args[0] >= 24) /* set height (chars) */ 2787 if (args[0] >= 24) /* set height (chars) */
2769 rxvt_set_widthheight(aR_ (unsigned int)R->TermWin.width, 2788 set_widthheight ((unsigned int)TermWin.width,
2770 (unsigned int)(args[1] * R->TermWin.fheight)); 2789 (unsigned int) (args[1] * TermWin.fheight));
2771 break; 2790 break;
2772 /* 2791 /*
2773 * reports - some output format copied from XTerm 2792 * reports - some output format copied from XTerm
2774 */ 2793 */
2775 case 11: /* report window state */ 2794 case 11: /* report window state */
2776 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2795 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2777 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2796 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2778 break; 2797 break;
2779 case 13: /* report window position */ 2798 case 13: /* report window position */
2780 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2781 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2800 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2782 -wattr.border_width, -wattr.border_width, 2801 -wattr.border_width, -wattr.border_width,
2783 &x, &y, &wdummy); 2802 &x, &y, &wdummy);
2784 R->tt_printf("\033[3;%d;%dt", x, y); 2803 tt_printf ("\033[3;%d;%dt", x, y);
2785 break; 2804 break;
2786 case 14: /* report window size (pixels) */ 2805 case 14: /* report window size (pixels) */
2787 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2788 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2807 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2789 break; 2808 break;
2790 case 18: /* report window size (chars) */ 2809 case 18: /* report window size (chars) */
2791 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2810 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2792 break; 2811 break;
2793#if 0 /* XXX: currently disabled due to security concerns */ 2812#if 0 /* XXX: currently disabled due to security concerns */
2794 case 20: /* report icon label */ 2813 case 20: /* report icon label */
2795 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2814 XGetIconName (display->display, TermWin.parent[0], &s);
2796 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2815 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2797 break; 2816 break;
2798 case 21: /* report window title */ 2817 case 21: /* report window title */
2799 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2818 XFetchName (display->display, TermWin.parent[0], &s);
2800 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2819 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2801 break; 2820 break;
2802#endif 2821#endif
2822
2803 } 2823 }
2804} 2824}
2805#endif 2825#endif
2806 2826
2807/*----------------------------------------------------------------------*/ 2827/*----------------------------------------------------------------------*/
2808/* 2828/*
2809 * get input up until STRING TERMINATOR (or BEL) 2829 * get input up until STRING TERMINATOR (or BEL)
2810 * ends_how is terminator used. returned input must be free()d 2830 * ends_how is terminator used. returned input must be free ()d
2811 */ 2831 */
2812/* INTPROTO */
2813unsigned char * 2832unsigned char *
2814rxvt_get_to_st(pR_ unsigned char *ends_how) 2833rxvt_term::get_to_st (unsigned char *ends_how)
2815{ 2834{
2816 int seen_esc = 0; /* seen escape? */ 2835 int seen_esc = 0; /* seen escape? */
2817 unsigned int n = 0; 2836 unsigned int n = 0;
2818 unsigned char *s; 2837 unsigned char *s;
2819 unsigned char ch, string[STRING_MAX]; 2838 unsigned char ch, string[STRING_MAX];
2820 2839
2821 for (; (ch = rxvt_cmd_getc(aR));) { 2840 for (; (ch = cmd_getc ());)
2841 {
2822 if (ch == C0_BEL 2842 if (ch == C0_BEL
2823 || ch == CHAR_ST 2843 || ch == CHAR_ST
2824 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2844 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2825 break; 2845 break;
2826 if (ch == C0_ESC) { 2846 if (ch == C0_ESC)
2847 {
2827 seen_esc = 1; 2848 seen_esc = 1;
2828 continue; 2849 continue;
2850 }
2829 } else if (ch == '\t') 2851 else if (ch == '\t')
2830 ch = ' '; /* translate '\t' to space */ 2852 ch = ' '; /* translate '\t' to space */
2831 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2853 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2832 return NULL; /* other control character - exit */ 2854 return NULL; /* other control character - exit */
2833 if (n < sizeof(string) - 1) 2855 if (n < sizeof (string) - 1)
2834 string[n++] = ch; 2856 string[n++] = ch;
2835 seen_esc = 0; 2857 seen_esc = 0;
2836 } 2858 }
2837 string[n++] = '\0'; 2859 string[n++] = '\0';
2838 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2860 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2839 return NULL; 2861 return NULL;
2840 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2862 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2841 STRNCPY(s, string, n); 2863 STRNCPY (s, string, n);
2842 return s; 2864 return s;
2843} 2865}
2844 2866
2845/*----------------------------------------------------------------------*/ 2867/*----------------------------------------------------------------------*/
2846/* 2868/*
2847 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 2869 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2848 */ 2870 */
2849/* INTPROTO */
2850void 2871void
2851rxvt_process_dcs_seq(pR) 2872rxvt_term::process_dcs_seq ()
2852{ 2873{
2853 unsigned char eh, *s; 2874 unsigned char eh, *s;
2854/* 2875 /*
2855 * Not handled yet 2876 * Not handled yet
2856 */ 2877 */
2857 s = rxvt_get_to_st(aR_ &eh); 2878 s = get_to_st (&eh);
2858 if (s) 2879 if (s)
2859 free(s); 2880 free (s);
2860 return; 2881 return;
2861} 2882}
2862 2883
2863/*----------------------------------------------------------------------*/ 2884/*----------------------------------------------------------------------*/
2864/* 2885/*
2865 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2886 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2866 */ 2887 */
2867/* INTPROTO */
2868void 2888void
2869rxvt_process_osc_seq(pR) 2889rxvt_term::process_osc_seq ()
2870{ 2890{
2871 unsigned char ch, eh, *s; 2891 unsigned char ch, eh, *s;
2872 int arg; 2892 int arg;
2873 2893
2874 ch = rxvt_cmd_getc(aR); 2894 ch = cmd_getc ();
2875 for (arg = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 2895 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2876 arg = arg * 10 + (ch - '0'); 2896 arg = arg * 10 + (ch - '0');
2877 2897
2878 if (ch == ';') { 2898 if (ch == ';')
2879 s = rxvt_get_to_st(aR_ &eh); 2899 {
2880 if (s) { 2900 s = get_to_st (&eh);
2881 /* 2901 if (s)
2902 {
2903 /*
2882 * rxvt_menubar_dispatch() violates the constness of the string, 2904 * rxvt_menubar_dispatch () violates the constness of the string,
2883 * so do it here 2905 * so do it here
2884 */ 2906 */
2885 if (arg == XTerm_Menu) 2907 if (arg == XTerm_Menu)
2886#if 0 /* XXX: currently disabled due to security concerns */ 2908#if 0 /* XXX: currently disabled due to security concerns */
2887 rxvt_menubar_dispatch(aR_ (char *)s); 2909 menubar_dispatch ((char *)s);
2888#else 2910#else
2889 0; 2911 (void)0;
2890#endif 2912#endif
2891 else 2913 else
2892 rxvt_xterm_seq(aR_ arg, (char *)s, eh); 2914 xterm_seq (arg, (char *)s, eh);
2893 free(s); 2915 free (s);
2894 } 2916 }
2895 } 2917 }
2896} 2918}
2897/* 2919/*
2898 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 2920 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2899 * 0 = change iconName/title 2921 * 0 = change iconName/title
… …
2912 * 10 = menu (may change in future) 2934 * 10 = menu (may change in future)
2913 * 20 = bg pixmap 2935 * 20 = bg pixmap
2914 * 39 = change default fg color 2936 * 39 = change default fg color
2915 * 49 = change default bg color 2937 * 49 = change default bg color
2916 * 55 = dump scrollback buffer and all of screen 2938 * 55 = dump scrollback buffer and all of screen
2939 * 701 = change locale
2940 * 702 = find font
2917 */ 2941 */
2918/* EXTPROTO */
2919void 2942void
2920rxvt_xterm_seq(pR_ int op, const char *str, unsigned char resp __attribute__((unused))) 2943rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
2921{ 2944{
2922 int changed = 0; 2945 int changed = 0;
2923 int color; 2946 int color;
2924 char *buf, *name; 2947 char *buf, *name;
2925 2948
2926 assert(str != NULL); 2949 assert (str != NULL);
2927 switch (op) { 2950 switch (op)
2951 {
2928 case XTerm_name: 2952 case XTerm_name:
2929 rxvt_set_title(aR_ str); 2953 set_title (str);
2930 /* FALLTHROUGH */ 2954 /* FALLTHROUGH */
2931 case XTerm_iconName: 2955 case XTerm_iconName:
2932 rxvt_set_iconName(aR_ str); 2956 set_iconName (str);
2933 break; 2957 break;
2934 case XTerm_title: 2958 case XTerm_title:
2935 rxvt_set_title(aR_ str); 2959 set_title (str);
2936 break; 2960 break;
2937 case XTerm_Color: 2961 case XTerm_Color:
2938 for (buf = (char *)str; buf && *buf;) { 2962 for (buf = (char *)str; buf && *buf;)
2963 {
2939 if ((name = STRCHR(buf, ';')) == NULL) 2964 if ((name = STRCHR (buf, ';')) == NULL)
2940 break; 2965 break;
2941 *name++ = '\0'; 2966 *name++ = '\0';
2942 color = atoi(buf); 2967 color = atoi (buf);
2943 if (color < 0 || color >= TOTAL_COLORS) 2968 if (color < 0 || color >= TOTAL_COLORS)
2944 break; 2969 break;
2945 if ((buf = STRCHR(name, ';')) != NULL) 2970 if ((buf = STRCHR (name, ';')) != NULL)
2946 *buf++ = '\0'; 2971 *buf++ = '\0';
2947 rxvt_set_window_color(aR_ color + minCOLOR, name); 2972 set_window_color (color + minCOLOR, name);
2948 } 2973 }
2949 break; 2974 break;
2950#ifndef NO_CURSORCOLOR 2975#ifndef NO_CURSORCOLOR
2951 case XTerm_Color_cursor: 2976 case XTerm_Color_cursor:
2952 rxvt_set_window_color(aR_ Color_cursor, str); 2977 set_window_color (Color_cursor, str);
2953 break; 2978 break;
2954#endif 2979#endif
2955 case XTerm_Color_pointer: 2980 case XTerm_Color_pointer:
2956 rxvt_set_window_color(aR_ Color_pointer, str); 2981 set_window_color (Color_pointer, str);
2957 break; 2982 break;
2958#ifndef NO_BOLD_UNDERLINE_REVERSE 2983#ifndef NO_BOLD_UNDERLINE_REVERSE
2959 case XTerm_Color_BD: 2984 case XTerm_Color_BD:
2960 rxvt_set_window_color(aR_ Color_BD, str); 2985 set_window_color (Color_BD, str);
2961 break; 2986 break;
2962 case XTerm_Color_UL: 2987 case XTerm_Color_UL:
2963 rxvt_set_window_color(aR_ Color_UL, str); 2988 set_window_color (Color_UL, str);
2964 break; 2989 break;
2965 case XTerm_Color_RV: 2990 case XTerm_Color_RV:
2966 rxvt_set_window_color(aR_ Color_RV, str); 2991 set_window_color (Color_RV, str);
2967 break; 2992 break;
2968#endif 2993#endif
2969 2994
2970 case XTerm_Menu: 2995 case XTerm_Menu:
2971 /* 2996 /*
2972 * rxvt_menubar_dispatch() violates the constness of the string, 2997 * rxvt_menubar_dispatch () violates the constness of the string,
2973 * so DON'T do it here 2998 * so DON'T do it here
2974 */ 2999 */
2975 break; 3000 break;
2976 case XTerm_Pixmap: 3001 case XTerm_Pixmap:
2977 if (*str != ';') { 3002 if (*str != ';')
3003 {
2978#if XPM_BACKGROUND 3004#if XPM_BACKGROUND
2979 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 3005 scale_pixmap (""); /* reset to default scaling */
2980 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 3006 set_bgPixmap (str); /* change pixmap */
2981#endif 3007#endif
2982 R->scr_touch (true); 3008 scr_touch (true);
2983 } 3009 }
2984 while ((str = STRCHR(str, ';')) != NULL) { 3010 while ((str = STRCHR (str, ';')) != NULL)
2985 str++; 3011 {
3012 str++;
2986#if XPM_BACKGROUND 3013#if XPM_BACKGROUND
2987 changed += rxvt_scale_pixmap(aR_ str); 3014 changed += scale_pixmap (str);
2988#endif 3015#endif
2989 } 3016
2990 if (changed) { 3017 }
3018 if (changed)
3019 {
2991#ifdef XPM_BACKGROUND 3020#ifdef XPM_BACKGROUND
2992 rxvt_resize_pixmap(aR); 3021 resize_pixmap ();
2993#endif 3022#endif
2994 R->scr_touch (true); 3023 scr_touch (true);
2995 } 3024 }
2996 break; 3025 break;
2997 3026
2998 case XTerm_restoreFG: 3027 case XTerm_restoreFG:
2999 rxvt_set_window_color(aR_ Color_fg, str); 3028 set_window_color (Color_fg, str);
3000 break; 3029 break;
3001 case XTerm_restoreBG: 3030 case XTerm_restoreBG:
3002 rxvt_set_window_color(aR_ Color_bg, str); 3031 set_window_color (Color_bg, str);
3003 break; 3032 break;
3004 case XTerm_logfile: 3033 case XTerm_logfile:
3005 break; 3034 break;
3006 case XTerm_font: 3035 case XTerm_font:
3007 rxvt_change_font(aR_ 0, str); 3036 change_font (str);
3008 break; 3037 break;
3038#ifndef NO_FRILLS
3039 case XTerm_locale:
3040 if (str[0] == '?' && !str[1])
3041 tt_printf ("%-.250s\n", locale);
3042 else
3043 {
3044 set_locale (str);
3045# ifdef USE_XIM
3046 im_cb ();
3047# endif
3048 }
3049 break;
3050 case XTerm_findfont:
3051 {
3052 int fid = TermWin.fontset->find_font (atoi (str));
3053 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3054 }
3055 break;
3056#endif
3009#if 0 3057#if 0
3010 case XTerm_dumpscreen: /* no error notices */ 3058 case XTerm_dumpscreen: /* no error notices */
3011 { 3059 {
3012 int fd; 3060 int fd;
3013 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) { 3061 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3014 rxvt_scr_dump(aR_ fd); 3062 {
3015 close(fd); 3063 scr_dump (fd);
3016 } 3064 close (fd);
3017 } 3065 }
3018 break; 3066 }
3067 break;
3019#endif 3068#endif
3069
3020 } 3070 }
3021} 3071}
3022/*----------------------------------------------------------------------*/ 3072/*----------------------------------------------------------------------*/
3023 3073
3024/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3074/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3029 * 's' = save 3079 * 's' = save
3030 * 'r' = restore 3080 * 'r' = restore
3031 * 't' = toggle 3081 * 't' = toggle
3032 * so no need for fancy checking 3082 * so no need for fancy checking
3033 */ 3083 */
3034/* INTPROTO */
3035int 3084int
3036rxvt_privcases(pR_ int mode, unsigned long bit) 3085rxvt_term::privcases (int mode, unsigned long bit)
3037{ 3086{
3038 int state; 3087 int state;
3039 3088
3040 if (mode == 's') { 3089 if (mode == 's')
3090 {
3041 R->SavedModes |= (R->PrivateModes & bit); 3091 SavedModes |= (PrivateModes & bit);
3042 return -1; 3092 return -1;
3043 } else { 3093 }
3094 else
3095 {
3044 if (mode == 'r') 3096 if (mode == 'r')
3045 state = (R->SavedModes & bit) ? 1 : 0; /* no overlapping */ 3097 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3046 else 3098 else
3047 state = (mode == 't') ? !(R->PrivateModes & bit) : mode; 3099 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3048 PrivMode(state, bit); 3100 PrivMode (state, bit);
3049 } 3101 }
3050 return state; 3102 return state;
3051} 3103}
3052 3104
3053/* we're not using priv _yet_ */ 3105/* we're not using priv _yet_ */
3054/* INTPROTO */
3055void 3106void
3056rxvt_process_terminal_mode(pR_ int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3107rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3057{ 3108{
3058 unsigned int i, j; 3109 unsigned int i, j;
3059 int state; 3110 int state;
3060 static const struct { 3111 static const struct
3112 {
3061 const int argval; 3113 const int argval;
3062 const unsigned long bit; 3114 const unsigned long bit;
3115 }
3063 } argtopriv[] = { 3116 argtopriv[] = {
3064 { 1, PrivMode_aplCUR }, 3117 { 1, PrivMode_aplCUR },
3065 { 2, PrivMode_vt52 }, 3118 { 2, PrivMode_vt52 },
3066 { 3, PrivMode_132 }, 3119 { 3, PrivMode_132 },
3067 { 4, PrivMode_smoothScroll }, 3120 { 4, PrivMode_smoothScroll },
3068 { 5, PrivMode_rVideo }, 3121 { 5, PrivMode_rVideo },
3069 { 6, PrivMode_relOrigin }, 3122 { 6, PrivMode_relOrigin },
3070 { 7, PrivMode_Autowrap }, 3123 { 7, PrivMode_Autowrap },
3071 { 9, PrivMode_MouseX10 }, 3124 { 9, PrivMode_MouseX10 },
3072#ifdef menuBar_esc 3125#ifdef menuBar_esc
3073 { menuBar_esc, PrivMode_menuBar }, 3126 { menuBar_esc, PrivMode_menuBar },
3074#endif 3127#endif
3075#ifdef scrollBar_esc 3128#ifdef scrollBar_esc
3076 { scrollBar_esc, PrivMode_scrollBar }, 3129 { scrollBar_esc, PrivMode_scrollBar },
3077#endif 3130#endif
3131 // 18, 19 printing-related
3078 { 25, PrivMode_VisibleCursor }, 3132 { 25, PrivMode_VisibleCursor },
3079 { 35, PrivMode_ShiftKeys }, 3133 // 30 show scrollbar rxvt. extension
3080 { 40, PrivMode_132OK }, 3134 { 35, PrivMode_ShiftKeys }, // rxvt extension
3081 { 47, PrivMode_Screen }, 3135 { 40, PrivMode_132OK },
3082 { 66, PrivMode_aplKP }, 3136 // 41 xterm more fixes NYI
3137 // 45 margin bell NYI
3138 // 46 start logging
3139 { 47, PrivMode_Screen },
3140 { 66, PrivMode_aplKP },
3083#ifndef NO_BACKSPACE_KEY 3141#ifndef NO_BACKSPACE_KEY
3084 { 67, PrivMode_BackSpace }, 3142 { 67, PrivMode_BackSpace },
3085#endif 3143#endif
3086 { 1000, PrivMode_MouseX11 }, 3144 { 1000, PrivMode_MouseX11 },
3087 { 1010, PrivMode_TtyOutputInh }, 3145 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3088 { 1011, PrivMode_Keypress }, 3146 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3089 { 1047, PrivMode_Screen }, 3147 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3148 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3149 { 1011, PrivMode_Keypress }, // rxvt extension
3150 // 1035 enable modifiers for alt, numlock NYI
3151 // 1036 send ESC for meta keys NYI
3152 // 1037 send DEL for keypad delete NYI
3153 { 1047, PrivMode_Screen },
3154 // 1048 save and restore cursor
3090 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3155 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3091 }; 3156 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3157 };
3092 3158
3093 if (nargs == 0) 3159 if (nargs == 0)
3094 return; 3160 return;
3095 3161
3096/* make lo/hi boolean */ 3162 /* make lo/hi boolean */
3097 if (mode == 'l') 3163 if (mode == 'l')
3098 mode = 0; /* reset */ 3164 mode = 0; /* reset */
3099 else if (mode == 'h') 3165 else if (mode == 'h')
3100 mode = 1; /* set */ 3166 mode = 1; /* set */
3101 3167
3102 for (i = 0; i < nargs; i++) { 3168 for (i = 0; i < nargs; i++)
3169 {
3103 state = -1; 3170 state = -1;
3104 3171
3105 /* basic handling */ 3172 /* basic handling */
3106 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3173 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3107 if (argtopriv[j].argval == arg[i]) { 3174 if (argtopriv[j].argval == arg[i])
3175 {
3108 state = rxvt_privcases(aR_ mode, argtopriv[j].bit); 3176 state = privcases (mode, argtopriv[j].bit);
3109 break; 3177 break;
3110 } 3178 }
3111 3179
3112 /* extra handling for values with state unkept */ 3180 /* extra handling for values with state unkept */
3113 if (state == -1)
3114 switch (arg[i]) { 3181 switch (arg[i])
3182 {
3115 case 1048: /* alternative cursor save */ 3183 case 1048: /* alternative cursor save */
3116 if (mode == 0) 3184 case 1049:
3117 rxvt_scr_cursor(aR_ RESTORE); 3185 if (mode == 0)
3118 else if (mode == 1) 3186 scr_cursor (RESTORE);
3119 rxvt_scr_cursor(aR_ SAVE); 3187 else if (mode == 1)
3188 scr_cursor (SAVE);
3120 /* FALLTHROUGH */ 3189 /* FALLTHROUGH */
3121 default: 3190 }
3122 continue; /* for(;i;) */
3123 }
3124 3191
3192 if (state >= 0)
3125 /* extra handling for values with valid 0 or 1 state */ 3193 /* extra handling for values with valid 0 or 1 state */
3126 switch (arg[i]) { 3194 switch (arg[i])
3195 {
3127 /* case 1: - application cursor keys */ 3196 /* case 1: - application cursor keys */
3128 case 2: /* VT52 mode */ 3197 case 2: /* VT52 mode */
3129 /* oddball mode. should be set regardless of set/reset 3198 /* oddball mode. should be set regardless of set/reset
3130 * parameter. Return from VT52 mode with an ESC < from 3199 * parameter. Return from VT52 mode with an ESC < from
3131 * within VT52 mode 3200 * within VT52 mode
3132 */ 3201 */
3133 PrivMode(1, PrivMode_vt52); 3202 PrivMode (1, PrivMode_vt52);
3134 break; 3203 break;
3135 case 3: /* 80/132 */ 3204 case 3: /* 80/132 */
3136 if (R->PrivateModes & PrivMode_132OK) 3205 if (PrivateModes & PrivMode_132OK)
3137 rxvt_set_widthheight(aR_ 3206 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3138 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth), 3207 break;
3139 (unsigned int)R->TermWin.height);
3140 break;
3141 case 4: /* smooth scrolling */ 3208 case 4: /* smooth scrolling */
3142 if (state) 3209 if (state)
3143 R->Options &= ~Opt_jumpScroll; 3210 Options &= ~Opt_jumpScroll;
3144 else 3211 else
3145 R->Options |= Opt_jumpScroll; 3212 Options |= Opt_jumpScroll;
3146 break; 3213 break;
3147 case 5: /* reverse video */ 3214 case 5: /* reverse video */
3148 rxvt_scr_rvideo_mode(aR_ state); 3215 scr_rvideo_mode (state);
3149 break; 3216 break;
3150 case 6: /* relative/absolute origins */ 3217 case 6: /* relative/absolute origins */
3151 rxvt_scr_relative_origin(aR_ state); 3218 scr_relative_origin (state);
3152 break; 3219 break;
3153 case 7: /* autowrap */ 3220 case 7: /* autowrap */
3154 rxvt_scr_autowrap(aR_ state); 3221 scr_autowrap (state);
3155 break; 3222 break;
3156 /* case 8: - auto repeat, can't do on a per window basis */ 3223 /* case 8: - auto repeat, can't do on a per window basis */
3157 case 9: /* X10 mouse reporting */ 3224 case 9: /* X10 mouse reporting */
3158 if (state) /* orthogonal */ 3225 if (state) /* orthogonal */
3159 R->PrivateModes &= ~(PrivMode_MouseX11); 3226 PrivateModes &= ~ (PrivMode_MouseX11);
3160 break; 3227 break;
3161#ifdef menuBar_esc 3228#ifdef menuBar_esc
3162 case menuBar_esc: 3229 case menuBar_esc:
3163#ifdef MENUBAR 3230#ifdef MENUBAR
3164 rxvt_map_menuBar(aR_ state); 3231 map_menuBar (state);
3165#endif 3232#endif
3166 break; 3233 break;
3167#endif 3234#endif
3168#ifdef scrollBar_esc 3235#ifdef scrollBar_esc
3169 case scrollBar_esc: 3236 case scrollBar_esc:
3170 if (rxvt_scrollbar_mapping(aR_ state)) { 3237 if (scrollbar_mapping (state))
3171 R->resize_all_windows (0, 0, 0); 3238 {
3239 resize_all_windows (0, 0, 0);
3172 R->scr_touch (true); 3240 scr_touch (true);
3173 } 3241 }
3174 break; 3242 break;
3175#endif 3243#endif
3176 case 25: /* visible/invisible cursor */ 3244 case 25: /* visible/invisible cursor */
3177 rxvt_scr_cursor_visible(aR_ state); 3245 scr_cursor_visible (state);
3178 break; 3246 break;
3179 /* case 35: - shift keys */ 3247 /* case 35: - shift keys */
3180 /* case 40: - 80 <--> 132 mode */ 3248 /* case 40: - 80 <--> 132 mode */
3181 case 47: /* secondary screen */ 3249 case 47: /* secondary screen */
3182 rxvt_scr_change_screen(aR_ state); 3250 scr_change_screen (state);
3183 break; 3251 break;
3184 /* case 66: - application key pad */ 3252 /* case 66: - application key pad */
3185 /* case 67: - backspace key */ 3253 /* case 67: - backspace key */
3186 case 1000: /* X11 mouse reporting */ 3254 case 1000: /* X11 mouse reporting */
3187 if (state) /* orthogonal */ 3255 if (state) /* orthogonal */
3188 R->PrivateModes &= ~(PrivMode_MouseX10); 3256 PrivateModes &= ~ (PrivMode_MouseX10);
3189 break; 3257 break;
3190#if 0 3258#if 0
3191 case 1001: 3259 case 1001:
3192 break; /* X11 mouse highlighting */ 3260 break; /* X11 mouse highlighting */
3193#endif 3261#endif
3194 case 1010: /* scroll to bottom on TTY output inhibit */ 3262 case 1010: /* scroll to bottom on TTY output inhibit */
3195 if (state) 3263 if (state)
3196 R->Options &= ~Opt_scrollTtyOutput; 3264 Options &= ~Opt_scrollTtyOutput;
3197 else 3265 else
3198 R->Options |= Opt_scrollTtyOutput; 3266 Options |= Opt_scrollTtyOutput;
3199 break; 3267 break;
3200 case 1011: /* scroll to bottom on key press */ 3268 case 1011: /* scroll to bottom on key press */
3201 if (state) 3269 if (state)
3202 R->Options |= Opt_scrollTtyKeypress; 3270 Options |= Opt_scrollTtyKeypress;
3203 else 3271 else
3204 R->Options &= ~Opt_scrollTtyKeypress; 3272 Options &= ~Opt_scrollTtyKeypress;
3205 break; 3273 break;
3206 case 1047: /* secondary screen w/ clearing */ 3274 case 1047: /* secondary screen w/ clearing */
3207 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3275 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3208 if (R->current_screen != PRIMARY) 3276 if (current_screen != PRIMARY)
3209 R->scr_erase_screen (2); 3277 scr_erase_screen (2);
3210 rxvt_scr_change_screen(aR_ state); 3278 scr_change_screen (state);
3211 /* FALLTHROUGH */ 3279 /* FALLTHROUGH */
3212 default: 3280 default:
3213 break; 3281 break;
3214 } 3282 }
3215 } 3283 }
3216} 3284}
3217/*}}} */ 3285/*}}} */
3218 3286
3219/*{{{ process sgr sequences */ 3287/*{{{ process sgr sequences */
3220/* INTPROTO */
3221void 3288void
3222rxvt_process_sgr_mode(pR_ unsigned int nargs, const int *arg) 3289rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3223{ 3290{
3224 unsigned int i; 3291 unsigned int i;
3225 short rendset; 3292 short rendset;
3226 int rendstyle; 3293 int rendstyle;
3227 3294
3228 if (nargs == 0) { 3295 if (nargs == 0)
3229 rxvt_scr_rendition(aR_ 0, ~RS_None);
3230 return;
3231 } 3296 {
3297 scr_rendition (0, ~RS_None);
3298 return;
3299 }
3232 for (i = 0; i < nargs; i++) { 3300 for (i = 0; i < nargs; i++)
3301 {
3233 rendset = -1; 3302 rendset = -1;
3234 switch (arg[i]) { 3303 switch (arg[i])
3235 case 0: 3304 {
3305 case 0:
3236 rendset = 0, rendstyle = ~RS_None; 3306 rendset = 0, rendstyle = ~RS_None;
3237 break; 3307 break;
3238 case 1: 3308 case 1:
3239 rendset = 1, rendstyle = RS_Bold; 3309 rendset = 1, rendstyle = RS_Bold;
3240 break; 3310 break;
3241 case 4: 3311 case 4:
3242 rendset = 1, rendstyle = RS_Uline; 3312 rendset = 1, rendstyle = RS_Uline;
3243 break; 3313 break;
3244 case 5: 3314 case 5:
3245 rendset = 1, rendstyle = RS_Blink; 3315 rendset = 1, rendstyle = RS_Blink;
3246 break; 3316 break;
3247 case 7: 3317 case 7:
3248 rendset = 1, rendstyle = RS_RVid; 3318 rendset = 1, rendstyle = RS_RVid;
3249 break; 3319 break;
3250 case 22: 3320 case 8:
3321 // invisible. NYI
3322 break;
3323 case 22:
3251 rendset = 0, rendstyle = RS_Bold; 3324 rendset = 0, rendstyle = RS_Bold;
3252 break; 3325 break;
3253 case 24: 3326 case 24:
3254 rendset = 0, rendstyle = RS_Uline; 3327 rendset = 0, rendstyle = RS_Uline;
3255 break; 3328 break;
3256 case 25: 3329 case 25:
3257 rendset = 0, rendstyle = RS_Blink; 3330 rendset = 0, rendstyle = RS_Blink;
3258 break; 3331 break;
3259 case 27: 3332 case 27:
3260 rendset = 0, rendstyle = RS_RVid; 3333 rendset = 0, rendstyle = RS_RVid;
3261 break; 3334 break;
3262 } 3335 case 28:
3336 // visible. NYI
3337 break;
3338 }
3339
3263 if (rendset != -1) { 3340 if (rendset != -1)
3264 rxvt_scr_rendition(aR_ rendset, rendstyle); 3341 {
3342 scr_rendition (rendset, rendstyle);
3265 continue; /* for(;i;) */ 3343 continue; /* for (;i;) */
3266 } 3344 }
3267 3345
3268 switch (arg[i]) { 3346 switch (arg[i])
3269 case 30: 3347 {
3348 case 30:
3270 case 31: /* set fg color */ 3349 case 31: /* set fg color */
3271 case 32: 3350 case 32:
3272 case 33: 3351 case 33:
3273 case 34: 3352 case 34:
3274 case 35: 3353 case 35:
3275 case 36: 3354 case 36:
3276 case 37: 3355 case 37:
3277 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 30)), 3356 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3278 Color_fg); 3357 break;
3279 break;
3280#ifdef TTY_256COLOR 3358#ifdef TTY_256COLOR
3281 case 38: 3359 case 38:
3282 if (nargs > i + 2 && arg[i + 1] == 5) { 3360 if (nargs > i + 2 && arg[i + 1] == 5)
3283 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3361 {
3284 Color_fg); 3362 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3285 i += 2; 3363 i += 2;
3286 } 3364 }
3287 break; 3365 break;
3288#endif 3366#endif
3289 case 39: /* default fg */ 3367 case 39: /* default fg */
3290 rxvt_scr_color(aR_ Color_fg, Color_fg); 3368 scr_color (Color_fg, Color_fg);
3291 break; 3369 break;
3292 3370
3293 case 40: 3371 case 40:
3294 case 41: /* set bg color */ 3372 case 41: /* set bg color */
3295 case 42: 3373 case 42:
3296 case 43: 3374 case 43:
3297 case 44: 3375 case 44:
3298 case 45: 3376 case 45:
3299 case 46: 3377 case 46:
3300 case 47: 3378 case 47:
3301 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 40)), 3379 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3302 Color_bg); 3380 break;
3303 break;
3304#ifdef TTY_256COLOR 3381#ifdef TTY_256COLOR
3305 case 48: 3382 case 48:
3306 if (nargs > i + 2 && arg[i + 1] == 5) { 3383 if (nargs > i + 2 && arg[i + 1] == 5)
3307 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3384 {
3308 Color_bg); 3385 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3309 i += 2; 3386 i += 2;
3310 } 3387 }
3311 break; 3388 break;
3312#endif 3389#endif
3313 case 49: /* default bg */ 3390 case 49: /* default bg */
3314 rxvt_scr_color(aR_ Color_bg, Color_bg); 3391 scr_color (Color_bg, Color_bg);
3315 break; 3392 break;
3316 3393
3317#ifndef NO_BRIGHTCOLOR 3394#ifndef NO_BRIGHTCOLOR
3318 case 90: 3395 case 90:
3319 case 91: /* set bright fg color */ 3396 case 91: /* set bright fg color */
3320 case 92: 3397 case 92:
3321 case 93: 3398 case 93:
3322 case 94: 3399 case 94:
3323 case 95: 3400 case 95:
3324 case 96: 3401 case 96:
3325 case 97: 3402 case 97:
3326 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3403 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3327 Color_fg); 3404 Color_fg);
3328 break; 3405 break;
3329 case 100: 3406 case 100:
3330 case 101: /* set bright bg color */ 3407 case 101: /* set bright bg color */
3331 case 102: 3408 case 102:
3332 case 103: 3409 case 103:
3333 case 104: 3410 case 104:
3334 case 105: 3411 case 105:
3335 case 106: 3412 case 106:
3336 case 107: 3413 case 107:
3337 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3414 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3338 Color_bg); 3415 Color_bg);
3339 break; 3416 break;
3340#endif 3417#endif
3341 } 3418
3419 }
3342 } 3420 }
3343} 3421}
3344/*}}} */ 3422/*}}} */
3345 3423
3346/*{{{ process Rob Nation's own graphics mode sequences */ 3424/*{{{ process Rob Nation's own graphics mode sequences */
3347/* INTPROTO */
3348void 3425void
3349rxvt_process_graphics(pR) 3426rxvt_term::process_graphics ()
3350{ 3427{
3351 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3428 unsigned char ch, cmd = cmd_getc ();
3352 3429
3353#ifndef RXVT_GRAPHICS 3430 if (cmd == 'Q')
3354 if (cmd == 'Q') { /* query graphics */ 3431 { /* query graphics */
3355 R->tt_printf("\033G0\n"); /* no graphics */ 3432 tt_printf ("\033G0\n"); /* no graphics */
3356 return; 3433 return;
3357 } 3434 }
3358/* swallow other graphics sequences until terminating ':' */ 3435 /* swallow other graphics sequences until terminating ':' */
3359 do 3436 do
3360 ch = rxvt_cmd_getc(aR); 3437 ch = cmd_getc ();
3361 while (ch != ':'); 3438 while (ch != ':');
3362#else
3363 unsigned int nargs;
3364 int args[NGRX_PTS];
3365 unsigned char *text = NULL;
3366
3367 if (cmd == 'Q') { /* query graphics */
3368 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3369 return;
3370 }
3371 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3372 int neg;
3373
3374 ch = rxvt_cmd_getc(aR);
3375 neg = (ch == '-');
3376 if (neg || ch == '+')
3377 ch = rxvt_cmd_getc(aR);
3378
3379 for (args[nargs] = 0; isdigit(ch); ch = rxvt_cmd_getc(aR))
3380 args[nargs] = args[nargs] * 10 + (ch - '0');
3381 if (neg)
3382 args[nargs] = -args[nargs];
3383
3384 nargs++;
3385 args[nargs] = 0;
3386 if (ch != ';')
3387 break;
3388 }
3389
3390 if ((cmd == 'T') && (nargs >= 5)) {
3391 int i, len = args[4];
3392
3393 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3394
3395 if (text != NULL) {
3396 for (i = 0; i < len; i++)
3397 text[i] = rxvt_cmd_getc(aR);
3398 text[len] = '\0';
3399 }
3400 }
3401 rxvt_Gr_do_graphics(aR_ cmd, nargs, args, text);
3402#endif
3403} 3439}
3404/*}}} */ 3440/*}}} */
3405 3441
3406/* ------------------------------------------------------------------------- */ 3442/* ------------------------------------------------------------------------- */
3407 3443
3408/* 3444/*
3409 * Send printf() formatted output to the command. 3445 * Send printf () formatted output to the command.
3410 * Only use for small amounts of data. 3446 * Only use for small amounts of data.
3411 */ 3447 */
3412void 3448void
3413rxvt_term::tt_printf (const char *fmt,...) 3449rxvt_term::tt_printf (const char *fmt,...)
3414{ 3450{
… …
3432 3468
3433 if (len) 3469 if (len)
3434 { 3470 {
3435 if (v_buflen == 0) 3471 if (v_buflen == 0)
3436 { 3472 {
3437 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 3473 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3474
3438 if (written == len) 3475 if ((unsigned int)written == len)
3439 return; 3476 return;
3440 3477
3441 data += written; 3478 data += written;
3442 len -= written; 3479 len -= written;
3443 } 3480 }

Diff Legend

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