[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.226 by root, Thu Jul 6 23:48:11 2006 UTC vs.
Revision 1.309 by root, Wed Feb 27 01:02:33 2008 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2008 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.
…		…
38	#include <limits>	38	#include <limits>
39		39
40	#include <csignal>	40	#include <csignal>
41	#include <cstring>	41	#include <cstring>
42		42
43	#ifdef TTY_GID_SUPPORT
44	# include <grp.h>
45	#endif
46
47	#ifdef HAVE_TERMIOS_H
48	# include <termios.h>	43	#include <termios.h>
		44
		45	#ifdef HAVE_XSETLOCALE
		46	# define X_LOCALE
		47	# include <X11/Xlocale.h>
		48	#else
		49	# ifdef HAVE_SETLOCALE
		50	# include <clocale>
		51	# endif
49	#endif	52	#endif
50		53
51	vector<rxvt_term *> rxvt_term::termlist;	54	vector<rxvt_term *> rxvt_term::termlist;
52		55
53	// used to tell global functions which terminal instance is "active"	56	// used to tell global functions which terminal instance is "active"
…		…
56	static char curlocale[128], savelocale[128];	59	static char curlocale[128], savelocale[128];
57		60
58	bool	61	bool
59	rxvt_set_locale (const char *locale) NOTHROW	62	rxvt_set_locale (const char *locale) NOTHROW
60	{	63	{
		64	int size = strlen (locale) + 1;
		65
		66	if (size > sizeof (curlocale))
		67	rxvt_fatal ("locale string too long, aborting.\n");
		68
61	if (!locale \|\| !strncmp (locale, curlocale, 128))	69	if (!locale \|\| !memcmp (locale, curlocale, size))
62	return false;	70	return false;
63		71
64	strncpy (curlocale, locale, 128);	72	memcpy (curlocale, locale, size);
65	setlocale (LC_CTYPE, curlocale);	73	setlocale (LC_CTYPE, curlocale);
66	return true;	74	return true;
67	}	75	}
68		76
69	void	77	void
…		…
83	class rxvt_composite_vec rxvt_composite;	91	class rxvt_composite_vec rxvt_composite;
84		92
85	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)	93	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86	{	94	{
87	compose_char *cc;	95	compose_char *cc;
88		96
89	// break compose chains, as stupid readline really likes to duplicate	97	// break compose chains, as stupid readline really likes to duplicate
90	// composing characters for some reason near the end of a line.	98	// composing characters for some reason near the end of a line.
91	cc = (*this)[c1];	99	cc = (*this)[c1];
92	while (cc)	100	while (cc)
93	{	101	{
…		…
142		150
143	}	151	}
144	#endif	152	#endif
145		153
146	rxvt_term::rxvt_term ()	154	rxvt_term::rxvt_term ()
147	:	155	{
148	#if TRANSPARENT \|\| ENABLE_PERL	156	#if HAVE_BG_PIXMAP
149	rootwin_ev (this, &rxvt_term::rootwin_cb),	157	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
150	#endif
151	#ifdef HAVE_SCROLLBARS
152	scrollbar_ev (this, &rxvt_term::x_cb),
153	#endif	158	#endif
154	#ifdef CURSOR_BLINK	159	#ifdef CURSOR_BLINK
155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	160	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
156	#endif	161	#endif
157	#ifdef TEXT_BLINK	162	#ifdef TEXT_BLINK
158	text_blink_ev (this, &rxvt_term::text_blink_cb),	163	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
159	#endif	164	#endif
160	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),	166	cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
162	#endif	167	#endif
163	#ifdef SELECTION_SCROLLING	168	#ifdef SELECTION_SCROLLING
164	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),	169	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
165	#endif	170	#endif
166	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),	172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
		173	#endif
		174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
		175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
		176	#endif
		177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
		178	#ifdef USE_XIM
		179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
