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.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.32 by pcg, Fri Feb 13 12:16:21 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines