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.19 by pcg, Thu Dec 18 05:45:11 2003 UTC vs.
Revision 1.55 by pcg, Sun Feb 22 20:08:18 2004 UTC

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

Diff Legend

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