168	#endif	180	#endif
169	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
170	pointer_ev (this, &rxvt_term::pointer_cb),	182	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171	#endif	183	#endif
172	#ifdef USE_XIM
173	im_ev (this, &rxvt_term::im_cb),
174	#endif
175	#ifndef NO_BELL	184	#ifndef NO_BELL
176	bell_ev (this, &rxvt_term::bell_cb),	185	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177	#endif	186	#endif
178	termwin_ev (this, &rxvt_term::x_cb),	187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179	vt_ev (this, &rxvt_term::x_cb),	188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180	child_ev (this, &rxvt_term::child_cb),	189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181	check_ev (this, &rxvt_term::check_cb),	190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182	flush_ev (this, &rxvt_term::flush_cb),	191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183	destroy_ev (this, &rxvt_term::destroy_cb),	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184	pty_ev (this, &rxvt_term::pty_cb),	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185	incr_ev (this, &rxvt_term::incr_cb)	194
186	{
187	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188		196
189	termlist.push_back (this);	197	termlist.push_back (this);
190		198
191	#ifdef KEYSYM_RESOURCE	199	#ifdef KEYSYM_RESOURCE
…		…
193	#endif	201	#endif
194	}	202	}
195		203
196	// clean up the most important stuff, do not call x or free mem etc.	204	// clean up the most important stuff, do not call x or free mem etc.
197	// for use before an emergency exit	205	// for use before an emergency exit
		206	void
198	void rxvt_term::emergency_cleanup ()	207	rxvt_term::emergency_cleanup ()
199	{	208	{
200	if (cmd_pid)	209	if (cmd_pid)
201	kill (-cmd_pid, SIGHUP);	210	kill (-cmd_pid, SIGHUP);
202		211
203	pty_ev.stop ();	212	pty_ev.stop ();
…		…
215	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
216	delete fontset[i];	225	delete fontset[i];
217	#endif	226	#endif
218	delete fontset[0];	227	delete fontset[0];
219		228
		229	#ifdef HAVE_BG_PIXMAP
		230	bgPixmap.destroy ();
		231	#endif
		232
220	if (display)	233	if (display)
221	{	234	{
222	selection_clear ();	235	selection_clear ();
223		236
224	#ifdef USE_XIM	237	#ifdef USE_XIM
225	im_destroy ();	238	im_destroy ();
226	#endif	239	#endif
227	#ifdef XTERM_SCROLLBAR	240	scrollBar.destroy ();
228	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
229	if (ShadowGC) XFreeGC (dpy, ShadowGC);
230	#endif
231	#ifdef PLAIN_SCROLLBAR
232	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
233	#endif
234	#ifdef NEXT_SCROLLBAR
235	if (blackGC) XFreeGC (dpy, blackGC);
236	if (whiteGC) XFreeGC (dpy, whiteGC);
237	if (grayGC) XFreeGC (dpy, grayGC);
238	if (darkGC) XFreeGC (dpy, darkGC);
239	if (stippleGC) XFreeGC (dpy, stippleGC);
240	if (dimple) XFreePixmap (dpy, dimple);
241	if (upArrow) XFreePixmap (dpy, upArrow);
242	if (downArrow) XFreePixmap (dpy, downArrow);
243	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
244	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
245	#endif
246	#ifdef RXVT_SCROLLBAR
247	if (topShadowGC) XFreeGC (dpy, topShadowGC);
248	if (botShadowGC) XFreeGC (dpy, botShadowGC);
249	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
250	#endif
251	if (gc) XFreeGC (dpy, gc);	241	if (gc) XFreeGC (dpy, gc);
252		242
253	delete drawable;	243	delete drawable;
254	// destroy all windows	244	// destroy all windows
255	if (parent[0])	245	if (parent[0])
…		…
263	pix_colors_unfocused [i].free (this);	253	pix_colors_unfocused [i].free (this);
264	#endif	254	#endif
265	}	255	}
266		256
267	clear ();	257	clear ();
268	}
269		258
270	delete pix_colors_focused;	259	display->flush (); /* ideally .put should do this */
271	#if OFF_FOCUS_FADING
272	delete pix_colors_unfocused;
273	#endif
274
275	displays.put (display);	260	displays.put (display);
		261	}
276		262
277	scr_release ();	263	scr_release ();
278		264
279	/* clear all resources */	265	/* clear all resources */
280	for (int i = 0; i < allocated.size (); i++)	266	for (int i = 0; i < allocated.size (); i++)
…		…
292	delete argv;	278	delete argv;
293		279
294	#ifdef KEYSYM_RESOURCE	280	#ifdef KEYSYM_RESOURCE
295	delete keyboard;	281	delete keyboard;
296	#endif	282	#endif
		283	#ifndef NO_RESOURCES
		284	XrmDestroyDatabase (option_db);
		285	#endif
