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

Diff Legend

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