ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.270 by elmex, Fri Jun 2 09:02:49 2006 UTC vs.
Revision 1.298 by root, Wed Jun 7 07:00:30 2006 UTC

…		…
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
		8	use Event;
8		9
9	use CFClient;	10	use CFClient;
10	use CFClient::Texture;	11	use CFClient::Texture;
11		12
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
…		…
15	our $ROOT;	16	our $ROOT;
16	our $TOOLTIP;	17	our $TOOLTIP;
17	our $BUTTON_STATE;	18	our $BUTTON_STATE;
18		19
19	our %WIDGET; # all widgets, weak-referenced	20	our %WIDGET; # all widgets, weak-referenced
		21
		22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
		23	if (!$GRAB) {
		24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		25	if (length $widget->{tooltip}) {
		26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->hide;
		28
		29	$TOOLTIP->{owner} = $widget;
		30
		31	return if $ENV{CFPLUS_DEBUG} & 8;
		32
		33	my $tip = $widget->{tooltip};
		34
		35	$tip = $tip->($widget) if CODE:: eq ref $tip;
		36
		37	$TOOLTIP->set_tooltip_from ($widget);
		38	$TOOLTIP->show;
		39	}
		40
		41	return;
		42	}
		43	}
		44	}
		45
		46	$TOOLTIP->hide;
		47	delete $TOOLTIP->{owner};
		48	});