297	}	286	}
298		287
299	// child has exited, usually destroys	288	// child has exited, usually destroys
300	void	289	void
301	rxvt_term::child_cb (child_watcher &w, int status)	290	rxvt_term::child_cb (ev::child &w, int status)
302	{	291	{
303	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	292	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
304		293
305	cmd_pid = 0;	294	cmd_pid = 0;
306		295
307	if (!OPTION (Opt_hold))	296	if (!option (Opt_hold))
308	destroy ();	297	destroy ();
309	}	298	}
310		299
311	void	300	void
312	rxvt_term::destroy ()	301	rxvt_term::destroy ()
313	{	302	{
314	if (destroy_ev.active)	303	if (destroy_ev.is_active ())
315	return;	304	return;
316		305
317	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	306	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
318		307
319	#if ENABLE_OVERLAY	308	#if ENABLE_OVERLAY
…		…
323	if (display)	312	if (display)
324	{	313	{
325	#if USE_XIM	314	#if USE_XIM
326	im_ev.stop (display);	315	im_ev.stop (display);
327	#endif	316	#endif
328	#if HAVE_SCROLLBARS
329	scrollbar_ev.stop (display);	317	scrollbar_ev.stop (display);
330	#endif
331	#if TRANSPARENT \|\| ENABLE_PERL	318	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
332	rootwin_ev.stop (display);	319	rootwin_ev.stop (display);
333	#endif	320	#endif
334	incr_ev.stop ();	321	incr_ev.stop ();
335	termwin_ev.stop (display);	322	termwin_ev.stop (display);
336	vt_ev.stop (display);	323	vt_ev.stop (display);
337	}	324	}
338		325
339	check_ev.stop ();	326	flush_ev.stop ();
340	pty_ev.stop ();	327	pty_ev.stop ();
341	#ifdef CURSOR_BLINK	328	#ifdef CURSOR_BLINK
342	cursor_blink_ev.stop ();	329	cursor_blink_ev.stop ();
343	#endif	330	#endif
344	#ifdef TEXT_BLINK	331	#ifdef TEXT_BLINK
…		…
352	#endif	339	#endif
353	#ifdef POINTER_BLANK	340	#ifdef POINTER_BLANK
354	pointer_ev.stop ();	341	pointer_ev.stop ();
355	#endif	342	#endif
356		343
357	destroy_ev.start (0);	344	destroy_ev.start ();
358	}	345	}
359		346
360	void	347	void
361	rxvt_term::destroy_cb (time_watcher &w)	348	rxvt_term::destroy_cb (ev::idle &w, int revents)
362	{	349	{
363	make_current ();	350	make_current ();
364		351
365	delete this;	352	delete this;
366	}	353	}
…		…
420	else	407	else
421	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	408	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
422	mesg, BUFSIZ);	409	mesg, BUFSIZ);
423	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	410	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
424	}	411	}
425	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	412	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
426	mesg, BUFSIZ);	413	mesg, BUFSIZ);
427	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	414	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
428	}	415	}
429	#endif	416	#endif
430		417
…		…
454	DisplayString (display));	441	DisplayString (display));
455	rxvt_emergency_cleanup ();	442	rxvt_emergency_cleanup ();
456	_exit (EXIT_FAILURE);	443	_exit (EXIT_FAILURE);
457	}	444	}
458		445
459	/----------------------------------------------------------------------/
460	bool
461	rxvt_term::init (int argc, const char const argv, stringvec *envv)
462	{
463	this->envv = envv;
464
465	SET_R (this);
466	set_locale ("");
467	set_environ (envv); // few things in X do not call setlocale :(
468
469	if (!init_vars ())
470	return false;
471
472	init_secondary ();
473
474	const char **cmd_argv = init_resources (argc, argv);
475
476	#ifdef KEYSYM_RESOURCE
477	keyboard->register_done ();
478	#endif
479
480	#ifdef HAVE_SCROLLBARS
481	if (OPTION (Opt_scrollBar))
482	scrollBar.setIdle (); /* set existence for size calculations */
483	#endif
484
485	pty = ptytty::create ();
486
487	create_windows (argc, argv);
488
489	init_xlocale ();
490
491	scr_reset (); // initialize screen
492
493	#if 0
494	XSynchronize (dpy, True);
495	#endif
496
497	#ifdef HAVE_SCROLLBARS
498	if (OPTION (Opt_scrollBar))
499	resize_scrollbar (); /* create and map scrollbar */
500	#endif
501	#ifdef TRANSPARENT
502	if (OPTION (Opt_transparent))
503	{
504	XSelectInput (dpy, display->root, PropertyChangeMask);
505	check_our_parents ();
506	rootwin_ev.start (display, display->root);
507	}
508	#endif
509	#if ENABLE_PERL
510	rootwin_ev.start (display, display->root);
511	#endif
512
513	set_colorfgbg ();
514
515	init_command (cmd_argv);
516
517	free (cmd_argv);
518
519	if (pty->pty >= 0)
520	pty_ev.start (pty->pty, EVENT_READ);
521
522	check_ev.start ();
523
524	HOOK_INVOKE ((this, HOOK_START, DT_END));
525
526	#if ENABLE_XEMBED
527	if (rs[Rs_embed])
528	{
529	long info[2] = { 0, XEMBED_MAPPED };
530
531	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
532	32, PropModeReplace, (unsigned char *)&info, 2);
533	}
534	#endif
535
536	XMapWindow (dpy, vt);
537	XMapWindow (dpy, parent[0]);
538
539	return true;
540	}
541
542	static struct sig_handlers	446	static struct sig_handlers
543	{	447	{
544	sig_watcher sw_term, sw_int;	448	ev::sig sw_term, sw_int;
545		449
546	/*	450	/*
547	* Catch a fatal signal and tidy up before quitting	451	* Catch a fatal signal and tidy up before quitting
548	*/	452	*/
549	void	453	void sig_term (ev::sig &w, int revents);
550	sig_term (sig_watcher &w)	454
		455	sig_handlers ()
551	{	456	{
552	rxvt_emergency_cleanup ();	457	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
553	signal (w.signum, SIG_DFL);
554	kill (getpid (), w.signum);
555	}
556
557	sig_handlers ()
558	: sw_term (this, &sig_handlers::sig_term),
559	sw_int (this, &sig_handlers::sig_term)	458	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
560	{
561	}	459	}
562	} sig_handlers;	460	} sig_handlers;
563		461
		462	void
		463	sig_handlers::sig_term (ev::sig &w, int revents)
		464	{
		465	rxvt_emergency_cleanup ();
		466	w.stop ();
		467	kill (getpid (), w.signum);
		468	}
		469
