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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.290 by ayin, Tue Dec 18 12:52:30 2007 UTC vs.
Revision 1.330 by sf-exg, Mon Jul 26 09:57:53 2010 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-2007 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.
…		…
35	#include "keyboard.h"	35	#include "keyboard.h"
36	#include "rxvtperl.h"	36	#include "rxvtperl.h"
37		37
38	#include <limits>	38	#include <limits>
39		39
		40	#include <cassert>
40	#include <csignal>	41	#include <csignal>
41	#include <cstring>	42	#include <cstring>
42		43
43	#include <termios.h>	44	#include <termios.h>
44		45
…		…
101	{	102	{
102	if (cc->c2 == c2) return c1;	103	if (cc->c2 == c2) return c1;
103	cc = (*this)[cc->c1];	104	cc = (*this)[cc->c1];
104	}	105	}
105		106
106	// check to see wether this combination already exists otherwise	107	// check to see whether this combination already exists otherwise
107	for (cc = v.end (); cc-- > v.begin (); )	108	for (cc = v.end (); cc-- > v.begin (); )
108	{	109	{
109	if (cc->c1 == c1 && cc->c2 == c2)	110	if (cc->c1 == c1 && cc->c2 == c2)
110	return COMPOSE_LO + (cc - v.begin ());	111	return COMPOSE_LO + (cc - v.begin ());
111	}	112	}
…		…
170	#endif	171	#endif
171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	172	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);	173	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173	#endif	174	#endif
174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	175	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
175	rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	176	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176	#endif	177	#endif
177	#ifdef HAVE_SCROLLBARS
178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179	#endif
180	#ifdef USE_XIM	179	#ifdef USE_XIM
181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),	180	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182	#endif	181	#endif
183	#ifdef POINTER_BLANK	182	#ifdef POINTER_BLANK
184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);	183	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
…		…
226	if (fontset[i] != fontset[0])	225	if (fontset[i] != fontset[0])
227	delete fontset[i];	226	delete fontset[i];
228	#endif	227	#endif
229	delete fontset[0];	228	delete fontset[0];
230		229
		230	#ifdef HAVE_BG_PIXMAP
		231	bgPixmap.destroy ();
		232	#endif
		233	#ifdef HAVE_AFTERIMAGE
		234	if (asv)
		235	destroy_asvisual (asv, 0);
		236	if (asimman)
		237	destroy_image_manager (asimman, 0);
		238	#endif
		239
231	if (display)	240	if (display)
232	{	241	{
233	selection_clear ();	242	selection_clear ();
		243	selection_clear (true);
234		244
235	#ifdef USE_XIM	245	#ifdef USE_XIM
236	im_destroy ();	246	im_destroy ();
237	#endif	247	#endif
238	#ifdef XTERM_SCROLLBAR	248	scrollBar.destroy ();
239	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
240	if (ShadowGC) XFreeGC (dpy, ShadowGC);
241	#endif
242	#ifdef PLAIN_SCROLLBAR
243	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
244	#endif
245	#ifdef NEXT_SCROLLBAR
246	if (blackGC) XFreeGC (dpy, blackGC);
247	if (whiteGC) XFreeGC (dpy, whiteGC);
248	if (grayGC) XFreeGC (dpy, grayGC);
249	if (darkGC) XFreeGC (dpy, darkGC);
250	if (stippleGC) XFreeGC (dpy, stippleGC);
251	if (dimple) XFreePixmap (dpy, dimple);
252	if (upArrow) XFreePixmap (dpy, upArrow);
253	if (downArrow) XFreePixmap (dpy, downArrow);
254	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
255	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
256	#endif
257	#ifdef RXVT_SCROLLBAR
258	if (topShadowGC) XFreeGC (dpy, topShadowGC);
259	if (botShadowGC) XFreeGC (dpy, botShadowGC);
260	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
261	#endif
262	if (gc) XFreeGC (dpy, gc);	249	if (gc) XFreeGC (dpy, gc);
263		250
264	delete drawable;	251	delete drawable;
265	// destroy all windows	252	// destroy all windows
266	if (parent[0])	253	if (parent[0])
…		…
274	pix_colors_unfocused [i].free (this);	261	pix_colors_unfocused [i].free (this);
275	#endif	262	#endif
276	}	263	}
277		264
278	clear ();	265	clear ();
279	}
280		266
281	delete [] pix_colors_focused;
282	#if OFF_FOCUS_FADING
283	delete [] pix_colors_unfocused;
284	#endif
285
286	#ifdef HAVE_BG_PIXMAP
287	bgPixmap.destroy ();
288	#endif
289	display->flush (); /* ideally .put should do this */	267	display->flush (); /* ideally .put should do this */
290	displays.put (display);	268	displays.put (display);
		269	}