20		49
21	sub get_layout {	50	sub get_layout {
22	my $layout;	51	my $layout;
23		52
24	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
39	my ($layout) = @_;	68	my ($layout) = @_;
40		69
41	$LAYOUT = $layout;	70	$LAYOUT = $layout;
42	}	71	}
43		72
44	sub check_tooltip {
45	return if $ENV{CFPLUS_DEBUG} & 8;
46
47	if (!$GRAB) {
48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49	if (length $widget->{tooltip}) {
50	if ($TOOLTIP->{owner} != $widget) {
51	$TOOLTIP->hide;
52
53	$TOOLTIP->{owner} = $widget;
54
55	my $tip = $widget->{tooltip};
56
57	$tip = $tip->($widget) if CODE:: eq ref $tip;
58
59	$TOOLTIP->set_tooltip_from ($widget);
60	$TOOLTIP->show;
61	}
62
63	return;
64	}
65	}
66	}
67
68	$TOOLTIP->hide;
69	delete $TOOLTIP->{owner};
70	}
71
72	# class methods for events	73	# class methods for events
73	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
74	$FOCUS->emit (key_down => $_[0])	75	$FOCUS->emit (key_down => $_[0])
75	if $FOCUS;	76	if $FOCUS;
76	}	77	}
…		…
88	my $widget = $ROOT->find_widget ($x, $y);	89	my $widget = $ROOT->find_widget ($x, $y);
89		90
90	$GRAB = $widget;	91	$GRAB = $widget;
91	$GRAB->update if $GRAB;	92	$GRAB->update if $GRAB;
92		93
93	check_tooltip;	94	$TOOLTIP_WATCHER->cb->();
94	}	95	}
95		96
96	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
97		98
98	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
…		…
113	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
114	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
115	$grab->update if $grab;	116	$grab->update if $grab;
116	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
117		118
118	check_tooltip;	119	$TOOLTIP_WATCHER->cb->();
119	}	120	}
120	}	121	}
121		122
122	sub feed_sdl_motion_event {	123	sub feed_sdl_motion_event {
123	my ($ev) = @_;	124	my ($ev) = @_;
…		…
129	my $hover = $HOVER; $HOVER = $widget;	130	my $hover = $HOVER; $HOVER = $widget;
130		131
131	$hover->update if $hover && $hover->{can_hover};	132	$hover->update if $hover && $hover->{can_hover};
132	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
133		134
134	check_tooltip;	135	$TOOLTIP_WATCHER->start;
135	}	136	}
136		137
137	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138	if $HOVER;	139	if $HOVER;
139	}	140	}
…		…
277	delete $self->{visible};	278	delete $self->{visible};
278		279
279	undef $GRAB if $GRAB == $self;	280	undef $GRAB if $GRAB == $self;
280	undef $HOVER if $HOVER == $self;	281	undef $HOVER if $HOVER == $self;
281		282
282	CFClient::UI::check_tooltip	283	$CFClient::UI::TOOLTIP_WATCHER->cb->()
283	if $TOOLTIP->{owner} == $self;	284	if $TOOLTIP->{owner} == $self;
284		285
285	$self->focus_out;	286	$self->focus_out;
286		287
287	$self->emit (visibility_change => 0);	288	$self->emit (visibility_change => 0);
…		…
314	}	315	}
315		316
316	sub move_abs {	317	sub move_abs {
317	my ($self, $x, $y, $z) = @_;	318	my ($self, $x, $y, $z) = @_;
318		319
319	$self->{x} = List::Util::max 0, int $x;	320	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320	$self->{y} = List::Util::max 0, int $y;	321	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321	$self->{z} = $z if defined $z;	322	$self->{z} = $z if defined $z;
322		323
323	$self->update;	324	$self->update;
324	}	325	}
325		326
…		…
371	sub size_allocate {	372	sub size_allocate {
372	# nothing to be done	373	# nothing to be done
373	}	374	}
374		375
375	sub children {	376	sub children {
		377	# nop
		378	}
		379
		380	sub visible_children {
		381	$_[0]->children
376	}	382	}
377		383
378	sub set_max_size {	384	sub set_max_size {
379	my ($self, $w, $h) = @_;	385	my ($self, $w, $h) = @_;
380		386
381	delete $self->{max_w}; $self->{max_w} = $w if $w;	387	$self->{max_w} = int $w if defined $w;
382	delete $self->{max_h}; $self->{max_h} = $h if $h;	388	$self->{max_h} = int $h if defined $h;
		389
		390	$self->realloc;
383	}	391	}
384		392
385	sub set_tooltip {	393	sub set_tooltip {
386	my ($self, $tooltip) = @_;	394	my ($self, $tooltip) = @_;
387		395
…		…
392		400
393	$self->{tooltip} = $tooltip;	401	$self->{tooltip} = $tooltip;
394		402
395	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	403	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396	delete $CFClient::UI::TOOLTIP->{owner};	404	delete $CFClient::UI::TOOLTIP->{owner};
397	CFClient::UI::check_tooltip;	405	$CFClient::UI::TOOLTIP_WATCHER->cb->();
398	}	406	}
399	}	407	}
400		408
401	# translate global coordinates to local coordinate system	409	# translate global coordinates to local coordinate system
402	sub coord2local {	410	sub coord2local {
…		…
439		447
440	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	448	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441	unless $FOCUS;	449	unless $FOCUS;
442	}	450	}
443		451
444	sub mouse_motion { }	452	sub mouse_motion { 0 }
445	sub button_up { }	453	sub button_up { 0 }
446	sub key_down { }	454	sub key_down { 0 }
447	sub key_up { }	455	sub key_up { 0 }
448		456
449	sub button_down {	457	sub button_down {
450	my ($self, $ev, $x, $y) = @_;	458	my ($self, $ev, $x, $y) = @_;
451		459
452	$self->focus_in;	460	$self->focus_in;
		461
		462	0
453	}	463	}
454		464
455	sub find_widget {	465	sub find_widget {
456	my ($self, $x, $y) = @_;	466	my ($self, $x, $y) = @_;
457		467
…		…
541	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	551	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	552	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
543		553
544	glPushMatrix;	554	glPushMatrix;
545	glTranslate $self->{x}, $self->{y}, 0;	555	glTranslate $self->{x}, $self->{y}, 0;
546	$self->_draw;
547	glPopMatrix;
548		556
549	if ($self == $HOVER && $self->{can_hover}) {	557	if ($self == $HOVER && $self->{can_hover}) {
550	my ($x, $y) = @$self{qw(x y)};
551
552	glColor 1, 0.8, 0.5, 0.2;	558	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
553	glEnable GL_BLEND;	559	glEnable GL_BLEND;
554	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	560	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
555	glBegin GL_QUADS;	561	glBegin GL_QUADS;
556	glVertex $x , $y;	562	glVertex 0 , 0;
557	glVertex $x + $self->{w}, $y;	563	glVertex $self->{w}, 0;
558	glVertex $x + $self->{w}, $y + $self->{h};	564	glVertex $self->{w}, $self->{h};
559	glVertex $x , $y + $self->{h};	565	glVertex 0 , $self->{h};
560	glEnd;	566	glEnd;
561	glDisable GL_BLEND;	567	glDisable GL_BLEND;
562	}	568	}
563		569
564	if ($ENV{CFPLUS_DEBUG} & 1) {	570	if ($ENV{CFPLUS_DEBUG} & 1) {
565	glPushMatrix;	571	glPushMatrix;
566	glColor 1, 1, 0, 1;	572	glColor 1, 1, 0, 1;
567	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	573	glTranslate 0.375, 0.375;
568	glBegin GL_LINE_LOOP;	574	glBegin GL_LINE_LOOP;
569	glVertex 0 , 0;	575	glVertex 0 , 0;
570	glVertex $self->{w} - 1, 0;	576	glVertex $self->{w} - 1, 0;
571	glVertex $self->{w} - 1, $self->{h} - 1;	577	glVertex $self->{w} - 1, $self->{h} - 1;
572	glVertex 0 , $self->{h} - 1;	578	glVertex 0 , $self->{h} - 1;
573	glEnd;	579	glEnd;
574	glPopMatrix;	580	glPopMatrix;
575	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	581	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
576	}	582	}
		583
		584	$self->_draw;
		585	glPopMatrix;
577	}	586	}
578		587
579	sub _draw {	588	sub _draw {
580	my ($self) = @_;	589	my ($self) = @_;
581		590
…		…
619		628
620	if ($color && (@$color < 4 || $color->[3])) {	629	if ($color && (@$color < 4 || $color->[3])) {
621	my ($w, $h) = @$self{qw(w h)};	630	my ($w, $h) = @$self{qw(w h)};
622		631
623	glEnable GL_BLEND;	632	glEnable GL_BLEND;
624	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	633	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
625	glColor @$color;	634	glColor_premultiply @$color;
626		635
627	glBegin GL_QUADS;	636	glBegin GL_QUADS;
628	glVertex 0 , 0;	637	glVertex 0 , 0;
629	glVertex 0 , $h;	638	glVertex 0 , $h;
630	glVertex $w, $h;	639	glVertex $w, $h;
…		…
661	our @ISA = CFClient::UI::Base::;	670	our @ISA = CFClient::UI::Base::;
662		671
663	sub new {	672	sub new {
664	my ($class, %arg) = @_;	673	my ($class, %arg) = @_;
665		674
666	my $children = delete $arg{children} || [];	675	my $children = delete $arg{children};
667		676
668	my $self = $class->SUPER::new (	677	my $self = $class->SUPER::new (
669	children => [],	678	children => [],
670	can_events => 0,	679	can_events => 0,
671	%arg,	680	%arg,
672	);	681	);
		682
673	$self->add ($_) for @$children;	683	$self->add (@$children)
		684	if $children;
674		685
675	$self	686	$self
676	}	687	}
677		688
678	sub add {	689	sub add {
…		…
726	$x -= $self->{x};	737	$x -= $self->{x};
727	$y -= $self->{y};	738	$y -= $self->{y};
728		739
729	my $res;	740	my $res;
730		741
731	for (reverse @{ $self->{children} }) {	742	for (reverse $self->visible_children) {
732	$res = $_->find_widget ($x, $y)	743	$res = $_->find_widget ($x, $y)
733	and return $res;	744	and return $res;
734	}	745	}
735		746
736	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	747	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
785	$self->{children}[0]->configure (0, 0, $w, $h);	796	$self->{children}[0]->configure (0, 0, $w, $h);
786	}	797	}
787		798
788	#############################################################################	799	#############################################################################
789		800
		801	# back-buffered drawing area
		802
790	package CFClient::UI::Window;	803	package CFClient::UI::Window;
791		804
792	our @ISA = CFClient::UI::Bin::;	805	our @ISA = CFClient::UI::Bin::;
793		806
794	use CFClient::OpenGL;	807	use CFClient::OpenGL;
…		…
845	my $tex = $self->{texture}	858	my $tex = $self->{texture}
846	or return;	859	or return;
847		860
848	glEnable GL_TEXTURE_2D;	861	glEnable GL_TEXTURE_2D;
849	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
850	glColor 1, 1, 1, 1;	863	glColor 0, 0, 0, 1;
851		864
852	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	865	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
853		866
854	glDisable GL_TEXTURE_2D;	867	glDisable GL_TEXTURE_2D;
855	}	868	}
…		…
946	package CFClient::UI::ScrolledWindow;	959	package CFClient::UI::ScrolledWindow;
947		960
948	our @ISA = CFClient::UI::HBox::;	961	our @ISA = CFClient::UI::HBox::;
949		962
950	sub new {	963	sub new {
951	my $class = shift;	964	my ($class, %arg) = @_;
		965
		966	my $child = delete $arg{child};
952		967
953	my $self;	968	my $self;
954		969
955	my $slider = new CFClient::UI::Slider	970	my $slider = new CFClient::UI::Slider
956	vertical => 1,	971	vertical => 1,
…		…
961	;	976	;
962		977
963	$self = $class->SUPER::new (	978	$self = $class->SUPER::new (
964	vp => (new CFClient::UI::ViewPort expand => 1),	979	vp => (new CFClient::UI::ViewPort expand => 1),
965	slider => $slider,	980	slider => $slider,
966	@_,	981	%arg,
967	);	982	);
968		983
969	$self->{vp}->add ($self->{scrolled});
970	$self->add ($self->{vp});
971	$self->add ($self->{slider});	984	$self->SUPER::add ($self->{vp}, $self->{slider});
		985	$self->add ($child) if $child;
972		986
973	$self	987	$self
		988	}
		989
		990	sub add {
		991	my ($self, $widget) = @_;
		992
		993	$self->{vp}->add ($self->{child} = $widget);
974	}	994	}
975		995
976	sub update {	996	sub update {
977	my ($self) = @_;	997	my ($self) = @_;
978		998
…		…
1017		1037
1018	if ($self->{bg}) {	1038	if ($self->{bg}) {
1019	my ($w, $h) = @$self{qw(w h)};	1039	my ($w, $h) = @$self{qw(w h)};
1020		1040
1021	glEnable GL_BLEND;	1041	glEnable GL_BLEND;
1022	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1042	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1023	glColor @{ $self->{bg} };	1043	glColor_premultiply @{ $self->{bg} };
1024		1044
1025	glBegin GL_QUADS;	1045	glBegin GL_QUADS;
1026	glVertex 0 , 0;	1046	glVertex 0 , 0;
1027	glVertex 0 , $h;	1047	glVertex 0 , $h;
1028	glVertex $w, $h;	1048	glVertex $w, $h;
…		…
1142	my $dy = $ev->{y} - $oy;	1162	my $dy = $ev->{y} - $oy;
1143		1163
1144	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1164	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1145	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1165	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146		1166
		1167	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1147	$self->realloc;	1168	$self->realloc;
1148	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149	};	1169	};
1150		1170
1151	} elsif ($lr ^ $td) {	1171	} elsif ($lr ^ $td) {
1152	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1172	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1153	my ($bx, $by) = ($self->{x}, $self->{y});	1173	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1156	my ($ev, $x, $y) = @_;	1176	my ($ev, $x, $y) = @_;
1157		1177
1158	($x, $y) = ($ev->{x}, $ev->{y});	1178	($x, $y) = ($ev->{x}, $ev->{y});
1159		1179
1160	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1181	# HACK: the next line is required to enforce placement
		1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1161	};	1183	};
		1184	} else {
		1185	return 0;
		1186	}
		1187
1162	}	1188	1
1163	}	1189	}
1164		1190
1165	sub button_up {	1191	sub button_up {
1166	my ($self, $ev, $x, $y) = @_;	1192	my ($self, $ev, $x, $y) = @_;
1167		1193
1168	delete $self->{motion};	1194	!!delete $self->{motion}
1169	}	1195	}
1170		1196
1171	sub mouse_motion {	1197	sub mouse_motion {
1172	my ($self, $ev, $x, $y) = @_;	1198	my ($self, $ev, $x, $y) = @_;
1173		1199
1174	$self->{motion}->($ev, $x, $y) if $self->{motion};	1200	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1201
		1202	!!$self->{motion}
1175	}	1203	}
1176		1204
1177	sub _draw {	1205	sub _draw {
1178	my ($self) = @_;	1206	my ($self) = @_;
1179		1207
…		…
1511		1539
1512	delete $self->{texture};	1540	delete $self->{texture};
1513	$self->SUPER::update;	1541	$self->SUPER::update;
1514	}	1542	}
1515		1543
		1544	sub realloc {
		1545	my ($self) = @_;
		1546
		1547	delete $self->{ox};
		1548	$self->SUPER::realloc;
		1549	}
		1550