564	char **rxvt_environ; // startup environment	470	char **rxvt_environ; // startup environment
565		471
566	void	472	void
567	rxvt_init ()	473	rxvt_init ()
568	{	474	{
569	ptytty::init ();	475	ptytty::init ();
		476
		477	if (!ev_default_loop (0))
		478	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
570		479
571	rxvt_environ = environ;	480	rxvt_environ = environ;
572		481
573	signal (SIGHUP, SIG_IGN);	482	signal (SIGHUP, SIG_IGN);
574	signal (SIGPIPE, SIG_IGN);	483	signal (SIGPIPE, SIG_IGN);
575		484
576	sig_handlers.sw_term.start (SIGTERM);	485	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
577	sig_handlers.sw_int.start (SIGINT);	486	sig_handlers.sw_int.start (SIGINT); ev_unref ();
578		487
579	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	488	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
580	/* signal (SIGURG, SIG_DFL); */	489	/* signal (SIGURG, SIG_DFL); */
581		490
582	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	491	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
584	XSetIOErrorHandler (rxvt_xioerror_handler);	493	XSetIOErrorHandler (rxvt_xioerror_handler);
585		494
586	XrmInitialize ();	495	XrmInitialize ();
587	}	496	}
588		497
589	/* ------------------------------------------------------------------------- *
590	* MEMORY ALLOCATION WRAPPERS *
591	* ------------------------------------------------------------------------- */
592	void *
593	rxvt_malloc (size_t size)
594	{
595	void *p = malloc (size);
596
597	if (!p)
598	rxvt_fatal ("memory allocation failure. aborting.\n");
599
600	return p;
601	}
602
603	void *
604	rxvt_calloc (size_t number, size_t size)
605	{
606	void *p = calloc (number, size);
607
608	if (!p)
609	rxvt_fatal ("memory allocation failure. aborting.\n");
610
611	return p;
612	}
613
614	void *
615	rxvt_realloc (void *ptr, size_t size)
616	{
617	void *p = realloc (ptr, size);
618
619	if (!p)
620	rxvt_fatal ("memory allocation failure. aborting.\n");
621
622	return p;
623	}
624
625	/----------------------------------------------------------------------/	498	/----------------------------------------------------------------------/
626	/*	499	/*
627	* window size/position calculcations for XSizeHint and other storage.	500	* window size/position calculations for XSizeHint and other storage.
628	* if width/height are non-zero then override calculated width/height	501	* if width/height are non-zero then override calculated width/height
629	*/	502	*/
630	void	503	void
631	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	504	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
632	{	505	{
633	short recalc_x, recalc_y;	506	short recalc_x, recalc_y;
634	int x, y, sb_w, flags;	507	int x, y, flags;
635	unsigned int w, h;	508	unsigned int w, h;
636	unsigned int max_width, max_height;	509	unsigned int max_width, max_height;
637		510
638	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	511	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
639	szHint.win_gravity = NorthWestGravity;	512	szHint.win_gravity = NorthWestGravity;
…		…
686	szHint.win_gravity = SouthEastGravity;	559	szHint.win_gravity = SouthEastGravity;
687	else	560	else
688	szHint.win_gravity = SouthWestGravity;	561	szHint.win_gravity = SouthWestGravity;
689	}	562	}
690	}	563	}
		564
		565	if (!szHint.width \|\| !szHint.height)
		566	rxvt_fatal ("window width or height must not be zero, aborting.\n");