291		270
292	scr_release ();	271	scr_release ();
293		272
294	/* clear all resources */	273	/* clear all resources */
295	for (int i = 0; i < allocated.size (); i++)	274	for (int i = 0; i < allocated.size (); i++)
296	free (allocated [i]);	275	free (allocated [i]);
297		276
298	free (selection.text);	277	free (selection.text);
		278	free (selection.clip_text);
299	// TODO: manage env vars in child only(!)	279	// TODO: manage env vars in child only(!)
300	free (env_display);	280	free (env_display);
301	free (env_term);	281	free (env_term);
302	free (locale);	282	free (locale);
303	free (v_buffer);	283	free (v_buffer);
…		…
341	if (display)	321	if (display)
342	{	322	{
343	#if USE_XIM	323	#if USE_XIM
344	im_ev.stop (display);	324	im_ev.stop (display);
345	#endif	325	#endif
346	#if HAVE_SCROLLBARS
347	scrollbar_ev.stop (display);	326	scrollbar_ev.stop (display);
348	#endif
349	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	327	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
350	rootwin_ev.stop (display);	328	rootwin_ev.stop (display);
351	#endif	329	#endif
352	incr_ev.stop ();	330	incr_ev.stop ();
353	termwin_ev.stop (display);	331	termwin_ev.stop (display);
…		…
405	char mesg[BUFSIZ];	383	char mesg[BUFSIZ];
406	char number[32];	384	char number[32];
407	char *mtype = "XlibMessage";	385	char *mtype = "XlibMessage";
408	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	386	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
409	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	387	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
410	rxvt_warn ("An X Error occured, trying to continue after report.\n");	388	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
411	rxvt_warn ("%s: %s\n", mesg, buffer);	389	rxvt_warn ("%s: %s\n", mesg, buffer);
412	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	390	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
413	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	391	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
414	sprintf(number, "%d", event->request_code);	392	sprintf(number, "%d", event->request_code);
415	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	393	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
416	rxvt_warn ("(which is %s)\n", buffer);	394	rxvt_warn ("(which is %s)\n", buffer);
417	if (event->request_code >= 128) {	395	if (event->request_code >= 128) {
418	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	396	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
419	mesg, BUFSIZ);	397	mesg, BUFSIZ);
420	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	398	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
421	}	399	}
422	if ((event->error_code == BadWindow) \|\|	400	if ((event->error_code == BadWindow) \|\|
423	(event->error_code == BadPixmap) \|\|	401	(event->error_code == BadPixmap) \|\|
424	(event->error_code == BadCursor) \|\|	402	(event->error_code == BadCursor) \|\|
425	(event->error_code == BadFont) \|\|	403	(event->error_code == BadFont) \|\|
426	(event->error_code == BadDrawable) \|\|	404	(event->error_code == BadDrawable) \|\|
427	(event->error_code == BadColor) \|\|	405	(event->error_code == BadColor) \|\|
428	(event->error_code == BadGC) \|\|	406	(event->error_code == BadGC) \|\|
429	(event->error_code == BadIDChoice) \|\|	407	(event->error_code == BadIDChoice) \|\|
430	(event->error_code == BadValue) \|\|	408	(event->error_code == BadValue) \|\|
431	(event->error_code == BadAtom)) {	409	(event->error_code == BadAtom)) {
432	if (event->error_code == BadValue)	410	if (event->error_code == BadValue)
433	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	411	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
434	mesg, BUFSIZ);	412	mesg, BUFSIZ);
435	else if (event->error_code == BadAtom)	413	else if (event->error_code == BadAtom)
436	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	414	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
437	mesg, BUFSIZ);	415	mesg, BUFSIZ);
438	else	416	else
439	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	417	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
440	mesg, BUFSIZ);	418	mesg, BUFSIZ);
441	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	419	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
442	}	420	}
443	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	421	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
444	mesg, BUFSIZ);	422	mesg, BUFSIZ);
445	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	423	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
446	}	424	}
447	#endif	425	#endif
448		426
449	int	427	int
…		…
472	DisplayString (display));	450	DisplayString (display));
473	rxvt_emergency_cleanup ();	451	rxvt_emergency_cleanup ();
474	_exit (EXIT_FAILURE);	452	_exit (EXIT_FAILURE);
475	}	453	}
476		454
477	/----------------------------------------------------------------------/
478	void
479	rxvt_term::init (int argc, const char const argv, stringvec *envv)
480	{
481	this->envv = envv;
482
483	SET_R (this);
484	set_locale ("");
485	set_environ (envv); // few things in X do not call setlocale :(
486
487	init_vars ();
488
489	init_secondary ();
490
491	const char **cmd_argv = init_resources (argc, argv);
492
493	#ifdef KEYSYM_RESOURCE
494	keyboard->register_done ();
495	#endif
496
497	#ifdef HAVE_SCROLLBARS
498	if (option (Opt_scrollBar))
499	scrollBar.setIdle (); /* set existence for size calculations */
500	#endif
501
502	pty = ptytty::create ();
503
504	create_windows (argc, argv);
505
506	init_xlocale ();
507
508	scr_reset (); // initialize screen
509
510	#if 0
511	XSynchronize (dpy, True);
512	#endif
513
514	#ifdef HAVE_SCROLLBARS
515	if (option (Opt_scrollBar))
516	resize_scrollbar (); /* create and map scrollbar */
517	#endif
518	#ifdef HAVE_BG_PIXMAP
519	{
520	bgPixmap.set_target (this);
521
522	#ifdef ENABLE_TRANSPARENCY
523	if (option (Opt_transparent))
524	{
525	bgPixmap.set_transparent ();
526	#ifdef HAVE_AFTERIMAGE
527	if (rs [Rs_blurradius])
528	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
529	#endif
530	if (ISSET_PIXCOLOR (Color_tint))
531	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
532	if (rs [Rs_shade])
533	bgPixmap.set_shade (rs [Rs_shade]);
534
535	bgPixmap.set_root_pixmap ();
536	XSelectInput (dpy, display->root, PropertyChangeMask);
537	rootwin_ev.start (display, display->root);
538	}
539	#endif
540
541	#ifdef BG_IMAGE_FROM_FILE
542	if (rs[Rs_backgroundPixmap] != NULL)
543	{
544	const char *p = rs[Rs_backgroundPixmap];
545
546	if ((p = strchr (p, ';')) != NULL)
547	{
548	p++;
549	bgPixmap.set_geometry (p);
550	}
551	else
552	bgPixmap.set_defaultGeometry ();
553
554	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
555	if (!bgPixmap.window_position_sensitive ())
556	update_background ();
557	}
558	#endif
559	}
560	#endif
561
562	#if ENABLE_PERL
563	rootwin_ev.start (display, display->root);
564	#endif
565
566	set_colorfgbg ();
567
568	init_command (cmd_argv);
569
570	free (cmd_argv);
571
572	if (pty->pty >= 0)
573	pty_ev.start (pty->pty, ev::READ);
574
575	HOOK_INVOKE ((this, HOOK_START, DT_END));
576
577	#if ENABLE_XEMBED
578	if (rs[Rs_embed])
579	{
580	long info[2] = { 0, XEMBED_MAPPED };
581
582	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
583	32, PropModeReplace, (unsigned char *)&info, 2);
584	}
585	#endif
586
587	XMapWindow (dpy, vt);
588	XMapWindow (dpy, parent[0]);
589	}
590
591	static struct sig_handlers	455	static struct sig_handlers
592	{	456	{
593	ev::sig sw_term, sw_int;	457	ev::sig sw_term, sw_int;
594		458
595	/*	459	/*
…		…
615	char **rxvt_environ; // startup environment	479	char **rxvt_environ; // startup environment
616		480
617	void	481	void
618	rxvt_init ()	482	rxvt_init ()
619	{	483	{
		484	assert (("fontMask must not overlap other RS masks",
		485	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));
		486
620	ptytty::init ();	487	ptytty::init ();
621		488
622	if (!ev_default_loop (0))	489	if (!ev_default_loop (0))
623	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	490	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
624		491
…		…
627	signal (SIGHUP, SIG_IGN);	494	signal (SIGHUP, SIG_IGN);
628	signal (SIGPIPE, SIG_IGN);	495	signal (SIGPIPE, SIG_IGN);
629		496
630	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	497	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
631	sig_handlers.sw_int.start (SIGINT); ev_unref ();	498	sig_handlers.sw_int.start (SIGINT); ev_unref ();
632
633	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
634	/* signal (SIGURG, SIG_DFL); */
635		499
636	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	500	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
637	// TODO: handle this with exceptions and tolerate the memory loss	501	// TODO: handle this with exceptions and tolerate the memory loss
638	XSetIOErrorHandler (rxvt_xioerror_handler);	502	XSetIOErrorHandler (rxvt_xioerror_handler);
639		503
…		…
647	*/	511	*/
648	void	512	void
649	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	513	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
650	{	514	{
651	short recalc_x, recalc_y;	515	short recalc_x, recalc_y;
652	int x, y, sb_w, flags;	516	int x, y, flags;
653	unsigned int w, h;	517	unsigned int w, h;
654	unsigned int max_width, max_height;	518	unsigned int max_width, max_height;
655		519
656	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	520	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
657	szHint.win_gravity = NorthWestGravity;	521	szHint.win_gravity = NorthWestGravity;
…		…
667	if (rs[Rs_geometry])	531	if (rs[Rs_geometry])
668	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	532	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
669		533
670	if (flags & WidthValue)	534	if (flags & WidthValue)
671	{	535	{
		536	if (!w)
		537	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		538
672	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	539	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
673	szHint.flags \|= USSize;	540	szHint.flags \|= USSize;
674	}	541	}
675		542
676	if (flags & HeightValue)	543	if (flags & HeightValue)
677	{	544	{
		545	if (!h)
		546	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		547
678	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	548	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
679	szHint.flags \|= USSize;	549	szHint.flags \|= USSize;
680	}	550	}
681		551
682	if (flags & XValue)	552	if (flags & XValue)
683	{	553	{
…		…
714	max_width = MAX_COLS * fwidth;	584	max_width = MAX_COLS * fwidth;
715	max_height = MAX_ROWS * fheight;	585	max_height = MAX_ROWS * fheight;
716		586
717	szHint.base_width = szHint.base_height = 2 * int_bwidth;	587	szHint.base_width = szHint.base_height = 2 * int_bwidth;
718		588
719	sb_w = 0;
720	window_vt_x = window_vt_y = int_bwidth;	589	window_vt_x = window_vt_y = int_bwidth;
721		590
722	if (scrollBar.state)	591	if (scrollBar.state)
723	{	592	{
724	sb_w = scrollbar_TotalWidth ();	593	int sb_w = scrollBar.total_width ();
725	szHint.base_width += sb_w;	594	szHint.base_width += sb_w;
726		595
727	if (!option (Opt_scrollBar_right))	596	if (!option (Opt_scrollBar_right))
728	window_vt_x += sb_w;	597	window_vt_x += sb_w;
729	}	598	}
…		…
753	{	622	{
754	min_it (height, max_height);	623	min_it (height, max_height);
755	szHint.height = szHint.base_height + height;	624	szHint.height = szHint.base_height + height;
756	}	625	}
757		626
758	if (scrollBar.state && option (Opt_scrollBar_right))
759	window_sb_x = szHint.width - sb_w;
760
761	if (recalc_x)	627	if (recalc_x)
762	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	628	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
763		629
764	if (recalc_y)	630	if (recalc_y)
765	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	631	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
766		632
767	ncol = width / fwidth;	633	ncol = width / fwidth;
768	nrow = height / fheight;	634	nrow = height / fheight;
769	}	635	}
770		636
771	/----------------------------------------------------------------------/	637	/----------------------------------------------------------------------/
772	/*	638	/*
…		…
783		649
784	ws.ws_col = ncol;	650	ws.ws_col = ncol;
785	ws.ws_row = nrow;	651	ws.ws_row = nrow;
786	ws.ws_xpixel = width;	652	ws.ws_xpixel = width;
787	ws.ws_ypixel = height;	653	ws.ws_ypixel = height;
788	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	654	ioctl (pty->pty, TIOCSWINSZ, &ws);
789		655
790	#if 0	656	#if 0
791	// TIOCSWINSZ is supposed to do this automatically and correctly	657	// TIOCSWINSZ is supposed to do this automatically and correctly
792	if (cmd_pid) /* force through to the command */	658	if (cmd_pid) /* force through to the command */
793	kill (-cmd_pid, SIGWINCH);	659	kill (-cmd_pid, SIGWINCH);
…		…
823	#endif	689	#endif
824		690
825	delete fontset[0];	691	delete fontset[0];
826	fontset[0] = fs;	692	fontset[0] = fs;
827		693
828	prop = (*fs)[1]->properties ();	694	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
829	prop.height += lineSpace;	695	prop.height += lineSpace;
		696	prop.width += letterSpace;
830		697
831	fs->set_prop (prop, false);	698	fs->set_prop (prop, false);
832		699
833	fwidth = prop.width;	700	fwidth = prop.width;
834	fheight = prop.height;	701	fheight = prop.height;
…		…
884	prop, XA_STRING, 8, PropModeReplace,	751	prop, XA_STRING, 8, PropModeReplace,
885	(const unsigned char *)str, len >= 0 ? len : strlen (str));	752	(const unsigned char *)str, len >= 0 ? len : strlen (str));
886	}	753	}
887		754
888	void	755	void
		756	rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
		757	{
		758	XTextProperty ct;
		759
		760	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
		761	{
		762	XSetTextProperty (dpy, parent[0], &ct, prop);
		763	XFree (ct.value);
		764	}
		765	}
		766
		767	void