1516	sub set_text {	1551	sub set_text {
1517	my ($self, $text) = @_;	1552	my ($self, $text) = @_;
1518		1553
1519	return if $self->{text} eq "T$text";	1554	return if $self->{text} eq "T$text";
1520	$self->{text} = "T$text";	1555	$self->{text} = "T$text";
1521		1556
1522	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1523	$self->{layout}->set_text ($text);	1558	$self->{layout}->set_text ($text);
1524		1559
		1560	delete $self->{size_req};
1525	$self->realloc;	1561	$self->realloc;
1526	$self->update;	1562	$self->update;
1527	}	1563	}
1528		1564
1529	sub set_markup {	1565	sub set_markup {
…		…
1535	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1571	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1536		1572
1537	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1573	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1538	$self->{layout}->set_markup ($markup);	1574	$self->{layout}->set_markup ($markup);
1539		1575
		1576	delete $self->{size_req};
1540	$self->realloc;	1577	$self->realloc;
1541	$self->update;	1578	$self->update;
1542	}	1579	}
1543		1580
1544	sub size_request {	1581	sub size_request {
1545	my ($self) = @_;	1582	my ($self) = @_;
1546		1583
		1584	$self->{size_req} ||= do {
1547	$self->{layout}->set_font ($self->{font}) if $self->{font};	1585	$self->{layout}->set_font ($self->{font}) if $self->{font};
1548	$self->{layout}->set_width ($self->{max_w} || -1);	1586	$self->{layout}->set_width ($self->{max_w} || -1);
1549	$self->{layout}->set_ellipsise ($self->{ellipsise});	1587	$self->{layout}->set_ellipsise ($self->{ellipsise});
1550	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1588	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1589	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552		1590
1553	my ($w, $h) = $self->{layout}->size;	1591	my ($w, $h) = $self->{layout}->size;
1554		1592
1555	if (exists $self->{template}) {	1593	if (exists $self->{template}) {
1556	$self->{template}->set_font ($self->{font}) if $self->{font};	1594	$self->{template}->set_font ($self->{font}) if $self->{font};
1557	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1595	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1558		1596
1559	my ($w2, $h2) = $self->{template}->size;	1597	my ($w2, $h2) = $self->{template}->size;
1560		1598
1561	$w = List::Util::max $w, $w2;	1599	$w = List::Util::max $w, $w2;
1562	$h = List::Util::max $h, $h2;	1600	$h = List::Util::max $h, $h2;
		1601	}
		1602
		1603	[$w, $h]
1563	}	1604	};
1564		1605
1565	($w, $h)	1606	@{ $self->{size_req} }
1566	}	1607	}
1567		1608
1568	sub size_allocate {	1609	sub size_allocate {
1569	my ($self, $w, $h) = @_;	1610	my ($self, $w, $h) = @_;
1570		1611
…		…
1579		1620
1580	$self->{fontsize} = $fontsize;	1621	$self->{fontsize} = $fontsize;
1581	delete $self->{texture};	1622	delete $self->{texture};
1582		1623
1583	$self->realloc;	1624	$self->realloc;
		1625	}
		1626
		1627	sub reconfigure {
		1628	my ($self) = @_;
		1629
		1630	delete $self->{size_req};
		1631
		1632	$self->SUPER::reconfigure;
1584	}	1633	}
1585		1634
1586	sub _draw {	1635	sub _draw {
1587	my ($self) = @_;	1636	my ($self) = @_;
1588		1637
…		…
1608	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1657	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1609	: ($self->{h} - $tex->{h}) * 0.5);	1658	: ($self->{h} - $tex->{h}) * 0.5);
1610	};	1659	};
1611		1660
1612	glEnable GL_TEXTURE_2D;	1661	glEnable GL_TEXTURE_2D;
1613	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1662
		1663	my $w = List::Util::min $self->{w} + 4, $tex->{w};
		1664	my $h = List::Util::min $self->{h} + 2, $tex->{h};
1614		1665
1615	if ($tex->{format} == GL_ALPHA) {	1666	if ($tex->{format} == GL_ALPHA) {
		1667	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1616	glColor @{$self->{fg}};	1668	glColor @{$self->{fg}};
1617	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1669	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1618	} else {	1670	} else {
		1671	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1619	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1672	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1620	}	1673	}
1621		1674
1622	glDisable GL_TEXTURE_2D;	1675	glDisable GL_TEXTURE_2D;
1623	}	1676	}
1624		1677
…		…
1641	can_hover => 1,	1694	can_hover => 1,
1642	can_focus => 1,	1695	can_focus => 1,
1643	valign => 0,	1696	valign => 0,
1644	can_events => 1,	1697	can_events => 1,
1645	#text => ...	1698	#text => ...
		1699	#hidden => "*",