691	}	567	}
692		568
693	/* TODO: BOUNDS */	569	/* TODO: BOUNDS */
694	width = ncol * fwidth;	570	width = ncol * fwidth;
695	height = nrow * fheight;	571	height = nrow * fheight;
696	max_width = MAX_COLS * fwidth;	572	max_width = MAX_COLS * fwidth;
697	max_height = MAX_ROWS * fheight;	573	max_height = MAX_ROWS * fheight;
698		574
699	szHint.base_width = szHint.base_height = 2 * int_bwidth;	575	szHint.base_width = szHint.base_height = 2 * int_bwidth;
700		576
701	sb_w = 0;
702	window_vt_x = window_vt_y = int_bwidth;	577	window_vt_x = window_vt_y = int_bwidth;
703		578
704	if (scrollBar.state)	579	if (scrollBar.state)
705	{	580	{
706	sb_w = scrollbar_TotalWidth ();	581	int sb_w = scrollBar.total_width ();
707	szHint.base_width += sb_w;	582	szHint.base_width += sb_w;
708		583
709	if (!OPTION (Opt_scrollBar_right))	584	if (!option (Opt_scrollBar_right))
710	window_vt_x += sb_w;	585	window_vt_x += sb_w;
711	}	586	}
712		587
713	szHint.width_inc = fwidth;	588	szHint.width_inc = fwidth;
714	szHint.height_inc = fheight;	589	szHint.height_inc = fheight;
…		…
734	else	609	else
735	{	610	{
736	min_it (height, max_height);	611	min_it (height, max_height);
737	szHint.height = szHint.base_height + height;	612	szHint.height = szHint.base_height + height;
738	}	613	}
739
740	if (scrollBar.state && OPTION (Opt_scrollBar_right))
741	window_sb_x = szHint.width - sb_w;
742		614
743	if (recalc_x)	615	if (recalc_x)
744	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	616	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
745		617
746	if (recalc_y)	618	if (recalc_y)
…		…
768	ws.ws_xpixel = width;	640	ws.ws_xpixel = width;
769	ws.ws_ypixel = height;	641	ws.ws_ypixel = height;
770	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	642	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
771		643
772	#if 0	644	#if 0
773	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	645	// TIOCSWINSZ is supposed to do this automatically and correctly
774	if (cmd_pid) /* force through to the command */	646	if (cmd_pid) /* force through to the command */
775	kill (-cmd_pid, SIGWINCH);	647	kill (-cmd_pid, SIGWINCH);
776	#endif	648	#endif
777	}	649	}
778		650
…		…
807	delete fontset[0];	679	delete fontset[0];
808	fontset[0] = fs;	680	fontset[0] = fs;
809		681
810	prop = (*fs)[1]->properties ();	682	prop = (*fs)[1]->properties ();
811	prop.height += lineSpace;	683	prop.height += lineSpace;
		684
