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.14 by pcg, Mon Dec 8 23:14:40 2003 UTC vs.
Revision 1.57 by pcg, Tue Feb 24 16:25:44 2004 UTC

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

Diff Legend

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