1646	@_	1700	@_
1647	)	1701	)
1648	}	1702	}
1649		1703
1650	sub _set_text {	1704	sub _set_text {
…		…
1652		1706
1653	delete $self->{cur_h};	1707	delete $self->{cur_h};
1654		1708
1655	return if $self->{text} eq $text;	1709	return if $self->{text} eq $text;
1656		1710
1657	delete $self->{texture};
1658
1659	$self->{last_activity} = $::NOW;	1711	$self->{last_activity} = $::NOW;
1660	$self->{text} = $text;	1712	$self->{text} = $text;
1661		1713
1662	$text =~ s/./*/g if $self->{hidden};	1714	$text =~ s/./*/g if $self->{hidden};
1663	$self->{layout}->set_text ("$text ");	1715	$self->{layout}->set_text ("$text ");
		1716	delete $self->{size_req};
1664		1717
1665	$self->_emit (changed => $self->{text});	1718	$self->_emit (changed => $self->{text});
		1719
		1720	$self->realloc;
		1721	$self->update;
1666	}	1722	}
1667		1723
1668	sub set_text {	1724	sub set_text {
1669	my ($self, $text) = @_;	1725	my ($self, $text) = @_;
1670		1726
1671	$self->{cursor} = length $text;	1727	$self->{cursor} = length $text;
1672	$self->_set_text ($text);	1728	$self->_set_text ($text);
1673
1674	$self->realloc;
1675	}	1729	}
1676		1730
1677	sub get_text {	1731	sub get_text {
1678	$_[0]{text}	1732	$_[0]{text}
1679	}	1733	}
…		…
1709	$self->{cursor} = length $text;	1763	$self->{cursor} = length $text;
1710	} elsif ($uni == 27) {	1764	} elsif ($uni == 27) {
1711	$self->_emit ('escape');	1765	$self->_emit ('escape');
1712	} elsif ($uni) {	1766	} elsif ($uni) {
1713	substr $text, $self->{cursor}++, 0, chr $uni;	1767	substr $text, $self->{cursor}++, 0, chr $uni;
		1768	} else {
		1769	return 0;
1714	}	1770	}
1715		1771
1716	$self->_set_text ($text);	1772	$self->_set_text ($text);
1717		1773
1718	$self->realloc;	1774	$self->realloc;
		1775
		1776	1
1719	}	1777	}
1720		1778
1721	sub focus_in {	1779	sub focus_in {
1722	my ($self) = @_;	1780	my ($self) = @_;
1723		1781
…		…
1738	utf8::encode $text;	1796	utf8::encode $text;
1739	$self->{cursor} = length substr $text, 0, $idx;	1797	$self->{cursor} = length substr $text, 0, $idx;
1740		1798
1741	$self->_set_text ($self->{text});	1799	$self->_set_text ($self->{text});
1742	$self->update;	1800	$self->update;
		1801
		1802	1
1743	}	1803	}
1744		1804
1745	sub mouse_motion {	1805	sub mouse_motion {
1746	my ($self, $ev, $x, $y) = @_;	1806	my ($self, $ev, $x, $y) = @_;
1747	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1807	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1808
		1809	0
1748	}	1810	}
1749		1811
1750	sub _draw {	1812	sub _draw {
1751	my ($self) = @_;	1813	my ($self) = @_;
1752		1814
1753	local $self->{fg} = $self->{fg};	1815	local $self->{fg} = $self->{fg};
1754		1816
1755	if ($FOCUS == $self) {	1817	if ($FOCUS == $self) {
1756	glColor @{$self->{active_bg}};	1818	glColor_premultiply @{$self->{active_bg}};
1757	$self->{fg} = $self->{active_fg};	1819	$self->{fg} = $self->{active_fg};
1758	} else {	1820	} else {
1759	glColor @{$self->{bg}};	1821	glColor_premultiply @{$self->{bg}};
1760	}	1822	}
1761		1823
1762	glEnable GL_BLEND;	1824	glEnable GL_BLEND;
1763	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1825	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1764	glBegin GL_QUADS;	1826	glBegin GL_QUADS;
1765	glVertex 0 , 0;	1827	glVertex 0 , 0;
1766	glVertex 0 , $self->{h};	1828	glVertex 0 , $self->{h};
1767	glVertex $self->{w}, $self->{h};	1829	glVertex $self->{w}, $self->{h};
1768	glVertex $self->{w}, 0;	1830	glVertex $self->{w}, 0;
…		…
1829	} else {	1891	} else {
1830	$self->set_text ($self->{history_saveback});	1892	$self->set_text ($self->{history_saveback});
1831	}	1893	}
1832		1894
1833	} else {	1895	} else {
1834	$self->SUPER::key_down ($ev);	1896	return $self->SUPER::key_down ($ev)
		1897	}
		1898
1835	}	1899	1
1836
1837	}	1900	}
1838		1901
1839	#############################################################################	1902	#############################################################################
1840		1903
1841	package CFClient::UI::Button;	1904	package CFClient::UI::Button;
…		…
1870	my ($self, $ev, $x, $y) = @_;	1933	my ($self, $ev, $x, $y) = @_;
1871		1934
1872	$self->emit ("activate")	1935	$self->emit ("activate")
1873	if $x >= 0 && $x < $self->{w}	1936	if $x >= 0 && $x < $self->{w}
1874	&& $y >= 0 && $y < $self->{h};	1937	&& $y >= 0 && $y < $self->{h};
		1938
		1939	1