812	fs->set_prop (prop);	685	fs->set_prop (prop, false);
813		686
814	fwidth = prop.width;	687	fwidth = prop.width;
815	fheight = prop.height;	688	fheight = prop.height;
816	fbase = prop.ascent;	689	fbase = prop.ascent;
817		690
…		…
826	{	699	{
827	fontset[style] = fs = new rxvt_fontset (this);	700	fontset[style] = fs = new rxvt_fontset (this);
828	rxvt_fontprop prop2 = prop;	701	rxvt_fontprop prop2 = prop;
829		702
830	if (res)	703	if (res)
831	prop2.weight = prop2.slant = rxvt_fontprop::unset;	704	{
		705	fs->populate (res);
		706	fs->set_prop (prop2, false);
		707	}
832	else	708	else
833	{	709	{
834	res = fontset[0]->fontdesc;	710	fs->populate (fontset[0]->fontdesc);
835		711
836	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	712	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
837	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;	713	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
		714
		715	fs->set_prop (prop2, true);
838	}	716	}
839		717
840	fs->populate (res);
841	fs->set_prop (prop2);
842	}	718	}
843	#else	719	#else
844	fontset[style] = fontset[0];	720	fontset[style] = fontset[0];
845	#endif	721	#endif
846	}	722	}
…		…
848	if (parent[0])	724	if (parent[0])
849	{	725	{
850	resize_all_windows (0, 0, 0);	726	resize_all_windows (0, 0, 0);
851	scr_remap_chars ();	727	scr_remap_chars ();
852	scr_touch (true);	728	scr_touch (true);
853	}	729	}
854		730
855	return true;	731	return true;
856	}	732	}
857		733
		734	void
858	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	735	rxvt_term::set_string_property (Atom prop, const char *str, int len)
859	{	736	{
860	XChangeProperty (dpy, parent[0],	737	XChangeProperty (dpy, parent[0],
861	prop, XA_STRING, 8, PropModeReplace,	738	prop, XA_STRING, 8, PropModeReplace,
862	(const unsigned char *)str, len >= 0 ? len : strlen (str));	739	(const unsigned char *)str, len >= 0 ? len : strlen (str));
863	}	740	}
864		741
		742	void
