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.26 by pcg, Wed Dec 24 06:26:52 2003 UTC vs.
Revision 1.68 by pcg, Sun Mar 14 17:33:07 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.26 2003/12/24 06:26:52 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{
… …
706 SET_LOCALE (locale); 680 SET_LOCALE (locale);
707 681
708 flush (); 682 flush ();
709} 683}
710 684
685#ifdef CURSOR_BLINK
711void 686void
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)
722 && xev.type == KeyPress)
723 {
724 if (hidden_cursor)
725 {
726 hidden_cursor = 0;
727 want_refresh = 1;
728 }
729
730 blink_ev.start (NOW + BLINK_INTERVAL);
731 }
732#endif
733
734#if defined(POINTER_BLANK)
735 if ((Options & Opt_pointerBlank)
736 && (pointerBlankDelay > 0))
737 {
738 if (xev.type == MotionNotify
739 || xev.type == ButtonPress
740 || xev.type == ButtonRelease)
741 if (hidden_pointer)
742 pointer_unblank ();
743
744 if (xev.type == KeyPress && hidden_pointer == 0)
745 pointer_blank ();
746 }
747#endif
748
749#ifdef USE_XIM
750 if (!XFilterEvent (&xev, xev.xany.window))
751#endif
752 rxvt_process_x_event (this, &xev);
753 }
754 while (XPending (Xdisplay));
755}
756
757void
758rxvt_term::blink_cb (time_watcher &w) 687rxvt_term::cursor_blink_cb (time_watcher &w)
759{ 688{
760 w.at += BLINK_INTERVAL;
761 hidden_cursor = !hidden_cursor; 689 hidden_cursor = !hidden_cursor;
762 want_refresh = 1; 690 want_refresh = 1;
763}
764 691
692 w.start (w.at + BLINK_INTERVAL);
693}
694#endif
695
696#ifdef TEXT_BLINK
765void 697void
766rxvt_term::x_cb (io_watcher &w, short revents) 698rxvt_term::text_blink_cb (time_watcher &w)
767{ 699{
768 SET_R (this); 700 if (scr_refresh_rend (RS_Blink, RS_Blink))
769 SET_LOCALE (locale); 701 {
770 702 hidden_text = !hidden_text;
771 process_x_events (); 703 want_refresh = 1;
704 w.start (w.at + TEXT_BLINK_INTERVAL);
705 }
772} 706}
707#endif
773 708
774bool 709bool
775rxvt_term::pty_fill () 710rxvt_term::pty_fill ()
776{ 711{
777 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 712 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
778 713
779 memmove (cmdbuf_base, cmdbuf_ptr, n); 714 memmove (cmdbuf_base, cmdbuf_ptr, n);
780 cmdbuf_ptr = cmdbuf_base; 715 cmdbuf_ptr = cmdbuf_base;
781 cmdbuf_endp = cmdbuf_ptr + n; 716 cmdbuf_endp = cmdbuf_ptr + n;
782 717
783 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 718 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
784 719
785 if (n > 0) 720 if (n > 0)
786 { 721 {
787 cmdbuf_endp += n; 722 cmdbuf_endp += n;
788 return true; 723 return true;
789 } 724 }
790 else if (n < 0 && errno != EAGAIN) 725 else if (n < 0 && errno != EAGAIN)
791 destroy (); 726 destroy ();
792 727
793 return false; 728 return false;
794} 729}
795 730
796void 731void
797rxvt_term::pty_cb (io_watcher &w, short revents) 732rxvt_term::pty_cb (io_watcher &w, short revents)
… …
814 seen_input = 1; 749 seen_input = 1;
815 /* 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! */
816 tt_winch (); 751 tt_winch ();
817 } 752 }
818 753
754 if (cmd_parse ())
755 break;
756 }
757 }
758}
759
760bool
761rxvt_term::cmd_parse ()
762{
763 bool flag = false;
819 uint32_t ch = NOCHAR; 764 uint32_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 uint32_t buf[BUFSIZ];
778 bool refreshnow = false;
779 int nlines = 0;
780 uint32_t *str = buf;
781
782 *str++ = ch;
820 783
821 for (;;) 784 for (;;)
822 { 785 {
823 if (ch == NOCHAR)
824 ch = next_char (); 786 ch = next_char ();
825 787
826 if (ch == NOCHAR) // TODO: improve 788 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
827 break; 789 break;
828 790 else
829 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
830 { 791 {
831 /* Read a text string from the input buffer */
832 uint32_t buf[BUFSIZ];
833 bool refreshnow = false;
834 int nlines = 0;
835 uint32_t *str = buf;
836
837 *str++ = ch; 792 *str++ = ch;
838 793
839 for (;;) 794 if (ch == '\n')
840 { 795 {
841 ch = next_char ();
842
843 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
844 break;
845 else 796 nlines++;
797 refresh_count++;
798
799 if (! (Options & Opt_jumpScroll)
800 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
846 { 801 {
847 *str++ = ch;
848
849 if (ch == '\n')
850 {
851 nlines++;
852 refresh_count++;
853
854 if (!(Options & Opt_jumpScroll)
855 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
856 {
857 refreshnow = true; 802 refreshnow = true;
858 flag = false; 803 flag = false;
859 ch = NOCHAR;
860 break;
861 }
862 }
863
864 if (str >= buf + BUFSIZ)
865 {
866 ch = NOCHAR; 804 ch = NOCHAR;
867 break; 805 break;
868 } 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;
869 } 814 }
870 } 815 }
871 816
872 rxvt_scr_add_lines (this, buf, nlines, str - buf); 817 if (str >= buf + BUFSIZ)
873
874 /*
875 * If there have been a lot of new lines, then update the screen
876 * What the heck I'll cheat and only refresh less than every page-full.
877 * the number of pages between refreshes is refresh_limit, which
878 * is incremented here because we must be doing flat-out scrolling.
879 *
880 * refreshing should be correct for small scrolls, because of the
881 * time-out
882 */
883 if (refreshnow)
884 { 818 {
885 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 819 ch = NOCHAR;
886 refresh_limit++; 820 break;
887
888 scr_refresh (refresh_type);
889 } 821 }
890
891 }
892 else
893 {
894 switch (ch)
895 {
896 default:
897 rxvt_process_nonprinting (this, ch);
898 break;
899 case C0_ESC: /* escape char */
900 rxvt_process_escape_seq (this);
901 break;
902 /*case 0x9b: */ /* CSI */
903 /* rxvt_process_csi_seq (this); */
904 }
905
906 ch = NOCHAR;
907 } 822 }
908 } 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
909 } 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 }
910 } 861 }
862
863 return flag;
911} 864}
912 865
913// read the next character, currently handles UTF-8 866// read the next character, currently handles UTF-8
914// will probably handle all sorts of other stuff in the future 867// will probably handle all sorts of other stuff in the future
915uint32_t 868uint32_t
916rxvt_term::next_char () 869rxvt_term::next_char ()
917{ 870{
918 while (cmdbuf_ptr < cmdbuf_endp) 871 while (cmdbuf_ptr < cmdbuf_endp)
919 { 872 {
920 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)
921 return *cmdbuf_ptr++; 876 return *cmdbuf_ptr++;
922 877
923 wchar_t wc; 878 wchar_t wc;
924 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);
925 880
926 if (len == (size_t)-2) 881 if (len == (size_t)-2)
927 return NOCHAR; 882 {
883 // the mbstate stores incomplete sequences. didn't know this :/
884 cmdbuf_ptr = cmdbuf_endp;
885 break;
886 }
928 887
929 if (len == (size_t)-1) 888 if (len == (size_t)-1)
930 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
931 890
932 // assume wchar == unicode 891 // assume wchar == unicode
… …
935 } 894 }
936 895
937 return NOCHAR; 896 return NOCHAR;
938} 897}
939 898
940/* rxvt_cmd_getc() - Return next input character */ 899/* rxvt_cmd_getc () - Return next input character */
941/* 900/*
942 * Return the next input character after first passing any keyboard input 901 * Return the next input character after first passing any keyboard input
943 * to the command. 902 * to the command.
944 */ 903 */
945/* INTPROTO */
946uint32_t 904uint32_t
947rxvt_cmd_getc(pR) 905rxvt_term::cmd_getc ()
948{ 906{
949 for (;;) 907 for (;;)
950 { 908 {
951 uint32_t c = R->next_char (); 909 uint32_t c = next_char ();
952 if (c != NOCHAR) 910 if (c != NOCHAR)
953 return c; 911 return c;
954 912
955 // incomplete sequences should occur rarely, still, a better solution 913 // incomplete sequences should occur rarely, still, a better solution
956 // would be preferred. either setjmp/longjmp or better design. 914 // would be preferred. either setjmp/longjmp or better design.
957 fcntl (R->cmd_fd, F_SETFL, 0); 915 fcntl (cmd_fd, F_SETFL, 0);
958 R->pty_fill (); 916 pty_fill ();
959 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 917 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
960 }
961
962#if 0
963#define TIMEOUT_USEC 5000
964 fd_set readfds;
965 int quick_timeout, select_res;
966 int want_motion_time, want_keypress_time;
967 struct timeval value;
968#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
969 struct timeval tp;
970#endif
971
972 for (;;) {
973 /* loop until we can return something */
974
975 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
976 R->tt_write(NULL, 0);
977
978#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
979 if (R->mouse_slip_wheel_speed) {
980 quick_timeout = 1;
981 if (!R->mouse_slip_wheel_delay--
982 && rxvt_scr_page(aR_ R->mouse_slip_wheel_speed > 0 ? UP : DN,
983 abs(R->mouse_slip_wheel_speed))) {
984 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
985 R->refresh_type |= SMOOTH_REFRESH;
986 R->want_refresh = 1;
987 } 918 }
988 }
989#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
990#ifdef SELECTION_SCROLLING
991 if (R->pending_scroll_selection) {
992 quick_timeout = 1;
993 if (!R->scroll_selection_delay--
994 && rxvt_scr_page(aR_ R->scroll_selection_dir,
995 R->scroll_selection_lines)) {
996 R->selection_extend (R->selection_save_x,
997 R->selection_save_y, R->selection_save_state);
998 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
999 R->refresh_type |= SMOOTH_REFRESH;
1000 R->want_refresh = 1;
1001 }
1002 }
1003#endif
1004#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1005 if (scrollbar_isUp() || scrollbar_isDn()) {
1006 quick_timeout = 1;
1007 if (!R->scroll_arrow_delay--
1008 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) {
1009 R->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1010 R->refresh_type |= SMOOTH_REFRESH;
1011 R->want_refresh = 1;
1012 }
1013 }
1014#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1015
1016#ifdef TRANSPARENT
1017 quick_timeout |= R->want_full_refresh;
1018#endif
1019#endif
1020} 919}
1021 920
921#ifdef POINTER_BLANK
1022void 922void
1023rxvt_term::pointer_unblank () 923rxvt_term::pointer_unblank ()
1024{ 924{
1025 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 925 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1026 recolour_cursor (); 926 recolour_cursor ();
1027 927
1028#ifdef POINTER_BLANK
1029 hidden_pointer = 0; 928 hidden_pointer = 0;
1030 929
1031 if (Options & Opt_pointerBlank) 930 if (Options & Opt_pointerBlank)
1032 pointer_ev.start (NOW + pointerBlankDelay); 931 pointer_ev.start (NOW + pointerBlankDelay);
1033#endif
1034} 932}
1035 933
1036#ifdef POINTER_BLANK
1037void 934void
1038rxvt_term::pointer_blank () 935rxvt_term::pointer_blank ()
1039{ 936{
1040 pointer_ev.stop ();
1041
1042 if (!(Options & Opt_pointerBlank)) 937 if (! (Options & Opt_pointerBlank))
1043 return; 938 return;
1044 939
1045 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 940 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1046 XFlush (Xdisplay); 941 XFlush (display->display);
1047 942
1048 hidden_pointer = 1; 943 hidden_pointer = 1;
1049} 944}
1050 945
1051void 946void
… …
1056 951
1057 pointer_blank (); 952 pointer_blank ();
1058} 953}
1059#endif 954#endif
1060 955
1061/* INTPROTO */
1062void 956void
1063rxvt_mouse_report(pR_ const XButtonEvent *ev) 957rxvt_term::mouse_report (XButtonEvent &ev)
1064{ 958{
1065 int button_number, key_state = 0; 959 int button_number, key_state = 0;
1066 int x, y; 960 int x, y;
1067 961
1068 x = ev->x; 962 x = ev.x;
1069 y = ev->y; 963 y = ev.y;
1070 R->pixel_position (&x, &y); 964 pixel_position (&x, &y);
1071 965
1072 if (R->MEvent.button == AnyButton) { 966 if (MEvent.button == AnyButton)
967 {
1073 button_number = 3; 968 button_number = 3;
1074 } else { 969 }
970 else
971 {
1075 button_number = R->MEvent.button - Button1; 972 button_number = MEvent.button - Button1;
1076 /* add 0x3D for wheel events, like xterm does */ 973 /* add 0x3D for wheel events, like xterm does */
1077 if (button_number >= 3) 974 if (button_number >= 3)
1078 button_number += (64 - 3); 975 button_number += (64 - 3);
1079 } 976 }
1080 977
1081 if (R->PrivateModes & PrivMode_MouseX10) { 978 if (PrivateModes & PrivMode_MouseX10)
979 {
1082 /* 980 /*
1083 * do not report ButtonRelease 981 * do not report ButtonRelease
1084 * no state info allowed 982 * no state info allowed
1085 */ 983 */
1086 key_state = 0; 984 key_state = 0;
1087 if (button_number == 3) 985 if (button_number == 3)
1088 return; 986 return;
1089 } else { 987 }
988 else
989 {
1090 /* XTerm mouse reporting needs these values: 990 /* XTerm mouse reporting needs these values:
1091 * 4 = Shift 991 * 4 = Shift
1092 * 8 = Meta 992 * 8 = Meta
1093 * 16 = Control 993 * 16 = Control
1094 * plus will add in our own Double-Click reporting 994 * plus will add in our own Double-Click reporting
1095 * 32 = Double Click 995 * 32 = Double Click
1096 */ 996 */
1097 key_state = ((R->MEvent.state & ShiftMask) ? 4 : 0) 997 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1098 + ((R->MEvent.state & R->ModMetaMask) ? 8 : 0) 998 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1099 + ((R->MEvent.state & ControlMask) ? 16 : 0); 999 + ((MEvent.state & ControlMask) ? 16 : 0);
1100#ifdef MOUSE_REPORT_DOUBLECLICK 1000#ifdef MOUSE_REPORT_DOUBLECLICK
1101 key_state += ((R->MEvent.clicks > 1) ? 32 : 0); 1001 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1102#endif 1002#endif
1003
1103 } 1004 }
1104 1005
1105#ifdef DEBUG_MOUSEREPORT 1006#ifdef DEBUG_MOUSEREPORT
1106 fprintf(stderr, "Mouse ["); 1007 fprintf (stderr, "Mouse [");
1107 if (key_state & 16) 1008 if (key_state & 16)
1108 fputc('C', stderr); 1009 fputc ('C', stderr);
1109 if (key_state & 4) 1010 if (key_state & 4)
1110 fputc('S', stderr); 1011 fputc ('S', stderr);
1111 if (key_state & 8) 1012 if (key_state & 8)
1112 fputc('A', stderr); 1013 fputc ('A', stderr);
1113 if (key_state & 32) 1014 if (key_state & 32)
1114 fputc('2', stderr); 1015 fputc ('2', stderr);
1115 fprintf(stderr, "]: <%d>, %d/%d\n", 1016 fprintf (stderr, "]: <%d>, %d/%d\n",
1116 button_number, 1017 button_number,
1117 x + 1, 1018 x + 1,
1118 y + 1); 1019 y + 1);
1119#else 1020#else
1120 R->tt_printf("\033[M%c%c%c", 1021 tt_printf ("\033[M%c%c%c",
1121 (32 + button_number + key_state), 1022 (32 + button_number + key_state),
1122 (32 + x + 1), 1023 (32 + x + 1),
1123 (32 + y + 1)); 1024 (32 + y + 1));
1124#endif 1025#endif
1125} 1026}
1126 1027
1127#ifdef USING_W11LIB 1028#ifdef USING_W11LIB
1128/* EXTPROTO */
1129void 1029void
1130rxvt_W11_process_x_event(XEvent *ev) 1030rxvt_W11_process_x_event (XEvent *ev)
1131{ 1031{
1132 rxvt_t *r = rxvt_get_r(); 1032 rxvt_t *r = rxvt_get_r ();
1133 1033
1134 rxvt_process_x_event(aR_ ev); 1034 x_cb (*ev);
1135} 1035}
1136#endif 1036#endif
1137 1037
1138/*{{{ process an X event */ 1038/*{{{ process an X event */
1139/* INTPROTO */
1140void 1039void
1141rxvt_process_x_event(pR_ XEvent *ev) 1040rxvt_term::x_cb (XEvent &ev)
1142{ 1041{
1143 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
1144 Window unused_root, unused_child; 1077 Window unused_root, unused_child;
1145 int unused_root_x, unused_root_y; 1078 int unused_root_x, unused_root_y;
1146 unsigned int unused_mask; 1079 unsigned int unused_mask;
1147 1080
1148#ifdef DEBUG_X 1081#ifdef DEBUG_X
1149 const char *const eventnames[] = 1082 const char *const eventnames[] =
1150 { /* mason - this matches my system */ 1083 { /* mason - this matches my system */
1151 "", 1084 "",
1152 "", 1085 "",
1153 "KeyPress", 1086 "KeyPress",
1154 "KeyRelease", 1087 "KeyRelease",
1155 "ButtonPress", 1088 "ButtonPress",
1156 "ButtonRelease", 1089 "ButtonRelease",
1157 "MotionNotify", 1090 "MotionNotify",
1158 "EnterNotify", 1091 "EnterNotify",
1159 "LeaveNotify", 1092 "LeaveNotify",
1160 "FocusIn", 1093 "FocusIn",
1161 "FocusOut", 1094 "FocusOut",
1162 "KeymapNotify", 1095 "KeymapNotify",
1163 "Expose", 1096 "Expose",
1164 "GraphicsExpose", 1097 "GraphicsExpose",
1165 "NoExpose", 1098 "NoExpose",
1166 "VisibilityNotify", 1099 "VisibilityNotify",
1167 "CreateNotify", 1100 "CreateNotify",
1168 "DestroyNotify", 1101 "DestroyNotify",
1169 "UnmapNotify", 1102 "UnmapNotify",
1170 "MapNotify", 1103 "MapNotify",
1171 "MapRequest", 1104 "MapRequest",
1172 "ReparentNotify", 1105 "ReparentNotify",
1173 "ConfigureNotify", 1106 "ConfigureNotify",
1174 "ConfigureRequest", 1107 "ConfigureRequest",
1175 "GravityNotify", 1108 "GravityNotify",
1176 "ResizeRequest", 1109 "ResizeRequest",
1177 "CirculateNotify", 1110 "CirculateNotify",
1178 "CirculateRequest", 1111 "CirculateRequest",
1179 "PropertyNotify", 1112 "PropertyNotify",
1180 "SelectionClear", 1113 "SelectionClear",
1181 "SelectionRequest", 1114 "SelectionRequest",
1182 "SelectionNotify", 1115 "SelectionNotify",
1183 "ColormapNotify", 1116 "ColormapNotify",
1184 "ClientMessage", 1117 "ClientMessage",
1185 "MappingNotify" 1118 "MappingNotify"
1186 }; 1119 };
1187#endif 1120#endif
1188 1121
1189#ifdef DEBUG_X 1122#ifdef DEBUG_X
1190 struct timeval tp; 1123 struct timeval tp;
1191 struct tm *ltt; 1124 struct tm *ltt;
1192 (void)gettimeofday(&tp, NULL); 1125 (void)gettimeofday (&tp, NULL);
1193 ltt = localtime(&(tp.tv_sec)); 1126 ltt = localtime (& (tp.tv_sec));
1194 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));
1195#endif 1128#endif
1196 1129
1197 switch (ev->type) { 1130 switch (ev.type)
1131 {
1198 case KeyPress: 1132 case KeyPress:
1199 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1133 lookup_key (ev.xkey);
1200 break; 1134 break;
1201 1135
1202#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1136#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1203 case KeyRelease: 1137 case KeyRelease:
1204 { 1138 {
1205 if (!(ev->xkey.state & ControlMask)) 1139 if (! (ev.xkey.state & ControlMask))
1206 R->mouse_slip_wheel_speed = 0; 1140 mouse_slip_wheel_speed = 0;
1207 else { 1141 else
1208 KeySym ks; 1142 {
1209 1143 KeySym ks;
1144
1210 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0); 1145 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1211 if (ks == XK_Control_L || ks == XK_Control_R) 1146 if (ks == XK_Control_L || ks == XK_Control_R)
1212 R->mouse_slip_wheel_speed = 0; 1147 mouse_slip_wheel_speed = 0;
1213 } 1148 }
1214 break; 1149 break;
1215 } 1150 }
1216#endif 1151#endif
1217 1152
1218 case ButtonPress: 1153 case ButtonPress:
1219 rxvt_button_press(aR_ (XButtonEvent *)ev); 1154 button_press (ev.xbutton);
1220 break; 1155 break;
1221 1156
1222 case ButtonRelease: 1157 case ButtonRelease:
1223 rxvt_button_release(aR_ (XButtonEvent *)ev); 1158 button_release (ev.xbutton);
1224 break; 1159 break;
1225 1160
1226 case ClientMessage: 1161 case ClientMessage:
1227 if (ev->xclient.format == 32 1162 if (ev.xclient.format == 32
1228 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1163 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1229 R->destroy (); 1164 destroy ();
1230#ifdef OFFIX_DND 1165#ifdef OFFIX_DND
1231 /* OffiX Dnd (drag 'n' drop) protocol */ 1166 /* OffiX Dnd (drag 'n' drop) protocol */
1232 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1167 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1233 && (ev->xclient.data.l[0] == DndFile 1168 && (ev.xclient.data.l[0] == DndFile
1234 || ev->xclient.data.l[0] == DndDir 1169 || ev.xclient.data.l[0] == DndDir
1235 || ev->xclient.data.l[0] == DndLink)) { 1170 || ev.xclient.data.l[0] == DndLink))
1236 /* Get Dnd data */ 1171 {
1172 /* Get Dnd data */
1237 Atom ActualType; 1173 Atom ActualType;
1238 int ActualFormat; 1174 int ActualFormat;
1239 unsigned char *data; 1175 unsigned char *data;
1240 unsigned long Size, RemainingBytes; 1176 unsigned long Size, RemainingBytes;
1241 1177
1242 XGetWindowProperty(R->Xdisplay, Xroot, 1178 XGetWindowProperty (display->display, display->root,
1243 R->xa[XA_DNDSELECTION], 1179 xa[XA_DNDSELECTION],
1244 0L, 1000000L, 1180 0L, 1000000L,
1245 False, AnyPropertyType, 1181 False, AnyPropertyType,
1246 &ActualType, &ActualFormat, 1182 &ActualType, &ActualFormat,
1247 &Size, &RemainingBytes, 1183 &Size, &RemainingBytes,
1248 &data); 1184 &data);
1249 XChangeProperty(R->Xdisplay, Xroot, 1185 XChangeProperty (display->display, display->root,
1250 XA_CUT_BUFFER0, XA_STRING, 1186 XA_CUT_BUFFER0, XA_STRING,
1251 8, PropModeReplace, 1187 8, PropModeReplace,
1252 data, STRLEN(data)); 1188 data, STRLEN (data));
1253 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, True); 1189 selection_paste (display->root, XA_CUT_BUFFER0, True);
1254 XSetInputFocus(R->Xdisplay, Xroot, RevertToNone, CurrentTime); 1190 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1255 } 1191 }
1256#endif /* OFFIX_DND */ 1192#endif /* OFFIX_DND */
1257 break; 1193 break;
1258 1194
1259 case MappingNotify: 1195 case MappingNotify:
1260 XRefreshKeyboardMapping(&(ev->xmapping)); 1196 XRefreshKeyboardMapping (& (ev.xmapping));
1261 break; 1197 break;
1262 1198
1263 /* 1199 /*
1264 * XXX: this is not the _current_ arrangement 1200 * XXX: this is not the _current_ arrangement
1265 * Here's my conclusion: 1201 * Here's my conclusion:
1266 * If the window is completely unobscured, use bitblt's 1202 * If the window is completely unobscured, use bitblt's
1267 * to scroll. Even then, they're only used when doing partial 1203 * to scroll. Even then, they're only used when doing partial
1268 * screen scrolling. When partially obscured, we have to fill 1204 * screen scrolling. When partially obscured, we have to fill
1269 * in the GraphicsExpose parts, which means that after each refresh, 1205 * in the GraphicsExpose parts, which means that after each refresh,
1270 * we need to wait for the graphics expose or Noexpose events, 1206 * we need to wait for the graphics expose or Noexpose events,
1271 * which ought to make things real slow! 1207 * which ought to make things real slow!
1272 */ 1208 */
1273 case VisibilityNotify: 1209 case VisibilityNotify:
1274 switch (ev->xvisibility.state) 1210 switch (ev.xvisibility.state)
1275 { 1211 {
1276 case VisibilityUnobscured: 1212 case VisibilityUnobscured:
1277 R->refresh_type = FAST_REFRESH; 1213 refresh_type = FAST_REFRESH;
1278 break; 1214 break;
1279 case VisibilityPartiallyObscured: 1215 case VisibilityPartiallyObscured:
1280 R->refresh_type = SLOW_REFRESH; 1216 refresh_type = SLOW_REFRESH;
1281 break; 1217 break;
1282 default: 1218 default:
1283 R->refresh_type = NO_REFRESH; 1219 refresh_type = NO_REFRESH;
1284 break; 1220 break;
1285 } 1221 }
1286 break; 1222 break;
1287 1223
1288 case FocusIn: 1224 case FocusIn:
1289 if (!R->TermWin.focus) { 1225 if (!TermWin.focus)
1290 R->TermWin.focus = 1; 1226 {
1291 R->want_refresh = 1; 1227 TermWin.focus = 1;
1228 want_refresh = 1;
1292#ifdef USE_XIM 1229#ifdef USE_XIM
1293 if (R->Input_Context != NULL) 1230 if (Input_Context != NULL)
1294 XSetICFocus(R->Input_Context); 1231 XSetICFocus (Input_Context);
1295#endif 1232#endif
1296#ifdef CURSOR_BLINK 1233#ifdef CURSOR_BLINK
1297 if (R->Options & Opt_cursorBlink) 1234 if (Options & Opt_cursorBlink)
1298 R->blink_ev.start (NOW + BLINK_INTERVAL); 1235 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1299#endif 1236#endif
1300 }
1301 break;
1302 1237
1238 }
1239 break;
1240
1303 case FocusOut: 1241 case FocusOut:
1304 if (R->TermWin.focus) { 1242 if (TermWin.focus)
1305 R->TermWin.focus = 0; 1243 {
1306 R->want_refresh = 1; 1244 TermWin.focus = 0;
1245 want_refresh = 1;
1307#ifdef USE_XIM 1246#ifdef USE_XIM
1308 if (R->Input_Context != NULL) 1247 if (Input_Context != NULL)
1309 XUnsetICFocus(R->Input_Context); 1248 XUnsetICFocus (Input_Context);
1310#endif 1249#endif
1311#ifdef CURSOR_BLINK 1250#ifdef CURSOR_BLINK
1312 if (R->Options & Opt_cursorBlink) 1251 if (Options & Opt_cursorBlink)
1313 R->blink_ev.stop (); 1252 cursor_blink_ev.stop ();
1314 R->hidden_cursor = 0; 1253 hidden_cursor = 0;
1315#endif 1254#endif
1316 }
1317 break;
1318 1255
1256 }
1257 break;
1258
1319 case ConfigureNotify: 1259 case ConfigureNotify:
1320 if (ev->xconfigure.window == R->TermWin.parent[0]) { 1260 if (ev.xconfigure.window == TermWin.parent[0])
1321 int height, width; 1261 {
1262 int height, width;
1322 1263
1264 do
1323 do { /* Wrap lots of configures into one */ 1265 { /* Wrap lots of configures into one */
1324 width = ev->xconfigure.width; 1266 width = ev.xconfigure.width;
1325 height = ev->xconfigure.height; 1267 height = ev.xconfigure.height;
1326 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1268 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1327 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1269 }
1328 ConfigureNotify, ev)); 1270 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1271
1329 if (R->szHint.width != width || R->szHint.height != height) { 1272 if (szHint.width != width || szHint.height != height)
1273 {
1330 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));
1331 R->resize_all_windows (width, height, 1); 1275 resize_all_windows (width, height, 1);
1332 } 1276 }
1333#ifdef DEBUG_SIZE 1277#ifdef DEBUG_SIZE
1334 else { 1278 else
1279 {
1335 D_SIZE((stderr, "Size: Not resizing")); 1280 D_SIZE ((stderr, "Size: Not resizing"));
1336 } 1281 }
1337#endif 1282#endif
1338#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1283#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1339 if (R->Options & Opt_transparent) { 1284 if (Options & Opt_transparent)
1340 rxvt_check_our_parents(aR); 1285 {
1341 if (R->am_transparent) 1286 check_our_parents ();
1342 R->want_full_refresh = 1; 1287 if (am_transparent)
1343 } 1288 want_full_refresh = 1;
1289 }
1344#endif 1290#endif
1345 }
1346 break;
1347 1291
1292 }
1293 break;
1294
1348 case SelectionClear: 1295 case SelectionClear:
1349 rxvt_selection_clear(aR); 1296 display->set_selection_owner (0);
1350 break; 1297 break;
1351 1298
1352 case SelectionNotify: 1299 case SelectionNotify:
1353 if (R->selection_wait == Sel_normal) 1300 if (selection_wait == Sel_normal)
1354 rxvt_selection_paste(aR_ ev->xselection.requestor, 1301 selection_paste (ev.xselection.requestor,
1355 ev->xselection.property, True); 1302 ev.xselection.property, True);
1356 break; 1303 break;
1357 1304
1358 case SelectionRequest: 1305 case SelectionRequest:
1359 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1306 selection_send (ev.xselectionrequest);
1360 break; 1307 break;
1361 1308
1362 case UnmapNotify: 1309 case UnmapNotify:
1363 R->TermWin.mapped = 0; 1310 TermWin.mapped = 0;
1364 break; 1311#ifdef TEXT_BLINK
1312 text_blink_ev.stop ();
1313#endif
1314 break;
1365 1315
1366 case MapNotify: 1316 case MapNotify:
1367 R->TermWin.mapped = 1; 1317 TermWin.mapped = 1;
1368 break; 1318#ifdef TEXT_BLINK
1369 1319 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1370 case PropertyNotify: 1320#endif
1371 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1372 if (ev->xproperty.state == PropertyNewValue)
1373 rxvt_selection_property(aR_ ev->xproperty.window,
1374 ev->xproperty.atom);
1375 break; 1321 break;
1376 } 1322
1377#ifdef TRANSPARENT 1323#ifdef TRANSPARENT
1378 /*
1379 * if user used some Esetroot compatible prog to set the root bg,
1380 * use the property to determine the pixmap. We use it later on.
1381 */
1382 if (R->xa[XA_XROOTPMAPID] == 0)
1383 R->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay,
1384 "_XROOTPMAP_ID", False);
1385 if (ev->xproperty.atom != R->xa[XA_XROOTPMAPID])
1386 break;
1387 /* FALLTHROUGH */
1388 case ReparentNotify: 1324 case ReparentNotify:
1389 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) { 1325 rootwin_cb (ev);
1390 if (R->am_transparent) 1326 break;
1391 R->want_full_refresh = 1;
1392 }
1393#endif /* TRANSPARENT */ 1327#endif /* TRANSPARENT */
1394 break;
1395 1328
1396 case GraphicsExpose: 1329 case GraphicsExpose:
1397 case Expose: 1330 case Expose:
1398 if (ev->xany.window == R->TermWin.vt) { 1331 if (ev.xany.window == TermWin.vt)
1332 {
1399#ifdef NO_SLOW_LINK_SUPPORT 1333#ifdef NO_SLOW_LINK_SUPPORT
1400 R->scr_expose (ev->xexpose.x, ev->xexpose.y, 1334 scr_expose (ev.xexpose.x, ev.xexpose.y,
1401 ev->xexpose.width, ev->xexpose.height, False); 1335 ev.xexpose.width, ev.xexpose.height, False);
1402#else 1336#else
1403 // don't understand this, so commented it out 1337 // don't understand this, so commented it out
1404 R->scr_expose (ev->xexpose.x, ev->xexpose.y, 1338 scr_expose (ev.xexpose.x, ev.xexpose.y,
1405 ev->xexpose.width, ev->xexpose.height, False); 1339 ev.xexpose.width, ev.xexpose.height, False);
1406 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1340 //scr_expose (ev.xexpose.x, 0,
1407 // ev->xexpose.width, R->TermWin.height, False); 1341 // ev.xexpose.width, TermWin.height, False);
1408#endif 1342#endif
1409 R->want_refresh = 1; 1343 want_refresh = 1;
1410 } else { 1344 }
1411 XEvent unused_xevent; 1345 else
1346 {
1347 XEvent unused_event;
1412 1348
1413 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1349 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1414 Expose, 1350 Expose,
1415 &unused_xevent)) ; 1351 &unused_event)) ;
1416 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1352 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1417 GraphicsExpose, 1353 GraphicsExpose,
1418 &unused_xevent)) ; 1354 &unused_event)) ;
1419 if (isScrollbarWindow(ev->xany.window)) { 1355 if (isScrollbarWindow (ev.xany.window))
1420 R->scrollBar.setIdle(); 1356 {
1421 rxvt_scrollbar_show(aR_ 0); 1357 scrollBar.setIdle ();
1422 } 1358 scrollbar_show (0);
1359 }
1423#ifdef MENUBAR 1360#ifdef MENUBAR
1424 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1361 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1425 rxvt_menubar_expose(aR); 1362 menubar_expose ();
1426#endif 1363#endif
1427#ifdef RXVT_GRAPHICS 1364 }
1428 rxvt_Gr_expose(aR_ ev->xany.window); 1365 break;
1429#endif
1430 }
1431 break;
1432 1366
1433 case MotionNotify: 1367 case MotionNotify:
1434#ifdef POINTER_BLANK 1368#ifdef POINTER_BLANK
1435 if (R->hidden_pointer) 1369 if (hidden_pointer)
1436 R->pointer_unblank (); 1370 pointer_unblank ();
1437#endif 1371#endif
1438#if MENUBAR 1372#if MENUBAR
1439 if (isMenuBarWindow(ev->xany.window)) { 1373 if (isMenuBarWindow (ev.xany.window))
1440 rxvt_menubar_control(aR_ &(ev->xbutton)); 1374 {
1441 break; 1375 menubar_control (ev.xbutton);
1442 } 1376 break;
1377 }
1443#endif 1378#endif
1444 if ((R->PrivateModes & PrivMode_mouse_report) && !(R->bypass_keystate)) 1379 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1445 break; 1380 break;
1446 1381
1447 if (ev->xany.window == R->TermWin.vt) { 1382 if (ev.xany.window == TermWin.vt)
1383 {
1448 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1384 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1449 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt, 1385 {
1450 MotionNotify, ev)) ; 1386 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1451 XQueryPointer(R->Xdisplay, R->TermWin.vt, 1387 ;
1452 &unused_root, &unused_child, 1388
1453 &unused_root_x, &unused_root_y, 1389 XQueryPointer (display->display, TermWin.vt,
1454 &(ev->xbutton.x), &(ev->xbutton.y), 1390 &unused_root, &unused_child,
1455 &unused_mask); 1391 &unused_root_x, &unused_root_y,
1392 & (ev.xbutton.x), & (ev.xbutton.y),
1393 &unused_mask);
1456#ifdef MOUSE_THRESHOLD 1394#ifdef MOUSE_THRESHOLD
1457 /* deal with a `jumpy' mouse */ 1395 /* deal with a `jumpy' mouse */
1458 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1396 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1397 {
1459#endif 1398#endif
1460 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1399 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1461 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1400 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1462#ifdef SELECTION_SCROLLING 1401#ifdef SELECTION_SCROLLING
1463 if (ev->xbutton.y<R->TermWin.int_bwidth || 1402 if (ev.xbutton.y < TermWin.int_bwidth
1464 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1403 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1465 int dist;
1466
1467 R->pending_scroll_selection=1;
1468
1469 /* don't clobber the current delay if we are
1470 * already in the middle of scrolling.
1471 */
1472 if (R->scroll_selection_delay<=0)
1473 R->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1474
1475 /* save the event params so we can highlight
1476 * the selection in the pending-scroll loop
1477 */
1478 R->selection_save_x=ev->xbutton.x;
1479 R->selection_save_y=ev->xbutton.y;
1480 R->selection_save_state=
1481 (ev->xbutton.state & Button3Mask) ? 2 : 0;
1482
1483 /* calc number of lines to scroll */
1484 if (ev->xbutton.y<R->TermWin.int_bwidth) {
1485 R->scroll_selection_dir = UP;
1486 dist = R->TermWin.int_bwidth - ev->xbutton.y;
1487 }
1488 else {
1489 R->scroll_selection_dir = DN;
1490 dist = ev->xbutton.y -
1491 (R->TermWin.int_bwidth + R->TermWin.height);
1492 }
1493 R->scroll_selection_lines=(Pixel2Height(dist)/
1494 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1495 MIN_IT(R->scroll_selection_lines,
1496 SELECTION_SCROLL_MAX_LINES);
1497 }
1498 else {
1499 /* we are within the text window, so we
1500 * shouldn't be scrolling
1501 */
1502 R->pending_scroll_selection = 0;
1503 }
1504#endif
1505#ifdef MOUSE_THRESHOLD
1506 }
1507#endif
1508 }
1509 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1510 while (XCheckTypedWindowEvent(R->Xdisplay, R->scrollBar.win,
1511 MotionNotify, ev)) ;
1512 XQueryPointer(R->Xdisplay, R->scrollBar.win,
1513 &unused_root, &unused_child,
1514 &unused_root_x, &unused_root_y,
1515 &(ev->xbutton.x), &(ev->xbutton.y),
1516 &unused_mask);
1517 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1518 scrollbar_size());
1519 R->scr_refresh (R->refresh_type);
1520 R->refresh_limit = 0;
1521 rxvt_scrollbar_show(aR_ 1);
1522 }
1523 break;
1524 }
1525}
1526
1527/* INTPROTO */
1528void
1529rxvt_button_press(pR_ XButtonEvent *ev)
1530{
1531 int reportmode = 0, clickintime;
1532
1533 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1534 if (!R->bypass_keystate)
1535 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1536/*
1537 * VT window processing of button press
1538 */
1539 if (ev->window == R->TermWin.vt)
1540 {
1541#if RXVT_GRAPHICS
1542 if (ev->subwindow != None)
1543 rxvt_Gr_ButtonPress (ev->x, ev->y);
1544 else
1545#endif
1546 {
1547 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1548 if (reportmode)
1549 {
1550 /* mouse report from vt window */
1551 /* save the xbutton state (for ButtonRelease) */
1552 R->MEvent.state = ev->state;
1553#ifdef MOUSE_REPORT_DOUBLECLICK
1554 if (ev->button == R->MEvent.button && clickintime)
1555 {
1556 /* same button, within alloted time */
1557 R->MEvent.clicks++;
1558 if (R->MEvent.clicks > 1)
1559 { 1404 {
1560 /* only report double clicks */ 1405 int dist;
1561 R->MEvent.clicks = 2;
1562 rxvt_mouse_report(aR_ ev);
1563 1406
1564 /* don't report the release */ 1407 pending_scroll_selection=1;
1565 R->MEvent.clicks = 0; 1408
1566 R->MEvent.button = AnyButton; 1409 /* don't clobber the current delay if we are
1567 } 1410 * already in the middle of scrolling.
1568 }
1569 else
1570 { 1411 */
1571 /* different button, or time expired */ 1412 if (scroll_selection_delay<=0)
1572 R->MEvent.clicks = 1; 1413 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1573 R->MEvent.button = ev->button; 1414
1574 rxvt_mouse_report(aR_ ev); 1415 /* save the event params so we can highlight
1575 } 1416 * the selection in the pending-scroll loop
1576#else
1577 R->MEvent.button = ev->button;
1578 rxvt_mouse_report(aR_ ev);
1579#endif /* MOUSE_REPORT_DOUBLECLICK */
1580 }
1581 else
1582 {
1583 if (ev->button != R->MEvent.button)
1584 R->MEvent.clicks = 0;
1585 switch (ev->button)
1586 { 1417 */
1587 case Button1: 1418 selection_save_x=ev.xbutton.x;
1588 /* allow shift+left click to extend selection */ 1419 selection_save_y=ev.xbutton.y;
1589 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)
1590 { 1425 {
1591 if (R->MEvent.button == Button1 && clickintime) 1426 scroll_selection_dir = UP;
1592 R->selection_rotate (ev->x, ev->y); 1427 dist = TermWin.int_bwidth - ev.xbutton.y;
1593 else
1594 R->selection_extend (ev->x, ev->y, 1);
1595 } 1428 }
1596 else 1429 else
1597 { 1430 {
1598 if (R->MEvent.button == Button1 && clickintime) 1431 scroll_selection_dir = DN;
1599 R->MEvent.clicks++; 1432 dist = ev.xbutton.y -
1600 else 1433 (TermWin.int_bwidth + TermWin.height);
1601 R->MEvent.clicks = 1;
1602
1603 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1604 } 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
1605 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
1606 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;
1607 break; 1691 break;
1608 1692 case R_SB_ALIGN_CENTRE:
1609 case Button3: 1693 csrO = (scrollBar.bot - scrollBar.top) / 2;
1610 if (R->MEvent.button == Button3 && clickintime)
1611 R->selection_rotate (ev->x, ev->y);
1612 else
1613 R->selection_extend (ev->x, ev->y, 1);
1614 R->MEvent.button = Button3;
1615 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 }
1616 } 1739 }
1617 }
1618 R->MEvent.time = ev->time;
1619 return; 1740 return;
1620 }
1621 }
1622
1623/*
1624 * Scrollbar window processing of button press
1625 */
1626 if (isScrollbarWindow(ev->window))
1627 {
1628 R->scrollBar.setIdle ();
1629 /*
1630 * Rxvt-style scrollbar:
1631 * move up if mouse is above slider
1632 * move dn if mouse is below slider
1633 *
1634 * XTerm-style scrollbar:
1635 * Move display proportional to pointer location
1636 * pointer near top -> scroll one line
1637 * pointer near bot -> scroll full page
1638 */
1639#ifndef NO_SCROLLBAR_REPORT
1640 if (reportmode) {
1641 /*
1642 * Mouse report disabled scrollbar:
1643 * arrow buttons - send up/down
1644 * click on scrollbar - send pageup/down
1645 */
1646 if ((R->scrollBar.style == R_SB_NEXT
1647 && scrollbarnext_upButton(ev->y))
1648 || (R->scrollBar.style == R_SB_RXVT
1649 && scrollbarrxvt_upButton(ev->y)))
1650 R->tt_printf("\033[A");
1651 else if ((R->scrollBar.style == R_SB_NEXT
1652 && scrollbarnext_dnButton(ev->y))
1653 || (R->scrollBar.style == R_SB_RXVT
1654 && scrollbarrxvt_dnButton(ev->y)))
1655 R->tt_printf("\033[B");
1656 else
1657 switch (ev->button) {
1658 case Button2:
1659 R->tt_printf("\014");
1660 break;
1661 case Button1:
1662 R->tt_printf("\033[6~");
1663 break;
1664 case Button3:
1665 R->tt_printf("\033[5~");
1666 break;
1667 }
1668 }
1669 else
1670#endif /* NO_SCROLLBAR_REPORT */
1671 {
1672 char upordown = 0;
1673
1674 if (R->scrollBar.style == R_SB_NEXT) {
1675 if (scrollbarnext_upButton(ev->y))
1676 upordown = -1; /* up */
1677 else if (scrollbarnext_dnButton(ev->y))
1678 upordown = 1; /* down */
1679 } else if (R->scrollBar.style == R_SB_RXVT) {
1680 if (scrollbarrxvt_upButton(ev->y))
1681 upordown = -1; /* up */
1682 else if (scrollbarrxvt_dnButton(ev->y))
1683 upordown = 1; /* down */
1684 } 1741 }
1685 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);
1686#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1764#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1687 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1765 refresh_type &= ~SMOOTH_REFRESH;
1688#endif
1689 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1690 if (upordown < 0)
1691 R->scrollBar.setUp ();
1692 else
1693 R->scrollBar.setDn ();
1694 }
1695 } else
1696 switch (ev->button) {
1697 case Button2:
1698 switch (R->scrollbar_align) {
1699 case R_SB_ALIGN_TOP:
1700 R->csrO = 0;
1701 break;
1702 case R_SB_ALIGN_CENTRE:
1703 R->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2;
1704 break;
1705 case R_SB_ALIGN_BOTTOM:
1706 R->csrO = R->scrollBar.bot - R->scrollBar.top;
1707 break;
1708 }
1709 if (R->scrollBar.style == R_SB_XTERM
1710 || scrollbar_above_slider(ev->y)
1711 || scrollbar_below_slider(ev->y))
1712 rxvt_scr_move_to(aR_
1713 scrollbar_position(ev->y) - R->csrO,
1714 scrollbar_size());
1715 R->scrollBar.setMotion ();
1716 break;
1717
1718 case Button1:
1719 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1720 R->csrO = ev->y - R->scrollBar.top;
1721 /* FALLTHROUGH */
1722
1723 case Button3:
1724 if (R->scrollBar.style != R_SB_XTERM) {
1725 if (scrollbar_above_slider(ev->y))
1726# ifdef RXVT_SCROLL_FULL
1727 rxvt_scr_page(aR_ UP, R->TermWin.nrow - 1);
1728# else
1729 rxvt_scr_page(aR_ UP, R->TermWin.nrow / 4);
1730# endif 1766#endif
1731 else if (scrollbar_below_slider(ev->y))
1732# ifdef RXVT_SCROLL_FULL
1733 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1734# else
1735 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1736# endif
1737 else
1738 R->scrollBar.setMotion ();
1739 } else {
1740 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1741 (R->TermWin.nrow
1742 * scrollbar_position(ev->y)
1743 / scrollbar_size()));
1744 }
1745 break;
1746 }
1747 }
1748 return;
1749 }
1750#if MENUBAR
1751 /*
1752 * Menubar window processing of button press
1753 */
1754 if (isMenuBarWindow(ev->window))
1755 rxvt_menubar_control(aR_ ev);
1756#endif
1757}
1758 1767
1759/* INTPROTO */
1760void
1761rxvt_button_release(pR_ XButtonEvent *ev)
1762{
1763 int reportmode = 0;
1764
1765 R->csrO = 0; /* reset csr Offset */
1766 if (!R->bypass_keystate)
1767 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1768
1769 if (scrollbar_isUpDn()) {
1770 R->scrollBar.setIdle ();
1771 rxvt_scrollbar_show(aR_ 0);
1772#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1773 R->refresh_type &= ~SMOOTH_REFRESH;
1774#endif
1775 } 1768 }
1776#ifdef SELECTION_SCROLLING 1769#ifdef SELECTION_SCROLLING
1777 R->pending_scroll_selection=0; 1770 pending_scroll_selection=0;
1778#endif 1771#endif
1779 if (ev->window == R->TermWin.vt) 1772 if (ev.window == TermWin.vt)
1780 { 1773 {
1781#ifdef RXVT_GRAPHICS
1782 if (ev->subwindow != None)
1783 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1784 else
1785#endif
1786 {
1787 if (reportmode) 1774 if (reportmode)
1788 { 1775 {
1789 /* mouse report from vt window */ 1776 /* mouse report from vt window */
1790 /* don't report release of wheel "buttons" */ 1777 /* don't report release of wheel "buttons" */
1791 if (ev->button >= 4) 1778 if (ev.button >= 4)
1792 return; 1779 return;
1793#ifdef MOUSE_REPORT_DOUBLECLICK 1780#ifdef MOUSE_REPORT_DOUBLECLICK
1794 /* only report the release of 'slow' single clicks */ 1781 /* only report the release of 'slow' single clicks */
1795 if (R->MEvent.button != AnyButton 1782 if (MEvent.button != AnyButton
1796 && (ev->button != R->MEvent.button 1783 && (ev.button != MEvent.button
1797 || (ev->time - R->MEvent.time 1784 || (ev.time - MEvent.time
1798 > MULTICLICK_TIME / 2))) 1785 > MULTICLICK_TIME / 2)))
1799 { 1786 {
1800 R->MEvent.clicks = 0; 1787 MEvent.clicks = 0;
1801 R->MEvent.button = AnyButton; 1788 MEvent.button = AnyButton;
1802 rxvt_mouse_report(aR_ ev); 1789 mouse_report (ev);
1803 } 1790 }
1804#else /* MOUSE_REPORT_DOUBLECLICK */ 1791#else /* MOUSE_REPORT_DOUBLECLICK */
1805 R->MEvent.button = AnyButton; 1792 MEvent.button = AnyButton;
1806 rxvt_mouse_report(aR_ ev); 1793 mouse_report (ev);
1807#endif /* MOUSE_REPORT_DOUBLECLICK */ 1794#endif /* MOUSE_REPORT_DOUBLECLICK */
1808 return; 1795 return;
1809 } 1796 }
1810 /* 1797 /*
1811 * dumb hack to compensate for the failure of click-and-drag 1798 * dumb hack to compensate for the failure of click-and-drag
1812 * when overriding mouse reporting 1799 * when overriding mouse reporting
1813 */ 1800 */
1814 if (R->PrivateModes & PrivMode_mouse_report 1801 if (PrivateModes & PrivMode_mouse_report
1815 && R->bypass_keystate 1802 && bypass_keystate
1816 && ev->button == Button1 && R->MEvent.clicks <= 1) 1803 && ev.button == Button1 && MEvent.clicks <= 1)
1817 R->selection_extend (ev->x, ev->y, 0); 1804 selection_extend (ev.x, ev.y, 0);
1818 1805
1819 switch (ev->button) { 1806 switch (ev.button)
1807 {
1820 case Button1: 1808 case Button1:
1821 case Button3: 1809 case Button3:
1822 rxvt_selection_make(aR_ ev->time); 1810 selection_make (ev.time);
1823 break; 1811 break;
1824 case Button2: 1812 case Button2:
1825 rxvt_selection_request(aR_ ev->time, ev->x, ev->y); 1813 selection_request (ev.time, ev.x, ev.y);
1826 break; 1814 break;
1827#ifdef MOUSE_WHEEL 1815#ifdef MOUSE_WHEEL
1828 case Button4: 1816 case Button4:
1829 case Button5: 1817 case Button5:
1830 { 1818 {
1831 int i; 1819 int i;
1832 page_dirn v; 1820 page_dirn v;
1833 1821
1834 v = (ev->button == Button4) ? UP : DN; 1822 v = (ev.button == Button4) ? UP : DN;
1835 if (ev->state & ShiftMask) 1823 if (ev.state & ShiftMask)
1836 i = 1; 1824 i = 1;
1837 else if ((R->Options & Opt_mouseWheelScrollPage)) 1825 else if ((Options & Opt_mouseWheelScrollPage))
1838 i = R->TermWin.nrow - 1; 1826 i = TermWin.nrow - 1;
1839 else 1827 else
1840 i = 5; 1828 i = 5;
1841# ifdef MOUSE_SLIP_WHEELING 1829# ifdef MOUSE_SLIP_WHEELING
1842 if (ev->state & ControlMask) 1830 if (ev.state & ControlMask)
1843 { 1831 {
1844 R->mouse_slip_wheel_speed += (v ? -1 : 1); 1832 mouse_slip_wheel_speed += (v ? -1 : 1);
1845 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1833 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1846 } 1834 }
1847# endif 1835# endif
1848# ifdef JUMP_MOUSE_WHEEL 1836# ifdef JUMP_MOUSE_WHEEL
1849 rxvt_scr_page(aR_ v, i); 1837 scr_page (v, i);
1850 R->scr_refresh (SMOOTH_REFRESH); 1838 scr_refresh (SMOOTH_REFRESH);
1851 rxvt_scrollbar_show(aR_ 1); 1839 scrollbar_show (1);
1852# else 1840# else
1853 while (i--) 1841 while (i--)
1854 { 1842 {
1855 rxvt_scr_page(aR_ v, 1); 1843 scr_page (v, 1);
1856 R->scr_refresh (SMOOTH_REFRESH); 1844 scr_refresh (SMOOTH_REFRESH);
1857 rxvt_scrollbar_show(aR_ 1); 1845 scrollbar_show (1);
1858 } 1846 }
1859# endif 1847# endif
1860 } 1848
1861 break; 1849 }
1850 break;
1862#endif 1851#endif
1863 } 1852
1864 }
1865 } 1853 }
1854 }
1866#ifdef MENUBAR 1855#ifdef MENUBAR
1867 else if (isMenuBarWindow(ev->window)) 1856 else if (isMenuBarWindow (ev.window))
1868 rxvt_menubar_control(aR_ ev); 1857 menubar_control (ev);
1869#endif 1858#endif
1870} 1859}
1871 1860
1872 1861
1873#ifdef TRANSPARENT 1862#ifdef TRANSPARENT
1874/* 1863/*
1875 * Check our parents are still who we think they are. 1864 * Check our parents are still who we think they are.
1876 * Do transparency updates if required 1865 * Do transparency updates if required
1877 */ 1866 */
1878/* EXTPROTO */
1879int 1867int
1880rxvt_check_our_parents(pR) 1868rxvt_term::check_our_parents ()
1881{ 1869{
1882 int i, pchanged, aformat, have_pixmap, rootdepth; 1870 int i, pchanged, aformat, have_pixmap, rootdepth;
1883 unsigned long nitems, bytes_after; 1871 unsigned long nitems, bytes_after;
1884 Atom atype; 1872 Atom atype;
1885 unsigned char *prop = NULL; 1873 unsigned char *prop = NULL;
1886 Window root, oldp, *list; 1874 Window root, oldp, *list;
1887 Pixmap rootpixmap = None; 1875 Pixmap rootpixmap = None;
1888 XWindowAttributes wattr, wrootattr; 1876 XWindowAttributes wattr, wrootattr;
1889 1877
1890 pchanged = 0; 1878 pchanged = 0;
1891 1879
1892 if (!(R->Options & Opt_transparent)) 1880 if (! (Options & Opt_transparent))
1893 return pchanged; /* Don't try any more */ 1881 return pchanged; /* Don't try any more */
1894 1882
1895 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr); 1883 XGetWindowAttributes (display->display, display->root, &wrootattr);
1896 rootdepth = wrootattr.depth; 1884 rootdepth = wrootattr.depth;
1897 1885
1898 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 1886 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1899 if (rootdepth != wattr.depth) { 1887 if (rootdepth != wattr.depth)
1888 {
1900 if (R->am_transparent) { 1889 if (am_transparent)
1890 {
1901 pchanged = 1; 1891 pchanged = 1;
1902 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1892 XSetWindowBackground (display->display, TermWin.vt,
1903 R->PixColors[Color_bg]); 1893 PixColors[Color_bg]);
1904 R->am_transparent = R->am_pixmap_trans = 0; 1894 am_transparent = am_pixmap_trans = 0;
1905 } 1895 }
1906 return pchanged; /* Don't try any more */ 1896 return pchanged; /* Don't try any more */
1907 } 1897 }
1908 1898
1909/* 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. */
1910 XSync(R->Xdisplay, False); 1900 XSync (display->display, False);
1911 1901
1912/* 1902 /*
1913 * Make the frame window set by the window manager have 1903 * Make the frame window set by the window manager have
1914 * the root background. Some window managers put multiple nested frame 1904 * the root background. Some window managers put multiple nested frame
1915 * 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.
1916 */ 1906 */
1917 i = (R->xa[XA_XROOTPMAPID] != 0 1907 i = (xa[XA_XROOTPMAPID] != 0
1918 && (XGetWindowProperty(R->Xdisplay, Xroot, R->xa[XA_XROOTPMAPID], 1908 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1919 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1909 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1920 &nitems, &bytes_after, &prop) == Success)); 1910 &nitems, &bytes_after, &prop) == Success));
1921 if (!i || prop == NULL) 1911 if (!i || prop == NULL)
1922 have_pixmap = 0; 1912 have_pixmap = 0;
1923 else { 1913 else
1914 {
1924 have_pixmap = 1; 1915 have_pixmap = 1;
1925 rootpixmap = *((Pixmap *)prop); 1916 rootpixmap = * ((Pixmap *)prop);
1926 XFree(prop); 1917 XFree (prop);
1927 } 1918 }
1928 if (have_pixmap) { 1919 if (have_pixmap)
1929/* 1920 {
1921 /*
1930 * Copy Xroot pixmap transparency 1922 * Copy display->root pixmap transparency
1931 */ 1923 */
1932 int sx, sy, nx, ny; 1924 int sx, sy, nx, ny;
1933 unsigned int nw, nh; 1925 unsigned int nw, nh;
1934 Window cr; 1926 Window cr;
1935 XImage *image; 1927 XImage *image;
1936 GC gc; 1928 GC gc;
1937 XGCValues gcvalue; 1929 XGCValues gcvalue;
1938 1930
1939 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 1931 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1940 0, 0, &sx, &sy, &cr); 1932 0, 0, &sx, &sy, &cr);
1941 nw = (unsigned int)R->szHint.width; 1933 nw = (unsigned int)szHint.width;
1942 nh = (unsigned int)R->szHint.height; 1934 nh = (unsigned int)szHint.height;
1943 nx = ny = 0; 1935 nx = ny = 0;
1944 if (sx < 0) { 1936
1937 if (sx < 0)
1938 {
1945 nw += sx; 1939 nw += sx;
1946 nx = -sx; 1940 nx = -sx;
1947 sx = 0; 1941 sx = 0;
1948 } 1942 }
1949 if (sy < 0) { 1943
1944 if (sy < 0)
1945 {
1950 nh += sy; 1946 nh += sy;
1951 ny = -sy; 1947 ny = -sy;
1952 sy = 0; 1948 sy = 0;
1953 } 1949 }
1950
1954 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 1951 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1955 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 1952 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1956 R->allowedxerror = -1; 1953 allowedxerror = -1;
1957 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 1954 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1958 ZPixmap); 1955 ZPixmap);
1959 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 1956 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1960 /* XXX: may need a delay here? */ 1957 /* XXX: may need a delay here? */
1961 R->allowedxerror = 0; 1958 allowedxerror = 0;
1962 if (image == NULL) { 1959 if (image == NULL)
1960 {
1963 if (R->am_transparent && R->am_pixmap_trans) { 1961 if (am_transparent && am_pixmap_trans)
1964 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 {
1965 if (R->TermWin.pixmap != None) { 1974 if (TermWin.pixmap != None)
1966 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 1975 XFreePixmap (display->display, TermWin.pixmap);
1967 R->TermWin.pixmap = None; 1976 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1968 } 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 }
1969 } 1992 }
1970 R->am_pixmap_trans = 0; 1993
1971 } else {
1972 if (R->TermWin.pixmap != None)
1973 XFreePixmap(R->Xdisplay, R->TermWin.pixmap);
1974 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt,
1975 (unsigned int)R->szHint.width,
1976 (unsigned int)R->szHint.height,
1977 (unsigned int)image->depth);
1978 gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 0UL, &gcvalue);
1979 XPutImage(R->Xdisplay, R->TermWin.pixmap, gc, image, 0, 0,
1980 nx, ny, (unsigned int)image->width,
1981 (unsigned int)image->height);
1982 XFreeGC(R->Xdisplay, gc);
1983 XDestroyImage(image);
1984 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt,
1985 R->TermWin.pixmap);
1986 if (!R->am_transparent || !R->am_pixmap_trans)
1987 pchanged = 1;
1988 R->am_transparent = R->am_pixmap_trans = 1;
1989 }
1990 }
1991 if (!R->am_pixmap_trans) { 1994 if (!am_pixmap_trans)
1995 {
1992 unsigned int n; 1996 unsigned int n;
1993/* 1997 /*
1994 * InheritPixmap transparency 1998 * InheritPixmap transparency
1995 */ 1999 */
1996 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2000 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1997 for (i = 1; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); 2001 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
1998 i++) { 2002 i++)
2003 {
1999 oldp = R->TermWin.parent[i]; 2004 oldp = TermWin.parent[i];
2000 XQueryTree(R->Xdisplay, R->TermWin.parent[i - 1], &root, 2005 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2001 &R->TermWin.parent[i], &list, &n); 2006 &TermWin.parent[i], &list, &n);
2002 XFree(list); 2007 XFree (list);
2003 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, R->TermWin.parent[i])); 2008 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2004 if (R->TermWin.parent[i] == Xroot) { 2009 if (TermWin.parent[i] == display->root)
2005 if (oldp != None) 2010 {
2006 pchanged = 1; 2011 if (oldp != None)
2007 break; 2012 pchanged = 1;
2008 } 2013 break;
2014 }
2009 if (oldp != R->TermWin.parent[i]) 2015 if (oldp != TermWin.parent[i])
2010 pchanged = 1; 2016 pchanged = 1;
2011 } 2017 }
2012 n = 0; 2018
2013 if (pchanged) { 2019 n = 0;
2020
2021 if (pchanged)
2022 {
2014 for (; n < (unsigned int)i; n++) { 2023 for (; n < (unsigned int)i; n++)
2024 {
2015 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2025 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2016 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"));
2017 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { 2027 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2028 {
2018 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2029 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2019 break; 2030 break;
2020 } 2031 }
2021 } 2032 }
2022 } 2033 }
2034
2023 if (n > (int)(sizeof(R->TermWin.parent) 2035 if (n > (int) (sizeof (TermWin.parent)
2024 / sizeof(R->TermWin.parent[0]))) { 2036 / sizeof (TermWin.parent[0])))
2037 {
2025 D_X((stderr, "InheritPixmap Turning off")); 2038 D_X ((stderr, "InheritPixmap Turning off"));
2026 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0], 2039 XSetWindowBackground (display->display, TermWin.parent[0],
2027 R->PixColors[Color_fg]); 2040 PixColors[Color_fg]);
2028 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 2041 XSetWindowBackground (display->display, TermWin.vt,
2029 R->PixColors[Color_bg]); 2042 PixColors[Color_bg]);
2030 R->am_transparent = 0; 2043 am_transparent = 0;
2031 /* XXX: also turn off Opt_transparent? */ 2044 /* XXX: also turn off Opt_transparent? */
2032 } else { 2045 }
2046 else
2047 {
2033 /* wait (an arbitrary period) for the WM to do its thing 2048 /* wait (an arbitrary period) for the WM to do its thing
2034 * needed for fvwm2.2.2 (and before?) */ 2049 * needed for fvwm2.2.2 (and before?) */
2035# ifdef HAVE_NANOSLEEP 2050# ifdef HAVE_NANOSLEEP
2036 struct timespec rqt; 2051 struct timespec rqt;
2037 2052
2038 rqt.tv_sec = 1; 2053 rqt.tv_sec = 1;
2039 rqt.tv_nsec = 0; 2054 rqt.tv_nsec = 0;
2040 nanosleep(&rqt, NULL); 2055 nanosleep (&rqt, NULL);
2041# else 2056# else
2042 sleep(1); 2057 sleep (1);
2043# endif 2058# endif
2044 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2059 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2045 for (n = 0; n < (unsigned int)i; n++) 2060 for (n = 0; n < (unsigned int)i; n++)
2046 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n], 2061 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2047 ParentRelative); 2062 ParentRelative);
2048 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 2063 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2049 ParentRelative); 2064 ParentRelative);
2050 R->am_transparent = 1; 2065 am_transparent = 1;
2051 } 2066 }
2067
2052 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++) 2068 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2053 R->TermWin.parent[i] = None; 2069 TermWin.parent[i] = None;
2054 } 2070 }
2055 return pchanged; 2071 return pchanged;
2056} 2072}
2057#endif 2073#endif
2058 2074
2059/*}}} */ 2075/*}}} */
2060 2076
2061/*{{{ print pipe */ 2077/*{{{ print pipe */
2062/*----------------------------------------------------------------------*/ 2078/*----------------------------------------------------------------------*/
2063#ifdef PRINTPIPE 2079#ifdef PRINTPIPE
2064/* EXTPROTO */ 2080FILE *
2065FILE *
2066rxvt_popen_printer(pR) 2081rxvt_term::popen_printer ()
2067{ 2082{
2068 FILE *stream = popen(R->rs[Rs_print_pipe], "w"); 2083 FILE *stream = popen (rs[Rs_print_pipe], "w");
2069 2084
2070 if (stream == NULL) 2085 if (stream == NULL)
2071 rxvt_print_error("can't open printer pipe"); 2086 rxvt_print_error ("can't open printer pipe");
2072 return stream; 2087 return stream;
2073} 2088}
2074 2089
2075/* EXTPROTO */
2076int 2090int
2077rxvt_pclose_printer (FILE *stream) 2091rxvt_term::pclose_printer (FILE *stream)
2078{ 2092{
2079 fflush (stream); 2093 fflush (stream);
2080/* pclose() reported not to work on SunOS 4.1.3 */ 2094 /* pclose () reported not to work on SunOS 4.1.3 */
2081# if defined (__sun__) /* TODO: RESOLVE THIS */ 2095# if defined (__sun__) /* TODO: RESOLVE THIS */
2082/* pclose works provided SIGCHLD handler uses waitpid */ 2096 /* pclose works provided SIGCHLD handler uses waitpid */
2083 return pclose (stream); /* return fclose (stream); */ 2097 return pclose (stream); /* return fclose (stream); */
2084# else 2098# else
2085 return pclose (stream); 2099 return pclose (stream);
2086# endif 2100# endif
2087} 2101}
2088 2102
2089/* 2103/*
2090 * simulate attached vt100 printer 2104 * simulate attached vt100 printer
2091 */ 2105 */
2092/* INTPROTO */
2093void 2106void
2094rxvt_process_print_pipe(pR) 2107rxvt_term::process_print_pipe ()
2095{ 2108{
2096 int done; 2109 int done;
2097 FILE *fd; 2110 FILE *fd;
2098 2111
2099 if ((fd = rxvt_popen_printer(aR)) == NULL) 2112 if ((fd = popen_printer ()) == NULL)
2100 return; 2113 return;
2101 2114
2102/* 2115 /*
2103 * 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
2104 * is received. 2117 * is received.
2105 */ 2118 */
2106 for (done = 0; !done;) { 2119 for (done = 0; !done;)
2120 {
2107 unsigned char buf[8]; 2121 unsigned char buf[8];
2108 unsigned char ch; 2122 unsigned char ch;
2109 unsigned int i, len; 2123 unsigned int i, len;
2110 2124
2111 if ((ch = rxvt_cmd_getc(aR)) != C0_ESC) { 2125 if ((ch = cmd_getc ()) != C0_ESC)
2126 {
2112 if (putc(ch, fd) == EOF) 2127 if (putc (ch, fd) == EOF)
2113 break; /* done = 1 */ 2128 break; /* done = 1 */
2114 } else { 2129 }
2130 else
2131 {
2115 len = 0; 2132 len = 0;
2116 buf[len++] = ch; 2133 buf[len++] = ch;
2117 2134
2118 if ((buf[len++] = rxvt_cmd_getc(aR)) == '[') { 2135 if ((buf[len++] = cmd_getc ()) == '[')
2119 if ((ch = rxvt_cmd_getc(aR)) == '?') { 2136 {
2120 buf[len++] = '?'; 2137 if ((ch = cmd_getc ()) == '?')
2121 ch = rxvt_cmd_getc(aR); 2138 {
2122 } 2139 buf[len++] = '?';
2140 ch = cmd_getc ();
2141 }
2123 if ((buf[len++] = ch) == '4') { 2142 if ((buf[len++] = ch) == '4')
2143 {
2124 if ((buf[len++] = rxvt_cmd_getc(aR)) == 'i') 2144 if ((buf[len++] = cmd_getc ()) == 'i')
2125 break; /* done = 1 */ 2145 break; /* done = 1 */
2126 } 2146 }
2147 }
2148 for (i = 0; i < len; i++)
2149 if (putc (buf[i], fd) == EOF)
2150 {
2151 done = 1;
2152 break;
2153 }
2154 }
2127 } 2155 }
2128 for (i = 0; i < len; i++)
2129 if (putc(buf[i], fd) == EOF) {
2130 done = 1;
2131 break;
2132 }
2133 }
2134 }
2135 rxvt_pclose_printer(fd); 2156 pclose_printer (fd);
2136} 2157}
2137#endif /* PRINTPIPE */ 2158#endif /* PRINTPIPE */
2138/*}}} */ 2159/*}}} */
2139 2160
2140/* *INDENT-OFF* */ 2161/* *INDENT-OFF* */
2141enum { 2162enum {
2142 C1_40 = 0x40, 2163 C1_40 = 0x40,
2143 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,
2144 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,
2145 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,
2146 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
2147}; 2168};
2148/* *INDENT-ON* */ 2169/* *INDENT-ON* */
2149 2170
2150/*{{{ process non-printing single characters */ 2171/*{{{ process non-printing single characters */
2151/* INTPROTO */
2152void 2172void
2153rxvt_process_nonprinting(pR_ unsigned char ch) 2173rxvt_term::process_nonprinting (unsigned char ch)
2154{ 2174{
2155 switch (ch) { 2175 switch (ch)
2176 {
2156 case C0_ENQ: /* terminal Status */ 2177 case C0_ENQ: /* terminal Status */
2157 if (R->rs[Rs_answerbackstring]) 2178 if (rs[Rs_answerbackstring])
2158 R->tt_write( 2179 tt_write (
2159 (const unsigned char *)R->rs[Rs_answerbackstring], 2180 (const unsigned char *)rs[Rs_answerbackstring],
2160 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2181 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2161 else 2182 else
2162 R->tt_write((unsigned char *)VT100_ANS, 2183 tt_write ((unsigned char *)VT100_ANS,
2163 (unsigned int)STRLEN(VT100_ANS)); 2184 (unsigned int)STRLEN (VT100_ANS));
2164 break; 2185 break;
2165 case C0_BEL: /* bell */ 2186 case C0_BEL: /* bell */
2166 rxvt_scr_bell(aR); 2187 scr_bell ();
2167 break; 2188 break;
2168 case C0_BS: /* backspace */ 2189 case C0_BS: /* backspace */
2169 rxvt_scr_backspace(aR); 2190 scr_backspace ();
2170 break; 2191 break;
2171 case C0_HT: /* tab */ 2192 case C0_HT: /* tab */
2172 rxvt_scr_tab(aR_ 1); 2193 scr_tab (1);
2173 break; 2194 break;
2174 case C0_CR: /* carriage return */ 2195 case C0_CR: /* carriage return */
2175 rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); 2196 scr_gotorc (0, 0, R_RELATIVE);
2176 break; 2197 break;
2177 case C0_VT: /* vertical tab, form feed */ 2198 case C0_VT: /* vertical tab, form feed */
2178 case C0_FF: 2199 case C0_FF:
2179 case C0_LF: /* line feed */ 2200 case C0_LF: /* line feed */
2180 rxvt_scr_index(aR_ UP); 2201 scr_index (UP);
2181 break; 2202 break;
2182 case C0_SO: /* shift out - acs */ 2203 case C0_SO: /* shift out - acs */
2183 rxvt_scr_charset_choose(aR_ 1); 2204 scr_charset_choose (1);
2184 break; 2205 break;
2185 case C0_SI: /* shift in - acs */ 2206 case C0_SI: /* shift in - acs */
2186 rxvt_scr_charset_choose(aR_ 0); 2207 scr_charset_choose (0);
2187 break; 2208 break;
2188 } 2209 }
2189} 2210}
2190/*}}} */ 2211/*}}} */
2191 2212
2192 2213
2193/*{{{ process VT52 escape sequences */ 2214/*{{{ process VT52 escape sequences */
2194/* INTPROTO */
2195void 2215void
2196rxvt_process_escape_vt52(pR_ unsigned char ch) 2216rxvt_term::process_escape_vt52 (unsigned char ch)
2197{ 2217{
2198 int row, col; 2218 int row, col;
2219
2220 switch (ch)
2199 2221 {
2200 switch (ch) {
2201 case 'A': /* cursor up */ 2222 case 'A': /* cursor up */
2202 rxvt_scr_gotorc(aR_ -1, 0, R_RELATIVE | C_RELATIVE); 2223 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2203 break; 2224 break;
2204 case 'B': /* cursor down */ 2225 case 'B': /* cursor down */
2205 rxvt_scr_gotorc(aR_ 1, 0, R_RELATIVE | C_RELATIVE); 2226 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2206 break; 2227 break;
2207 case 'C': /* cursor right */ 2228 case 'C': /* cursor right */
2208 rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); 2229 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2209 break; 2230 break;
2210 case 'D': /* cursor left */ 2231 case 'D': /* cursor left */
2211 rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); 2232 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2212 break; 2233 break;
2213 case 'H': /* cursor home */ 2234 case 'H': /* cursor home */
2214 rxvt_scr_gotorc(aR_ 0, 0, 0); 2235 scr_gotorc (0, 0, 0);
2215 break; 2236 break;
2216 case 'I': /* cursor up and scroll down if needed */ 2237 case 'I': /* cursor up and scroll down if needed */
2217 rxvt_scr_index(aR_ DN); 2238 scr_index (DN);
2218 break; 2239 break;
2219 case 'J': /* erase to end of screen */ 2240 case 'J': /* erase to end of screen */
2220 R->scr_erase_screen (0); 2241 scr_erase_screen (0);
2221 break; 2242 break;
2222 case 'K': /* erase to end of line */ 2243 case 'K': /* erase to end of line */
2223 rxvt_scr_erase_line(aR_ 0); 2244 scr_erase_line (0);
2224 break; 2245 break;
2225 case 'Y': /* move to specified row and col */ 2246 case 'Y': /* move to specified row and col */
2226 /* full command is 'ESC Y row col' where row and col 2247 /* full command is 'ESC Y row col' where row and col
2227 * are encoded by adding 32 and sending the ascii 2248 * are encoded by adding 32 and sending the ascii
2228 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2249 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2229 * etc. */ 2250 * etc. */
2230 row = rxvt_cmd_getc(aR) - ' '; 2251 row = cmd_getc () - ' ';
2231 col = rxvt_cmd_getc(aR) - ' '; 2252 col = cmd_getc () - ' ';
2232 rxvt_scr_gotorc(aR_ row, col, 0); 2253 scr_gotorc (row, col, 0);
2233 break; 2254 break;
2234 case 'Z': /* identify the terminal type */ 2255 case 'Z': /* identify the terminal type */
2235 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2256 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2236 break; 2257 break;
2237 case '<': /* turn off VT52 mode */ 2258 case '<': /* turn off VT52 mode */
2238 PrivMode(0, PrivMode_vt52); 2259 PrivMode (0, PrivMode_vt52);
2239 break; 2260 break;
2240 case 'F': /* use special graphics character set */ 2261 case 'F': /* use special graphics character set */
2241 case 'G': /* use regular character set */ 2262 case 'G': /* use regular character set */
2242 /* unimplemented */ 2263 /* unimplemented */
2243 break; 2264 break;
2244 case '=': /* use alternate keypad mode */ 2265 case '=': /* use alternate keypad mode */
2245 case '>': /* use regular keypad mode */ 2266 case '>': /* use regular keypad mode */
2246 /* unimplemented */ 2267 /* unimplemented */
2247 break; 2268 break;
2248 } 2269 }
2249} 2270}
2250/*}}} */ 2271/*}}} */
2251 2272
2252 2273
2253/*{{{ process escape sequences */ 2274/*{{{ process escape sequences */
2254/* INTPROTO */
2255void 2275void
2256rxvt_process_escape_seq(pR) 2276rxvt_term::process_escape_seq ()
2257{ 2277{
2258 unsigned char ch = rxvt_cmd_getc(aR); 2278 unsigned char ch = cmd_getc ();
2259 2279
2260 if (R->PrivateModes & PrivMode_vt52) { 2280 if (PrivateModes & PrivMode_vt52)
2261 rxvt_process_escape_vt52(aR_ ch);
2262 return;
2263 }
2264 2281 {
2282 process_escape_vt52 (ch);
2283 return;
2284 }
2285
2265 switch (ch) { 2286 switch (ch)
2287 {
2266 /* case 1: do_tek_mode (); break; */ 2288 /* case 1: do_tek_mode (); break; */
2267 case '#': 2289 case '#':
2268 if (rxvt_cmd_getc(aR) == '8') 2290 if (cmd_getc () == '8')
2269 rxvt_scr_E(aR); 2291 scr_E ();
2270 break; 2292 break;
2271 case '(': 2293 case '(':
2272 rxvt_scr_charset_set(aR_ 0, (unsigned int)rxvt_cmd_getc(aR)); 2294 scr_charset_set (0, (unsigned int)cmd_getc ());
2273 break; 2295 break;
2274 case ')': 2296 case ')':
2275 rxvt_scr_charset_set(aR_ 1, (unsigned int)rxvt_cmd_getc(aR)); 2297 scr_charset_set (1, (unsigned int)cmd_getc ());
2276 break; 2298 break;
2277 case '*': 2299 case '*':
2278 rxvt_scr_charset_set(aR_ 2, (unsigned int)rxvt_cmd_getc(aR)); 2300 scr_charset_set (2, (unsigned int)cmd_getc ());
2279 break; 2301 break;
2280 case '+': 2302 case '+':
2281 rxvt_scr_charset_set(aR_ 3, (unsigned int)rxvt_cmd_getc(aR)); 2303 scr_charset_set (3, (unsigned int)cmd_getc ());
2282 break; 2304 break;
2283#ifdef MULTICHAR_SET
2284 case '$':
2285 rxvt_scr_charset_set(aR_ -2, (unsigned int)rxvt_cmd_getc(aR));
2286 break;
2287#endif
2288#ifndef NO_FRILLS 2305#ifndef NO_FRILLS
2289 case '6': 2306 case '6':
2290 rxvt_scr_backindex(aR); 2307 scr_backindex ();
2291 break; 2308 break;
2292#endif 2309#endif
2293 case '7': 2310 case '7':
2294 rxvt_scr_cursor(aR_ SAVE); 2311 scr_cursor (SAVE);
2295 break; 2312 break;
2296 case '8': 2313 case '8':
2297 rxvt_scr_cursor(aR_ RESTORE); 2314 scr_cursor (RESTORE);
2298 break; 2315 break;
2299#ifndef NO_FRILLS 2316#ifndef NO_FRILLS
2300 case '9': 2317 case '9':
2301 rxvt_scr_forwardindex(aR); 2318 scr_forwardindex ();
2302 break; 2319 break;
2303#endif 2320#endif
2304 case '=': 2321 case '=':
2305 case '>': 2322 case '>':
2306 PrivMode((ch == '='), PrivMode_aplKP); 2323 PrivMode ((ch == '='), PrivMode_aplKP);
2307 break; 2324 break;
2308 2325
2309 case C1_40: 2326 case C1_40:
2310 rxvt_cmd_getc(aR); 2327 cmd_getc ();
2311 break; 2328 break;
2312 case C1_44: 2329 case C1_44:
2313 rxvt_scr_index(aR_ UP); 2330 scr_index (UP);
2314 break; 2331 break;
2315 2332
2316 /* 8.3.87: NEXT LINE */ 2333 /* 8.3.87: NEXT LINE */
2317 case C1_NEL: /* ESC E */ 2334 case C1_NEL: /* ESC E */
2318 { 2335 {
2319 uint32_t nlcr[] = { '\n', '\r' }; 2336 uint32_t nlcr[] = { '\n', '\r' };
2320 rxvt_scr_add_lines(aR_ nlcr, 1, 2); 2337 scr_add_lines (nlcr, 1, 2);
2321 } 2338 }
2322 break; 2339 break;
2323 2340
2324 /* kidnapped escape sequence: Should be 8.3.48 */ 2341 /* kidnapped escape sequence: Should be 8.3.48 */
2325 case C1_ESA: /* ESC G */ 2342 case C1_ESA: /* ESC G */
2326 rxvt_process_graphics(aR); 2343 process_graphics ();
2327 break; 2344 break;
2328 2345
2329 /* 8.3.63: CHARACTER TABULATION SET */ 2346 /* 8.3.63: CHARACTER TABULATION SET */
2330 case C1_HTS: /* ESC H */ 2347 case C1_HTS: /* ESC H */
2331 rxvt_scr_set_tab(aR_ 1); 2348 scr_set_tab (1);
2332 break; 2349 break;
2333 2350
2334 /* 8.3.105: REVERSE LINE FEED */ 2351 /* 8.3.105: REVERSE LINE FEED */
2335 case C1_RI: /* ESC M */ 2352 case C1_RI: /* ESC M */
2336 rxvt_scr_index(aR_ DN); 2353 scr_index (DN);
2337 break; 2354 break;
2338 2355
2339 /* 8.3.142: SINGLE-SHIFT TWO */ 2356 /* 8.3.142: SINGLE-SHIFT TWO */
2340 /*case C1_SS2: scr_single_shift (2); break; */ 2357 /*case C1_SS2: scr_single_shift (2); break; */
2341 2358
2342 /* 8.3.143: SINGLE-SHIFT THREE */ 2359 /* 8.3.143: SINGLE-SHIFT THREE */
2343 /*case C1_SS3: scr_single_shift (3); break; */ 2360 /*case C1_SS3: scr_single_shift (3); break; */
2344 2361
2345 /* 8.3.27: DEVICE CONTROL STRING */ 2362 /* 8.3.27: DEVICE CONTROL STRING */
2346 case C1_DCS: /* ESC P */ 2363 case C1_DCS: /* ESC P */
2347 rxvt_process_dcs_seq(aR); 2364 process_dcs_seq ();
2348 break; 2365 break;
2349 2366
2350 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2367 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2351 case C1_SCI: /* ESC Z */ 2368 case C1_SCI: /* ESC Z */
2352 R->tt_write((const unsigned char *)ESCZ_ANSWER, 2369 tt_write ((const unsigned char *)ESCZ_ANSWER,
2353 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2370 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2354 break; /* steal obsolete ESC [ c */ 2371 break; /* steal obsolete ESC [ c */
2355 2372
2356 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2373 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2357 case C1_CSI: /* ESC [ */ 2374 case C1_CSI: /* ESC [ */
2358 rxvt_process_csi_seq(aR); 2375 process_csi_seq ();
2359 break; 2376 break;
2360 2377
2361 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2378 /* 8.3.90: OPERATING SYSTEM COMMAND */
2362 case C1_OSC: /* ESC ] */ 2379 case C1_OSC: /* ESC ] */
2363 rxvt_process_osc_seq(aR); 2380 process_osc_seq ();
2364 break; 2381 break;
2365 2382
2366 /* 8.3.106: RESET TO INITIAL STATE */ 2383 /* 8.3.106: RESET TO INITIAL STATE */
2367 case 'c': 2384 case 'c':
2368 rxvt_scr_poweron(aR); 2385 scr_poweron ();
2369 rxvt_scrollbar_show(aR_ 1); 2386 scrollbar_show (1);
2370 break; 2387 break;
2371 2388
2372 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2389 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2373 case 'n': 2390 case 'n':
2374 rxvt_scr_charset_choose(aR_ 2); 2391 scr_charset_choose (2);
2375 break; 2392 break;
2376 2393
2377 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2394 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2378 case 'o': 2395 case 'o':
2379 rxvt_scr_charset_choose(aR_ 3); 2396 scr_charset_choose (3);
2380 break; 2397 break;
2381 } 2398 }
2382} 2399}
2383/*}}} */ 2400/*}}} */
2384 2401
2385/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2402/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2386/* *INDENT-OFF* */ 2403/* *INDENT-OFF* */
2387enum { 2404enum {
2388 CSI_ICH = 0x40, 2405 CSI_ICH = 0x40,
2389 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,
2390 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 ,
2391 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,
2392 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,
2393 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,
2394 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,
2395 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 ,
2396 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
2397}; 2414};
2398 2415
2399#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2416#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2400 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2417 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2401 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2418 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2402#define get_byte_array_bit(array, bit) \ 2419#define get_byte_array_bit(array, bit) \
2403 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2420 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2404 2421
2405const unsigned char csi_defaults[] = { 2422const unsigned char csi_defaults[] =
2423 {
2406 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, */
2407 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, */
2408 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, */
2409 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, [, \, ], ^, _, */
2410 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, */
2411 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, */
2412 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, */
2413 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, {, |, }, ~, */
2414}; 2432 };
2415/* *INDENT-ON* */ 2433/* *INDENT-ON* */
2416 2434
2417/* INTPROTO */
2418void 2435void
2419rxvt_process_csi_seq(pR) 2436rxvt_term::process_csi_seq ()
2420{ 2437{
2421 unsigned char ch, priv, i; 2438 unsigned char ch, priv, i;
2422 unsigned int nargs, p; 2439 unsigned int nargs, p;
2423 int n, ndef; 2440 int n, ndef;
2424 int arg[ESC_ARGS]; 2441 int arg[ESC_ARGS];
2425 2442
2426 for (nargs = ESC_ARGS; nargs > 0;) 2443 for (nargs = ESC_ARGS; nargs > 0;)
2427 arg[--nargs] = 0; 2444 arg[--nargs] = 0;
2428 2445
2429 priv = 0; 2446 priv = 0;
2447 ch = cmd_getc ();
2448 if (ch >= '<' && ch <= '?')
2449 { /* '<' '=' '>' '?' */
2450 priv = ch;
2430 ch = rxvt_cmd_getc(aR); 2451 ch = cmd_getc ();
2431 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2432 priv = ch;
2433 ch = rxvt_cmd_getc(aR);
2434 } 2452 }
2435/* read any numerical arguments */ 2453 /* read any numerical arguments */
2436 for (n = -1; ch < CSI_ICH; ) { 2454 for (n = -1; ch < CSI_ICH; )
2455 {
2437 if (isdigit(ch)) { 2456 if (isdigit (ch))
2457 {
2438 if (n < 0) 2458 if (n < 0)
2439 n = ch - '0'; 2459 n = ch - '0';
2440 else 2460 else
2441 n = n * 10 + ch - '0'; 2461 n = n * 10 + ch - '0';
2462 }
2442 } else if (ch == ';') { 2463 else if (ch == ';')
2464 {
2443 if (nargs < ESC_ARGS) 2465 if (nargs < ESC_ARGS)
2444 arg[nargs++] = n; 2466 arg[nargs++] = n;
2445 n = -1; 2467 n = -1;
2468 }
2446 } else if (ch == '\b') { 2469 else if (ch == '\b')
2447 rxvt_scr_backspace(aR); 2470 {
2471 scr_backspace ();
2472 }
2448 } else if (ch == C0_ESC) { 2473 else if (ch == C0_ESC)
2449 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)
2450 return; 2486 return;
2451 } else if (ch < ' ') {
2452 rxvt_process_nonprinting(aR_ ch);
2453 }
2454 ch = rxvt_cmd_getc(aR);
2455 }
2456 2487
2457 if (ch > CSI_7F)
2458 return;
2459
2460 if (nargs < ESC_ARGS) 2488 if (nargs < ESC_ARGS)
2461 arg[nargs++] = n; 2489 arg[nargs++] = n;
2462 2490
2463 i = ch - CSI_ICH; 2491 i = ch - CSI_ICH;
2464 ndef = get_byte_array_bit(csi_defaults, i); 2492 ndef = get_byte_array_bit (csi_defaults, i);
2465 for (p = 0; p < nargs; p++) 2493 for (p = 0; p < nargs; p++)
2466 if (arg[p] == -1) 2494 if (arg[p] == -1)
2467 arg[p] = ndef; 2495 arg[p] = ndef;
2468 2496
2469#ifdef DEBUG_CMD 2497#ifdef DEBUG_CMD
2470 fprintf(stderr, "CSI "); 2498 fprintf (stderr, "CSI ");
2471 for (p = 0; p < nargs; p++) 2499 for (p = 0; p < nargs; p++)
2472 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2500 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2473 fprintf(stderr, "%c\n", ch); 2501 fprintf (stderr, "%c\n", ch);
2474#endif 2502#endif
2475 2503
2476/* 2504 /*
2477 * private mode handling 2505 * private mode handling
2478 */ 2506 */
2479 if (priv) { 2507 if (priv)
2480 switch (priv) { 2508 {
2481 case '>': 2509 switch (priv)
2510 {
2511 case '>':
2482 if (ch == CSI_DA) /* secondary device attributes */ 2512 if (ch == CSI_DA) /* secondary device attributes */
2483 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2513 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2484 break; 2514 break;
2485 case '?': 2515 case '?':
2486 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2516 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2487 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2517 process_terminal_mode (ch, priv, nargs, arg);
2488 break; 2518 break;
2489 } 2519 }
2490 return; 2520 return;
2491 } 2521 }
2492 2522
2493 switch (ch) { 2523 switch (ch)
2494/* 2524 {
2525 /*
2495 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2526 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2496 */ 2527 */
2497#ifdef PRINTPIPE 2528#ifdef PRINTPIPE
2498 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2529 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2499 switch (arg[0]) { 2530 switch (arg[0])
2531 {
2500 case 0: /* initiate transfer to primary aux device */ 2532 case 0: /* initiate transfer to primary aux device */
2501 rxvt_scr_printscreen(aR_ 0); 2533 scr_printscreen (0);
2502 break; 2534 break;
2503 case 5: /* start relay to primary aux device */ 2535 case 5: /* start relay to primary aux device */
2504 rxvt_process_print_pipe(aR); 2536 process_print_pipe ();
2537 break;
2538 }
2505 break; 2539 break;
2506 }
2507 break;
2508#endif 2540#endif
2509 2541
2510 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2542 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2511 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2543 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2512 arg[0] = -arg[0]; 2544 arg[0] = -arg[0];
2513 /* FALLTHROUGH */ 2545 /* FALLTHROUGH */
2514 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2546 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2515 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2547 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2516 rxvt_scr_gotorc(aR_ arg[0], 0, RELATIVE); 2548 scr_gotorc (arg[0], 0, RELATIVE);
2517 break; 2549 break;
2518 2550
2519 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2551 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2520 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2552 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2521#ifdef ISO6429 2553#ifdef ISO6429
2522 arg[0] = -arg[0]; 2554 arg[0] = -arg[0];
2523#else /* emulate common DEC VTs */ 2555#else /* emulate common DEC VTs */
2524 arg[0] = arg[0] ? -arg[0] : -1; 2556 arg[0] = arg[0] ? -arg[0] : -1;
2525#endif 2557#endif
2526 /* FALLTHROUGH */ 2558 /* FALLTHROUGH */
2527 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2559 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2528 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2560 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2529#ifdef ISO6429 2561#ifdef ISO6429
2530 rxvt_scr_gotorc(aR_ 0, arg[0], RELATIVE); 2562 scr_gotorc (0, arg[0], RELATIVE);
2531#else /* emulate common DEC VTs */ 2563#else /* emulate common DEC VTs */
2532 rxvt_scr_gotorc(aR_ 0, arg[0] ? arg[0] : 1, RELATIVE); 2564 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2533#endif 2565#endif
2534 break; 2566 break;
2535 2567
2536 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2568 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2537 arg[0] = -arg[0]; 2569 arg[0] = -arg[0];
2538 /* FALLTHROUGH */ 2570 /* FALLTHROUGH */
2539 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2571 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2540 rxvt_scr_gotorc(aR_ arg[0], 0, R_RELATIVE); 2572 scr_gotorc (arg[0], 0, R_RELATIVE);
2541 break; 2573 break;
2542 2574
2543 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2575 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2544 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2576 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2545 rxvt_scr_gotorc(aR_ 0, arg[0] - 1, R_RELATIVE); 2577 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2546 break; 2578 break;
2547 2579
2548 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2580 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2549 rxvt_scr_gotorc(aR_ arg[0] - 1, 0, C_RELATIVE); 2581 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2550 break; 2582 break;
2551 2583
2552 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2584 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2553 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 */
2554 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);
2555 break; 2587 break;
2556 2588
2557 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2589 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2558 arg[0] = -arg[0]; 2590 arg[0] = -arg[0];
2559 /* FALLTHROUGH */ 2591 /* FALLTHROUGH */
2560 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2592 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2561 rxvt_scr_tab(aR_ arg[0]); 2593 scr_tab (arg[0]);
2562 break; 2594 break;
2563 2595
2564 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2596 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2565 R->scr_erase_screen (arg[0]); 2597 scr_erase_screen (arg[0]);
2566 break; 2598 break;
2567 2599
2568 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2600 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2569 rxvt_scr_erase_line(aR_ arg[0]); 2601 scr_erase_line (arg[0]);
2570 break; 2602 break;
2571 2603
2572 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2604 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2573 rxvt_scr_insdel_chars(aR_ arg[0], INSERT); 2605 scr_insdel_chars (arg[0], INSERT);
2574 break; 2606 break;
2575 2607
2576 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2608 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2577 rxvt_scr_insdel_lines(aR_ arg[0], INSERT); 2609 scr_insdel_lines (arg[0], INSERT);
2578 break; 2610 break;
2579 2611
2580 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2612 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2581 rxvt_scr_insdel_lines(aR_ arg[0], DELETE); 2613 scr_insdel_lines (arg[0], DELETE);
2582 break; 2614 break;
2583 2615
2584 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2616 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2585 rxvt_scr_insdel_chars(aR_ arg[0], ERASE); 2617 scr_insdel_chars (arg[0], ERASE);
2586 break; 2618 break;
2587 2619
2588 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2620 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2589 rxvt_scr_insdel_chars(aR_ arg[0], DELETE); 2621 scr_insdel_chars (arg[0], DELETE);
2590 break; 2622 break;
2591 2623
2592 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2624 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2593 arg[0] = -arg[0]; 2625 arg[0] = -arg[0];
2594 /* FALLTHROUGH */ 2626 /* FALLTHROUGH */
2595 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2627 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2596 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2628 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2597 break; 2629 break;
2598 2630
2599 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2631 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2600 R->tt_write((const unsigned char *)VT100_ANS, 2632 tt_write ((const unsigned char *)VT100_ANS,
2601 (unsigned int)(sizeof(VT100_ANS) - 1)); 2633 (unsigned int) (sizeof (VT100_ANS) - 1));
2602 break; 2634 break;
2603 2635
2604 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2636 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2605 rxvt_process_sgr_mode(aR_ nargs, arg); 2637 process_sgr_mode (nargs, arg);
2606 break; 2638 break;
2607 2639
2608 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2640 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2609 switch (arg[0]) { 2641 switch (arg[0])
2642 {
2610 case 5: /* DSR requested */ 2643 case 5: /* DSR requested */
2611 R->tt_printf("\033[0n"); 2644 tt_printf ("\033[0n");
2612 break; 2645 break;
2613 case 6: /* CPR requested */ 2646 case 6: /* CPR requested */
2614 rxvt_scr_report_position(aR); 2647 scr_report_position ();
2615 break; 2648 break;
2616#if defined (ENABLE_DISPLAY_ANSWER) 2649#if defined (ENABLE_DISPLAY_ANSWER)
2617 case 7: /* unofficial extension */ 2650 case 7: /* unofficial extension */
2618 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]); 2651 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2619 break; 2652 break;
2620#endif 2653#endif
2621 case 8: /* unofficial extension */ 2654 case 8: /* unofficial extension */
2622 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2655 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2656 break;
2657 }
2623 break; 2658 break;
2624 }
2625 break;
2626 2659
2627 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2660 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2628 switch (arg[0]) { 2661 switch (arg[0])
2662 {
2629 case 0: /* char tab stop cleared at active position */ 2663 case 0: /* char tab stop cleared at active position */
2630 rxvt_scr_set_tab(aR_ 0); 2664 scr_set_tab (0);
2631 break; 2665 break;
2632 /* case 1: */ /* line tab stop cleared in active line */ 2666 /* case 1: */ /* line tab stop cleared in active line */
2633 /* case 2: */ /* char tab stops cleared in active line */ 2667 /* case 2: */ /* char tab stops cleared in active line */
2634 case 3: /* all char tab stops are cleared */ 2668 case 3: /* all char tab stops are cleared */
2635 /* case 4: */ /* all line tab stops are cleared */ 2669 /* case 4: */ /* all line tab stops are cleared */
2636 case 5: /* all tab stops are cleared */ 2670 case 5: /* all tab stops are cleared */
2637 rxvt_scr_set_tab(aR_ -1); 2671 scr_set_tab (-1);
2672 break;
2673 }
2638 break; 2674 break;
2639 }
2640 break;
2641 2675
2642 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2676 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2643 switch (arg[0]) { 2677 switch (arg[0])
2678 {
2644 case 0: /* char tab stop set at active position */ 2679 case 0: /* char tab stop set at active position */
2645 rxvt_scr_set_tab(aR_ 1); 2680 scr_set_tab (1);
2646 break; /* = ESC H */ 2681 break; /* = ESC H */
2647 /* case 1: */ /* line tab stop set at active line */ 2682 /* case 1: */ /* line tab stop set at active line */
2648 case 2: /* char tab stop cleared at active position */ 2683 case 2: /* char tab stop cleared at active position */
2649 rxvt_scr_set_tab(aR_ 0); 2684 scr_set_tab (0);
2650 break; /* = ESC [ 0 g */ 2685 break; /* = ESC [ 0 g */
2651 /* case 3: */ /* line tab stop cleared at active line */ 2686 /* case 3: */ /* line tab stop cleared at active line */
2652 /* case 4: */ /* char tab stops cleared at active line */ 2687 /* case 4: */ /* char tab stops cleared at active line */
2653 case 5: /* all char tab stops are cleared */ 2688 case 5: /* all char tab stops are cleared */
2654 rxvt_scr_set_tab(aR_ -1); 2689 scr_set_tab (-1);
2655 break; /* = ESC [ 3 g */ 2690 break; /* = ESC [ 3 g */
2656 /* case 6: */ /* all line tab stops are cleared */ 2691 /* case 6: */ /* all line tab stops are cleared */
2657 } 2692 }
2658 break; 2693 break;
2659 2694
2660 case CSI_RM: /* 8.3.107: RESET MODE */ 2695 case CSI_RM: /* 8.3.107: RESET MODE */
2661 if (arg[0] == 4) 2696 if (arg[0] == 4)
2662 rxvt_scr_insert_mode(aR_ 0); 2697 scr_insert_mode (0);
2663 break; 2698 break;
2664 2699
2665 case CSI_SM: /* 8.3.126: SET MODE */ 2700 case CSI_SM: /* 8.3.126: SET MODE */
2666 if (arg[0] == 4) 2701 if (arg[0] == 4)
2667 rxvt_scr_insert_mode(aR_ 1); 2702 scr_insert_mode (1);
2668 break; 2703 break;
2669 2704
2670/* 2705 /*
2671 * PRIVATE USE beyond this point. All CSI_7? sequences here 2706 * PRIVATE USE beyond this point. All CSI_7? sequences here
2672 */ 2707 */
2673 case CSI_72: /* DECSTBM: set top and bottom margins */ 2708 case CSI_72: /* DECSTBM: set top and bottom margins */
2674 if (nargs == 1) 2709 if (nargs == 1)
2675 rxvt_scr_scroll_region(aR_ arg[0] - 1, MAX_ROWS - 1); 2710 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2676 else if (nargs == 0 || arg[0] >= arg[1]) 2711 else if (nargs == 0 || arg[0] >= arg[1])
2677 rxvt_scr_scroll_region(aR_ 0, MAX_ROWS - 1); 2712 scr_scroll_region (0, MAX_ROWS - 1);
2678 else 2713 else
2679 rxvt_scr_scroll_region(aR_ arg[0] - 1, arg[1] - 1); 2714 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2680 break; 2715 break;
2681 2716
2682 case CSI_73: 2717 case CSI_73:
2683 rxvt_scr_cursor(aR_ SAVE); 2718 scr_cursor (SAVE);
2684 break; 2719 break;
2685 case CSI_75: 2720 case CSI_75:
2686 rxvt_scr_cursor(aR_ RESTORE); 2721 scr_cursor (RESTORE);
2687 break; 2722 break;
2688 2723
2689#ifndef NO_FRILLS 2724#ifndef NO_FRILLS
2690 case CSI_74: 2725 case CSI_74:
2691 rxvt_process_window_ops(aR_ arg, nargs); 2726 process_window_ops (arg, nargs);
2692 break; 2727 break;
2693#endif 2728#endif
2694 2729
2695 case CSI_78: /* DECREQTPARM */ 2730 case CSI_78: /* DECREQTPARM */
2696 if (arg[0] == 0 || arg[0] == 1) 2731 if (arg[0] == 0 || arg[0] == 1)
2697 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2732 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2698 /* FALLTHROUGH */ 2733 /* FALLTHROUGH */
2699 2734
2700 default: 2735 default:
2701 break; 2736 break;
2702 } 2737 }
2703} 2738}
2704/*}}} */ 2739/*}}} */
2705 2740
2706#ifndef NO_FRILLS 2741#ifndef NO_FRILLS
2707/* ARGSUSED */ 2742/* ARGSUSED */
2708/* INTPROTO */
2709void 2743void
2710rxvt_process_window_ops(pR_ const int *args, unsigned int nargs) 2744rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2711{ 2745{
2712 int x, y; 2746 int x, y;
2713#if 0 2747#if 0
2714 char *s; 2748 char *s;
2715#endif 2749#endif
2716 XWindowAttributes wattr; 2750 XWindowAttributes wattr;
2717 Window wdummy; 2751 Window wdummy;
2718 2752
2719 if (nargs == 0) 2753 if (nargs == 0)
2720 return; 2754 return;
2721 switch (args[0]) { 2755 switch (args[0])
2756 {
2722 /* 2757 /*
2723 * commands 2758 * commands
2724 */ 2759 */
2725 case 1: /* deiconify window */ 2760 case 1: /* deiconify window */
2726 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 2761 XMapWindow (display->display, TermWin.parent[0]);
2727 break; 2762 break;
2728 case 2: /* iconify window */ 2763 case 2: /* iconify window */
2729 XIconifyWindow(R->Xdisplay, R->TermWin.parent[0], 2764 XIconifyWindow (display->display, TermWin.parent[0],
2730 DefaultScreen(R->Xdisplay)); 2765 DefaultScreen (display->display));
2731 break; 2766 break;
2732 case 3: /* set position (pixels) */ 2767 case 3: /* set position (pixels) */
2733 XMoveWindow(R->Xdisplay, R->TermWin.parent[0], args[1], args[2]); 2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2734 break; 2769 break;
2735 case 4: /* set size (pixels) */ 2770 case 4: /* set size (pixels) */
2736 rxvt_set_widthheight(aR_ (unsigned int)args[2], (unsigned int)args[1]); 2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2737 break; 2772 break;
2738 case 5: /* raise window */ 2773 case 5: /* raise window */
2739 XRaiseWindow(R->Xdisplay, R->TermWin.parent[0]); 2774 XRaiseWindow (display->display, TermWin.parent[0]);
2740 break; 2775 break;
2741 case 6: /* lower window */ 2776 case 6: /* lower window */
2742 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2777 XLowerWindow (display->display, TermWin.parent[0]);
2743 break; 2778 break;
2744 case 7: /* refresh window */ 2779 case 7: /* refresh window */
2745 R->scr_touch (true); 2780 scr_touch (true);
2746 break; 2781 break;
2747 case 8: /* set size (chars) */ 2782 case 8: /* set size (chars) */
2748 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2749 (unsigned int)(args[1] * R->TermWin.fheight)); 2784 (unsigned int) (args[1] * TermWin.fheight));
2750 break; 2785 break;
2751 default: 2786 default:
2752 if (args[0] >= 24) /* set height (chars) */ 2787 if (args[0] >= 24) /* set height (chars) */
2753 rxvt_set_widthheight(aR_ (unsigned int)R->TermWin.width, 2788 set_widthheight ((unsigned int)TermWin.width,
2754 (unsigned int)(args[1] * R->TermWin.fheight)); 2789 (unsigned int) (args[1] * TermWin.fheight));
2755 break; 2790 break;
2756 /* 2791 /*
2757 * reports - some output format copied from XTerm 2792 * reports - some output format copied from XTerm
2758 */ 2793 */
2759 case 11: /* report window state */ 2794 case 11: /* report window state */
2760 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2795 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2761 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2796 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2762 break; 2797 break;
2763 case 13: /* report window position */ 2798 case 13: /* report window position */
2764 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2765 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2800 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2766 -wattr.border_width, -wattr.border_width, 2801 -wattr.border_width, -wattr.border_width,
2767 &x, &y, &wdummy); 2802 &x, &y, &wdummy);
2768 R->tt_printf("\033[3;%d;%dt", x, y); 2803 tt_printf ("\033[3;%d;%dt", x, y);
2769 break; 2804 break;
2770 case 14: /* report window size (pixels) */ 2805 case 14: /* report window size (pixels) */
2771 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2772 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2807 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2773 break; 2808 break;
2774 case 18: /* report window size (chars) */ 2809 case 18: /* report window size (chars) */
2775 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2810 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2776 break; 2811 break;
2777#if 0 /* XXX: currently disabled due to security concerns */ 2812#if 0 /* XXX: currently disabled due to security concerns */
2778 case 20: /* report icon label */ 2813 case 20: /* report icon label */
2779 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2814 XGetIconName (display->display, TermWin.parent[0], &s);
2780 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2815 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2781 break; 2816 break;
2782 case 21: /* report window title */ 2817 case 21: /* report window title */
2783 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2818 XFetchName (display->display, TermWin.parent[0], &s);
2784 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2819 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2785 break; 2820 break;
2786#endif 2821#endif
2822
2787 } 2823 }
2788} 2824}
2789#endif 2825#endif
2790 2826
2791/*----------------------------------------------------------------------*/ 2827/*----------------------------------------------------------------------*/
2792/* 2828/*
2793 * get input up until STRING TERMINATOR (or BEL) 2829 * get input up until STRING TERMINATOR (or BEL)
2794 * ends_how is terminator used. returned input must be free()d 2830 * ends_how is terminator used. returned input must be free ()d
2795 */ 2831 */
2796/* INTPROTO */
2797unsigned char * 2832unsigned char *
2798rxvt_get_to_st(pR_ unsigned char *ends_how) 2833rxvt_term::get_to_st (unsigned char *ends_how)
2799{ 2834{
2800 int seen_esc = 0; /* seen escape? */ 2835 int seen_esc = 0; /* seen escape? */
2801 unsigned int n = 0; 2836 unsigned int n = 0;
2802 unsigned char *s; 2837 unsigned char *s;
2803 unsigned char ch, string[STRING_MAX]; 2838 unsigned char ch, string[STRING_MAX];
2804 2839
2805 for (; (ch = rxvt_cmd_getc(aR));) { 2840 for (; (ch = cmd_getc ());)
2841 {
2806 if (ch == C0_BEL 2842 if (ch == C0_BEL
2807 || ch == CHAR_ST 2843 || ch == CHAR_ST
2808 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2844 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2809 break; 2845 break;
2810 if (ch == C0_ESC) { 2846 if (ch == C0_ESC)
2847 {
2811 seen_esc = 1; 2848 seen_esc = 1;
2812 continue; 2849 continue;
2850 }
2813 } else if (ch == '\t') 2851 else if (ch == '\t')
2814 ch = ' '; /* translate '\t' to space */ 2852 ch = ' '; /* translate '\t' to space */
2815 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2853 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2816 return NULL; /* other control character - exit */ 2854 return NULL; /* other control character - exit */
2817 if (n < sizeof(string) - 1) 2855 if (n < sizeof (string) - 1)
2818 string[n++] = ch; 2856 string[n++] = ch;
2819 seen_esc = 0; 2857 seen_esc = 0;
2820 } 2858 }
2821 string[n++] = '\0'; 2859 string[n++] = '\0';
2822 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2860 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2823 return NULL; 2861 return NULL;
2824 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2862 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2825 STRNCPY(s, string, n); 2863 STRNCPY (s, string, n);
2826 return s; 2864 return s;
2827} 2865}
2828 2866
2829/*----------------------------------------------------------------------*/ 2867/*----------------------------------------------------------------------*/
2830/* 2868/*
2831 * 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)'
2832 */ 2870 */
2833/* INTPROTO */
2834void 2871void
2835rxvt_process_dcs_seq(pR) 2872rxvt_term::process_dcs_seq ()
2836{ 2873{
2837 unsigned char eh, *s; 2874 unsigned char eh, *s;
2838/* 2875 /*
2839 * Not handled yet 2876 * Not handled yet
2840 */ 2877 */
2841 s = rxvt_get_to_st(aR_ &eh); 2878 s = get_to_st (&eh);
2842 if (s) 2879 if (s)
2843 free(s); 2880 free (s);
2844 return; 2881 return;
2845} 2882}
2846 2883
2847/*----------------------------------------------------------------------*/ 2884/*----------------------------------------------------------------------*/
2848/* 2885/*
2849 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2886 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2850 */ 2887 */
2851/* INTPROTO */
2852void 2888void
2853rxvt_process_osc_seq(pR) 2889rxvt_term::process_osc_seq ()
2854{ 2890{
2855 unsigned char ch, eh, *s; 2891 unsigned char ch, eh, *s;
2856 int arg; 2892 int arg;
2857 2893
2858 ch = rxvt_cmd_getc(aR); 2894 ch = cmd_getc ();
2859 for (arg = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 2895 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2860 arg = arg * 10 + (ch - '0'); 2896 arg = arg * 10 + (ch - '0');
2861 2897
2862 if (ch == ';') { 2898 if (ch == ';')
2863 s = rxvt_get_to_st(aR_ &eh); 2899 {
2864 if (s) { 2900 s = get_to_st (&eh);
2865 /* 2901 if (s)
2902 {
2903 /*
2866 * rxvt_menubar_dispatch() violates the constness of the string, 2904 * rxvt_menubar_dispatch () violates the constness of the string,
2867 * so do it here 2905 * so do it here
2868 */ 2906 */
2869 if (arg == XTerm_Menu) 2907 if (arg == XTerm_Menu)
2870#if 0 /* XXX: currently disabled due to security concerns */ 2908#if 0 /* XXX: currently disabled due to security concerns */
2871 rxvt_menubar_dispatch(aR_ (char *)s); 2909 menubar_dispatch ((char *)s);
2872#else 2910#else
2873 0; 2911 (void)0;
2874#endif 2912#endif
2875 else 2913 else
2876 rxvt_xterm_seq(aR_ arg, (char *)s, eh); 2914 xterm_seq (arg, (char *)s, eh);
2877 free(s); 2915 free (s);
2878 } 2916 }
2879 } 2917 }
2880} 2918}
2881/* 2919/*
2882 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 2920 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2883 * 0 = change iconName/title 2921 * 0 = change iconName/title
… …
2896 * 10 = menu (may change in future) 2934 * 10 = menu (may change in future)
2897 * 20 = bg pixmap 2935 * 20 = bg pixmap
2898 * 39 = change default fg color 2936 * 39 = change default fg color
2899 * 49 = change default bg color 2937 * 49 = change default bg color
2900 * 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
2901 */ 2941 */
2902/* EXTPROTO */
2903void 2942void
2904rxvt_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)))
2905{ 2944{
2906 int changed = 0; 2945 int changed = 0;
2907 int color; 2946 int color;
2908 char *buf, *name; 2947 char *buf, *name;
2909 2948
2910 assert(str != NULL); 2949 assert (str != NULL);
2911 switch (op) { 2950 switch (op)
2951 {
2912 case XTerm_name: 2952 case XTerm_name:
2913 rxvt_set_title(aR_ str); 2953 set_title (str);
2914 /* FALLTHROUGH */ 2954 /* FALLTHROUGH */
2915 case XTerm_iconName: 2955 case XTerm_iconName:
2916 rxvt_set_iconName(aR_ str); 2956 set_iconName (str);
2917 break; 2957 break;
2918 case XTerm_title: 2958 case XTerm_title:
2919 rxvt_set_title(aR_ str); 2959 set_title (str);
2920 break; 2960 break;
2921 case XTerm_Color: 2961 case XTerm_Color:
2922 for (buf = (char *)str; buf && *buf;) { 2962 for (buf = (char *)str; buf && *buf;)
2963 {
2923 if ((name = STRCHR(buf, ';')) == NULL) 2964 if ((name = STRCHR (buf, ';')) == NULL)
2924 break; 2965 break;
2925 *name++ = '\0'; 2966 *name++ = '\0';
2926 color = atoi(buf); 2967 color = atoi (buf);
2927 if (color < 0 || color >= TOTAL_COLORS) 2968 if (color < 0 || color >= TOTAL_COLORS)
2928 break; 2969 break;
2929 if ((buf = STRCHR(name, ';')) != NULL) 2970 if ((buf = STRCHR (name, ';')) != NULL)
2930 *buf++ = '\0'; 2971 *buf++ = '\0';
2931 rxvt_set_window_color(aR_ color + minCOLOR, name); 2972 set_window_color (color + minCOLOR, name);
2932 } 2973 }
2933 break; 2974 break;
2934#ifndef NO_CURSORCOLOR 2975#ifndef NO_CURSORCOLOR
2935 case XTerm_Color_cursor: 2976 case XTerm_Color_cursor:
2936 rxvt_set_window_color(aR_ Color_cursor, str); 2977 set_window_color (Color_cursor, str);
2937 break; 2978 break;
2938#endif 2979#endif
2939 case XTerm_Color_pointer: 2980 case XTerm_Color_pointer:
2940 rxvt_set_window_color(aR_ Color_pointer, str); 2981 set_window_color (Color_pointer, str);
2941 break; 2982 break;
2942#ifndef NO_BOLD_UNDERLINE_REVERSE 2983#ifndef NO_BOLD_UNDERLINE_REVERSE
2943 case XTerm_Color_BD: 2984 case XTerm_Color_BD:
2944 rxvt_set_window_color(aR_ Color_BD, str); 2985 set_window_color (Color_BD, str);
2945 break; 2986 break;
2946 case XTerm_Color_UL: 2987 case XTerm_Color_UL:
2947 rxvt_set_window_color(aR_ Color_UL, str); 2988 set_window_color (Color_UL, str);
2948 break; 2989 break;
2949 case XTerm_Color_RV: 2990 case XTerm_Color_RV:
2950 rxvt_set_window_color(aR_ Color_RV, str); 2991 set_window_color (Color_RV, str);
2951 break; 2992 break;
2952#endif 2993#endif
2953 2994
2954 case XTerm_Menu: 2995 case XTerm_Menu:
2955 /* 2996 /*
2956 * rxvt_menubar_dispatch() violates the constness of the string, 2997 * rxvt_menubar_dispatch () violates the constness of the string,
2957 * so DON'T do it here 2998 * so DON'T do it here
2958 */ 2999 */
2959 break; 3000 break;
2960 case XTerm_Pixmap: 3001 case XTerm_Pixmap:
2961 if (*str != ';') { 3002 if (*str != ';')
3003 {
2962#if XPM_BACKGROUND 3004#if XPM_BACKGROUND
2963 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 3005 scale_pixmap (""); /* reset to default scaling */
2964 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 3006 set_bgPixmap (str); /* change pixmap */
2965#endif 3007#endif
2966 R->scr_touch (true); 3008 scr_touch (true);
2967 } 3009 }
2968 while ((str = STRCHR(str, ';')) != NULL) { 3010 while ((str = STRCHR (str, ';')) != NULL)
2969 str++; 3011 {
3012 str++;
2970#if XPM_BACKGROUND 3013#if XPM_BACKGROUND
2971 changed += rxvt_scale_pixmap(aR_ str); 3014 changed += scale_pixmap (str);
2972#endif 3015#endif
2973 } 3016
2974 if (changed) { 3017 }
3018 if (changed)
3019 {
2975#ifdef XPM_BACKGROUND 3020#ifdef XPM_BACKGROUND
2976 rxvt_resize_pixmap(aR); 3021 resize_pixmap ();
2977#endif 3022#endif
2978 R->scr_touch (true); 3023 scr_touch (true);
2979 } 3024 }
2980 break; 3025 break;
2981 3026
2982 case XTerm_restoreFG: 3027 case XTerm_restoreFG:
2983 rxvt_set_window_color(aR_ Color_fg, str); 3028 set_window_color (Color_fg, str);
2984 break; 3029 break;
2985 case XTerm_restoreBG: 3030 case XTerm_restoreBG:
2986 rxvt_set_window_color(aR_ Color_bg, str); 3031 set_window_color (Color_bg, str);
2987 break; 3032 break;
2988 case XTerm_logfile: 3033 case XTerm_logfile:
2989 break; 3034 break;
2990 case XTerm_font: 3035 case XTerm_font:
2991 rxvt_change_font(aR_ 0, str); 3036 change_font (str);
2992 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
2993#if 0 3057#if 0
2994 case XTerm_dumpscreen: /* no error notices */ 3058 case XTerm_dumpscreen: /* no error notices */
2995 { 3059 {
2996 int fd; 3060 int fd;
2997 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)
2998 rxvt_scr_dump(aR_ fd); 3062 {
2999 close(fd); 3063 scr_dump (fd);
3000 } 3064 close (fd);
3001 } 3065 }
3002 break; 3066 }
3067 break;
3003#endif 3068#endif
3069
3004 } 3070 }
3005} 3071}
3006/*----------------------------------------------------------------------*/ 3072/*----------------------------------------------------------------------*/
3007 3073
3008/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3074/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3013 * 's' = save 3079 * 's' = save
3014 * 'r' = restore 3080 * 'r' = restore
3015 * 't' = toggle 3081 * 't' = toggle
3016 * so no need for fancy checking 3082 * so no need for fancy checking
3017 */ 3083 */
3018/* INTPROTO */
3019int 3084int
3020rxvt_privcases(pR_ int mode, unsigned long bit) 3085rxvt_term::privcases (int mode, unsigned long bit)
3021{ 3086{
3022 int state; 3087 int state;
3023 3088
3024 if (mode == 's') { 3089 if (mode == 's')
3090 {
3025 R->SavedModes |= (R->PrivateModes & bit); 3091 SavedModes |= (PrivateModes & bit);
3026 return -1; 3092 return -1;
3027 } else { 3093 }
3094 else
3095 {
3028 if (mode == 'r') 3096 if (mode == 'r')
3029 state = (R->SavedModes & bit) ? 1 : 0; /* no overlapping */ 3097 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3030 else 3098 else
3031 state = (mode == 't') ? !(R->PrivateModes & bit) : mode; 3099 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3032 PrivMode(state, bit); 3100 PrivMode (state, bit);
3033 } 3101 }
3034 return state; 3102 return state;
3035} 3103}
3036 3104
3037/* we're not using priv _yet_ */ 3105/* we're not using priv _yet_ */
3038/* INTPROTO */
3039void 3106void
3040rxvt_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)
3041{ 3108{
3042 unsigned int i, j; 3109 unsigned int i, j;
3043 int state; 3110 int state;
3044 static const struct { 3111 static const struct
3112 {
3045 const int argval; 3113 const int argval;
3046 const unsigned long bit; 3114 const unsigned long bit;
3115 }
3047 } argtopriv[] = { 3116 argtopriv[] = {
3048 { 1, PrivMode_aplCUR }, 3117 { 1, PrivMode_aplCUR },
3049 { 2, PrivMode_vt52 }, 3118 { 2, PrivMode_vt52 },
3050 { 3, PrivMode_132 }, 3119 { 3, PrivMode_132 },
3051 { 4, PrivMode_smoothScroll }, 3120 { 4, PrivMode_smoothScroll },
3052 { 5, PrivMode_rVideo }, 3121 { 5, PrivMode_rVideo },
3053 { 6, PrivMode_relOrigin }, 3122 { 6, PrivMode_relOrigin },
3054 { 7, PrivMode_Autowrap }, 3123 { 7, PrivMode_Autowrap },
3055 { 9, PrivMode_MouseX10 }, 3124 { 9, PrivMode_MouseX10 },
3056#ifdef menuBar_esc 3125#ifdef menuBar_esc
3057 { menuBar_esc, PrivMode_menuBar }, 3126 { menuBar_esc, PrivMode_menuBar },
3058#endif 3127#endif
3059#ifdef scrollBar_esc 3128#ifdef scrollBar_esc
3060 { scrollBar_esc, PrivMode_scrollBar }, 3129 { scrollBar_esc, PrivMode_scrollBar },
3061#endif 3130#endif
3062 { 25, PrivMode_VisibleCursor }, 3131 { 25, PrivMode_VisibleCursor },
3063 { 35, PrivMode_ShiftKeys }, 3132 { 35, PrivMode_ShiftKeys },
3064 { 40, PrivMode_132OK }, 3133 { 40, PrivMode_132OK },
3065 { 47, PrivMode_Screen }, 3134 { 47, PrivMode_Screen },
3066 { 66, PrivMode_aplKP }, 3135 { 66, PrivMode_aplKP },
3067#ifndef NO_BACKSPACE_KEY 3136#ifndef NO_BACKSPACE_KEY
3068 { 67, PrivMode_BackSpace }, 3137 { 67, PrivMode_BackSpace },
3069#endif 3138#endif
3070 { 1000, PrivMode_MouseX11 }, 3139 { 1000, PrivMode_MouseX11 },
3071 { 1010, PrivMode_TtyOutputInh }, 3140 { 1010, PrivMode_TtyOutputInh },
3072 { 1011, PrivMode_Keypress }, 3141 { 1011, PrivMode_Keypress },
3073 { 1047, PrivMode_Screen }, 3142 { 1047, PrivMode_Screen },
3074 }; 3143 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3144 };
3075 3145
3076 if (nargs == 0) 3146 if (nargs == 0)
3077 return; 3147 return;
3078 3148
3079/* make lo/hi boolean */ 3149 /* make lo/hi boolean */
3080 if (mode == 'l') 3150 if (mode == 'l')
3081 mode = 0; /* reset */ 3151 mode = 0; /* reset */
3082 else if (mode == 'h') 3152 else if (mode == 'h')
3083 mode = 1; /* set */ 3153 mode = 1; /* set */
3084 3154
3085 for (i = 0; i < nargs; i++) { 3155 for (i = 0; i < nargs; i++)
3156 {
3086 state = -1; 3157 state = -1;
3087 3158
3088 /* basic handling */ 3159 /* basic handling */
3089 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3160 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3090 if (argtopriv[j].argval == arg[i]) { 3161 if (argtopriv[j].argval == arg[i])
3162 {
3091 state = rxvt_privcases(aR_ mode, argtopriv[j].bit); 3163 state = privcases (mode, argtopriv[j].bit);
3092 break; 3164 break;
3093 } 3165 }
3094 3166
3095 /* extra handling for values with state unkept */ 3167 /* extra handling for values with state unkept */
3096 if (state == -1) 3168 if (state == -1)
3097 switch (arg[i]) { 3169 switch (arg[i])
3170 {
3098 case 1048: /* alternative cursor save */ 3171 case 1048: /* alternative cursor save */
3099 if (mode == 0) 3172 if (mode == 0)
3100 rxvt_scr_cursor(aR_ RESTORE); 3173 scr_cursor (RESTORE);
3101 else if (mode == 1) 3174 else if (mode == 1)
3102 rxvt_scr_cursor(aR_ SAVE); 3175 scr_cursor (SAVE);
3103 /* FALLTHROUGH */ 3176 /* FALLTHROUGH */
3104 default: 3177 default:
3105 continue; /* for(;i;) */ 3178 continue; /* for (;i;) */
3106 } 3179 }
3107 3180
3108 /* extra handling for values with valid 0 or 1 state */ 3181 /* extra handling for values with valid 0 or 1 state */
3109 switch (arg[i]) { 3182 switch (arg[i])
3183 {
3110 /* case 1: - application cursor keys */ 3184 /* case 1: - application cursor keys */
3111 case 2: /* VT52 mode */ 3185 case 2: /* VT52 mode */
3112 /* oddball mode. should be set regardless of set/reset 3186 /* oddball mode. should be set regardless of set/reset
3113 * parameter. Return from VT52 mode with an ESC < from 3187 * parameter. Return from VT52 mode with an ESC < from
3114 * within VT52 mode 3188 * within VT52 mode
3115 */ 3189 */
3116 PrivMode(1, PrivMode_vt52); 3190 PrivMode (1, PrivMode_vt52);
3117 break; 3191 break;
3118 case 3: /* 80/132 */ 3192 case 3: /* 80/132 */
3119 if (R->PrivateModes & PrivMode_132OK) 3193 if (PrivateModes & PrivMode_132OK)
3120 rxvt_set_widthheight(aR_ 3194 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3121 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth), 3195 break;
3122 (unsigned int)R->TermWin.height);
3123 break;
3124 case 4: /* smooth scrolling */ 3196 case 4: /* smooth scrolling */
3125 if (state) 3197 if (state)
3126 R->Options &= ~Opt_jumpScroll; 3198 Options &= ~Opt_jumpScroll;
3127 else 3199 else
3128 R->Options |= Opt_jumpScroll; 3200 Options |= Opt_jumpScroll;
3129 break; 3201 break;
3130 case 5: /* reverse video */ 3202 case 5: /* reverse video */
3131 rxvt_scr_rvideo_mode(aR_ state); 3203 scr_rvideo_mode (state);
3132 break; 3204 break;
3133 case 6: /* relative/absolute origins */ 3205 case 6: /* relative/absolute origins */
3134 rxvt_scr_relative_origin(aR_ state); 3206 scr_relative_origin (state);
3135 break; 3207 break;
3136 case 7: /* autowrap */ 3208 case 7: /* autowrap */
3137 rxvt_scr_autowrap(aR_ state); 3209 scr_autowrap (state);
3138 break; 3210 break;
3139 /* case 8: - auto repeat, can't do on a per window basis */ 3211 /* case 8: - auto repeat, can't do on a per window basis */
3140 case 9: /* X10 mouse reporting */ 3212 case 9: /* X10 mouse reporting */
3141 if (state) /* orthogonal */ 3213 if (state) /* orthogonal */
3142 R->PrivateModes &= ~(PrivMode_MouseX11); 3214 PrivateModes &= ~ (PrivMode_MouseX11);
3143 break; 3215 break;
3144#ifdef menuBar_esc 3216#ifdef menuBar_esc
3145 case menuBar_esc: 3217 case menuBar_esc:
3146#ifdef MENUBAR 3218#ifdef MENUBAR
3147 rxvt_map_menuBar(aR_ state); 3219 map_menuBar (state);
3148#endif 3220#endif
3149 break; 3221 break;
3150#endif 3222#endif
3151#ifdef scrollBar_esc 3223#ifdef scrollBar_esc
3152 case scrollBar_esc: 3224 case scrollBar_esc:
3153 if (rxvt_scrollbar_mapping(aR_ state)) { 3225 if (scrollbar_mapping (state))
3154 R->resize_all_windows (0, 0, 0); 3226 {
3227 resize_all_windows (0, 0, 0);
3155 R->scr_touch (true); 3228 scr_touch (true);
3156 } 3229 }
3157 break; 3230 break;
3158#endif 3231#endif
3159 case 25: /* visible/invisible cursor */ 3232 case 25: /* visible/invisible cursor */
3160 rxvt_scr_cursor_visible(aR_ state); 3233 scr_cursor_visible (state);
3161 break; 3234 break;
3162 /* case 35: - shift keys */ 3235 /* case 35: - shift keys */
3163 /* case 40: - 80 <--> 132 mode */ 3236 /* case 40: - 80 <--> 132 mode */
3164 case 47: /* secondary screen */ 3237 case 47: /* secondary screen */
3165 rxvt_scr_change_screen(aR_ state); 3238 scr_change_screen (state);
3166 break; 3239 break;
3167 /* case 66: - application key pad */ 3240 /* case 66: - application key pad */
3168 /* case 67: - backspace key */ 3241 /* case 67: - backspace key */
3169 case 1000: /* X11 mouse reporting */ 3242 case 1000: /* X11 mouse reporting */
3170 if (state) /* orthogonal */ 3243 if (state) /* orthogonal */
3171 R->PrivateModes &= ~(PrivMode_MouseX10); 3244 PrivateModes &= ~ (PrivMode_MouseX10);
3172 break; 3245 break;
3173#if 0 3246#if 0
3174 case 1001: 3247 case 1001:
3175 break; /* X11 mouse highlighting */ 3248 break; /* X11 mouse highlighting */
3176#endif 3249#endif
3177 case 1010: /* scroll to bottom on TTY output inhibit */ 3250 case 1010: /* scroll to bottom on TTY output inhibit */
3178 if (state) 3251 if (state)
3179 R->Options &= ~Opt_scrollTtyOutput; 3252 Options &= ~Opt_scrollTtyOutput;
3180 else 3253 else
3181 R->Options |= Opt_scrollTtyOutput; 3254 Options |= Opt_scrollTtyOutput;
3182 break; 3255 break;
3183 case 1011: /* scroll to bottom on key press */ 3256 case 1011: /* scroll to bottom on key press */
3184 if (state) 3257 if (state)
3185 R->Options |= Opt_scrollTtyKeypress; 3258 Options |= Opt_scrollTtyKeypress;
3186 else 3259 else
3187 R->Options &= ~Opt_scrollTtyKeypress; 3260 Options &= ~Opt_scrollTtyKeypress;
3188 break; 3261 break;
3189 case 1047: /* secondary screen w/ clearing */ 3262 case 1047: /* secondary screen w/ clearing */
3263 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3190 if (R->current_screen != PRIMARY) 3264 if (current_screen != PRIMARY)
3191 R->scr_erase_screen (2); 3265 scr_erase_screen (2);
3192 rxvt_scr_change_screen(aR_ state); 3266 scr_change_screen (state);
3193 /* FALLTHROUGH */ 3267 /* FALLTHROUGH */
3194 default: 3268 default:
3195 break; 3269 break;
3196 } 3270 }
3197 } 3271 }
3198} 3272}
3199/*}}} */ 3273/*}}} */
3200 3274
3201/*{{{ process sgr sequences */ 3275/*{{{ process sgr sequences */
3202/* INTPROTO */
3203void 3276void
3204rxvt_process_sgr_mode(pR_ unsigned int nargs, const int *arg) 3277rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3205{ 3278{
3206 unsigned int i; 3279 unsigned int i;
3207 short rendset; 3280 short rendset;
3208 int rendstyle; 3281 int rendstyle;
3209 3282
3210 if (nargs == 0) { 3283 if (nargs == 0)
3211 rxvt_scr_rendition(aR_ 0, ~RS_None);
3212 return;
3213 } 3284 {
3285 scr_rendition (0, ~RS_None);
3286 return;
3287 }
3214 for (i = 0; i < nargs; i++) { 3288 for (i = 0; i < nargs; i++)
3289 {
3215 rendset = -1; 3290 rendset = -1;
3216 switch (arg[i]) { 3291 switch (arg[i])
3217 case 0: 3292 {
3293 case 0:
3218 rendset = 0, rendstyle = ~RS_None; 3294 rendset = 0, rendstyle = ~RS_None;
3219 break; 3295 break;
3220 case 1: 3296 case 1:
3221 rendset = 1, rendstyle = RS_Bold; 3297 rendset = 1, rendstyle = RS_Bold;
3222 break; 3298 break;
3223 case 4: 3299 case 4:
3224 rendset = 1, rendstyle = RS_Uline; 3300 rendset = 1, rendstyle = RS_Uline;
3225 break; 3301 break;
3226 case 5: 3302 case 5:
3227 rendset = 1, rendstyle = RS_Blink; 3303 rendset = 1, rendstyle = RS_Blink;
3228 break; 3304 break;
3229 case 7: 3305 case 7:
3230 rendset = 1, rendstyle = RS_RVid; 3306 rendset = 1, rendstyle = RS_RVid;
3231 break; 3307 break;
3232 case 22: 3308 case 22:
3233 rendset = 0, rendstyle = RS_Bold; 3309 rendset = 0, rendstyle = RS_Bold;
3234 break; 3310 break;
3235 case 24: 3311 case 24:
3236 rendset = 0, rendstyle = RS_Uline; 3312 rendset = 0, rendstyle = RS_Uline;
3237 break; 3313 break;
3238 case 25: 3314 case 25:
3239 rendset = 0, rendstyle = RS_Blink; 3315 rendset = 0, rendstyle = RS_Blink;
3240 break; 3316 break;
3241 case 27: 3317 case 27:
3242 rendset = 0, rendstyle = RS_RVid; 3318 rendset = 0, rendstyle = RS_RVid;
3243 break; 3319 break;
3244 } 3320 }
3245 if (rendset != -1) { 3321 if (rendset != -1)
3246 rxvt_scr_rendition(aR_ rendset, rendstyle); 3322 {
3323 scr_rendition (rendset, rendstyle);
3247 continue; /* for(;i;) */ 3324 continue; /* for (;i;) */
3248 } 3325 }
3249 3326
3250 switch (arg[i]) { 3327 switch (arg[i])
3251 case 30: 3328 {
3329 case 30:
3252 case 31: /* set fg color */ 3330 case 31: /* set fg color */
3253 case 32: 3331 case 32:
3254 case 33: 3332 case 33:
3255 case 34: 3333 case 34:
3256 case 35: 3334 case 35:
3257 case 36: 3335 case 36:
3258 case 37: 3336 case 37:
3259 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 30)), 3337 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)),
3260 Color_fg); 3338 Color_fg);
3261 break; 3339 break;
3262#ifdef TTY_256COLOR 3340#ifdef TTY_256COLOR
3263 case 38: 3341 case 38:
3264 if (nargs > i + 2 && arg[i + 1] == 5) { 3342 if (nargs > i + 2 && arg[i + 1] == 5)
3343 {
3265 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3344 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3266 Color_fg); 3345 Color_fg);
3267 i += 2; 3346 i += 2;
3268 } 3347 }
3269 break; 3348 break;
3270#endif 3349#endif
3271 case 39: /* default fg */ 3350 case 39: /* default fg */
3272 rxvt_scr_color(aR_ Color_fg, Color_fg); 3351 scr_color (Color_fg, Color_fg);
3273 break; 3352 break;
3274 3353
3275 case 40: 3354 case 40:
3276 case 41: /* set bg color */ 3355 case 41: /* set bg color */
3277 case 42: 3356 case 42:
3278 case 43: 3357 case 43:
3279 case 44: 3358 case 44:
3280 case 45: 3359 case 45:
3281 case 46: 3360 case 46:
3282 case 47: 3361 case 47:
3283 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 40)), 3362 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)),
3284 Color_bg); 3363 Color_bg);
3285 break; 3364 break;
3286#ifdef TTY_256COLOR 3365#ifdef TTY_256COLOR
3287 case 48: 3366 case 48:
3288 if (nargs > i + 2 && arg[i + 1] == 5) { 3367 if (nargs > i + 2 && arg[i + 1] == 5)
3368 {
3289 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3369 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3290 Color_bg); 3370 Color_bg);
3291 i += 2; 3371 i += 2;
3292 } 3372 }
3293 break; 3373 break;
3294#endif 3374#endif
3295 case 49: /* default bg */ 3375 case 49: /* default bg */
3296 rxvt_scr_color(aR_ Color_bg, Color_bg); 3376 scr_color (Color_bg, Color_bg);
3297 break; 3377 break;
3298 3378
3299#ifndef NO_BRIGHTCOLOR 3379#ifndef NO_BRIGHTCOLOR
3300 case 90: 3380 case 90:
3301 case 91: /* set bright fg color */ 3381 case 91: /* set bright fg color */
3302 case 92: 3382 case 92:
3303 case 93: 3383 case 93:
3304 case 94: 3384 case 94:
3305 case 95: 3385 case 95:
3306 case 96: 3386 case 96:
3307 case 97: 3387 case 97:
3308 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3388 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3309 Color_fg); 3389 Color_fg);
3310 break; 3390 break;
3311 case 100: 3391 case 100:
3312 case 101: /* set bright bg color */ 3392 case 101: /* set bright bg color */
3313 case 102: 3393 case 102:
3314 case 103: 3394 case 103:
3315 case 104: 3395 case 104:
3316 case 105: 3396 case 105:
3317 case 106: 3397 case 106:
3318 case 107: 3398 case 107:
3319 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3399 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3320 Color_bg); 3400 Color_bg);
3321 break; 3401 break;
3322#endif 3402#endif
3323 } 3403
3404 }
3324 } 3405 }
3325} 3406}
3326/*}}} */ 3407/*}}} */
3327 3408
3328/*{{{ process Rob Nation's own graphics mode sequences */ 3409/*{{{ process Rob Nation's own graphics mode sequences */
3329/* INTPROTO */
3330void 3410void
3331rxvt_process_graphics(pR) 3411rxvt_term::process_graphics ()
3332{ 3412{
3333 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3413 unsigned char ch, cmd = cmd_getc ();
3334 3414
3335#ifndef RXVT_GRAPHICS 3415 if (cmd == 'Q')
3336 if (cmd == 'Q') { /* query graphics */ 3416 { /* query graphics */
3337 R->tt_printf("\033G0\n"); /* no graphics */ 3417 tt_printf ("\033G0\n"); /* no graphics */
3338 return; 3418 return;
3339 } 3419 }
3340/* swallow other graphics sequences until terminating ':' */ 3420 /* swallow other graphics sequences until terminating ':' */
3341 do 3421 do
3342 ch = rxvt_cmd_getc(aR); 3422 ch = cmd_getc ();
3343 while (ch != ':'); 3423 while (ch != ':');
3344#else
3345 unsigned int nargs;
3346 int args[NGRX_PTS];
3347 unsigned char *text = NULL;
3348
3349 if (cmd == 'Q') { /* query graphics */
3350 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3351 return;
3352 }
3353 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3354 int neg;
3355
3356 ch = rxvt_cmd_getc(aR);
3357 neg = (ch == '-');
3358 if (neg || ch == '+')
3359 ch = rxvt_cmd_getc(aR);
3360
3361 for (args[nargs] = 0; isdigit(ch); ch = rxvt_cmd_getc(aR))
3362 args[nargs] = args[nargs] * 10 + (ch - '0');
3363 if (neg)
3364 args[nargs] = -args[nargs];
3365
3366 nargs++;
3367 args[nargs] = 0;
3368 if (ch != ';')
3369 break;
3370 }
3371
3372 if ((cmd == 'T') && (nargs >= 5)) {
3373 int i, len = args[4];
3374
3375 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3376
3377 if (text != NULL) {
3378 for (i = 0; i < len; i++)
3379 text[i] = rxvt_cmd_getc(aR);
3380 text[len] = '\0';
3381 }
3382 }
3383 rxvt_Gr_do_graphics(aR_ cmd, nargs, args, text);
3384#endif
3385} 3424}
3386/*}}} */ 3425/*}}} */
3387 3426
3388/* ------------------------------------------------------------------------- */ 3427/* ------------------------------------------------------------------------- */
3389 3428
3390/* 3429/*
3391 * Send printf() formatted output to the command. 3430 * Send printf () formatted output to the command.
3392 * Only use for small amounts of data. 3431 * Only use for small amounts of data.
3393 */ 3432 */
3394void 3433void
3395rxvt_term::tt_printf (const char *fmt,...) 3434rxvt_term::tt_printf (const char *fmt,...)
3396{ 3435{
… …
3414 3453
3415 if (len) 3454 if (len)
3416 { 3455 {
3417 if (v_buflen == 0) 3456 if (v_buflen == 0)
3418 { 3457 {
3419 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 3458 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3459
3420 if (written == len) 3460 if ((unsigned int)written == len)
3421 return; 3461 return;
3422 3462
3423 data += written; 3463 data += written;
3424 len -= written; 3464 len -= written;
3425 } 3465 }

Diff Legend

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