1875	}	1940	}
1876		1941
1877	sub _draw {	1942	sub _draw {
1878	my ($self) = @_;	1943	my ($self) = @_;
1879		1944
1880	local $self->{fg} = $self->{fg};	1945	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1881
1882	if ($GRAB == $self) {
1883	$self->{fg} = $self->{active_fg};
1884	}
1885		1946
1886	glEnable GL_TEXTURE_2D;	1947	glEnable GL_TEXTURE_2D;
1887	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1948	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888	glColor 0, 0, 0, 1;	1949	glColor 0, 0, 0, 1;
1889		1950
…		…
1933		1994
1934	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	1995	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1935	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	1996	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1936	$self->{state} = !$self->{state};	1997	$self->{state} = !$self->{state};
1937	$self->_emit (changed => $self->{state});	1998	$self->_emit (changed => $self->{state});
		1999	} else {
		2000	return 0
		2001	}
		2002
1938	}	2003	1
1939	}	2004	}
1940		2005
1941	sub _draw {	2006	sub _draw {
1942	my ($self) = @_;	2007	my ($self) = @_;
1943		2008
…		…
2110		2175
2111	my $h1 = $self->{h} * (1 - $ycut1);	2176	my $h1 = $self->{h} * (1 - $ycut1);
2112	my $h2 = $self->{h} * (1 - $ycut2);	2177	my $h2 = $self->{h} * (1 - $ycut2);
2113		2178
2114	glEnable GL_BLEND;	2179	glEnable GL_BLEND;
2115	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2180	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2181	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2116	glEnable GL_TEXTURE_2D;	2182	glEnable GL_TEXTURE_2D;
2117	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2183	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118		2184
2119	glBindTexture GL_TEXTURE_2D, $t1->{name};	2185	glBindTexture GL_TEXTURE_2D, $t1->{name};
2120	glBegin GL_QUADS;	2186	glBegin GL_QUADS;
…		…
2241	sub set_range {	2307	sub set_range {
2242	my ($self, $range) = @_;	2308	my ($self, $range) = @_;
2243		2309
2244	($range, $self->{range}) = ($self->{range}, $range);	2310	($range, $self->{range}) = ($self->{range}, $range);
2245		2311
2246	$self->update
2247	if "@$range" ne "@{$self->{range}}";	2312	if ("@$range" ne "@{$self->{range}}") {
		2313	$self->update;
		2314	$self->set_value ($self->{range}[0]);
		2315	}
2248	}	2316	}
2249		2317
2250	sub set_value {	2318	sub set_value {
2251	my ($self, $value) = @_;	2319	my ($self, $value) = @_;
2252		2320
…		…
2281		2349
2282	$self->SUPER::button_down ($ev, $x, $y);	2350	$self->SUPER::button_down ($ev, $x, $y);
2283		2351
2284	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2352	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285		2353
2286	$self->mouse_motion ($ev, $x, $y);	2354	$self->mouse_motion ($ev, $x, $y)
2287	}	2355	}
2288		2356
2289	sub mouse_motion {	2357	sub mouse_motion {
2290	my ($self, $ev, $x, $y) = @_;	2358	my ($self, $ev, $x, $y) = @_;
2291		2359
…		…
2295	my (undef, $lo, $hi, $page) = @{$self->{range}};	2363	my (undef, $lo, $hi, $page) = @{$self->{range}};
2296		2364
2297	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2365	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298		2366
2299	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2367	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2368	} else {
		2369	return 0;
		2370	}
		2371
2300	}	2372	1
2301	}	2373	}
2302		2374
2303	sub update {	2375	sub update {
2304	my ($self) = @_;	2376	my ($self) = @_;
2305		2377
2306	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2378	delete $self->{knob_w};
		2379	$self->SUPER::update;
		2380	}
		2381
		2382	sub _draw {
		2383	my ($self) = @_;
		2384
		2385	unless ($self->{knob_w}) {
2307	$self->set_value ($self->{range}[0]);	2386	$self->set_value ($self->{range}[0]);
2308		2387
2309	my ($value, $lo, $hi, $page) = @{$self->{range}};	2388	my ($value, $lo, $hi, $page) = @{$self->{range}};
2310	my $range = ($hi - $page - $lo) || 1e-100;	2389	my $range = ($hi - $page - $lo) || 1e-100;
2311		2390
…		…
2317	$value = ($value - $lo) / $range;	2396	$value = ($value - $lo) / $range;
2318	$value = $value * $self->{scale} + $self->{offset};	2397	$value = $value * $self->{scale} + $self->{offset};
2319		2398
2320	$self->{knob_x} = $value - $knob_w * 0.5;	2399	$self->{knob_x} = $value - $knob_w * 0.5;
2321	$self->{knob_w} = $knob_w;	2400	$self->{knob_w} = $knob_w;
2322	});	2401	}
2323
2324	$self->SUPER::update;
2325	}
2326
2327	sub _draw {
2328	my ($self) = @_;
2329		2402
2330	$self->SUPER::_draw ();	2403	$self->SUPER::_draw ();
2331		2404
2332	glScale $self->{w}, $self->{h};	2405	glScale $self->{w}, $self->{h};
2333		2406
…		…
2394	sub set_range { shift->{slider}->set_range (@_) }	2467	sub set_range { shift->{slider}->set_range (@_) }
2395	sub set_value { shift->{slider}->set_value (@_) }	2468	sub set_value { shift->{slider}->set_value (@_) }
2396		2469
2397	#############################################################################	2470	#############################################################################
2398		2471
2399	package CFClient::UI::TextView;	2472	package CFClient::UI::TextScroller;
2400		2473
2401	our @ISA = CFClient::UI::HBox::;	2474	our @ISA = CFClient::UI::HBox::;
2402		2475
2403	use CFClient::OpenGL;	2476	use CFClient::OpenGL;
2404		2477
…		…
2406	my $class = shift;	2479	my $class = shift;
2407		2480
2408	my $self = $class->SUPER::new (	2481	my $self = $class->SUPER::new (
2409	fontsize => 1,	2482	fontsize => 1,
2410	can_events => 0,	2483	can_events => 0,
		2484	indent => 0,
2411	#font => default_font	2485	#font => default_font
2412	@_,	2486	@_,
2413		2487
2414	layout => (new CFClient::Layout 1),	2488	layout => (new CFClient::Layout 1),
2415	par => [],	2489	par => [],
…		…
2438	$self->SUPER::size_allocate ($w, $h);	2512	$self->SUPER::size_allocate ($w, $h);
2439		2513
2440	$self->{layout}->set_font ($self->{font}) if $self->{font};	2514	$self->{layout}->set_font ($self->{font}) if $self->{font};
2441	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2515	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2442	$self->{layout}->set_width ($self->{children}[0]{w});	2516	$self->{layout}->set_width ($self->{children}[0]{w});
		2517	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2443		2518
2444	$self->reflow;	2519	$self->reflow;
2445	}	2520	}
2446		2521
2447	sub text_size {	2522	sub text_size {
…		…
2449		2524
2450	my $layout = $self->{layout};	2525	my $layout = $self->{layout};
2451		2526
2452	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2527	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453	$layout->set_width ($self->{children}[0]{w} - $indent);	2528	$layout->set_width ($self->{children}[0]{w} - $indent);
		2529	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2454	$layout->set_markup ($text);	2530	$layout->set_markup ($text);
2455		2531
2456	$layout->size	2532	$layout->size
2457	}	2533	}
2458		2534
…		…
2497		2573
2498	return unless $self->{h} > 0;	2574	return unless $self->{h} > 0;
2499		2575
2500	delete $self->{texture};	2576	delete $self->{texture};
2501		2577
2502	$ROOT->on_post_alloc ($self, sub {	2578	$ROOT->on_post_alloc ($self => sub {
2503	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2579	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504		2580
2505	if (delete $self->{need_reflow}) {	2581	if (delete $self->{need_reflow}) {
2506	my $height = 0;	2582	my $height = 0;
2507		2583
…		…
2510	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2586	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511		2587
2512	for (@{$self->{par}}) {	2588	for (@{$self->{par}}) {
2513	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2589	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2514	$layout->set_width ($W - $_->[3]);	2590	$layout->set_width ($W - $_->[3]);
		2591	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2515	$layout->set_markup ($_->[4]);	2592	$layout->set_markup ($_->[4]);
2516	my ($w, $h) = $layout->size;	2593	my ($w, $h) = $layout->size;
2517	$_->[0] = $w + $_->[3];	2594	$_->[0] = $w + $_->[3];
2518	$_->[1] = $h;	2595	$_->[1] = $h;
2519	}	2596	}
…		…
2522	}	2599	}
2523		2600
2524	$self->{height} = $height;	2601	$self->{height} = $height;
2525		2602
2526	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2603	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2527		2604
2528	delete $self->{texture};	2605	delete $self->{texture};
2529	}	2606	}
2530		2607
2531	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2608	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2532	glClearColor 0.5, 0.5, 0.5, 0;	2609	glClearColor 0, 0, 0, 0;
2533	glClear GL_COLOR_BUFFER_BIT;	2610	glClear GL_COLOR_BUFFER_BIT;
2534		2611
2535	my $top = int $self->{children}[1]{range}[0];	2612	my $top = int $self->{children}[1]{range}[0];
2536		2613
2537	my $y0 = $top;	2614	my $y0 = $top;
…		…
2551	my $h = $par->[1];	2628	my $h = $par->[1];
2552		2629
2553	if ($y0 < $y + $h && $y < $y1) {	2630	if ($y0 < $y + $h && $y < $y1) {
2554	$layout->set_foreground (@{ $par->[2] });	2631	$layout->set_foreground (@{ $par->[2] });
2555	$layout->set_width ($W - $par->[3]);	2632	$layout->set_width ($W - $par->[3]);
		2633	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2556	$layout->set_markup ($par->[4]);	2634	$layout->set_markup ($par->[4]);
2557		2635
2558	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2636	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2559		2637
2560	glRasterPos $par->[3], $y - $y0;	2638	glRasterPos $par->[3], $y - $y0;
…		…
2572	sub _draw {	2650	sub _draw {
2573	my ($self) = @_;	2651	my ($self) = @_;
2574		2652
2575	glEnable GL_TEXTURE_2D;	2653	glEnable GL_TEXTURE_2D;
2576	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2654	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2577	glColor 1, 1, 1, 1;	2655	glColor 0, 0, 0, 1;
2578	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2656	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2579	glDisable GL_TEXTURE_2D;	2657	glDisable GL_TEXTURE_2D;
2580		2658
2581	$self->{children}[1]->draw;	2659	$self->{children}[1]->draw;
2582		2660
2583	}	2661	}
…		…
2674	$tooltip .= "\n\n" . (ref $widget) . "\n"	2752	$tooltip .= "\n\n" . (ref $widget) . "\n"
2675	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2753	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676	. "req $widget->{req_w} $widget->{req_h}\n"	2754	. "req $widget->{req_w} $widget->{req_h}\n"
2677	. "visible $widget->{visible}";	2755	. "visible $widget->{visible}";
2678	}	2756	}
		2757
		2758	$tooltip =~ s/^\n+//;
		2759	$tooltip =~ s/\n+$//;
2679		2760
2680	$self->add (new CFClient::UI::Label	2761	$self->add (new CFClient::UI::Label
2681	markup => $tooltip,	2762	markup => $tooltip,
2682	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2763	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2683	fontsize => 0.8,	2764	fontsize => 0.8,
…		…
2711	or return;	2792	or return;
2712		2793
2713	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2794	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714		2795
2715	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2796	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716	if $x + $self->{w} > $::WIDTH;	2797	if $x + $self->{w} > $self->{root}{w};
2717		2798
2718	$self->move_abs ($x, $y);	2799	$self->move_abs ($x, $y);
2719	});	2800	});
2720	}	2801	}
2721		2802
…		…
2810	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	2891	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2811		2892
2812	if ($tex) {	2893	if ($tex) {
2813	glEnable GL_TEXTURE_2D;	2894	glEnable GL_TEXTURE_2D;
2814	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2895	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2815	glColor 1, 1, 1, 1;	2896	glColor 0, 0, 0, 1;
2816	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2897	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2817	glDisable GL_TEXTURE_2D;	2898	glDisable GL_TEXTURE_2D;
2818	}	2899	}
2819	}	2900	}
2820		2901
…		…
2824	$self->{timer}->cancel	2905	$self->{timer}->cancel
2825	if $self->{timer};	2906	if $self->{timer};
2826		2907
2827	$self->SUPER::DESTROY;	2908	$self->SUPER::DESTROY;
2828	}	2909	}
		2910
		2911	#############################################################################
		2912
		2913	package CFClient::UI::Buttonbar;
		2914
		2915	our @ISA = CFClient::UI::HBox::;
		2916
		2917	# TODO: should actualyl wrap buttons and other goodies.