889	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	768	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
890	{	769	{
891	wchar_t *ws = rxvt_mbstowcs (str, len);	770	wchar_t *ws = rxvt_mbstowcs (str, len);
892	char *s = rxvt_wcstoutf8 (ws);	771	char *s = rxvt_wcstoutf8 (ws);
893		772
…		…
903	/----------------------------------------------------------------------/	782	/----------------------------------------------------------------------/
904	/* xterm sequences - title, iconName, color (exptl) */	783	/* xterm sequences - title, iconName, color (exptl) */
905	void	784	void
906	rxvt_term::set_title (const char *str)	785	rxvt_term::set_title (const char *str)
907	{	786	{
908	set_string_property (XA_WM_NAME, str);	787	set_mbstring_property (XA_WM_NAME, str);
909	#if ENABLE_EWMH	788	#if ENABLE_EWMH
910	set_utf8_property (xa[XA_NET_WM_NAME], str);	789	set_utf8_property (xa[XA_NET_WM_NAME], str);
911	#endif	790	#endif
912	}	791	}
913		792
914	void	793	void
915	rxvt_term::set_icon_name (const char *str)	794	rxvt_term::set_icon_name (const char *str)
916	{	795	{
917	set_string_property (XA_WM_ICON_NAME, str);	796	set_mbstring_property (XA_WM_ICON_NAME, str);
918	#if ENABLE_EWMH	797	#if ENABLE_EWMH
919	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	798	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
920	#endif	799	#endif
921	}	800	}
922		801
923	void	802	void
924	rxvt_term::set_window_color (int idx, const char *color)	803	rxvt_term::set_window_color (int idx, const char *color)
925	{	804	{
926	#ifdef XTERM_COLOR_CHANGE	805	#ifdef XTERM_COLOR_CHANGE
927	rxvt_color xcol;	806	rxvt_color xcol;
928	int i;
929		807
930	if (color == NULL \|\| *color == '\0')	808	if (color == NULL \|\| *color == '\0')
931	return;	809	return;
932		810
933	color = strdup (color);	811	color = strdup (color);
…		…
935	rs[Rs_color + idx] = color;	813	rs[Rs_color + idx] = color;
936		814
937	/* handle color aliases */	815	/* handle color aliases */
938	if (isdigit (*color))	816	if (isdigit (*color))
939	{	817	{
940	i = atoi (color);	818	int i = atoi (color);
941		819
942	if (i >= 8 && i <= 15)	820	if (i >= 8 && i <= 15)
943	{	821	{
944	/* bright colors */	822	/* bright colors */
945	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	823	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
…		…
1049	int old_width = szHint.width;	927	int old_width = szHint.width;
1050	int old_height = szHint.height;	928	int old_height = szHint.height;
1051		929
1052	window_calc (newwidth, newheight);	930	window_calc (newwidth, newheight);
1053		931
1054	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	932	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		933
		934	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		935	if (set_hint)
		936	{
		937	szHint.flags &= ~(PBaseSize \| PResizeInc);
1055	XSetWMNormalHints (dpy, parent[0], &szHint);	938	XSetWMNormalHints (dpy, parent[0], &szHint);
		939	szHint.flags \|= PBaseSize \| PResizeInc;
		940	}
1056		941
1057	if (!ignoreparent)	942	if (!ignoreparent)
1058	{	943	{
1059	#ifdef SMART_RESIZE	944	#ifdef SMART_RESIZE
1060	/*	945	/*
…		…
1100	#else	985	#else
1101	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	986	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1102	#endif	987	#endif
1103	}	988	}
1104		989
		990	if (set_hint)
		991	XSetWMNormalHints (dpy, parent[0], &szHint);
		992
1105	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	993	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1106		994
1107	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	995	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1108	{	996	{
1109	if (scrollBar.state)	997	if (scrollBar.state)
1110	{	998	scrollBar.resize ();
1111	XMoveResizeWindow (dpy, scrollBar.win,
1112	window_sb_x, 0,
1113	scrollbar_TotalWidth (), szHint.height);
1114	resize_scrollbar ();
1115	}
1116		999
1117	XMoveResizeWindow (dpy, vt,	1000	XMoveResizeWindow (dpy, vt,
1118	window_vt_x, window_vt_y,	1001	window_vt_x, window_vt_y,
1119	width, height);	1002	width, height);
1120		1003
1121	#ifdef HAVE_BG_PIXMAP	1004	#ifdef HAVE_BG_PIXMAP
1122	if (bgPixmap.window_size_sensitive ())	1005	if (bgPixmap.window_size_sensitive ())
1123	update_background ();	1006	update_background ();
1124	#endif	1007	#endif
1125
1126	scr_clear ();
1127	}	1008	}
1128		1009
1129	if (fix_screen \|\| old_height == 0)	1010	if (fix_screen \|\| old_height == 0)
1130	scr_reset ();	1011	scr_reset ();
1131
1132	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1133	//scr_touch (false);
1134		1012
1135	#ifdef HAVE_BG_PIXMAP	1013	#ifdef HAVE_BG_PIXMAP
1136	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?	1014	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1137	// if (bgPixmap.pixmap)	1015	// if (bgPixmap.pixmap)
1138	// scr_touch (false);	1016	// scr_touch (false);
…		…
1210		1088
1211	/* Checking whether input method is running. */	1089	/* Checking whether input method is running. */
1212	bool	1090	bool
1213	rxvt_term::IMisRunning ()	1091	rxvt_term::IMisRunning ()
1214	{	1092	{
1215	char *p;
1216	Atom atom;	1093	Atom atom;
1217	Window win;	1094	Window win;
1218	char server[IMBUFSIZ];	1095	char server[IMBUFSIZ];
1219		1096
1220	/* get current locale modifier */	1097	/* get current locale modifier */
1221	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1098	if (char *p = XSetLocaleModifiers (0))
1222	{	1099	{
1223	strcpy (server, "@server=");	1100	strcpy (server, "@server=");
1224	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1101	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1225		1102
1226	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1103	if (p = strchr (server + 1, '@')) /* first one only */
1227	*p = '\0';	1104	*p = '\0';
1228		1105
1229	atom = XInternAtom (dpy, server, False);	1106	atom = XInternAtom (dpy, server, False);
1230	win = XGetSelectionOwner (dpy, atom);	1107	win = XGetSelectionOwner (dpy, atom);
1231		1108
…		…
1298		1175
1299	term->make_current ();	1176	term->make_current ();
1300		1177
1301	if (text)	1178	if (text)
1302	{	1179	{
1303	void *str;	1180	wchar_t *str;
1304		1181
1305	if (!text->encoding_is_wchar && text->string.multi_byte)	1182	if (!text->encoding_is_wchar && text->string.multi_byte)
1306	{	1183	{
1307	// of course, X makes it ugly again	1184	// of course, X makes it ugly again
1308	if (term->rs[Rs_imLocale])	1185	if (term->rs[Rs_imLocale])
1309	SET_LOCALE (term->rs[Rs_imLocale]);	1186	SET_LOCALE (term->rs[Rs_imLocale]);
1310		1187
1311	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1188	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1312	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1189	mbstowcs (str, text->string.multi_byte, text->length + 1);
1313		1190
1314	if (term->rs[Rs_imLocale])	1191	if (term->rs[Rs_imLocale])
1315	SET_LOCALE (term->locale);	1192	SET_LOCALE (term->locale);
1316	}	1193	}
1317	else	1194	else
1318	str = (void *)text->string.wide_char;	1195	str = text->string.wide_char;
1319		1196
1320	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1197	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1321	DT_INT, call_data->caret,	1198	DT_INT, call_data->caret,
1322	DT_INT, call_data->chg_first,	1199	DT_INT, call_data->chg_first,
1323	DT_INT, call_data->chg_length,	1200	DT_INT, call_data->chg_length,
…		…
1694	unsigned char *prop = NULL;	1571	unsigned char *prop = NULL;
1695	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1572	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1696	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1573	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1697	&nitems, &bytes_after, &prop);	1574	&nitems, &bytes_after, &prop);
1698	if (result == Success && prop && atype == XA_PIXMAP)	1575	if (result == Success && prop && atype == XA_PIXMAP)
1699	{
1700	return (Pixmap )prop;	1576	return (Pixmap )prop;
1701	}
1702	}	1577	}
		1578
1703	return None;	1579	return None;
1704	}	1580	}
1705		1581
1706	#ifdef HAVE_BG_PIXMAP	1582	#ifdef HAVE_BG_PIXMAP
1707	# if TRACE_PIXMAPS	1583	# if TRACE_PIXMAPS
1708	# undef update_background	1584	# undef update_background
		1585	void
1709	int rxvt_term::trace_update_background (const char *file, int line)	1586	rxvt_term::trace_update_background (const char *file, int line)
1710	{	1587	{
1711	fprintf (stderr, "%s:%d:update_background()\n", file, line);	1588	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1712	update_background ();	1589	update_background ();
1713	}	1590	}
1714	# endif	1591	# endif
1715		1592
1716	int	1593	void
1717	rxvt_term::update_background ()	1594	rxvt_term::update_background ()
1718	{	1595	{
		1596	if (update_background_ev.is_active ())
		1597	return;
		1598
1719	bgPixmap.invalidate ();	1599	bgPixmap.invalidate ();
1720		1600
1721	/* no chance of real time refresh if we are blurring! */	1601	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1722	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1602
		1603	if (to_wait <= 0.)
1723	bgPixmap.render ();	1604	bgPixmap.render ();
1724	else	1605	else
1725	{
1726	ev_tstamp refresh;
1727	update_background_ev.stop ();
1728
1729	if (!bgPixmap.need_client_side_rendering ())
1730	refresh = .05;
1731	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1732	refresh = .20; /* very slow !!! */
1733	else
1734	refresh = .07;
1735	update_background_ev.start (refresh);	1606	update_background_ev.start (to_wait);
1736	}
1737
1738	return 0;
1739	}	1607	}
1740		1608
1741	void	1609	void
1742	rxvt_term::update_background_cb (ev::timer &w, int revents)	1610	rxvt_term::update_background_cb (ev::timer &w, int revents)
1743	{	1611	{
1744	make_current ();	1612	make_current ();
		1613
		1614	update_background_ev.stop ();
1745	bgPixmap.render ();	1615	bgPixmap.render ();
1746	refresh_check ();	1616	refresh_check ();
1747	}	1617	}
1748		1618
1749	#endif /* HAVE_BG_PIXMAP */	1619	#endif /* HAVE_BG_PIXMAP */

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.290 by ayin, Tue Dec 18 12:52:30 2007 UTC vs. Revision 1.330 by sf-exg, Mon Jul 26 09:57:53 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.290 by ayin, Tue Dec 18 12:52:30 2007 UTC vs.
Revision 1.330 by sf-exg, Mon Jul 26 09:57:53 2010 UTC