865	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	743	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
866	{	744	{
867	wchar_t *ws = rxvt_mbstowcs (str, len);	745	wchar_t *ws = rxvt_mbstowcs (str, len);
868	char *s = rxvt_wcstoutf8 (ws);	746	char *s = rxvt_wcstoutf8 (ws);
869		747
870	XChangeProperty (dpy, parent[0],	748	XChangeProperty (dpy, parent[0],
…		…
894	#if ENABLE_EWMH	772	#if ENABLE_EWMH
895	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	773	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
896	#endif	774	#endif
897	}	775	}
898		776
		777	void
		778	rxvt_term::set_window_color (int idx, const char *color)
		779	{
899	#ifdef XTERM_COLOR_CHANGE	780	#ifdef XTERM_COLOR_CHANGE
900	void
901	rxvt_term::set_window_color (int idx, const char *color)
902	{
903	rxvt_color xcol;	781	rxvt_color xcol;
904	int i;	782
905
906	if (color == NULL \|\| *color == '\0')	783	if (color == NULL \|\| *color == '\0')
907	return;	784	return;
908		785
909	color = strdup (color);	786	color = strdup (color);
910	allocated.push_back ((void *)color);	787	allocated.push_back ((void *)color);
911	rs[Rs_color + idx] = color;	788	rs[Rs_color + idx] = color;
912		789
913	/* handle color aliases */	790	/* handle color aliases */
914	if (isdigit (*color))	791	if (isdigit (*color))
915	{	792	{
916	i = atoi (color);	793	int i = atoi (color);
917		794
918	if (i >= 8 && i <= 15)	795	if (i >= 8 && i <= 15)
		796	{
919	{ /* bright colors */	797	/* bright colors */
920	i -= 8;
921	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	798	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
922	goto done;	799	goto done;
923	}	800	}
924		801
925	if (i >= 0 && i <= 7)	802	if (i >= 0 && i <= 7)
		803	{
926	{ /* normal colors */	804	/* normal colors */
927	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	805	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
928	goto done;	806	goto done;
929	}	807	}
930	}	808	}
931		809
…		…
936	* so just keep gobbling up the colormap	814	* so just keep gobbling up the colormap
937	*/	815	*/
938		816
939	pix_colors_focused[idx] = xcol;	817	pix_colors_focused[idx] = xcol;
940		818
941	/* XSetWindowAttributes attr; */
942	/* Cursor cursor; */
943	done:	819	done:
944	/TODO: handle Color_BD, scrollbar background, etc. /	820	/TODO: handle Color_BD, scrollbar background, etc. /
945		821
946	update_fade_color (idx);	822	update_fade_color (idx);
947	recolour_cursor ();	823	recolour_cursor ();
948	scr_recolour ();	824	scr_recolour ();
		825	#endif /* XTERM_COLOR_CHANGE */
949	}	826	}
950
951	#else
952	# define set_window_color (idx,color) ((void)0)
953	#endif /* XTERM_COLOR_CHANGE */
954		827
955	void	828	void
956	rxvt_term::recolour_cursor ()	829	rxvt_term::recolour_cursor ()
957	{	830	{
958	XColor fg, bg;	831	XColor fg, bg;
…		…
974	*/	847	*/
975	void	848	void
976	rxvt_term::set_colorfgbg ()	849	rxvt_term::set_colorfgbg ()
977	{	850	{
978	unsigned int i;	851	unsigned int i;
979	const char *xpmb = "\0";	852	const char *xpmb = "";
980	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	853	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
981		854
982	strcpy (fstr, "default");	855	strcpy (fstr, "default");
983	strcpy (bstr, "default");	856	strcpy (bstr, "default");
984	for (i = Color_Black; i <= Color_White; i++)	857	for (i = Color_Black; i <= Color_White; i++)
…		…
990		863
991	for (i = Color_Black; i <= Color_White; i++)	864	for (i = Color_Black; i <= Color_White; i++)
992	if (pix_colors[Color_bg] == pix_colors[i])	865	if (pix_colors[Color_bg] == pix_colors[i])
993	{	866	{
994	sprintf (bstr, "%d", (i - Color_Black));	867	sprintf (bstr, "%d", (i - Color_Black));
995	#ifdef XPM_BACKGROUND	868	#ifdef BG_IMAGE_FROM_FILE
996	xpmb = "default;";	869	xpmb = "default;";
997	#endif	870	#endif
998	break;	871	break;
999	}	872	}
1000		873
…		…
1085	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	958	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1086		959
1087	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	960	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1088	{	961	{
1089	if (scrollBar.state)	962	if (scrollBar.state)
1090	{	963	scrollBar.resize ();
1091	XMoveResizeWindow (dpy, scrollBar.win,
1092	window_sb_x, 0,
1093	scrollbar_TotalWidth (), szHint.height);
1094	resize_scrollbar ();
1095	}
1096		964
1097	XMoveResizeWindow (dpy, vt,	965	XMoveResizeWindow (dpy, vt,
1098	window_vt_x, window_vt_y,	966	window_vt_x, window_vt_y,
1099	width, height);	967	width, height);
1100		968
		969	#ifdef HAVE_BG_PIXMAP
		970	if (bgPixmap.window_size_sensitive ())
		971	update_background ();
		972	#endif
		973
1101	scr_clear ();	974	scr_clear ();
1102	#ifdef XPM_BACKGROUND
1103	resize_pixmap ();
1104	#endif
1105	}	975	}
1106		976
1107	if (fix_screen \|\| old_height == 0)	977	if (fix_screen \|\| old_height == 0)
1108	scr_reset ();	978	scr_reset ();
1109		979
1110	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version	980	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1111	//scr_touch (false);	981	//scr_touch (false);
1112		982
1113	#ifdef XPM_BACKGROUND	983	#ifdef HAVE_BG_PIXMAP
1114	if (pixmap)	984	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
		985	// if (bgPixmap.pixmap)
1115	scr_touch (false);	986	// scr_touch (false);
1116	#endif	987	#endif
1117		988
1118	#ifdef USE_XIM	989	#ifdef USE_XIM
1119	IMSetPosition ();	990	IMSetPosition ();
1120	#endif	991	#endif
…		…
1291	if (term->rs[Rs_imLocale])	1162	if (term->rs[Rs_imLocale])
1292	SET_LOCALE (term->locale);	1163	SET_LOCALE (term->locale);
1293	}	1164	}
1294	else	1165	else
1295	str = (void *)text->string.wide_char;	1166	str = (void *)text->string.wide_char;
1296		1167
1297	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1168	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1298	DT_INT, call_data->caret,	1169	DT_INT, call_data->caret,
1299	DT_INT, call_data->chg_first,	1170	DT_INT, call_data->chg_first,
1300	DT_INT, call_data->chg_length,	1171	DT_INT, call_data->chg_length,
1301	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1172	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1620		1491
1621	if (input_style & XIMPreeditPosition)	1492	if (input_style & XIMPreeditPosition)
1622	{	1493	{
1623	im_set_size (preedit_rect);	1494	im_set_size (preedit_rect);
1624	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1495	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1625		1496
1626	XSetICValues (Input_Context,	1497	XSetICValues (Input_Context,
1627	XNPreeditAttributes, preedit_attr, NULL);	1498	XNPreeditAttributes, preedit_attr, NULL);
1628	}	1499	}
1629	else	1500	else
1630	{	1501	{
…		…
1647	XFree (status_attr);	1518	XFree (status_attr);
1648	}	1519	}
1649		1520
1650	XFree (preedit_attr);	1521	XFree (preedit_attr);
1651	}	1522	}
1652	#endif /* USE_XIM */	1523	#endif /* USE_XIM */
		1524
		1525	void
		1526	rxvt_term::get_window_origin (int &x, int &y)
		1527	{
		1528	Window cr;
		1529	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1530	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
		1531	}
		1532
		1533	Pixmap
		1534	rxvt_term::get_pixmap_property (int prop_id)
		1535	{
		1536	if (prop_id > 0 && prop_id < NUM_XA)
		1537	if (xa[prop_id])
		1538	{
		1539	int aformat;
		1540	unsigned long nitems, bytes_after;
		1541	Atom atype;
		1542	unsigned char *prop = NULL;
		1543	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1544	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1545	&nitems, &bytes_after, &prop);
		1546	if (result == Success && prop && atype == XA_PIXMAP)
		1547	return (Pixmap )prop;
		1548	}
		1549
		1550	return None;
		1551	}
		1552
		1553	#ifdef HAVE_BG_PIXMAP
		1554	# if TRACE_PIXMAPS
		1555	# undef update_background
		1556	void
		1557	rxvt_term::trace_update_background (const char *file, int line)
		1558	{
		1559	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1560	update_background ();
		1561	}
		1562	# endif
		1563
		1564	void
		1565	rxvt_term::update_background ()
		1566	{
		1567	if (update_background_ev.is_active ())
		1568	return;
		1569
		1570	bgPixmap.invalidate ();
		1571
		1572	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
		1573
		1574	if (to_wait <= 0.)
		1575	bgPixmap.render ();
		1576	else
		1577	update_background_ev.start (to_wait);
		1578	}
		1579
		1580	void
		1581	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1582	{
		1583	make_current ();
		1584
		1585	update_background_ev.stop ();
		1586	bgPixmap.render ();
		1587	refresh_check ();
		1588	}
		1589
		1590	#endif /* HAVE_BG_PIXMAP */
1653		1591
1654	/----------------------- end-of-file (C source) -----------------------/	1592	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.226 by root, Thu Jul 6 23:48:11 2006 UTC vs. Revision 1.309 by root, Wed Feb 27 01:02:33 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.226 by root, Thu Jul 6 23:48:11 2006 UTC vs.
Revision 1.309 by root, Wed Feb 27 01:02:33 2008 UTC