2829		2918
2830	#############################################################################	2919	#############################################################################
2831		2920
2832	package CFClient::UI::Menu;	2921	package CFClient::UI::Menu;
2833		2922
…		…
2845	);	2934	);
2846		2935
2847	$self->add ($self->{vbox} = new CFClient::UI::VBox);	2936	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2848		2937
2849	for my $item (@{ $self->{items} }) {	2938	for my $item (@{ $self->{items} }) {
2850	my ($widget, $cb) = @$item;	2939	my ($widget, $cb, $tooltip) = @$item;
2851		2940
2852	# handle various types of items, only text for now	2941	# handle various types of items, only text for now
2853	if (!ref $widget) {	2942	if (!ref $widget) {
2854	$widget = new CFClient::UI::Label	2943	$widget = new CFClient::UI::Label
2855	can_hover => 1,	2944	can_hover => 1,
2856	can_events => 1,	2945	can_events => 1,
2857	text => $widget;	2946	markup => $widget,
		2947	tooltip => $tooltip
2858	}	2948	}
2859		2949
2860	$self->{item}{$widget} = $item;	2950	$self->{item}{$widget} = $item;
2861		2951
2862	$self->{vbox}->add ($widget);	2952	$self->{vbox}->add ($widget);
…		…
2883	my ($self, $ev, $x, $y) = @_;	2973	my ($self, $ev, $x, $y) = @_;
2884		2974
2885	# TODO: should use vbox->find_widget or so	2975	# TODO: should use vbox->find_widget or so
2886	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2976	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887	$self->{hover} = $self->{item}{$HOVER};	2977	$self->{hover} = $self->{item}{$HOVER};
		2978
		2979	0
2888	}	2980	}
2889		2981
2890	sub button_up {	2982	sub button_up {
2891	my ($self, $ev, $x, $y) = @_;	2983	my ($self, $ev, $x, $y) = @_;
2892		2984
…		…
2894	undef $GRAB;	2986	undef $GRAB;
2895	$self->hide;	2987	$self->hide;
2896		2988
2897	$self->_emit ("popdown");	2989	$self->_emit ("popdown");
2898	$self->{hover}[1]->() if $self->{hover};	2990	$self->{hover}[1]->() if $self->{hover};
		2991	} else {
		2992	return 0
		2993	}
		2994
2899	}	2995	1
2900	}	2996	}
2901		2997
2902	#############################################################################	2998	#############################################################################
2903		2999
2904	package CFClient::UI::Statusbox;	3000	package CFClient::UI::Multiplexer;
2905		3001
2906	our @ISA = CFClient::UI::VBox::;	3002	our @ISA = CFClient::UI::Container::;
2907		3003
2908	sub new {	3004	sub new {
2909	my $class = shift;	3005	my $class = shift;
2910		3006
2911	$class->SUPER::new (	3007	my $self = $class->SUPER::new (
		3008	@_,
		3009	);
		3010
		3011	$self->{current} = $self->{children}[0]
		3012	if @{ $self->{children} };
		3013
		3014	$self
		3015	}
		3016
		3017	sub add {
		3018	my ($self, @widgets) = @_;
		3019
		3020	$self->SUPER::add (@widgets);
		3021
		3022	$self->{current} = $self->{children}[0]
		3023	if @{ $self->{children} };
		3024	}
		3025
		3026	sub set_current_page {
		3027	my ($self, $page_or_widget) = @_;
		3028
		3029	my $widget = ref $page_or_widget
		3030	? $page_or_widget
		3031	: $self->{children}[$page_or_widget];
		3032
		3033	$self->{current} = $widget;
		3034	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3035
		3036	$self->_emit (page_changed => $self->{current});
		3037
		3038	$self->realloc;
		3039	}
		3040
		3041	sub visible_children {
		3042	$_[0]{current}
		3043	}
		3044
		3045	sub size_request {
		3046	my ($self) = @_;
		3047
		3048	$self->{current}->size_request
		3049	}
		3050
		3051	sub size_allocate {
		3052	my ($self, $w, $h) = @_;
		3053
		3054	$self->{current}->configure (0, 0, $w, $h);
		3055	}
		3056
		3057	sub _draw {
		3058	my ($self) = @_;
		3059
		3060	$self->{current}->draw;
		3061	}
		3062
		3063	#############################################################################
		3064
		3065	package CFClient::UI::Notebook;
		3066
		3067	our @ISA = CFClient::UI::VBox::;
		3068
		3069	sub new {
		3070	my $class = shift;
		3071
		3072	my $self = $class->SUPER::new (
		3073	buttonbar => (new CFClient::UI::Buttonbar),
		3074	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3075	# filter => # will be put between multiplexer and $self
		3076	@_,
		3077	);
		3078
		3079	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3080	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3081
		3082	$self
		3083	}
		3084
		3085	sub add {
		3086	my ($self, $title, $widget, $tooltip) = @_;
		3087
		3088	Scalar::Util::weaken $self;
		3089
		3090	$self->{buttonbar}->add (new CFClient::UI::Button
		3091	markup => $title,
		3092	tooltip => $tooltip,
		3093	on_activate => sub { $self->set_current_page ($widget) },
		3094	);
		3095
		3096	$self->{multiplexer}->add ($widget);
		3097	}
		3098
		3099	sub set_current_page {
		3100	my ($self, $page) = @_;
		3101
		3102	$self->{multiplexer}->set_current_page ($page);
		3103	$self->_emit (page_changed => $self->{multiplexer}{current});
		3104	}
		3105
		3106	#############################################################################
		3107
		3108	package CFClient::UI::Combobox;
		3109
		3110	use utf8;
		3111
		3112	our @ISA = CFClient::UI::Button::;
		3113
		3114	sub new {
		3115	my $class = shift;
		3116
		3117	my $self = $class->SUPER::new (
		3118	options => [], # [value, title, longdesc], ...
		3119	value => undef,
		3120	@_,
		3121	);
		3122
		3123	$self->_set_value ($self->{value});
		3124
		3125	$self
		3126	}
		3127
		3128	sub button_down {
		3129	my ($self, $ev) = @_;
		3130
		3131	my @menu_items;
		3132
		3133	for (@{ $self->{options} }) {
		3134	my ($value, $title, $tooltip) = @$_;
		3135
		3136	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3137	}
		3138
		3139	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3140	}
		3141
		3142	sub _set_value {
		3143	my ($self, $value) = @_;
		3144
		3145	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3146	or return;
		3147
		3148	$self->{value} = $item->[0];
		3149	$self->set_markup ("$item->[1] ⇓");
		3150	$self->set_tooltip ($item->[2]);
		3151	}
		3152
		3153	sub set_value {
		3154	my ($self, $value) = @_;
		3155
		3156	return unless $self->{value} ne $value;
		3157
		3158	$self->_set_value ($value);
		3159	$self->_emit (changed => $value);
		3160	}
		3161
		3162	#############################################################################
		3163
		3164	package CFClient::UI::Statusbox;
		3165
		3166	our @ISA = CFClient::UI::VBox::;
		3167
		3168	sub new {
		3169	my $class = shift;
		3170
		3171	my $self = $class->SUPER::new (
2912	fontsize => 0.8,	3172	fontsize => 0.8,
2913	@_,	3173	@_,
2914	)	3174	);
		3175
		3176	Scalar::Util::weaken (my $this = $self);
		3177
		3178	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3179
		3180	$self
2915	}	3181	}
2916		3182
2917	sub reorder {	3183	sub reorder {
2918	my ($self) = @_;	3184	my ($self) = @_;
2919	my $NOW = time;	3185	my $NOW = Time::HiRes::time;
		3186
		3187	# freeze display when hovering over any label
		3188	return if $CFClient::UI::TOOLTIP->{owner}
		3189	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3190	values %{ $self->{item} };
2920		3191
2921	while (my ($k, $v) = each %{ $self->{item} }) {	3192	while (my ($k, $v) = each %{ $self->{item} }) {
2922	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3193	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923	}	3194	}
2924		3195
…		…
2927	my @items = sort {	3198	my @items = sort {
2928	$a->{pri} <=> $b->{pri}	3199	$a->{pri} <=> $b->{pri}
2929	or $b->{id} <=> $a->{id}	3200	or $b->{id} <=> $a->{id}
2930	} values %{ $self->{item} };	3201	} values %{ $self->{item} };
2931		3202
		3203	$self->{timer}->interval (1);
		3204
2932	my $count = 10 + 1;	3205	my $count = 10 + 1;
2933	for my $item (@items) {	3206	for my $item (@items) {
2934	last unless --$count;	3207	last unless --$count;
2935		3208
2936	push @widgets, $item->{label} ||= do {	3209	my $label = $item->{label} ||= do {
2937	# TODO: doesn't handle markup well (read as: at all)	3210	# TODO: doesn't handle markup well (read as: at all)
2938	my $short = $item->{count} > 1	3211	my $short = $item->{count} > 1
2939	? "<b>$item->{count} ×</b> $item->{text}"	3212	? "<b>$item->{count} ×</b> $item->{text}"
2940	: $item->{text};	3213	: $item->{text};
2941		3214
…		…
2949	tooltip => $item->{tooltip},	3222	tooltip => $item->{tooltip},
2950	tooltip_font => $::FONT_PROP,	3223	tooltip_font => $::FONT_PROP,
2951	tooltip_width => 0.67,	3224	tooltip_width => 0.67,
2952	fontsize => $item->{fontsize} || $self->{fontsize},	3225	fontsize => $item->{fontsize} || $self->{fontsize},
2953	max_w => $::WIDTH * 0.44,	3226	max_w => $::WIDTH * 0.44,
2954	fg => $item->{fg},	3227	fg => [@{ $item->{fg} }],
2955	can_events => 1,	3228	can_events => 1,
2956	can_hover => 1	3229	can_hover => 1
2957	};	3230	};
		3231
		3232	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3233	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3234	$label->update;
		3235	$label->set_max_size (undef, $label->{req_h} * $diff)
		3236	if $diff < 1;
		3237	$self->{timer}->interval (1/30);
		3238	} else {
		3239	$label->{fg}[3] = $item->{fg}[3] || 1;
		3240	}
		3241
		3242	push @widgets, $label;
2958	}	3243	}
2959		3244
2960	$self->clear;	3245	$self->clear;
2961	$self->SUPER::add (reverse @widgets);	3246	$self->SUPER::add (reverse @widgets);
2962	}	3247	}
…		…
2967	$text =~ s/^\s+//;	3252	$text =~ s/^\s+//;
2968	$text =~ s/\s+$//;	3253	$text =~ s/\s+$//;
2969		3254
2970	return unless $text;	3255	return unless $text;
2971		3256
2972	my $timeout = time + ((delete $arg{timeout}) || 60);	3257	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2973		3258
2974	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3259	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2975		3260
2976	if (my $item = $self->{item}{$group}) {	3261	if (my $item = $self->{item}{$group}) {
2977	if ($item->{text} eq $text) {	3262	if ($item->{text} eq $text) {
…		…
3007		3292
3008	$self->reorder;	3293	$self->reorder;
3009	$self->SUPER::reconfigure;	3294	$self->SUPER::reconfigure;
3010	}	3295	}
3011		3296
		3297	sub DESTROY {
		3298	my ($self) = @_;
		3299
		3300	$self->{timer}->cancel;
		3301
		3302	$self->SUPER::DESTROY;
		3303	}
		3304
3012	#############################################################################	3305	#############################################################################
3013		3306
3014	package CFClient::UI::Inventory;	3307	package CFClient::UI::Inventory;
3015		3308
3016	our @ISA = CFClient::UI::ScrolledWindow::;	3309	our @ISA = CFClient::UI::ScrolledWindow::;
3017		3310
3018	sub new {	3311	sub new {
3019	my $class = shift;	3312	my $class = shift;
3020		3313
3021	my $self = $class->SUPER::new (	3314	my $self = $class->SUPER::new (
3022	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3315	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3023	@_,	3316	@_,
3024	);	3317	);
3025		3318
3026	$self	3319	$self
3027	}	3320	}
3028		3321
3029	sub set_items {	3322	sub set_items {
3030	my ($self, $items) = @_;	3323	my ($self, $items) = @_;
3031		3324
3032	$self->{scrolled}->clear;	3325	$self->{child}->clear;
3033	return unless $items;	3326	return unless $items;
3034		3327
3035	my @items = sort {	3328	my @items = sort {
3036	($a->{type} <=> $b->{type})	3329	($a->{type} <=> $b->{type})
3037	or ($a->{name} cmp $b->{name})	3330	or ($a->{name} cmp $b->{name})
…		…
3041		3334
3042	my $row = 0;	3335	my $row = 0;
3043	for my $item (@items) {	3336	for my $item (@items) {
3044	CFClient::Item::update_widgets $item;	3337	CFClient::Item::update_widgets $item;
3045		3338
3046	$self->{scrolled}->add (0, $row, $item->{face_widget});	3339	$self->{child}->add (0, $row, $item->{face_widget});
3047	$self->{scrolled}->add (1, $row, $item->{desc_widget});	3340	$self->{child}->add (1, $row, $item->{desc_widget});
3048	$self->{scrolled}->add (2, $row, $item->{weight_widget});	3341	$self->{child}->add (2, $row, $item->{weight_widget});
3049		3342
3050	$row++;	3343	$row++;
3051	}	3344	}
3052	}	3345	}
3053		3346
…		…
3250		3543
3251	#############################################################################	3544	#############################################################################
3252		3545
3253	package CFClient::UI::SpellList;	3546	package CFClient::UI::SpellList;
3254		3547
3255	our @ISA = CFClient::UI::FancyFrame::;	3548	our @ISA = CFClient::UI::Table::;
3256		3549
3257	sub new {	3550	sub new {
3258	my $class = shift;	3551	my $class = shift;
3259		3552
3260	my $self = $class->SUPER::new (binding => [], commands => [], @_);	3553	my $self = $class->SUPER::new (
3261		3554	binding => [],
3262	$self->add (new CFClient::UI::ScrolledWindow	3555	commands => [],
3263	scrolled => $self->{spellbox} = new CFClient::UI::Table);	3556	@_,
3264		3557	)
3265	$self;
3266	}	3558	}
3267		3559
3268	# XXX: Do sorting? Argl...	3560	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3561
		3562	my @TOOLTIP_NAME = (align => 0, can_events => 1, can_hover => 1, tooltip =>
		3563	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3564	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3565	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
		3566	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3567	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
		3568	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3569	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
		3570
		3571	sub rebuild_spell_list {
		3572	my ($self) = @_;
		3573
		3574	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3575	$self->clear;
		3576
		3577	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3578	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3579	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3580	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3581
		3582	my $row = 0;
		3583
		3584	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3585	my $spell = $self->{spell}{$_};
		3586
		3587	$row++;
		3588
		3589	my $spell_cb = sub {
		3590	my ($widget, $ev) = @_;
		3591
		3592	if ($ev->{button} == 1) {
		3593	$::CONN->user_send ("cast $spell->{name}");
		3594	} elsif ($ev->{button} == 2) {
		3595	$::CONN->user_send ("invoke $spell->{name}");
		3596	} elsif ($ev->{button} == 3) {
		3597	(new CFClient::UI::Menu
		3598	items => [
		3599	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3600	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3601	],
		3602	)->popup ($ev);
		3603	} else {
		3604	return 0;
		3605	}
		3606
		3607	1
		3608	};
		3609
		3610	$self->add (0, $row, new CFClient::UI::Face
		3611	face => $spell->{face},
		3612	can_hover => 1,
		3613	can_events => 1,
		3614	tooltip => $spell->{message},
		3615	on_button_down => $spell_cb,
		3616	);
		3617
		3618	$self->add (1, $row, new CFClient::UI::Label
		3619	expand => 1,
		3620	text => $spell->{name},
		3621	can_hover => 1,
		3622	can_events => 1,
		3623	tooltip => "$spell->{message}$TOOLTIP_ALL",
		3624	on_button_down => $spell_cb,
		3625	);
		3626
		3627	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3628	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
		3629	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3630	}
		3631	});
		3632	}
		3633
3269	sub add_spell {	3634	sub add_spell {
3270	my ($self, $spell) = @_;	3635	my ($self, $spell) = @_;
		3636
3271	$self->{spells}->{$spell->{name}} = $spell;	3637	$self->{spell}->{$spell->{name}} = $spell;
3272		3638	$self->rebuild_spell_list;
3273	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3274	face => $spell->{face},
3275	can_hover => 1,
3276	can_events => 1,
3277	tooltip => $spell->{message});
3278
3279	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3280	text => $spell->{name},
3281	can_hover => 1,
3282	can_events => 1,
3283	tooltip => $spell->{message},
3284	expand => 1);
3285
3286	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3287	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3288	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3289	expand => 1);
3290
3291	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3292	text => "bind to key",
3293	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3294	}
3295
3296	sub rebuild_spell_list {
3297	my ($self) = @_;
3298	$self->{tbl_idx} = 0;
3299	$self->add_spell ($_) for values %{$self->{spells}};
3300	}	3639	}
3301		3640
3302	sub remove_spell {	3641	sub remove_spell {
3303	my ($self, $spell) = @_;	3642	my ($self, $spell) = @_;
		3643
3304	delete $self->{spells}->{$spell->{name}};	3644	delete $self->{spell}->{$spell->{name}};
3305	$self->rebuild_spell_list;	3645	$self->rebuild_spell_list;
3306	}	3646	}
3307		3647
3308	#############################################################################	3648	#############################################################################
3309		3649
3310	package CFClient::UI::Root;	3650	package CFClient::UI::Root;
3311		3651
3312	our @ISA = CFClient::UI::Container::;	3652	our @ISA = CFClient::UI::Container::;
		3653
		3654	use List::Util qw(min max);
3313		3655
3314	use CFClient::OpenGL;	3656	use CFClient::OpenGL;
3315		3657
3316	sub new {	3658	sub new {
3317	my $class = shift;	3659	my $class = shift;
…		…
3452		3794
3453	delete $queue{$widget+0};	3795	delete $queue{$widget+0};
3454		3796
3455	my ($w, $h) = $widget->size_request;	3797	my ($w, $h) = $widget->size_request;
3456		3798
3457	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3799	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3458	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3800	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3801
		3802	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3803	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3459		3804
3460	$w = $widget->{force_w} if exists $widget->{force_w};	3805	$w = $widget->{force_w} if exists $widget->{force_w};
3461	$h = $widget->{force_h} if exists $widget->{force_h};	3806	$h = $widget->{force_h} if exists $widget->{force_h};
3462		3807
3463	if ($widget->{req_w} != $w || $widget->{req_h} != $h	3808	if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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