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.23 by pcg, Thu Dec 18 14:11:47 2003 UTC vs.
Revision 1.49 by pcg, Sat Feb 21 22:14:00 2004 UTC

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

Diff Legend

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