ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.8 by pcg, Thu Nov 27 10:12:10 2003 UTC vs.
Revision 1.43 by pcg, Tue Feb 24 00:02:44 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.8 2003/11/27 10:12:10 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>
… …
12 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
13 * - extensive modifications 12 * - extensive modifications
14 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
15 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
16 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
42 42
43#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring>
48
49static char curlocale[128];
50
51void
52rxvt_set_locale (const char *locale)
53{
54 if (locale && STRNCMP (locale, curlocale, 128))
55 {
56 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale);
58 }
59}
60
47void * 61void *
48rxvt_term::operator new (size_t s) 62rxvt_term::operator new (size_t s)
49{ 63{
50 void *p = malloc (s); 64 void *p = malloc (s);
51 65
… …
58{ 72{
59 free (p); 73 free (p);
60} 74}
61 75
62rxvt_term::rxvt_term () 76rxvt_term::rxvt_term ()
77 :
78 rootwin_ev (this, &rxvt_term::rootwin_cb),
79 termwin_ev (this, &rxvt_term::x_cb),
63: pty_ev (this, &rxvt_term::pty_cb), 80 vt_ev (this, &rxvt_term::x_cb),
81#ifdef HAVE_SCROLLBARS
82 scrollbar_ev (this, &rxvt_term::x_cb),
83#endif
84#ifdef MENUBAR
85 menubar_ev (this, &rxvt_term::x_cb),
86#endif
64#ifdef CURSOR_BLINK 87#ifdef CURSOR_BLINK
88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
89#endif
90#ifdef TEXT_BLINK
65 blink_ev (this, &rxvt_term::blink_cb), 91 text_blink_ev (this, &rxvt_term::text_blink_cb),
66#endif 92#endif
67#ifdef POINTER_BLANK 93#ifdef POINTER_BLANK
68 pointer_ev (this, &rxvt_term::pointer_cb), 94 pointer_ev (this, &rxvt_term::pointer_cb),
69#endif 95#endif
96#ifdef USE_XIM
70 x_ev (this, &rxvt_term::x_cb), 97 im_ev (this, &rxvt_term::im_cb),
98#endif
99 check_ev (this, &rxvt_term::check_cb),
71 destroy_ev (this, &rxvt_term::destroy_cb) 100 destroy_ev (this, &rxvt_term::destroy_cb),
101 pty_ev (this, &rxvt_term::pty_cb),
102 incr_ev (this, &rxvt_term::incr_cb)
72{ 103{
73 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
74} 105}
75 106
76rxvt_term::~rxvt_term () 107rxvt_term::~rxvt_term ()
77{ 108{
78 rxvt_scr_release (this);
79
80#ifndef NO_SETOWNER_TTYDEV
81 rxvt_privileged_ttydev (this, RESTORE);
82#endif
83#ifdef UTMP_SUPPORT
84 rxvt_privileged_utmp (this, RESTORE);
85#endif
86#ifdef USE_XIM
87 if (Input_Context != NULL)
88 {
89 XDestroyIC (Input_Context);
90 Input_Context = NULL;
91 }
92#endif
93
94 if (cmd_fd >= 0) 109 if (cmd_fd >= 0)
95 close (cmd_fd); 110 close (cmd_fd);
96 111
97 if (Xfd >= 0) 112#ifndef NO_SETOWNER_TTYDEV
98 XCloseDisplay (Xdisplay); 113 privileged_ttydev (RESTORE);
114#endif
115#ifdef UTMP_SUPPORT
116 privileged_utmp (RESTORE);
117#endif
118
119 delete TermWin.fontset;
120
121 if (display)
122 if (TermWin.parent[0])
123 XDestroyWindow (display->display, TermWin.parent[0]);
124
125 // TODO: free pixcolours, colours should become part of rxvt_display
99 126
100 delete PixColors; 127 delete PixColors;
128
129 displays.put (display);
130
131 scr_release ();
132
133 free (env_windowid);
134 free (env_display);
135 free (env_term);
136 free (env_colorfgbg);
137 free (locale);
138 free (codeset);
139
140 delete envv;
141 delete argv;
101} 142}
102 143
103void 144void
104rxvt_term::destroy () 145rxvt_term::destroy ()
105{ 146{
147 if (display)
148 {
149 rootwin_ev.stop (display);
150 termwin_ev.stop (display);
151 vt_ev.stop (display);
152#ifdef USE_XIM
153 im_destroy ();
154 im_ev.stop (display);
155#endif
156#ifdef HAVE_SCROLLBARS
157 scrollbar_ev.stop (display);
158#endif
159#ifdef MENUBAR
160 menubar_ev.stop (display);
161#endif
162 }
163
164 check_ev.stop ();
106 pty_ev.stop (); 165 pty_ev.stop ();
107 x_ev.stop ();
108#ifdef CURSOR_BLINK 166#ifdef CURSOR_BLINK
167 cursor_blink_ev.stop ();
168#endif
169#ifdef TEXT_BLINK
109 blink_ev.stop (); 170 text_blink_ev.stop ();
110#endif 171#endif
111#ifdef POINTER_BLANK 172#ifdef POINTER_BLANK
112 pointer_ev.stop (); 173 pointer_ev.stop ();
113#endif 174#endif
114 175
… …
122 183
123 delete this; 184 delete this;
124} 185}
125 186
126/*----------------------------------------------------------------------*/ 187/*----------------------------------------------------------------------*/
127/* rxvt_init() */ 188/* rxvt_init () */
128/* LIBPROTO */ 189/* LIBPROTO */
129rxvt_t 190rxvt_t
130rxvt_init(int argc, const char *const *argv) 191rxvt_init (int argc, const char *const *argv)
131{ 192{
132 SET_R(new rxvt_term); 193 SET_R (new rxvt_term);
133 dR;
134 194
135 if (!R->init_vars () || !R->init (argc, argv)) 195 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
136 { 196 {
137 delete R; 197 delete GET_R;
138 return NULL; 198 SET_R (0);
139 } 199 }
140 200
141 return R; 201 return GET_R;
142} 202}
143 203
144/* EXTPROTO */ 204static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
205
145void 206void
146rxvt_init_signals () 207rxvt_init_signals ()
147{ 208{
148/* install exit handler for cleanup */ 209 /* install exit handler for cleanup */
149#if 0 210#if 0
150#ifdef HAVE_ATEXIT 211#ifdef HAVE_ATEXIT
151 atexit(rxvt_clean_exit); 212 atexit (rxvt_clean_exit);
152#else 213#else
153# ifdef HAVE_ON_EXIT
154 on_exit(rxvt_clean_exit, NULL); /* non-ANSI exit handler */
155# endif
156#endif 214#endif
157#endif 215#endif
158 216
159 struct sigaction sa; 217 struct sigaction sa;
160 218
161 sigfillset (&sa.sa_mask); 219 sigfillset (&sa.sa_mask);
162 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART; 220 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
163 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGHUP , &sa, 0); //TODO, also: SIGPIPE 221 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
222 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
164 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0); 223 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
165 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0); 224 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
166 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0); 225 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
167 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0); 226 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
168 227
169/* need to trap SIGURG for SVR4 (Unixware) rlogin */ 228 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
170/* signal (SIGURG, SIG_DFL); */ 229 /* signal (SIGURG, SIG_DFL); */
171 230
172 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 231 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
173 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 232 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
174} 233}
175 234
176bool 235bool
177rxvt_term::init (int argc, const char *const *argv) 236rxvt_term::init (int argc, const char *const *argv)
178{ 237{
179 dR;//TODO (scrollbar, setidle)
180
181 /* 238 /*
182 * Save and then give up any super-user privileges 239 * Save and then give up any super-user privileges
183 * If we need privileges in any area then we must specifically request it. 240 * If we need privileges in any area then we must specifically request it.
184 * We should only need to be root in these cases: 241 * We should only need to be root in these cases:
185 * 1. write utmp entries on some systems 242 * 1. write utmp entries on some systems
186 * 2. chown tty on some systems 243 * 2. chown tty on some systems
187 */ 244 */
188 rxvt_privileges (this, SAVE); 245 privileges (SAVE);
189 rxvt_privileges (this, IGNORE); 246 privileges (IGNORE);
190 247
191 rxvt_init_secondary (this); 248 init_secondary ();
192 249
193 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 250 const char **cmd_argv = init_resources (argc, argv);
251
252 set_locale ("");
194 253
195#if (MENUBAR_MAX) 254#if (MENUBAR_MAX)
196 rxvt_menubar_read (this, rs[Rs_menu]); 255 menubar_read (rs[Rs_menu]);
197#endif 256#endif
198#ifdef HAVE_SCROLLBARS 257#ifdef HAVE_SCROLLBARS
199 if (Options & Opt_scrollBar) 258 if (Options & Opt_scrollBar)
200 scrollbar_setIdle (); /* set existence for size calculations */ 259 scrollBar.setIdle (); /* set existence for size calculations */
201#endif 260#endif
202 261
203 rxvt_Create_Windows (this, argc, argv); 262 create_windows (argc, argv);
204 263
205 rxvt_init_xlocale (this); 264 init_xlocale ();
206 265
207 rxvt_scr_reset (this); /* initialize screen */ 266 scr_reset (); /* initialize screen */
208#ifdef RXVT_GRAPHICS
209 rxvt_Gr_reset (this); /* reset graphics */
210#endif
211 267
212#if 0 268#if 0
213#ifdef DEBUG_X
214 XSynchronize(Xdisplay, True); 269 XSynchronize (display->display, True);
215#endif
216#endif 270#endif
217 271
218#ifdef HAVE_SCROLLBARS 272#ifdef HAVE_SCROLLBARS
219 if (Options & Opt_scrollBar) 273 if (Options & Opt_scrollBar)
220 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 274 resize_scrollbar (); /* create and map scrollbar */
221#endif 275#endif
222#if (MENUBAR_MAX) 276#if (MENUBAR_MAX)
223 if (menubar_visible(r)) 277 if (menubar_visible ())
224 XMapWindow (Xdisplay, menuBar.win); 278 XMapWindow (display->display, menuBar.win);
225#endif 279#endif
226#ifdef TRANSPARENT 280#ifdef TRANSPARENT
227 if (Options & Opt_transparent) 281 if (Options & Opt_transparent)
228 { 282 {
229 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 283 XSelectInput (display->display, display->root, PropertyChangeMask);
230 rxvt_check_our_parents (this); 284 check_our_parents ();
231 } 285 }
232#endif 286#endif
287
288 rootwin_ev.start (display, display->root);
289
233 XMapWindow (Xdisplay, TermWin.vt); 290 XMapWindow (display->display, TermWin.vt);
234 XMapWindow (Xdisplay, TermWin.parent[0]); 291 XMapWindow (display->display, TermWin.parent[0]);
235 292
236 rxvt_init_env (this);
237 rxvt_init_command (this, cmd_argv); 293 init_command (cmd_argv);
238 294
239 x_ev.start (Xfd, EVENT_READ);
240 pty_ev.start (cmd_fd, EVENT_READ); 295 pty_ev.start (cmd_fd, EVENT_READ);
241 296
242 flush (); 297 check_ev.start ();
243 298
244 return true; 299 return true;
245} 300}
246 301
247/* ------------------------------------------------------------------------- * 302/* ------------------------------------------------------------------------- *
… …
251 * Catch a SIGCHLD signal and exit if the direct child has died 306 * Catch a SIGCHLD signal and exit if the direct child has died
252 */ 307 */
253/* ARGSUSED */ 308/* ARGSUSED */
254/* EXTPROTO */ 309/* EXTPROTO */
255RETSIGTYPE 310RETSIGTYPE
256rxvt_Child_signal(int sig __attribute__ ((unused))) 311rxvt_Child_signal (int sig __attribute__ ((unused)))
257{ 312{
258 int pid, save_errno = errno; 313 int pid, save_errno = errno;
259 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 314 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
260 ; 315 ;
261 errno = save_errno; 316 errno = save_errno;
262 317
263#if 0 318#if 0
264 if (pid == R->cmd_pid) 319 if (pid == cmd_pid)
265 exit (EXIT_SUCCESS); 320 exit (EXIT_SUCCESS);
266#endif 321#endif
267} 322}
268 323
269/* 324/*
270 * Catch a fatal signal and tidy up before quitting 325 * Catch a fatal signal and tidy up before quitting
271 */ 326 */
272/* EXTPROTO */ 327/* EXTPROTO */
273RETSIGTYPE 328RETSIGTYPE
274rxvt_Exit_signal(int sig) 329rxvt_Exit_signal (int sig)
275{ 330{
276 signal(sig, SIG_DFL); 331 signal (sig, SIG_DFL);
277#ifdef DEBUG_CMD 332#ifdef DEBUG_CMD
278 rxvt_print_error("signal %d", sig); 333 rxvt_print_error ("signal %d", sig);
279#endif 334#endif
280 rxvt_clean_exit(); 335 rxvt_clean_exit ();
281 kill(getpid(), sig); 336 kill (getpid (), sig);
282} 337}
283 338
284/* ARGSUSED */
285/* INTPROTO */ 339/* INTPROTO */
286int 340int
287rxvt_xerror_handler(const Display * display 341rxvt_xerror_handler (Display *display, XErrorEvent *event)
288 __attribute__ ((unused)), const XErrorEvent * event)
289{ 342{
290 dR;
291
292 if (R->allowedxerror == -1) 343 if (GET_R->allowedxerror == -1)
293 R->allowedxerror = event->error_code; 344 GET_R->allowedxerror = event->error_code;
294 else 345 else
295 { 346 {
296 rxvt_print_error("XError: Request: %d . %d, Error: %d", 347 old_xerror_handler (display, event);
297 event->request_code, event->minor_code,
298 event->error_code);
299
300 R->destroy (); 348 GET_R->destroy ();
301 } 349 }
302 350
303 return 0; 351 return 0;
304} 352}
305 353
… …
310 */ 358 */
311/* EXTPROTO */ 359/* EXTPROTO */
312void 360void
313rxvt_clean_exit () 361rxvt_clean_exit ()
314{ 362{
315 dR; 363 // TODO: rxvtd should clean up all ressources
316 364 if (GET_R)
317 R->destroy (); 365 GET_R->destroy ();
318} 366}
319 367
320/* ------------------------------------------------------------------------- * 368/* ------------------------------------------------------------------------- *
321 * MEMORY ALLOCATION WRAPPERS * 369 * MEMORY ALLOCATION WRAPPERS *
322 * ------------------------------------------------------------------------- */ 370 * ------------------------------------------------------------------------- */
323/* EXTPROTO */ 371/* EXTPROTO */
324void * 372void *
325rxvt_malloc(size_t size) 373rxvt_malloc (size_t size)
326{ 374{
327 void *p; 375 void *p;
328 376
329 p = malloc(size); 377 p = malloc (size);
330 if (p) 378 if (p)
331 return p; 379 return p;
332 380
333 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 381 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
334 rxvt_clean_exit(); 382 rxvt_clean_exit ();
335 exit(EXIT_FAILURE); 383 exit (EXIT_FAILURE);
336/* NOTREACHED */ 384 /* NOTREACHED */
337} 385}
338 386
339/* EXTPROTO */ 387/* EXTPROTO */
340void * 388void *
341rxvt_calloc(size_t number, size_t size) 389rxvt_calloc (size_t number, size_t size)
342{ 390{
343 void *p; 391 void *p;
344 392
345 p = calloc(number, size); 393 p = calloc (number, size);
346 if (p) 394 if (p)
347 return p; 395 return p;
348 396
349 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 397 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
350 rxvt_clean_exit(); 398 rxvt_clean_exit ();
351 exit(EXIT_FAILURE); 399 exit (EXIT_FAILURE);
352/* NOTREACHED */ 400 /* NOTREACHED */
353} 401}
354 402
355/* EXTPROTO */ 403/* EXTPROTO */
356void * 404void *
357rxvt_realloc(void *ptr, size_t size) 405rxvt_realloc (void *ptr, size_t size)
358{ 406{
359 void *p; 407 void *p;
360 408
361 if (ptr) 409 if (ptr)
362 p = realloc(ptr, size); 410 p = realloc (ptr, size);
363 else 411 else
364 p = malloc(size); 412 p = malloc (size);
365 if (p) 413 if (p)
366 return p; 414 return p;
367 415
368 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 416 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
369 rxvt_clean_exit(); 417 rxvt_clean_exit ();
370 exit(EXIT_FAILURE); 418 exit (EXIT_FAILURE);
371/* NOTREACHED */ 419 /* NOTREACHED */
372} 420}
373 421
374/* ------------------------------------------------------------------------- * 422/* ------------------------------------------------------------------------- *
375 * PRIVILEGED OPERATIONS * 423 * PRIVILEGED OPERATIONS *
376 * ------------------------------------------------------------------------- */ 424 * ------------------------------------------------------------------------- */
377/* take care of suid/sgid super-user (root) privileges */ 425/* take care of suid/sgid super-user (root) privileges */
378/* INTPROTO */
379void 426void
380rxvt_privileges(pR_ int mode) 427rxvt_term::privileges (int mode)
381{ 428{
382#if ! defined(__CYGWIN32__) 429#if ! defined(__CYGWIN32__)
383# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 430# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
384/* setreuid() is the poor man's setuid(), seteuid() */ 431 /* setreuid () is the poor man's setuid (), seteuid () */
385# define seteuid(a) setreuid(-1, (a)) 432# define seteuid(a) setreuid(-1, (a))
386# define setegid(a) setregid(-1, (a)) 433# define setegid(a) setregid(-1, (a))
387# define HAVE_SETEUID 434# define HAVE_SETEUID
388# endif 435# endif
389# ifdef HAVE_SETEUID 436# ifdef HAVE_SETEUID
390 switch (mode) { 437 switch (mode)
438 {
391 case IGNORE: 439 case IGNORE:
392 /* 440 /*
393 * change effective uid/gid - not real uid/gid - so we can switch 441 * change effective uid/gid - not real uid/gid - so we can switch
394 * back to root later, as required 442 * back to root later, as required
395 */ 443 */
396 seteuid(getuid()); 444 seteuid (getuid ());
397 setegid(getgid()); 445 setegid (getgid ());
398 break; 446 break;
399 case SAVE: 447 case SAVE:
400 R->euid = geteuid(); 448 euid = geteuid ();
401 R->egid = getegid(); 449 egid = getegid ();
402 break; 450 break;
403 case RESTORE: 451 case RESTORE:
404 seteuid(R->euid); 452 seteuid (euid);
405 setegid(R->egid); 453 setegid (egid);
406 break; 454 break;
407 } 455 }
408# else 456# else
409 switch (mode) { 457 switch (mode)
458 {
410 case IGNORE: 459 case IGNORE:
411 setuid(getuid()); 460 setuid (getuid ());
412 setgid(getgid()); 461 setgid (getgid ());
413 /* FALLTHROUGH */ 462 /* FALLTHROUGH */
414 case SAVE: 463 case SAVE:
415 /* FALLTHROUGH */ 464 /* FALLTHROUGH */
416 case RESTORE: 465 case RESTORE:
417 break; 466 break;
418 } 467 }
419# endif 468# endif
420#endif 469#endif
421} 470}
422 471
423#ifdef UTMP_SUPPORT 472#ifdef UTMP_SUPPORT
424/* EXTPROTO */
425void 473void
426rxvt_privileged_utmp(pR_ char action) 474rxvt_term::privileged_utmp (char action)
427{ 475{
428 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 476 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
429 action, R->next_utmp_action, getpid())); 477 action, next_utmp_action, getpid ()));
430 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 478 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
431 || (R->Options & Opt_utmpInhibit) 479 || (Options & Opt_utmpInhibit)
432 || R->ttydev == NULL || *R->ttydev == '\0') 480 || ttydev == NULL || *ttydev == '\0')
433 return; 481 return;
434 482
435 rxvt_privileges(aR_ RESTORE); 483 privileges (RESTORE);
436 if (action == SAVE) { 484 if (action == SAVE)
485 {
437 R->next_utmp_action = RESTORE; 486 next_utmp_action = RESTORE;
438 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 487 makeutent (ttydev, rs[Rs_display_name]);
488 }
489 else
439 } else { /* action == RESTORE */ 490 { /* action == RESTORE */
440 R->next_utmp_action = IGNORE; 491 next_utmp_action = IGNORE;
441 rxvt_cleanutent(aR); 492 cleanutent ();
442 } 493 }
443 rxvt_privileges(aR_ IGNORE); 494 privileges (IGNORE);
444} 495}
445#endif 496#endif
446 497
447#ifndef NO_SETOWNER_TTYDEV 498#ifndef NO_SETOWNER_TTYDEV
448/* EXTPROTO */
449void 499void
450rxvt_privileged_ttydev(pR_ char action) 500rxvt_term::privileged_ttydev (char action)
451{ 501{
452 D_MAIN((stderr, 502 D_MAIN ((stderr,
453 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 503 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
454 action, R->next_tty_action, getpid())); 504 action, next_tty_action, getpid ()));
455 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 505 if (next_tty_action != action || (action != SAVE && action != RESTORE)
456 || R->ttydev == NULL || *R->ttydev == '\0') 506 || ttydev == NULL || *ttydev == '\0')
457 return; 507 return;
458 508
459 rxvt_privileges(aR_ RESTORE); 509 privileges (RESTORE);
460 510
461 if (action == SAVE) { 511 if (action == SAVE)
512 {
462 R->next_tty_action = RESTORE; 513 next_tty_action = RESTORE;
463# ifndef RESET_TTY_TO_COMMON_DEFAULTS 514# ifndef RESET_TTY_TO_COMMON_DEFAULTS
464/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 515 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
465 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 516 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
466 R->next_tty_action = IGNORE; 517 next_tty_action = IGNORE;
467 else 518 else
468# endif 519# endif
520
469 { 521 {
470 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 522 chown (ttydev, getuid (), ttygid); /* fail silently */
471 chmod(R->ttydev, R->ttymode); 523 chmod (ttydev, ttymode);
472# ifdef HAVE_REVOKE 524# ifdef HAVE_REVOKE
473 revoke(R->ttydev); 525 revoke (ttydev);
474# endif 526# endif
527
475 } 528 }
529 }
530 else
476 } else { /* action == RESTORE */ 531 { /* action == RESTORE */
477 R->next_tty_action = IGNORE; 532 next_tty_action = IGNORE;
478# ifndef RESET_TTY_TO_COMMON_DEFAULTS 533# ifndef RESET_TTY_TO_COMMON_DEFAULTS
479 chmod(R->ttydev, R->ttyfd_stat.st_mode); 534 chmod (ttydev, ttyfd_stat.st_mode);
480 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 535 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
481# else 536# else
482 chmod(R->ttydev, 537 chmod (ttydev,
483 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 538 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
484 chown(R->ttydev, 0, 0); 539 chown (ttydev, 0, 0);
485# endif 540# endif
486 }
487 541
542 }
543
488 rxvt_privileges(aR_ IGNORE); 544 privileges (IGNORE);
489 545
490# ifndef RESET_TTY_TO_COMMON_DEFAULTS 546# ifndef RESET_TTY_TO_COMMON_DEFAULTS
491 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 547 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
492 action == RESTORE ? "Restoring" : (action == 548 action == RESTORE ? "Restoring" : (action ==
493 SAVE ? "Saving" : 549 SAVE ? "Saving" :
494 "UNKNOWN ERROR for"), R->ttydev, 550 "UNKNOWN ERROR for"), ttydev,
495 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 551 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
496 R->ttyfd_stat.st_gid)); 552 ttyfd_stat.st_gid));
497# endif 553# endif
498} 554}
499#endif 555#endif
500 556
501/*----------------------------------------------------------------------*/ 557/*----------------------------------------------------------------------*/
502/* 558/*
503 * window size/position calculcations for XSizeHint and other storage. 559 * window size/position calculcations for XSizeHint and other storage.
504 * if width/height are non-zero then override calculated width/height 560 * if width/height are non-zero then override calculated width/height
505 */ 561 */
506/* EXTPROTO */
507void 562void
508rxvt_window_calc(pR_ unsigned int width, unsigned int height) 563rxvt_term::window_calc (unsigned int width, unsigned int height)
509{ 564{
510 short recalc_x, recalc_y; 565 short recalc_x, recalc_y;
511 int x, y, sb_w, mb_h, flags; 566 int x, y, sb_w, mb_h, flags;
512 unsigned int w, h; 567 unsigned int w, h;
513 unsigned int max_width, max_height; 568 unsigned int max_width, max_height;
514 569
515 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 570 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
516 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 571 TermWin.ncol, TermWin.nrow, szHint.width,
517 R->szHint.height)); 572 szHint.height));
518 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 573 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
519 R->szHint.win_gravity = NorthWestGravity; 574 szHint.win_gravity = NorthWestGravity;
520/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 575 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
521 576
522 recalc_x = recalc_y = 0; 577 recalc_x = recalc_y = 0;
523 flags = 0; 578 flags = 0;
524 if (!R->parsed_geometry) { 579 if (!parsed_geometry)
580 {
525 R->parsed_geometry = 1; 581 parsed_geometry = 1;
526 if (R->rs[Rs_geometry]) 582 if (rs[Rs_geometry])
527 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 583 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
528 if (flags & WidthValue) { 584 if (flags & WidthValue)
585 {
529 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 586 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
530 R->szHint.flags |= USSize; 587 szHint.flags |= USSize;
531 } 588 }
532 if (flags & HeightValue) { 589 if (flags & HeightValue)
590 {
533 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 591 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
534 R->szHint.flags |= USSize; 592 szHint.flags |= USSize;
535 } 593 }
536 if (flags & XValue) { 594 if (flags & XValue)
595 {
537 R->szHint.x = x; 596 szHint.x = x;
538 R->szHint.flags |= USPosition; 597 szHint.flags |= USPosition;
539 if (flags & XNegative) { 598 if (flags & XNegative)
599 {
540 recalc_x = 1; 600 recalc_x = 1;
541 R->szHint.win_gravity = NorthEastGravity; 601 szHint.win_gravity = NorthEastGravity;
542 } 602 }
543 } 603 }
544 if (flags & YValue) { 604 if (flags & YValue)
605 {
545 R->szHint.y = y; 606 szHint.y = y;
546 R->szHint.flags |= USPosition; 607 szHint.flags |= USPosition;
547 if (flags & YNegative) { 608 if (flags & YNegative)
609 {
548 recalc_y = 1; 610 recalc_y = 1;
549 if (R->szHint.win_gravity == NorthEastGravity) 611 if (szHint.win_gravity == NorthEastGravity)
550 R->szHint.win_gravity = SouthEastGravity; 612 szHint.win_gravity = SouthEastGravity;
551 else 613 else
552 R->szHint.win_gravity = SouthWestGravity; 614 szHint.win_gravity = SouthWestGravity;
553 } 615 }
554 } 616 }
555 } 617 }
556/* TODO: BOUNDS */ 618 /* TODO: BOUNDS */
557 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 619 TermWin.width = TermWin.ncol * TermWin.fwidth;
558 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 620 TermWin.height = TermWin.nrow * TermWin.fheight;
559 max_width = MAX_COLS * R->TermWin.fwidth; 621 max_width = MAX_COLS * TermWin.fwidth;
560 max_height = MAX_ROWS * R->TermWin.fheight; 622 max_height = MAX_ROWS * TermWin.fheight;
561 623
562 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 624 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
563 625
564 sb_w = mb_h = 0; 626 sb_w = mb_h = 0;
565 R->window_vt_x = R->window_vt_y = 0; 627 window_vt_x = window_vt_y = 0;
566 if (scrollbar_visible(R)) { 628 if (scrollbar_visible ())
629 {
567 sb_w = scrollbar_TotalWidth(); 630 sb_w = scrollbar_TotalWidth ();
568 R->szHint.base_width += sb_w; 631 szHint.base_width += sb_w;
569 if (!(R->Options & Opt_scrollBar_right)) 632 if (! (Options & Opt_scrollBar_right))
570 R->window_vt_x = sb_w; 633 window_vt_x = sb_w;
571 } 634 }
572 if (menubar_visible(R)) { 635 if (menubar_visible ())
636 {
573 mb_h = menuBar_TotalHeight(); 637 mb_h = menuBar_TotalHeight ();
574 R->szHint.base_height += mb_h; 638 szHint.base_height += mb_h;
575 R->window_vt_y = mb_h; 639 window_vt_y = mb_h;
576 } 640 }
577 R->szHint.width_inc = R->TermWin.fwidth; 641 szHint.width_inc = TermWin.fwidth;
578 R->szHint.height_inc = R->TermWin.fheight; 642 szHint.height_inc = TermWin.fheight;
579 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 643 szHint.min_width = szHint.base_width + szHint.width_inc;
580 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 644 szHint.min_height = szHint.base_height + szHint.height_inc;
581 645
582 if (width && width - R->szHint.base_width < max_width) { 646 if (width && width - szHint.base_width < max_width)
647 {
583 R->szHint.width = width; 648 szHint.width = width;
584 R->TermWin.width = width - R->szHint.base_width; 649 TermWin.width = width - szHint.base_width;
585 } else { 650 }
651 else
652 {
586 MIN_IT(R->TermWin.width, max_width); 653 MIN_IT (TermWin.width, max_width);
587 R->szHint.width = R->szHint.base_width + R->TermWin.width; 654 szHint.width = szHint.base_width + TermWin.width;
588 } 655 }
589 if (height && height - R->szHint.base_height < max_height) { 656 if (height && height - szHint.base_height < max_height)
657 {
590 R->szHint.height = height; 658 szHint.height = height;
591 R->TermWin.height = height - R->szHint.base_height; 659 TermWin.height = height - szHint.base_height;
592 } else { 660 }
661 else
662 {
593 MIN_IT(R->TermWin.height, max_height); 663 MIN_IT (TermWin.height, max_height);
594 R->szHint.height = R->szHint.base_height + R->TermWin.height; 664 szHint.height = szHint.base_height + TermWin.height;
595 } 665 }
596 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 666 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
597 R->window_sb_x = R->szHint.width - sb_w; 667 window_sb_x = szHint.width - sb_w;
598 668
599 if (recalc_x) 669 if (recalc_x)
600 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 670 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
601 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 671 - szHint.width - 2 * TermWin.ext_bwidth);
602 if (recalc_y) 672 if (recalc_y)
603 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 673 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
604 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 674 - szHint.height - 2 * TermWin.ext_bwidth);
605 675
606 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 676 TermWin.ncol = TermWin.width / TermWin.fwidth;
607 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 677 TermWin.nrow = TermWin.height / TermWin.fheight;
608 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 678 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
609 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 679 TermWin.ncol, TermWin.nrow, szHint.width,
610 R->szHint.height)); 680 szHint.height));
611 return; 681 return;
612} 682}
613 683
614/*----------------------------------------------------------------------*/ 684/*----------------------------------------------------------------------*/
615/* 685/*
616 * Tell the teletype handler what size the window is. 686 * Tell the teletype handler what size the window is.
617 * Called after a window size change. 687 * Called after a window size change.
618 */ 688 */
619/* EXTPROTO */
620void 689void
621rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) 690rxvt_term::tt_winch ()
622{ 691{
623 struct winsize ws; 692 struct winsize ws;
624 693
625 if (fd < 0) 694 if (cmd_fd < 0)
626 return; 695 return;
696
627 ws.ws_col = col; 697 ws.ws_col = TermWin.ncol;
628 ws.ws_row = row; 698 ws.ws_row = TermWin.nrow;
629 ws.ws_xpixel = ws.ws_ypixel = 0; 699 ws.ws_xpixel = ws.ws_ypixel = 0;
630#ifndef DEBUG_SIZE 700#ifndef DEBUG_SIZE
631 (void)ioctl(fd, TIOCSWINSZ, &ws); 701 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
632#else 702#else
633 if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { 703 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
634 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 704 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
635 }
636# ifdef SIGWINCH 705# ifdef SIGWINCH
637 else if (pid) /* force through to the command */ 706 else if (cmd_pid) /* force through to the command */
638 kill(pid, SIGWINCH); 707 kill (cmd_pid, SIGWINCH);
639# endif 708# endif
640#endif 709#endif
641} 710}
642 711
643/*----------------------------------------------------------------------*/ 712/*----------------------------------------------------------------------*/
644/* rxvt_change_font() - Switch to a new font */ 713/* rxvt_change_font () - Switch to a new font */
645/* 714/*
646 * init = 1 - initialize 715 * init = 1 - initialize
647 * 716 *
648 * fontname == FONT_UP - switch to bigger font 717 * fontname == FONT_UP - switch to bigger font
649 * fontname == FONT_DN - switch to smaller font 718 * fontname == FONT_DN - switch to smaller font
650 */ 719 */
651/* EXTPROTO */ 720bool
652void
653rxvt_change_font(pR_ int init, const char *fontname) 721rxvt_term::change_font (const char *fontname)
654{ 722{
655} 723 if (fontname == FONT_UP)
724 {
725 // TODO
726 }
727 else if (fontname == FONT_DN)
728 {
729 // TODO
730 }
731 else
732 {
733 rxvt_fontset *fs = new rxvt_fontset (this);
656 734
657/* INTPROTO */ 735 if (fs && fs->populate (fontname))
658void 736 {
737 delete TermWin.fontset;
738 TermWin.fontset = fs;
739 TermWin.fwidth = fs->base_font ()->width;
740 TermWin.fheight = fs->base_font ()->height;
741 TermWin.fbase = fs->base_font ()->ascent;
742
743 // TODO: screen needs to be told about new fonts
744
745 if (TermWin.parent[0])
746 {
747 resize_all_windows (0, 0, 0);
748 scr_remap_chars ();
749 scr_touch (true);
750 }
751
752 return true;
753 }
754 }
755
756 return false;
757}
758
759bool
659rxvt_font_up_down(pR_ int n, int direction) 760rxvt_term::font_up_down (int n, int direction)
660{ 761{
762 return false;
661} 763}
662 764
663/*----------------------------------------------------------------------*/ 765/*----------------------------------------------------------------------*/
664/*----------------------------------------------------------------------*/ 766/*----------------------------------------------------------------------*/
665/* xterm sequences - title, iconName, color (exptl) */ 767/* xterm sequences - title, iconName, color (exptl) */
666/* EXTPROTO */
667void 768void
668rxvt_set_title(pR_ const char *str) 769rxvt_term::set_title (const char *str)
669{ 770{
670#ifndef SMART_WINDOW_TITLE 771#ifndef SMART_WINDOW_TITLE
671 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 772 XStoreName (display->display, TermWin.parent[0], str);
672#else 773#else
673 char *name; 774 char *name;
674 775
675 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 776 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
676 name = NULL; 777 name = NULL;
677 if (name == NULL || STRCMP(name, str)) 778 if (name == NULL || STRCMP (name, str))
678 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 779 XStoreName (display->display, TermWin.parent[0], str);
679 if (name) 780 if (name)
680 XFree(name); 781 XFree (name);
681#endif 782#endif
682} 783}
683 784
684/* EXTPROTO */
685void 785void
686rxvt_set_iconName(pR_ const char *str) 786rxvt_term::set_iconName (const char *str)
687{ 787{
688#ifndef SMART_WINDOW_TITLE 788#ifndef SMART_WINDOW_TITLE
689 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 789 XSetIconName (display->display, TermWin.parent[0], str);
690#else 790#else
691 char *name; 791 char *name;
692 792
693 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 793 if (XGetIconName (display->display, TermWin.parent[0], &name))
694 name = NULL; 794 name = NULL;
695 if (name == NULL || STRCMP(name, str)) 795 if (name == NULL || STRCMP (name, str))
696 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 796 XSetIconName (display->display, TermWin.parent[0], str);
697 if (name) 797 if (name)
698 XFree(name); 798 XFree (name);
699#endif 799#endif
700} 800}
701 801
702#ifdef XTERM_COLOR_CHANGE 802#ifdef XTERM_COLOR_CHANGE
703/* EXTPROTO */
704void 803void
705rxvt_set_window_color(pR_ int idx, const char *color) 804rxvt_term::set_window_color (int idx, const char *color)
706{ 805{
707 rxvt_color xcol; 806 rxvt_color xcol;
708 int i; 807 int i;
709 808
710 if (color == NULL || *color == '\0') 809 if (color == NULL || *color == '\0')
711 return; 810 return;
712 811
713/* handle color aliases */ 812 /* handle color aliases */
714 if (isdigit(*color)) { 813 if (isdigit (*color))
814 {
715 i = atoi(color); 815 i = atoi (color);
816 if (i >= 8 && i <= 15)
716 if (i >= 8 && i <= 15) { /* bright colors */ 817 { /* bright colors */
717 i -= 8; 818 i -= 8;
718# ifndef NO_BRIGHTCOLOR 819# ifndef NO_BRIGHTCOLOR
719 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 820 PixColors[idx] = PixColors[minBrightCOLOR + i];
720 SET_PIXCOLOR(R, idx); 821 SET_PIXCOLOR (idx);
721 goto Done; 822 goto Done;
722# endif 823# endif
824
723 } 825 }
724 if (i >= 0 && i <= 7) { /* normal colors */ 826 if (i >= 0 && i <= 7)
827 { /* normal colors */
725 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 828 PixColors[idx] = PixColors[minCOLOR + i];
726 SET_PIXCOLOR(R, idx); 829 SET_PIXCOLOR (idx);
727 goto Done; 830 goto Done;
728 } 831 }
729 } 832 }
730 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 833 if (!rXParseAllocColor (& xcol, color))
731 return; 834 return;
732/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 835 /* XStoreColor (display->display, XCMAP, XColor*); */
733 836
734/* 837 /*
735 * FIXME: should free colors here, but no idea how to do it so instead, 838 * FIXME: should free colors here, but no idea how to do it so instead,
736 * so just keep gobbling up the colormap 839 * so just keep gobbling up the colormap
737 */ 840 */
738# if 0 841# if 0
739 for (i = Color_Black; i <= Color_White; i++) 842 for (i = Color_Black; i <= Color_White; i++)
740 if (R->PixColors[idx] == R->PixColors[i]) 843 if (PixColors[idx] == PixColors[i])
741 break; 844 break;
742 if (i > Color_White) { 845 if (i > Color_White)
846 {
743 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 847 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
744 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 848 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
745 DisplayPlanes(R->Xdisplay, Xscreen)); 849 DisplayPlanes (display->display, display->screen));
746 } 850 }
747# endif 851# endif
748 852
749 R->PixColors[idx] = xcol; 853 PixColors[idx] = xcol;
750 SET_PIXCOLOR(R, idx); 854 SET_PIXCOLOR (idx);
751 855
752/* XSetWindowAttributes attr; */ 856 /* XSetWindowAttributes attr; */
753/* Cursor cursor; */ 857 /* Cursor cursor; */
754 Done: 858Done:
755 if (idx == Color_bg && !(R->Options & Opt_transparent)) 859 if (idx == Color_bg && ! (Options & Opt_transparent))
756 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 860 XSetWindowBackground (display->display, TermWin.vt,
757 R->PixColors[Color_bg]); 861 PixColors[Color_bg]);
758 862
759/* handle Color_BD, scrollbar background, etc. */ 863 /* handle Color_BD, scrollbar background, etc. */
760 864
761 rxvt_set_colorfgbg(aR); 865 set_colorfgbg ();
762 rxvt_recolour_cursor(aR); 866 recolour_cursor ();
763/* the only reasonable way to enforce a clean update */ 867 /* the only reasonable way to enforce a clean update */
764 rxvt_scr_poweron(aR); 868 scr_poweron ();
765} 869}
766 870
767#else 871#else
768# define rxvt_set_window_color(aR_ idx,color) ((void)0) 872# define set_window_color (idx,color) ((void)0)
769#endif /* XTERM_COLOR_CHANGE */ 873#endif /* XTERM_COLOR_CHANGE */
770 874
771/* EXTPROTO */
772void 875void
773rxvt_recolour_cursor(pR) 876rxvt_term::recolour_cursor ()
774{ 877{
775 rxvt_color xcol[2];
776
777#if TODO 878#if TODO
879 rxvt_color xcol[2];
880
778 xcol[0] = R->PixColors[Color_pointer]; 881 xcol[0] = PixColors[Color_pointer];
779 xcol[1] = R->PixColors[Color_bg]; 882 xcol[1] = PixColors[Color_bg];
780 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 883 XQueryColors (display->display, XCMAP, xcol, 2);
781 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 884 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
782#endif 885#endif
783} 886}
784 887
785/*----------------------------------------------------------------------*/ 888/*----------------------------------------------------------------------*/
786/* 889/*
787 * find if fg/bg matches any of the normal (low-intensity) colors 890 * find if fg/bg matches any of the normal (low-intensity) colors
788 */ 891 */
789/* INTPROTO */
790void 892void
791rxvt_set_colorfgbg(pR) 893rxvt_term::set_colorfgbg ()
792{ 894{
793 unsigned int i; 895 unsigned int i;
794 const char *xpmb = "\0"; 896 const char *xpmb = "\0";
795 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 897 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
796 898
797 R->env_colorfgbg = 899 env_colorfgbg =
798 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 900 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
799 STRCPY(fstr, "default"); 901 STRCPY (fstr, "default");
800 STRCPY(bstr, "default"); 902 STRCPY (bstr, "default");
801 for (i = Color_Black; i <= Color_White; i++) 903 for (i = Color_Black; i <= Color_White; i++)
802 if (R->PixColors[Color_fg] == R->PixColors[i]) { 904 if (PixColors[Color_fg] == PixColors[i])
905 {
803 sprintf(fstr, "%d", (i - Color_Black)); 906 sprintf (fstr, "%d", (i - Color_Black));
804 break; 907 break;
805 } 908 }
806 for (i = Color_Black; i <= Color_White; i++) 909 for (i = Color_Black; i <= Color_White; i++)
807 if (R->PixColors[Color_bg] == R->PixColors[i]) { 910 if (PixColors[Color_bg] == PixColors[i])
911 {
808 sprintf(bstr, "%d", (i - Color_Black)); 912 sprintf (bstr, "%d", (i - Color_Black));
809#ifdef XPM_BACKGROUND 913#ifdef XPM_BACKGROUND
810 xpmb = "default;"; 914 xpmb = "default;";
811#endif 915#endif
812 break; 916 break;
813 } 917 }
918
814 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 919 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
815 putenv(R->env_colorfgbg);
816 920
817#ifndef NO_BRIGHTCOLOR 921#ifndef NO_BRIGHTCOLOR
818 R->colorfgbg = DEFAULT_RSTYLE; 922 colorfgbg = DEFAULT_RSTYLE;
819 for (i = minCOLOR; i <= maxCOLOR; i++) { 923 for (i = minCOLOR; i <= maxCOLOR; i++)
924 {
820 if (R->PixColors[Color_fg] == R->PixColors[i]) 925 if (PixColors[Color_fg] == PixColors[i])
821 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 926 colorfgbg = SET_FGCOLOR (colorfgbg, i);
822 if (R->PixColors[Color_bg] == R->PixColors[i]) 927 if (PixColors[Color_bg] == PixColors[i])
823 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 928 colorfgbg = SET_BGCOLOR (colorfgbg, i);
824 } 929 }
825#endif 930#endif
826} 931}
827 932
828/*----------------------------------------------------------------------*/ 933/*----------------------------------------------------------------------*/
829/* 934/*
830 * Colour determination for low colour displays, routine from 935 * Colour determination for low colour displays, routine from
831 * Hans de Goede <hans@highrise.nl> 936 * Hans de Goede <hans@highrise.nl>
832 */ 937 */
833 938
834/* EXTPROTO */
835int 939int
836rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 940rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
837{ 941{
838 screen_in_out->set(aR_ colour);
839
840 if (!screen_in_out->set(aR_ colour)) { 942 if (!screen_in_out->set (display, colour))
943 {
841 rxvt_print_error("can't allocate colour: %s", colour); 944 rxvt_print_error ("can't allocate colour: %s", colour);
842 return false; 945 return false;
843 } 946 }
844 947
845 return true; 948 return true;
846} 949}
847 950
848/* -------------------------------------------------------------------- * 951/* -------------------------------------------------------------------- *
849 * - WINDOW RESIZING - * 952 * - WINDOW RESIZING - *
850 * -------------------------------------------------------------------- */ 953 * -------------------------------------------------------------------- */
851/* EXTPROTO */
852void 954void
853rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 955rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
854 int ignoreparent)
855{ 956{
856 int fix_screen; 957 int fix_screen;
857 958
858#ifdef SMART_RESIZE 959#ifdef SMART_RESIZE
859 int old_width = R->szHint.width, old_height = R->szHint.height; 960 int old_width = szHint.width, old_height = szHint.height;
860#endif 961#endif
861 962
862 rxvt_window_calc(aR_ width, height); 963 window_calc (width, height);
863 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 964 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
864 if (!ignoreparent) { 965 if (!ignoreparent)
966 {
865#ifdef SMART_RESIZE 967#ifdef SMART_RESIZE
866/* 968 /*
867 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 969 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
868 * reposition window on resize depending on placement on screen 970 * reposition window on resize depending on placement on screen
869 */ 971 */
870 int x, y, x1, y1; 972 int x, y, x1, y1;
871 int dx, dy; 973 int dx, dy;
872 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 974 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
873 Window unused_cr; 975 Window unused_cr;
874 976
875 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 977 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
876 0, 0, &x, &y, &unused_cr); 978 0, 0, &x, &y, &unused_cr);
877 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 979 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
878 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 980 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
879 /* 981 /*
880 * if Xroot isn't the parent window, a WM will probably have offset 982 * if display->root isn't the parent window, a WM will probably have offset
881 * our position for handles and decorations. Counter it 983 * our position for handles and decorations. Counter it
882 */ 984 */
883 if (x1 != x || y1 != y) { 985 if (x1 != x || y1 != y)
986 {
884 x -= x1; 987 x -= x1;
885 y -= y1; 988 y -= y1;
886 } 989 }
887 990
888 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 991 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
889 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 992 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
890 dx = old_width - R->szHint.width; 993 dx = old_width - szHint.width;
891 dy = old_height - R->szHint.height; 994 dy = old_height - szHint.height;
892 995
893 /* Check position of the center of the window */ 996 /* Check position of the center of the window */
894 if (x < x1) /* left half */ 997 if (x < x1) /* left half */
895 dx = 0; 998 dx = 0;
896 else if (x == x1) /* exact center */ 999 else if (x == x1) /* exact center */
897 dx /= 2; 1000 dx /= 2;
898 if (y < y1) /* top half */ 1001 if (y < y1) /* top half */
899 dy = 0; 1002 dy = 0;
900 else if (y == y1) /* exact center */ 1003 else if (y == y1) /* exact center */
901 dy /= 2; 1004 dy /= 2;
902 1005
903 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 1006 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
904 R->szHint.width, R->szHint.height); 1007 szHint.width, szHint.height);
905#else 1008#else
906 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 1009 XResizeWindow (display->display, TermWin.parent[0], szHint.width,
907 R->szHint.height); 1010 szHint.height);
908#endif 1011#endif
909 }
910 1012
1013 }
1014
911 fix_screen = (R->TermWin.ncol != R->prev_ncol 1015 fix_screen = (TermWin.ncol != prev_ncol
912 || R->TermWin.nrow != R->prev_nrow); 1016 || TermWin.nrow != prev_nrow);
1017
913 if (fix_screen || width != R->old_width || height != R->old_height) { 1018 if (fix_screen || width != old_width || height != old_height)
1019 {
914 if (scrollbar_visible(R)) { 1020 if (scrollbar_visible ())
1021 {
915 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 1022 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,
916 0, scrollbar_TotalWidth(), R->szHint.height); 1023 0, scrollbar_TotalWidth (), szHint.height);
917 rxvt_Resize_scrollBar(aR); 1024 resize_scrollbar ();
918 } 1025 }
1026
919 if (menubar_visible(R)) 1027 if (menubar_visible ())
920 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 1028 XMoveResizeWindow (display->display, menuBar.win, window_vt_x,
921 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 1029 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
1030
922 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 1031 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
923 R->window_vt_y, TermWin_TotalWidth(), 1032 window_vt_y, TermWin_TotalWidth (),
924 TermWin_TotalHeight()); 1033 TermWin_TotalHeight ());
925#ifdef RXVT_GRAPHICS
926 if (R->old_height)
927 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
928 R->old_height - R->szHint.base_height);
929#endif
930 rxvt_scr_clear(aR); 1034 scr_clear ();
931#ifdef XPM_BACKGROUND 1035#ifdef XPM_BACKGROUND
932 rxvt_resize_pixmap(aR); 1036 resize_pixmap ();
933#endif 1037#endif
934 }
935 1038
1039 }
1040
936 if (fix_screen || R->old_height == 0) { 1041 if (fix_screen || old_height == 0)
1042 {
937 int curr_screen = -1; 1043 int curr_screen = -1;
938 uint16_t old_ncol = R->prev_ncol; 1044 int old_ncol = prev_ncol;
939 1045
940 /* scr_reset only works on the primary screen */ 1046 /* scr_reset only works on the primary screen */
941 if (R->old_height) /* this is not the first time through */ 1047 if (old_height) /* this is not the first time through */
1048 {
1049 unsigned int ncol = TermWin.ncol;
1050 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
942 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 1051 curr_screen = scr_change_screen (PRIMARY);
943 rxvt_scr_reset(aR); 1052 TermWin.ncol = ncol;
944 if (curr_screen >= 0) { /* this is not the first time through */
945 rxvt_scr_change_screen(aR_ curr_screen);
946 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
947 } 1053 }
948 }
949 1054
1055 scr_reset ();
1056
1057 if (curr_screen >= 0) /* this is not the first time through */
1058 {
1059 scr_change_screen (curr_screen);
1060 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1061 }
1062 }
1063
950 R->old_width = R->szHint.width; 1064 old_width = szHint.width;
951 R->old_height = R->szHint.height; 1065 old_height = szHint.height;
952 1066
953#ifdef USE_XIM 1067#ifdef USE_XIM
954 rxvt_IMSetStatusPosition(aR); 1068 IMSetStatusPosition ();
955#endif 1069#endif
956} 1070}
957 1071
958/* 1072/*
959 * Set the width/height of the vt window in characters. Units are pixels. 1073 * Set the width/height of the vt window in characters. Units are pixels.
960 * good for toggling 80/132 columns 1074 * good for toggling 80/132 columns
961 */ 1075 */
962/* EXTPROTO */
963void 1076void
964rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1077rxvt_term::set_widthheight (unsigned int width, unsigned int height)
965{ 1078{
966 XWindowAttributes wattr; 1079 XWindowAttributes wattr;
967 1080
968 if (width == 0 || height == 0) { 1081 if (width == 0 || height == 0)
1082 {
969 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1083 XGetWindowAttributes (display->display, display->root, &wattr);
970 if (width == 0) 1084 if (width == 0)
971 width = wattr.width - R->szHint.base_width; 1085 width = wattr.width - szHint.base_width;
972 if (height == 0) 1086 if (height == 0)
973 height = wattr.height - R->szHint.base_height; 1087 height = wattr.height - szHint.base_height;
974 } 1088 }
975 if (width != R->TermWin.width || height != R->TermWin.height) { 1089 if (width != TermWin.width || height != TermWin.height)
1090 {
976 width += R->szHint.base_width; 1091 width += szHint.base_width;
977 height += R->szHint.base_height; 1092 height += szHint.base_height;
978 rxvt_resize_all_windows(aR_ width, height, 0); 1093 resize_all_windows (width, height, 0);
979 } 1094 }
980} 1095}
981 1096
982/* -------------------------------------------------------------------- * 1097/* -------------------------------------------------------------------- *
983 * - X INPUT METHOD ROUTINES - * 1098 * - X INPUT METHOD ROUTINES - *
984 * -------------------------------------------------------------------- */ 1099 * -------------------------------------------------------------------- */
985#ifdef USE_XIM 1100#ifdef USE_XIM
986/* INTPROTO */ 1101
987void 1102void
988rxvt_setSize(pR_ XRectangle * size) 1103rxvt_term::im_set_size (XRectangle *size)
989{ 1104{
990 size->x = R->TermWin.int_bwidth; 1105 size->x = TermWin.int_bwidth;
991 size->y = R->TermWin.int_bwidth; 1106 size->y = TermWin.int_bwidth;
992 size->width = Width2Pixel(R->TermWin.ncol); 1107 size->width = Width2Pixel (TermWin.ncol);
993 size->height = Height2Pixel(R->TermWin.nrow); 1108 size->height = Height2Pixel (TermWin.nrow);
994} 1109}
995 1110
996/* INTPROTO */
997void 1111void
998rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1112rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
999{ 1113{
1000 *fg = R->PixColors[Color_fg]; 1114 *fg = PixColors[Color_fg];
1001 *bg = R->PixColors[Color_bg]; 1115 *bg = PixColors[Color_bg];
1002} 1116}
1003 1117
1004/* Checking whether input method is running. */ 1118/* Checking whether input method is running. */
1005/* INTPROTO */
1006Bool 1119bool
1007rxvt_IMisRunning(pR) 1120rxvt_term::IMisRunning ()
1008{ 1121{
1009 char *p; 1122 char *p;
1010 Atom atom; 1123 Atom atom;
1011 Window win; 1124 Window win;
1012 char server[IMBUFSIZ]; 1125 char server[IMBUFSIZ];
1013 1126
1014/* get current locale modifier */ 1127 /* get current locale modifier */
1015 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1128 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1129 {
1016 STRCPY(server, "@server="); 1130 STRCPY (server, "@server=");
1017 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1131 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1018 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1132 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1019 *p = '\0'; 1133 *p = '\0';
1020 1134
1021 atom = XInternAtom(R->Xdisplay, server, False); 1135 atom = XInternAtom (display->display, server, False);
1022 win = XGetSelectionOwner(R->Xdisplay, atom); 1136 win = XGetSelectionOwner (display->display, atom);
1023 if (win != None) 1137 if (win != None)
1024 return True; 1138 return True;
1025 } 1139 }
1026 return False; 1140 return False;
1027} 1141}
1028 1142
1029/* EXTPROTO */
1030void 1143void
1031rxvt_IMSendSpot(pR) 1144rxvt_term::IMSendSpot ()
1032{ 1145{
1033 XPoint spot; 1146 XPoint spot;
1034 XVaNestedList preedit_attr; 1147 XVaNestedList preedit_attr;
1035 1148
1036 if (R->Input_Context == NULL 1149 if (Input_Context == NULL
1037 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1150 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1038 || !(R->event_type == KeyPress 1151 || ! (event_type == KeyPress
1039 || R->event_type == Expose 1152 || event_type == Expose
1040 || R->event_type == NoExpose 1153 || event_type == NoExpose
1041 || R->event_type == SelectionNotify 1154 || event_type == SelectionNotify
1042 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1155 || event_type == ButtonRelease || event_type == FocusIn)
1043 || !rxvt_IMisRunning(aR)) 1156 || !IMisRunning ())
1044 return; 1157 return;
1045 1158
1046 rxvt_setPosition(aR_ & spot); 1159 im_set_position (&spot);
1047 1160
1048 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1161 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1049 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1162 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1050 XFree(preedit_attr); 1163 XFree (preedit_attr);
1051} 1164}
1052 1165
1053/* EXTPROTO */
1054void 1166void
1055rxvt_setTermFontSet(pR_ int idx)
1056{
1057 char *string;
1058 long length;
1059 int success = 0;
1060
1061 if (idx < 0 || idx >= MAX_NFONTS)
1062 return;
1063}
1064
1065/* INTPROTO */
1066void
1067rxvt_setPreeditArea(pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1167rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1068 XRectangle * needed_rect) 1168 XRectangle * needed_rect)
1069{ 1169{
1070 int mbh, vtx = 0; 1170 int mbh, vtx = 0;
1071 1171
1072 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1172 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1073 vtx = scrollbar_TotalWidth(); 1173 vtx = scrollbar_TotalWidth ();
1174
1074 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1175 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1075 mbh -= R->TermWin.lineSpace; 1176 mbh -= TermWin.lineSpace;
1076 1177
1077 preedit_rect->x = needed_rect->width + vtx; 1178 preedit_rect->x = needed_rect->width + vtx;
1078 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1179 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1079 1180
1080 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1181 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1081 + vtx;
1082 preedit_rect->height = Height2Pixel(1); 1182 preedit_rect->height = Height2Pixel (1);
1083 1183
1084 status_rect->x = vtx; 1184 status_rect->x = vtx;
1085 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1185 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1086 1186
1087 status_rect->width = needed_rect->width ? needed_rect->width 1187 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1088 : Width2Pixel(R->TermWin.ncol + 1);
1089 status_rect->height = Height2Pixel(1); 1188 status_rect->height = Height2Pixel (1);
1090} 1189}
1091 1190
1092/* ARGSUSED */
1093/* INTPROTO */
1094void 1191void
1095rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1192rxvt_term::im_destroy ()
1096 __attribute__ ((unused)), XPointer call_data
1097 __attribute__ ((unused)))
1098{ 1193{
1099 dR; 1194 if (Input_Context)
1100 1195 {
1196 XDestroyIC (Input_Context);
1101 R->Input_Context = NULL; 1197 Input_Context = NULL;
1102/* To avoid Segmentation Fault in C locale: Solaris only? */ 1198 }
1103 if (STRCMP(R->locale, "C"))
1104 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
1105 rxvt_IMInstantiateCallback, NULL);
1106}
1107 1199
1108/* 1200 if (input_method)
1109 * X manual pages and include files don't match on some systems:
1110 * some think this is an XIDProc and others an XIMProc so we can't
1111 * use the first argument - need to update this to be nice for
1112 * both types via some sort of configure detection
1113 */
1114/* ARGSUSED */
1115/* EXTPROTO */
1116void
1117rxvt_IMInstantiateCallback(Display * unused
1118 __attribute__ ((unused)), XPointer client_data
1119 __attribute__ ((unused)), XPointer call_data
1120 __attribute__ ((unused)))
1121{
1122 dR;
1123 int i, found, had_im;
1124 const char *p;
1125 char **s;
1126 char buf[IMBUFSIZ];
1127
1128 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1129 if (R->Input_Context)
1130 return;
1131
1132 found = had_im = 0;
1133 p = R->rs[Rs_inputMethod];
1134 if (p && *p) {
1135 had_im = 1;
1136 s = rxvt_splitcommastring(p);
1137 for (i = 0; s[i]; i++) {
1138 if (*s[i]) {
1139 STRCPY(buf, "@im=");
1140 STRNCAT(buf, s[i], IMBUFSIZ - 5);
1141 if ((p = XSetLocaleModifiers(buf)) != NULL && *p
1142 && (rxvt_IM_get_IC(aR) == True)) {
1143 found = 1;
1144 break;
1145 }
1146 }
1147 }
1148 for (i = 0; s[i]; i++)
1149 free(s[i]);
1150 free(s);
1151 } 1201 {
1152 if (found) 1202 display->put_xim (input_method);
1153 return; 1203 input_method = 0;
1154
1155/* try with XMODIFIERS env. var. */
1156 if ((p = XSetLocaleModifiers("")) != NULL && *p) {
1157 rxvt_IM_get_IC(aR);
1158 return;
1159 } 1204 }
1160
1161/* try with no modifiers base IF the user didn't specify an IM */
1162 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p
1163 && rxvt_IM_get_IC(aR) == True)
1164 return;
1165} 1205}
1166 1206
1167/* 1207/*
1168 * Try to open a XIM with the current modifiers, then see if we can 1208 * Try to open a XIM with the current modifiers, then see if we can
1169 * open a suitable preedit type 1209 * open a suitable preedit type
1170 */ 1210 */
1171/* INTPROTO */
1172Bool 1211bool
1173rxvt_IM_get_IC(pR) 1212rxvt_term::IM_get_IC (const char *modifiers)
1174{ 1213{
1175 int i, j, found; 1214 int i, j, found;
1176 XIM xim; 1215 XIM xim;
1177 XPoint spot; 1216 XPoint spot;
1178 XRectangle rect, status_rect, needed_rect; 1217 XRectangle rect, status_rect, needed_rect;
1179 unsigned long fg, bg; 1218 unsigned long fg, bg;
1180 const char *p; 1219 const char *p;
1181 char **s; 1220 char **s;
1182 XIMStyles *xim_styles; 1221 XIMStyles *xim_styles;
1183 XVaNestedList preedit_attr, status_attr; 1222 XVaNestedList preedit_attr, status_attr;
1184 XIMCallback ximcallback;
1185 1223
1224 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1225 return false;
1226
1186 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1227 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1187 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); 1228 input_method = display->get_xim (locale, modifiers);
1188 if (xim == NULL) 1229 if (input_method == NULL)
1189 return False; 1230 return false;
1190 1231
1232 xim = input_method->xim;
1233
1191 xim_styles = NULL; 1234 xim_styles = NULL;
1192 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) 1235 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1193 || !xim_styles || !xim_styles->count_styles) { 1236 || !xim_styles || !xim_styles->count_styles)
1194 XCloseIM(xim); 1237 {
1238 display->put_xim (input_method);
1195 return False; 1239 return false;
1196 } 1240 }
1197 1241
1198 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] 1242 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1199 : "OverTheSpot,OffTheSpot,Root";
1200 s = rxvt_splitcommastring(p); 1243 s = rxvt_splitcommastring (p);
1201 for (i = found = 0; !found && s[i]; i++) { 1244 for (i = found = 0; !found && s[i]; i++)
1245 {
1202 if (!STRCMP(s[i], "OverTheSpot")) 1246 if (!STRCMP (s[i], "OverTheSpot"))
1203 R->input_style = (XIMPreeditPosition | XIMStatusNothing); 1247 input_style = (XIMPreeditPosition | XIMStatusNothing);
1204 else if (!STRCMP(s[i], "OffTheSpot")) 1248 else if (!STRCMP (s[i], "OffTheSpot"))
1205 R->input_style = (XIMPreeditArea | XIMStatusArea); 1249 input_style = (XIMPreeditArea | XIMStatusArea);
1206 else if (!STRCMP(s[i], "Root")) 1250 else if (!STRCMP (s[i], "Root"))
1207 R->input_style = (XIMPreeditNothing | XIMStatusNothing); 1251 input_style = (XIMPreeditNothing | XIMStatusNothing);
1208 1252
1209 for (j = 0; j < xim_styles->count_styles; j++) 1253 for (j = 0; j < xim_styles->count_styles; j++)
1210 if (R->input_style == xim_styles->supported_styles[j]) { 1254 if (input_style == xim_styles->supported_styles[j])
1255 {
1211 found = 1; 1256 found = 1;
1257 break;
1258 }
1259 }
1260
1261 for (i = 0; s[i]; i++)
1262 free (s[i]);
1263
1264 free (s);
1265 XFree (xim_styles);
1266
1267 if (!found)
1268 {
1269 display->put_xim (input_method);
1270 return false;
1271 }
1272
1273 preedit_attr = status_attr = NULL;
1274
1275 if (input_style & XIMPreeditPosition)
1276 {
1277 im_set_size (&rect);
1278 im_set_position (&spot);
1279 im_set_color (&fg, &bg);
1280
1281 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1282 XNSpotLocation, &spot,
1283 XNForeground, fg, XNBackground, bg,
1284 //XNFontSet, TermWin.fontset,
1285 NULL);
1286 }
1287 else if (input_style & XIMPreeditArea)
1288 {
1289 im_set_color (&fg, &bg);
1290
1291 /*
1292 * The necessary width of preedit area is unknown
1293 * until create input context.
1294 */
1295 needed_rect.width = 0;
1296
1297 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1298
1299 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1300 XNForeground, fg, XNBackground, bg,
1301 //XNFontSet, TermWin.fontset,
1302 NULL);
1303 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1304 XNForeground, fg, XNBackground, bg,
1305 //XNFontSet, TermWin.fontset,
1306 NULL);
1307 }
1308
1309 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1310 XNClientWindow, TermWin.parent[0],
1311 XNFocusWindow, TermWin.parent[0],
1312 preedit_attr ? XNPreeditAttributes : NULL,
1313 preedit_attr,
1314 status_attr ? XNStatusAttributes : NULL,
1315 status_attr, NULL);
1316 if (preedit_attr) XFree (preedit_attr);
1317 if (status_attr) XFree (status_attr);
1318
1319 if (Input_Context == NULL)
1320 {
1321 rxvt_print_error ("failed to create input context");
1322 display->put_xim (input_method);
1323 return false;
1324 }
1325
1326 if (input_style & XIMPreeditArea)
1327 IMSetStatusPosition ();
1328
1329 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1330 return true;
1331}
1332
1333void
1334rxvt_term::im_cb ()
1335{
1336 int i, found, had_im;
1337 const char *p;
1338 char **s;
1339 char buf[IMBUFSIZ];
1340
1341 im_destroy ();
1342
1343 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1344 if (Input_Context)
1345 return;
1346
1347#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1348 if (rs[Rs_imLocale])
1349 SET_LOCALE (rs[Rs_imLocale]);
1350#endif
1351
1352 p = rs[Rs_inputMethod];
1353 if (p && *p)
1354 {
1355 bool found = false;
1356
1357 s = rxvt_splitcommastring (p);
1358 for (i = 0; s[i]; i++)
1359 {
1360 if (*s[i])
1361 {
1362 STRCPY (buf, "@im=");
1363 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1364 if (IM_get_IC (buf))
1365 {
1366 found = true;
1212 break; 1367 break;
1368 }
1213 } 1369 }
1214 } 1370 }
1215 for (i = 0; s[i]; i++) 1371 for (i = 0; s[i]; i++)
1216 free(s[i]); 1372 free (s[i]);
1217 free(s); 1373 free (s);
1218 XFree(xim_styles);
1219 1374
1220 if (!found) { 1375 if (found)
1221 XCloseIM(xim); 1376 goto done;
1222 return False;
1223 } 1377 }
1224 1378
1225 ximcallback.callback = rxvt_IMDestroyCallback; 1379 /* try with XMODIFIERS env. var. */
1380 if (IM_get_IC (""))
1381 goto done;
1226 1382
1227/* XXX: not sure why we need this (as well as IC one below) */ 1383 /* try with no modifiers base IF the user didn't specify an IM */
1228 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1384 if (IM_get_IC ("@im=none"))
1385 goto done;
1229 1386
1230 preedit_attr = status_attr = NULL; 1387done:
1231 1388#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1232 if (R->input_style & XIMPreeditPosition) { 1389 if (rs[Rs_imLocale])
1233 rxvt_setSize(aR_ & rect); 1390 SET_LOCALE (locale);
1234 rxvt_setPosition(aR_ & spot); 1391#endif
1235 rxvt_setColor(aR_ & fg, &bg);
1236
1237 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1238 XNSpotLocation, &spot,
1239 XNForeground, fg, XNBackground, bg,
1240 //XNFontSet, R->TermWin.fontset,
1241 NULL);
1242 } else if (R->input_style & XIMPreeditArea) {
1243 rxvt_setColor(aR_ & fg, &bg);
1244
1245 /*
1246 * The necessary width of preedit area is unknown
1247 * until create input context.
1248 */
1249 needed_rect.width = 0;
1250
1251 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1252
1253 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1254 XNForeground, fg, XNBackground, bg,
1255 //XNFontSet, R->TermWin.fontset,
1256 NULL);
1257 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1258 XNForeground, fg, XNBackground, bg,
1259 //XNFontSet, R->TermWin.fontset,
1260 NULL);
1261 }
1262 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1263 XNClientWindow, R->TermWin.parent[0],
1264 XNFocusWindow, R->TermWin.parent[0],
1265 XNDestroyCallback, &ximcallback,
1266 preedit_attr ? XNPreeditAttributes : NULL,
1267 preedit_attr,
1268 status_attr ? XNStatusAttributes : NULL,
1269 status_attr, NULL);
1270 if (preedit_attr)
1271 XFree(preedit_attr);
1272 if (status_attr)
1273 XFree(status_attr);
1274 if (R->Input_Context == NULL) {
1275 rxvt_print_error("failed to create input context");
1276 XCloseIM(xim);
1277 return False;
1278 }
1279 if (R->input_style & XIMPreeditArea)
1280 rxvt_IMSetStatusPosition(aR);
1281 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1282 return True;
1283} 1392}
1284 1393
1285/* EXTPROTO */
1286void 1394void
1287rxvt_IMSetStatusPosition(pR) 1395rxvt_term::IMSetStatusPosition ()
1288{ 1396{
1289 XRectangle preedit_rect, status_rect, *needed_rect; 1397 XRectangle preedit_rect, status_rect, *needed_rect;
1290 XVaNestedList preedit_attr, status_attr; 1398 XVaNestedList preedit_attr, status_attr;
1291 1399
1292 if (R->Input_Context == NULL 1400 if (Input_Context == NULL
1293 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1401 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1294 || !rxvt_IMisRunning(aR)) 1402 || !IMisRunning ())
1295 return; 1403 return;
1296 1404
1297/* Getting the necessary width of preedit area */ 1405 /* Getting the necessary width of preedit area */
1298 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1406 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1299 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1407 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1300 XFree(status_attr); 1408 XFree (status_attr);
1301 1409
1302 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1410 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1303 1411
1304 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1412 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1305 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1413 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1306 1414
1307 XSetICValues(R->Input_Context, 1415 XSetICValues (Input_Context,
1308 XNPreeditAttributes, preedit_attr, 1416 XNPreeditAttributes, preedit_attr,
1309 XNStatusAttributes, status_attr, NULL); 1417 XNStatusAttributes, status_attr, NULL);
1310 1418
1311 XFree(preedit_attr); 1419 XFree (preedit_attr);
1312 XFree(status_attr); 1420 XFree (status_attr);
1313} 1421}
1314#endif /* USE_XIM */ 1422#endif /* USE_XIM */
1315 1423
1316/*----------------------------------------------------------------------*/ 1424/*----------------------------------------------------------------------*/
1317rxvt_t rxvt_current_term; 1425rxvt_t rxvt_current_term;

Diff Legend

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