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.216 by root, Fri May 19 16:43:57 2006 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30:03 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
		7	use Event;
8		8
9	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
		11	use CFPlus::Texture;
10		12
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		14
		15	our $LAYOUT;
13	our $ROOT;	16	our $ROOT;
14	our $TOOLTIP;	17	our $TOOLTIP;
15	our $BUTTON_STATE;	18	our $BUTTON_STATE;
16		19
17	our %WIDGET; # all widgets, weak-referenced	20	our %WIDGET; # all widgets, weak-referenced
18		21
19	sub check_tooltip {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20	if (!$GRAB) {	23	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
23
24	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
		28	$TOOLTIP->hide;
		29
25	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
		32
		33	return if $ENV{CFPLUS_DEBUG} & 8;
26		34
27	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
28		36
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	37	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		38
31	$TOOLTIP->set_tooltip_from ($widget);	39	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	40	$TOOLTIP->show;
33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;
38
39	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;
42	}	41	}
43		42
44	return;	43	return;
45	}	44	}
46	}	45	}
47	}	46	}
48		47
49	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
		51	});
		52
		53	sub get_layout {
		54	my $layout;
		55
		56	for (grep { $_->{name} } values %WIDGET) {
		57	my $win = $layout->{$_->{name}} = { };
		58
		59	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		60	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		61	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		62	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		63
		64	$win->{show} = $_->{visible} && $_->{is_toplevel};
		65	}
		66
		67	$layout
		68	}
		69
		70	sub set_layout {
		71	my ($layout) = @_;
		72
		73	$LAYOUT = $layout;
51	}	74	}
52		75
53	# class methods for events	76	# class methods for events
54	sub feed_sdl_key_down_event {	77	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	78	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	79	if $FOCUS;
57	}	80	}
58		81
59	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	83	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	84	if $FOCUS;
		85	}
		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
62	}	98	}
63		99
64	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	101	my ($ev) = @_;
66	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
67		103
68	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
69	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
70		108
71	$GRAB = $widget;	109	$GRAB = $widget;
72	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
73		111
74	check_tooltip;	112	$TOOLTIP_WATCHER->cb->();
75	}	113	}
76
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		114
79	if ($GRAB) {	115	if ($GRAB) {
80	($x, $y) = $GRAB->coord2local ($x, $y);	116	if ($ev->{button} == 4 || $ev->{button} == 5) {
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);	117	# mousewheel
		118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		120
		121	$ev->{dx} = $shift ? $delta : 0;
		122	$ev->{dy} = $shift ? 0 : $delta;
		123
		124	$GRAB->emit (mouse_wheel => $ev);
		125	} else {
		126	$GRAB->emit (button_down => $ev)
		127	}
82	}	128	}
83	}	129	}
84		130
85	sub feed_sdl_button_up_event {	131	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	132	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});
88		133
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	134	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
90		135
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	136	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		137
93	if ($GRAB) {	138	$GRAB->emit (button_up => $ev)
94	($x, $y) = $GRAB->coord2local ($x, $y);	139	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		140
98	if (!$BUTTON_STATE) {	141	unless ($BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	142	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	143	$grab->update if $grab;
101	$GRAB->update if $GRAB;	144	$GRAB->update if $GRAB;
102		145
103	check_tooltip;	146	check_hover $widget;
		147	$TOOLTIP_WATCHER->cb->();
104	}	148	}
105	}	149	}
106		150
107	sub feed_sdl_motion_event {	151	sub feed_sdl_motion_event {
108	my ($ev) = @_;	152	my ($ev) = @_;
109	my ($x, $y) = ($ev->{x}, $ev->{y});	153	my ($x, $y) = ($ev->{x}, $ev->{y});
110		154
111	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	155	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
112		156
113	if ($widget != $HOVER) {	157	check_hover $widget;
114	my $hover = $HOVER; $HOVER = $widget;
115		158
116	$hover->update if $hover && $hover->{can_hover};	159	$HOVER->emit (mouse_motion => $ev)
117	$HOVER->update if $HOVER && $HOVER->{can_hover};
118
119	check_tooltip;
120	}
121
122	if ($HOVER) {	160	if $HOVER;
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
125	}
126	}	161	}
127		162
128	# convert position array to integers	163	# convert position array to integers
129	sub harmonize {	164	sub harmonize {
130	my ($vals) = @_;	165	my ($vals) = @_;
…		…
136	$rem += $_ - $i;	171	$rem += $_ - $i;
137	$_ = $i;	172	$_ = $i;
138	}	173	}
139	}	174	}
140		175
		176	sub full_refresh {
		177	# make a copy, otherwise for complains about freed values.
		178	my @widgets = values %WIDGET;
		179
		180	$_->update
		181	for @widgets;
		182	}
		183
		184	sub reconfigure_widgets {
		185	# make a copy, otherwise C<for> complains about freed values.
		186	my @widgets = values %WIDGET;
		187
		188	$_->reconfigure
		189	for @widgets;
		190	}
		191
141	# call when resolution changes etc.	192	# call when resolution changes etc.
142	sub rescale_widgets {	193	sub rescale_widgets {
143	my ($sx, $sy) = @_;	194	my ($sx, $sy) = @_;
144		195
145	# make a copy, otherwise for complains about freed values.
146	my @widgets = values %WIDGET;	196	for my $widget (values %WIDGET) {
147
148	for my $widget (@widgets) {
149	if ($widget->{toplevel}) {	197	if ($widget->{is_toplevel}) {
		198	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		199	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		200
150	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	201	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
151	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	202	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	203	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
153	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	204	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
155	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	205	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	206	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
157	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	207
		208	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		209	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		210
158	}	211	}
159
160	$widget->reconfigure;
161	}	212	}
		213
		214	reconfigure_widgets;
162	}	215	}
163		216
164	#############################################################################	217	#############################################################################
165		218
		219	package CFPlus::UI::Event;
		220
		221	sub xy {
		222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		223	}
		224
		225	#############################################################################
		226
166	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
167		228
168	use strict;	229	use strict;
169		230
170	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
171		232
172	sub new {	233	sub new {
173	my $class = shift;	234	my $class = shift;
174		235
175	my $self = bless {	236	my $self = bless {
176	x => 0,	237	x => "center",
177	y => 0,	238	y => "center",
178	z => 0,	239	z => 0,
		240	w => undef,
		241	h => undef,
179	can_events => 1,	242	can_events => 1,
180	@_	243	@_
181	}, $class;	244	}, $class;
182		245
		246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
		247
183	for (keys %$self) {	248	for (keys %$self) {
184	if (/^connect_(.*)$/) {	249	if (/^on_(.*)$/) {
185	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
186	}	251	}
187	}	252	}
188		253
189	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
		255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
		256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
		257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
		258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
		259
		260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		262
		263	$self->show if $layout->{show};
		264	}
190		265
191	$self	266	$self
192	}	267	}
193		268
194	sub destroy {	269	sub destroy {
195	my ($self) = @_;	270	my ($self) = @_;
196		271
197	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
198	%$self = ();	274	%$self = ();
199	}	275	}
200		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
201	sub show {	281	sub show {
202	my ($self) = @_;	282	my ($self) = @_;
203		283
204	return if $self->{parent};	284	return if $self->{parent};
205		285
206	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
207	}	287	}
208		288
209	sub hide {	289	sub set_visible {
210	my ($self) = @_;	290	my ($self) = @_;
		291
		292	return if $self->{visible};
		293
		294	$self->{root} = $self->{parent}{root};
		295	$self->{visible} = $self->{parent}{visible} + 1;
		296
		297	$self->emit (visibility_change => 1);
		298
		299	$self->realloc if !exists $self->{req_w};
		300
		301	$_->set_visible for $self->children;
		302	}
		303
		304	sub set_invisible {
		305	my ($self) = @_;
		306
		307	return unless $self->{visible};
		308
		309	$_->set_invisible for $self->children;
		310
		311	delete $self->{visible};
		312	delete $self->{root};
211		313
212	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
213	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
214		316
		317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
		318	if $TOOLTIP->{owner} == $self;
		319
		320	$self->emit ("focus_out");
		321	$self->emit (visibility_change => 0);
		322	}
		323
		324	sub set_visibility {
		325	my ($self, $visible) = @_;
		326
		327	return if $self->{visible} == $visible;
		328
		329	$visible ? $self->show
		330	: $self->hide;
		331	}
		332
		333	sub toggle_visibility {
		334	my ($self) = @_;
		335
		336	$self->{visible}
		337	? $self->hide
		338	: $self->show;
		339	}
		340
		341	sub hide {
		342	my ($self) = @_;
		343
		344	$self->set_invisible;
		345
215	$self->{parent}->remove ($self)	346	$self->{parent}->remove ($self)
216	if $self->{parent};	347	if $self->{parent};
217	}	348	}
218		349
219	sub move {	350	sub move_abs {
220	my ($self, $x, $y, $z) = @_;	351	my ($self, $x, $y, $z) = @_;
221		352
222	$self->{x} = int $x;	353	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
223	$self->{y} = int $y;	354	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
224	$self->{z} = $z if defined $z;	355	$self->{z} = $z if defined $z;
225		356
226	$self->update;	357	$self->update;
227	}	358	}
228		359
229	sub set_size {	360	sub set_size {
230	my ($self, $w, $h) = @_;	361	my ($self, $w, $h) = @_;
231		362
232	$self->{user_w} = $w;	363	$self->{force_w} = $w;
233	$self->{user_h} = $h;	364	$self->{force_h} = $h;
234		365
235	$self->check_size;	366	$self->realloc;
236	}	367	}
237		368
238	sub size_request {	369	sub size_request {
239	require Carp;	370	require Carp;
240	Carp::confess "size_request is abstract";	371	Carp::confess "size_request is abstract";
241	}	372	}
242		373
		374	sub baseline_shift {
		375	0
		376	}
		377
243	sub configure {	378	sub configure {
244	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
245		380
246	if ($self->{aspect}) {	381	if ($self->{aspect}) {
		382	my ($ow, $oh) = ($w, $h);
		383
247	my $w2 = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
248	my $h2 = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
249		386
250	# use alignment to adjust x, y	387	# use alignment to adjust x, y
251		388
252	$x += int +($w - $w2) * 0.5;	389	$x += int 0.5 * ($ow - $w);
253	$y += int +($h - $h2) * 0.5;	390	$y += int 0.5 * ($oh - $h);
254
255	($w, $h) = ($w2, $h2);
256	}	391	}
257		392
258	if ($self->{x} != $x || $self->{y} != $y) {	393	if ($self->{x} ne $x || $self->{y} ne $y) {
259	$self->{x} = $x;	394	$self->{x} = $x;
260	$self->{y} = $y;	395	$self->{y} = $y;
261	$self->update;	396	$self->update;
262	}	397	}
263		398
264	if ($self->{w} != $w || $self->{h} != $h) {	399	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
265	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	400	return unless $self->{visible};
266	}
267	}
268		401
269	sub size_allocate {	402	$self->{alloc_w} = $w;
270	# nothing to be done	403	$self->{alloc_h} = $h;
271	}
272		404
273	sub reconfigure {	405	$self->{root}{size_alloc}{$self+0} = $self;
274	my ($self) = @_;	406	}
275
276	$self->check_size (1);
277	$self->update;
278	}	407	}
279		408
280	sub children {	409	sub children {
		410	# nop
		411	}
		412
		413	sub visible_children {
		414	$_[0]->children
281	}	415	}
282		416
283	sub set_max_size {	417	sub set_max_size {
284	my ($self, $w, $h) = @_;	418	my ($self, $w, $h) = @_;
285		419
286	delete $self->{max_w}; $self->{max_w} = $w if $w;	420	$self->{max_w} = int $w if defined $w;
287	delete $self->{max_h}; $self->{max_h} = $h if $h;	421	$self->{max_h} = int $h if defined $h;
		422
		423	$self->realloc;
288	}	424	}
289		425
290	sub set_tooltip {	426	sub set_tooltip {
291	my ($self, $tooltip) = @_;	427	my ($self, $tooltip) = @_;
292		428
		429	$tooltip =~ s/^\s+//;
		430	$tooltip =~ s/\s+$//;
		431
		432	return if $self->{tooltip} eq $tooltip;
		433
293	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
294		435
295	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
296	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
297	CFClient::UI::check_tooltip;	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
298	}	439	}
299	}	440	}
300		441
301	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
302	sub coord2local {	443	sub coord2local {
303	my ($self, $x, $y) = @_;	444	my ($self, $x, $y) = @_;
304		445
		446	Carp::confess unless $self->{parent};#d#
		447
305	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
306	}	449	}
307		450
308	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
309	sub coord2global {	452	sub coord2global {
310	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
311		454
		455	Carp::confess unless $self->{parent};#d#
		456
312	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
313	}	458	}
314		459
315	sub focus_in {	460	sub invoke_focus_in {
316	my ($self) = @_;	461	my ($self) = @_;
317		462
318	return if $FOCUS == $self;	463	return if $FOCUS == $self;
319	return unless $self->{can_focus};	464	return unless $self->{can_focus};
320		465
321	my $focus = $FOCUS; $FOCUS = $self;	466	$FOCUS = $self;
322		467
323	$self->emit (focus_in => $focus);	468	$self->update;
324		469
325	$focus->update if $focus;	470	0
326	$FOCUS->update;
327	}	471	}
328		472
329	sub focus_out {	473	sub invoke_focus_out {
330	my ($self) = @_;	474	my ($self) = @_;
331		475
332	return unless $FOCUS == $self;	476	return unless $FOCUS == $self;
333		477
334	my $focus = $FOCUS; undef $FOCUS;	478	undef $FOCUS;
335		479
336	$self->emit (focus_out => $focus);	480	$self->update;
337		481
338	$focus->update if $focus; #?	482	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
339	}	483	unless $FOCUS;
340		484
		485	0
		486	}
		487
		488	sub grab_focus {
		489	my ($self) = @_;
		490
		491	$FOCUS->emit ("focus_out") if $FOCUS;
		492	$self->emit ("focus_in");
		493	}
		494
341	sub mouse_motion { }	495	sub invoke_mouse_motion { 0 }
342	sub button_up { }	496	sub invoke_button_up { 0 }
343	sub key_down { }	497	sub invoke_key_down { 0 }
344	sub key_up { }	498	sub invoke_key_up { 0 }
		499	sub invoke_mouse_wheel { 0 }
345		500
346	sub button_down {	501	sub invoke_button_down {
347	my ($self, $ev, $x, $y) = @_;	502	my ($self, $ev, $x, $y) = @_;
348		503
349	$self->focus_in;	504	$self->grab_focus;
350	}
351		505
352	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	506	0
353	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	507	}
354	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	508
355	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	509	sub connect {
356	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	510	my ($self, $signal, $cb) = @_;
		511
		512	push @{ $self->{signal_cb}{$signal} }, $cb;
		513
		514	defined wantarray and CFPlus::guard {
		515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		516	@{ $self->{signal_cb}{$signal} };
		517	}
		518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
		524	}
		525
		526	my %has_coords = (
		527	button_down => 1,
		528	button_up => 1,
		529	mouse_motion => 1,
		530	mouse_wheel => 1,
		531	);
		532
		533	sub emit {
		534	my ($self, $signal, @args) = @_;
		535
		536	# I do not really like this solution, but I do not like duplication
		537	# and needlessly verbose code, either.
		538	my @append
		539	= $has_coords{$signal}
		540	? $args[0]->xy ($self)
		541	: ();
		542
		543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		544
		545	for my $cb (
		546	@{$self->{signal_cb}{$signal} || []}, # before
		547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
		553	$self->{parent} && $self->{parent}->emit ($signal, @args)
		554	}
		555
		556	#sub find_widget {
		557	# in .xs
		558
		559	sub set_parent {
		560	my ($self, $parent) = @_;
		561
		562	CFPlus::weaken ($self->{parent} = $parent);
		563	$self->set_visible if $parent->{visible};
		564	}
		565
		566	sub realloc {
		567	my ($self) = @_;
		568
		569	if ($self->{visible}) {
		570	return if $self->{root}{realloc}{$self+0};
		571
		572	$self->{root}{realloc}{$self+0} = $self;
		573	$self->{root}->update;
		574	} else {
		575	delete $self->{req_w};
		576	delete $self->{req_h};
		577	}
		578	}
		579
		580	sub update {
		581	my ($self) = @_;
		582
		583	$self->{parent}->update
		584	if $self->{parent};
		585	}
		586
		587	sub reconfigure {
		588	my ($self) = @_;
		589
		590	$self->realloc;
		591	$self->update;
		592	}
		593
		594	# using global variables seems a bit hacky, but passing through all drawing
		595	# functions seems pointless.
		596	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
357		597
358	sub draw {	598	sub draw {
359	my ($self) = @_;	599	my ($self) = @_;
360		600
361	return unless $self->{h} && $self->{w};	601	return unless $self->{h} && $self->{w};
		602
		603	# update screen rectangle
		604	local $draw_x = $draw_x + $self->{x};
		605	local $draw_y = $draw_y + $self->{y};
		606
		607	# skip widgets that are entirely outside the drawing area
		608	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		609	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
362		610
363	glPushMatrix;	611	glPushMatrix;
364	glTranslate $self->{x}, $self->{y}, 0;	612	glTranslate $self->{x}, $self->{y}, 0;
365	$self->_draw;
366	glPopMatrix;
367		613
368	if ($self == $HOVER && $self->{can_hover}) {	614	if ($self == $HOVER && $self->{can_hover}) {
369	my ($x, $y) = @$self{qw(x y)};
370
371	glColor 1, 0.8, 0.5, 0.2;	615	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
372	glEnable GL_BLEND;	616	glEnable GL_BLEND;
373	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	617	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
374	glBegin GL_QUADS;	618	glBegin GL_QUADS;
375	glVertex $x , $y;
376	glVertex $x + $self->{w}, $y;
377	glVertex $x + $self->{w}, $y + $self->{h};
378	glVertex $x , $y + $self->{h};
379	glEnd;
380	glDisable GL_BLEND;
381	}
382
383	if ($ENV{PCLIENT_DEBUG}) {
384	glPushMatrix;
385	glColor 1, 1, 0, 1;
386	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387	glBegin GL_LINE_LOOP;
388	glVertex 0 , 0;	619	glVertex 0 , 0;
389	glVertex $self->{w}, 0;	620	glVertex $self->{w}, 0;
390	glVertex $self->{w}, $self->{h};	621	glVertex $self->{w}, $self->{h};
391	glVertex 0 , $self->{h};	622	glVertex 0 , $self->{h};
392	glEnd;	623	glEnd;
		624	glDisable GL_BLEND;
		625	}
		626
		627	if ($ENV{CFPLUS_DEBUG} & 1) {
		628	glPushMatrix;
		629	glColor 1, 1, 0, 1;
		630	glTranslate 0.375, 0.375;
		631	glBegin GL_LINE_LOOP;
		632	glVertex 0 , 0;
		633	glVertex $self->{w} - 1, 0;
		634	glVertex $self->{w} - 1, $self->{h} - 1;
		635	glVertex 0 , $self->{h} - 1;
		636	glEnd;
393	glPopMatrix;	637	glPopMatrix;
394	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
395	}	639	}
		640
		641	$self->_draw;
		642	glPopMatrix;
396	}	643	}
397		644
398	sub _draw {	645	sub _draw {
399	my ($self) = @_;	646	my ($self) = @_;
400		647
401	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
402	}	649	}
403		650
404	sub find_widget {	651	my $cntx;#d#
405	my ($self, $x, $y) = @_;
406
407	return () unless $self->{can_events};
408
409	return $self
410	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
411	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
412
413	()
414	}
415
416	sub set_parent {
417	my ($self, $parent) = @_;
418
419	Scalar::Util::weaken ($self->{parent} = $parent);
420
421	# TODO: req_w _does_change after ->reconfigure
422	$self->check_size
423	unless exists $self->{req_w};
424	}
425
426	sub check_size {
427	my ($self, $forced) = @_;
428
429	$self->{force_alloc} = 1 if $forced;
430	$CFClient::UI::ROOT->{check_size}{$self} = $self;
431	}
432
433	sub update {
434	my ($self) = @_;
435
436	$self->{parent}->update
437	if $self->{parent};
438	}
439
440	sub connect {
441	my ($self, $signal, $cb) = @_;
442
443	push @{ $self->{signal_cb}{$signal} }, $cb;
444	}
445
446	sub emit {
447	my ($self, $signal, @args) = @_;
448
449	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
450	}
451
452	sub DESTROY {	652	sub DESTROY {
453	my ($self) = @_;	653	my ($self) = @_;
454		654
		655	return if CFPlus::in_destruct;
		656
		657	eval { $self->destroy };
		658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		659
455	delete $WIDGET{$self+0};	660	delete $WIDGET{$self+0};
456	#$self->deactivate;
457	}	661	}
458		662
459	#############################################################################	663	#############################################################################
460		664
461	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
462		666
463	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
464		668
465	use strict;	669	use strict;
466	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
467		671
468	sub new {	672	sub new {
469	my $class = shift;	673	my $class = shift;
470		674
471	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
486		690
487	if ($color && (@$color < 4 || $color->[3])) {	691	if ($color && (@$color < 4 || $color->[3])) {
488	my ($w, $h) = @$self{qw(w h)};	692	my ($w, $h) = @$self{qw(w h)};
489		693
490	glEnable GL_BLEND;	694	glEnable GL_BLEND;
491	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	695	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
492	glColor @$color;	696	glColor_premultiply @$color;
493		697
494	glBegin GL_QUADS;	698	glBegin GL_QUADS;
495	glVertex 0 , 0;	699	glVertex 0 , 0;
496	glVertex 0 , $h;	700	glVertex 0 , $h;
497	glVertex $w, $h;	701	glVertex $w, $h;
…		…
502	}	706	}
503	}	707	}
504		708
505	#############################################################################	709	#############################################################################
506		710
507	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
508		712
509	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
510		714
511	sub new {	715	sub new {
512	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
513	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
514	}	718	}
515		719
516	sub size_request {	720	sub size_request {
517	(0, 0)	721	my ($self) = @_;
		722
		723	($self->{w} + 0, $self->{h} + 0)
518	}	724	}
519		725
520	sub draw { }	726	sub draw { }
521		727
522	#############################################################################	728	#############################################################################
523		729
524	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
525		731
526	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
527		733
528	sub new {	734	sub new {
529	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
530		736
531	my $children = delete $arg{children} || [];	737	my $children = delete $arg{children};
532		738
533	my $self = $class->SUPER::new (	739	my $self = $class->SUPER::new (
534	children => [],	740	children => [],
535	can_events => 0,	741	can_events => 0,
536	%arg,	742	%arg,
537	);	743	);
		744
538	$self->add ($_) for @$children;	745	$self->add (@$children)
		746	if $children;
539		747
540	$self	748	$self
		749	}
		750
		751	sub realloc {
		752	my ($self) = @_;
		753
		754	$self->{force_realloc} = 1;
		755	$self->{force_size_alloc} = 1;
		756	$self->SUPER::realloc;
541	}	757	}
542		758
543	sub add {	759	sub add {
544	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
545		761
…		…
551	$self->{children} = [	767	$self->{children} = [
552	sort { $a->{z} <=> $b->{z} }	768	sort { $a->{z} <=> $b->{z} }
553	@{$self->{children}}, @widgets	769	@{$self->{children}}, @widgets
554	];	770	];
555		771
556	$self->check_size (1);	772	$self->realloc;
557	$self->update;
558	}	773	}
559		774
560	sub children {	775	sub children {
561	@{ $_[0]{children} }	776	@{ $_[0]{children} }
562	}	777	}
…		…
567	delete $child->{parent};	782	delete $child->{parent};
568	$child->hide;	783	$child->hide;
569		784
570	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	785	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571		786
572	$self->check_size;	787	$self->realloc;
573	$self->update;
574	}	788	}
575		789
576	sub clear {	790	sub clear {
577	my ($self) = @_;	791	my ($self) = @_;
578		792
…		…
582	for (@$children) {	796	for (@$children) {
583	delete $_->{parent};	797	delete $_->{parent};
584	$_->hide;	798	$_->hide;
585	}	799	}
586		800
587	$self->check_size;	801	$self->realloc;
588	$self->update;
589	}	802	}
590		803
591	sub find_widget {	804	sub find_widget {
592	my ($self, $x, $y) = @_;	805	my ($self, $x, $y) = @_;
593		806
594	$x -= $self->{x};	807	$x -= $self->{x};
595	$y -= $self->{y};	808	$y -= $self->{y};
596		809
597	my $res;	810	my $res;
598		811
599	for (reverse @{ $self->{children} }) {	812	for (reverse $self->visible_children) {
600	$res = $_->find_widget ($x, $y)	813	$res = $_->find_widget ($x, $y)
601	and return $res;	814	and return $res;
602	}	815	}
603		816
604	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	817	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
610	$_->draw for @{$self->{children}};	823	$_->draw for @{$self->{children}};
611	}	824	}
612		825
613	#############################################################################	826	#############################################################################
614		827
615	package CFClient::UI::Bin;	828	package CFPlus::UI::Bin;
616		829
617	our @ISA = CFClient::UI::Container::;	830	our @ISA = CFPlus::UI::Container::;
618		831
619	sub new {	832	sub new {
620	my ($class, %arg) = @_;	833	my ($class, %arg) = @_;
621		834
622	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	835	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
623		836
624	$class->SUPER::new (children => [$child], %arg)	837	$class->SUPER::new (children => [$child], %arg)
625	}	838	}
626		839
627	sub add {	840	sub add {
628	my ($self, $child) = @_;	841	my ($self, $child) = @_;
629		842
630	$self->{children} = [];	843	$self->SUPER::remove ($_) for @{ $self->{children} };
631
632	$self->SUPER::add ($child);	844	$self->SUPER::add ($child);
633	}	845	}
634		846
635	sub remove {	847	sub remove {
636	my ($self, $widget) = @_;	848	my ($self, $widget) = @_;
637		849
638	$self->SUPER::remove ($widget);	850	$self->SUPER::remove ($widget);
639		851
640	$self->{children} = [new CFClient::UI::Empty]	852	$self->{children} = [new CFPlus::UI::Empty]
641	unless @{$self->{children}};	853	unless @{$self->{children}};
642	}	854	}
643		855
644	sub child { $_[0]->{children}[0] }	856	sub child { $_[0]->{children}[0] }
645		857
646	sub size_request {	858	sub size_request {
647	$_[0]{children}[0]->size_request	859	$_[0]{children}[0]->size_request
648	}	860	}
649		861
650	sub size_allocate {	862	sub invoke_size_allocate {
651	my ($self, $w, $h) = @_;	863	my ($self, $w, $h) = @_;
652		864
653	$self->{children}[0]->configure (0, 0, $w, $h);	865	$self->{children}[0]->configure (0, 0, $w, $h);
		866
		867	1
654	}	868	}
655		869
656	#############################################################################	870	#############################################################################
657		871
		872	# back-buffered drawing area
		873
658	package CFClient::UI::Window;	874	package CFPlus::UI::Window;
659		875
660	our @ISA = CFClient::UI::Bin::;	876	our @ISA = CFPlus::UI::Bin::;
661		877
662	use CFClient::OpenGL;	878	use CFPlus::OpenGL;
663		879
664	sub new {	880	sub new {
665	my ($class, %arg) = @_;	881	my ($class, %arg) = @_;
666		882
667	my $self = $class->SUPER::new (%arg);	883	my $self = $class->SUPER::new (%arg);
…		…
672		888
673	$ROOT->on_post_alloc ($self => sub { $self->render_child });	889	$ROOT->on_post_alloc ($self => sub { $self->render_child });
674	$self->SUPER::update;	890	$self->SUPER::update;
675	}	891	}
676		892
677	sub size_allocate {	893	sub invoke_size_allocate {
678	my ($self, $w, $h) = @_;	894	my ($self, $w, $h) = @_;
679		895
680	$self->SUPER::size_allocate ($w, $h);
681	$self->update;	896	$self->update;
		897
		898	$self->SUPER::invoke_size_allocate ($w, $h)
682	}	899	}
683		900
684	sub _render {	901	sub _render {
		902	my ($self) = @_;
		903
685	$_[0]{children}[0]->draw;	904	$self->{children}[0]->draw;
686	}	905	}
687		906
688	sub render_child {	907	sub render_child {
689	my ($self) = @_;	908	my ($self) = @_;
690		909
691	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	910	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
692	glClearColor 0, 0, 0, 0;	911	glClearColor 0, 0, 0, 0;
693	glClear GL_COLOR_BUFFER_BIT;	912	glClear GL_COLOR_BUFFER_BIT;
694		913
		914	{
		915	package CFPlus::UI::Base;
		916
		917	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		918	(0, 0, $self->{w}, $self->{h});
		919
695	$self->_render;	920	$self->_render;
		921	}
696	};	922	};
697	}	923	}
698		924
699	sub _draw {	925	sub _draw {
700	my ($self) = @_;	926	my ($self) = @_;
701
702	my ($w, $h) = ($self->w, $self->h);
703		927
704	my $tex = $self->{texture}	928	my $tex = $self->{texture}
705	or return;	929	or return;
706		930
707	glEnable GL_TEXTURE_2D;	931	glEnable GL_TEXTURE_2D;
708	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	932	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
709	glColor 1, 1, 1, 1;	933	glColor 0, 0, 0, 1;
710		934
711	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	935	$tex->draw_quad_alpha_premultiplied (0, 0);
712		936
713	glDisable GL_TEXTURE_2D;	937	glDisable GL_TEXTURE_2D;
714	}	938	}
715		939
716	#############################################################################	940	#############################################################################
717		941
718	package CFClient::UI::ViewPort;	942	package CFPlus::UI::ViewPort;
719		943
		944	use List::Util qw(min max);
		945
720	our @ISA = CFClient::UI::Window::;	946	our @ISA = CFPlus::UI::Window::;
		947
		948	sub new {
		949	my $class = shift;
		950
		951	$class->SUPER::new (
		952	scroll_x => 0,
		953	scroll_y => 1,
		954	@_,
		955	)
		956	}
721		957
722	sub size_request {	958	sub size_request {
723	my ($self) = @_;	959	my ($self) = @_;
724		960
725	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	961	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
726	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
727		962
728	@$self{qw(child_w child_h)}	963	$w = 10 if $self->{scroll_x};
729	}	964	$h = 10 if $self->{scroll_y};
730		965
		966	($w, $h)
		967	}
		968
731	sub size_allocate {	969	sub invoke_size_allocate {
732	my ($self, $w, $h) = @_;	970	my ($self, $w, $h) = @_;
733		971
		972	my $child = $self->child;
		973
		974	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
		975	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
		976
		977	$self->child->configure (0, 0, $w, $h);
734	$self->update;	978	$self->update;
		979
		980	1
735	}	981	}
736		982
737	sub set_offset {	983	sub set_offset {
738	my ($self, $x, $y) = @_;	984	my ($self, $x, $y) = @_;
739		985
		986	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		987	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		988
		989	if ($x != $self->{view_x} or $y != $self->{view_y}) {
740	$self->{view_x} = int $x;	990	$self->{view_x} = $x;
741	$self->{view_y} = int $y;	991	$self->{view_y} = $y;
742		992
		993	$self->emit (changed => $x, $y);
743	$self->update;	994	$self->update;
		995	}
744	}	996	}
745		997
746	# hmm, this does not work for topleft of $self... but we should not ask for that	998	# hmm, this does not work for topleft of $self... but we should not ask for that
747	sub coord2local {	999	sub coord2local {
748	my ($self, $x, $y) = @_;	1000	my ($self, $x, $y) = @_;
…		…
763	my ($self, $x, $y) = @_;	1015	my ($self, $x, $y) = @_;
764		1016
765	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1017	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
766	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1018	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
767	) {	1019	) {
768	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1020	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
769	} else {	1021	} else {
770	$self->CFClient::UI::Base::find_widget ($x, $y)	1022	$self->CFPlus::UI::Base::find_widget ($x, $y)
771	}	1023	}
772	}	1024	}
773		1025
774	sub _render {	1026	sub _render {
775	my ($self) = @_;	1027	my ($self) = @_;
776		1028
		1029	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
		1030	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
		1031
777	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1032	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
778		1033
779	$self->SUPER::_render;	1034	$self->SUPER::_render;
780	}	1035	}
781		1036
782	#############################################################################	1037	#############################################################################
783		1038
784	package CFClient::UI::ScrolledWindow;	1039	package CFPlus::UI::ScrolledWindow;
785		1040
786	our @ISA = CFClient::UI::HBox::;	1041	our @ISA = CFPlus::UI::Table::;
787		1042
788	sub new {	1043	sub new {
789	my $class = shift;	1044	my ($class, %arg) = @_;
		1045
		1046	my $child = delete $arg{child};
790		1047
791	my $self;	1048	my $self;
792		1049
793	my $slider = new CFClient::UI::Slider	1050	my $hslider = new CFPlus::UI::Slider
794	vertical => 1,	1051	vertical => 0,
795	range => [0, 0, 1, 0.01], # HACK fix	1052	range => [0, 0, 1, 0.01], # HACK fix
796	connect_changed => sub {	1053	on_changed => sub {
797	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	1054	$self->{hpos} = $_[1];
		1055	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
798	},	1056	},
799	;	1057	;
800		1058
		1059	my $vslider = new CFPlus::UI::Slider
		1060	vertical => 1,
		1061	range => [0, 0, 1, 0.01], # HACK fix
		1062	on_changed => sub {
		1063	$self->{vpos} = $_[1];
		1064	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1065	},
		1066	;
		1067
801	$self = $class->SUPER::new (	1068	$self = $class->SUPER::new (
802	vp => (new CFClient::UI::ViewPort),	1069	scroll_x => 0,
		1070	scroll_y => 1,
		1071	can_events => 1,
803	slider => $slider,	1072	hslider => $hslider,
804	@_,	1073	vslider => $vslider,
		1074	col_expand => [1, 0],
		1075	row_expand => [1, 0],
		1076	%arg,
805	);	1077	);
806		1078
807	$self->{vp}->add ($self->{scrolled});	1079	$self->{vp} = new CFPlus::UI::ViewPort
		1080	expand => 1,
		1081	scroll_x => $self->{scroll_x},
		1082	scroll_y => $self->{scroll_y},
		1083	on_changed => sub {
		1084	my ($vp, $x, $y) = @_;
		1085
		1086	$vp->{parent}{hslider}->set_value ($x);
		1087	$vp->{parent}{vslider}->set_value ($y);
		1088
		1089	0
		1090	},
		1091	;
		1092
808	$self->add ($self->{vp});	1093	$self->SUPER::add_at (0, 0, $self->{vp});
809	$self->add ($self->{slider});	1094
		1095	$self->add ($child) if $child;
810		1096
811	$self	1097	$self
812	}	1098	}
813		1099
814	#TODO# update range on size_allocate depending on child	1100	#TODO# update range on size_allocate depending on child
815	# update viewport offset on scroll	1101
		1102	sub add {
		1103	my ($self, $widget) = @_;
		1104
		1105	$self->{vp}->add ($self->{child} = $widget);
		1106	}
		1107
		1108	sub update_slider {
		1109	my ($self) = @_;
		1110
		1111	my $child = ($self->{vp} or return)->child;
		1112
		1113	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1114	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1115
		1116	my $visible = $w1 > $w2;
		1117	if ($visible != $self->{hslider}{visible}) {
		1118	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
		1119	: $self->{hslider}->hide;
		1120	}
		1121
		1122	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1123	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1124
		1125	my $visible = $h1 > $h2;
		1126	if ($visible != $self->{vslider}{visible}) {
		1127	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
		1128	: $self->{vslider}->hide;
		1129	}
		1130	}
		1131
		1132	sub update {
		1133	my ($self) = @_;
		1134
		1135	$self->update_slider;
		1136	$self->SUPER::update;
		1137	}
		1138
		1139	sub invoke_mouse_wheel {
		1140	my ($self, $ev) = @_;
		1141
		1142	$self->{vslider}->emit (mouse_wheel => $ev)
		1143	if $ev->{dy};
		1144
		1145	$self->{hslider}->emit (mouse_wheel => $ev)
		1146	if $ev->{dx};
		1147
		1148	1
		1149	}
		1150
		1151	sub invoke_button_down {
		1152	my ($self, $ev, $x, $y) = @_;
		1153
		1154	if ($ev->{button} == 2) {
		1155	$self->grab_focus;
		1156
		1157	my $ox = $self->{vp}{view_x} + $ev->{x};
		1158	my $oy = $self->{vp}{view_y} + $ev->{y};
		1159
		1160	$self->{motion} = sub {
		1161	my ($ev, $x, $y) = @_;
		1162
		1163	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1164	$self->update;
		1165	};
		1166
		1167	return 1;
		1168	}
		1169
		1170	0
		1171	}
		1172
		1173	sub invoke_button_up {
		1174	my ($self, $ev, $x, $y) = @_;
		1175
		1176	if (delete $self->{motion}) {
		1177	return 1;
		1178	}
		1179
		1180	0
		1181	}
		1182
		1183	sub invoke_mouse_motion {
		1184	my ($self, $ev, $x, $y) = @_;
		1185
		1186	if ($self->{motion}) {
		1187	$self->{motion}->($ev, $x, $y);
		1188	return 1;
		1189	}
		1190
		1191	0
		1192	}
		1193
		1194	sub invoke_size_allocate {
		1195	my ($self, $w, $h) = @_;
		1196
		1197	$self->update_slider;
		1198	$self->SUPER::invoke_size_allocate ($w, $h)
		1199	}
816		1200
817	#############################################################################	1201	#############################################################################
818		1202
819	package CFClient::UI::Frame;	1203	package CFPlus::UI::Frame;
820		1204
821	our @ISA = CFClient::UI::Bin::;	1205	our @ISA = CFPlus::UI::Bin::;
822		1206
823	use CFClient::OpenGL;	1207	use CFPlus::OpenGL;
824		1208
825	sub new {	1209	sub new {
826	my $class = shift;	1210	my $class = shift;
827		1211
828	$class->SUPER::new (	1212	$class->SUPER::new (
…		…
836		1220
837	if ($self->{bg}) {	1221	if ($self->{bg}) {
838	my ($w, $h) = @$self{qw(w h)};	1222	my ($w, $h) = @$self{qw(w h)};
839		1223
840	glEnable GL_BLEND;	1224	glEnable GL_BLEND;
841	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1225	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
842	glColor @{ $self->{bg} };	1226	glColor_premultiply @{ $self->{bg} };
843		1227
844	glBegin GL_QUADS;	1228	glBegin GL_QUADS;
845	glVertex 0 , 0;	1229	glVertex 0 , 0;
846	glVertex 0 , $h;	1230	glVertex 0 , $h;
847	glVertex $w, $h;	1231	glVertex $w, $h;
…		…
854	$self->SUPER::_draw;	1238	$self->SUPER::_draw;
855	}	1239	}
856		1240
857	#############################################################################	1241	#############################################################################
858		1242
859	package CFClient::UI::FancyFrame;	1243	package CFPlus::UI::FancyFrame;
860		1244
861	our @ISA = CFClient::UI::Bin::;	1245	our @ISA = CFPlus::UI::Bin::;
862		1246
863	use CFClient::OpenGL;	1247	use CFPlus::OpenGL;
864
865	my @tex =
866	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
867	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
868		1248
869	sub new {	1249	sub new {
870	my $class = shift;	1250	my ($class, %arg) = @_;
871		1251
872	# TODO: user_x, user_y, overwrite moveto?	1252	if ((exists $arg{label}) && !ref $arg{label}) {
		1253	$arg{label} = new CFPlus::UI::Label
		1254	align => 1,
		1255	valign => 0,
		1256	text => $arg{label},
		1257	fontsize => ($arg{border} || 0.8) * 0.75;
		1258	}
873		1259
874	my $self = $class->SUPER::new (	1260	my $self = $class->SUPER::new (
		1261	# label => "",
875	bg => [1, 1, 1, 1],	1262	fg => [0.6, 0.3, 0.1],
876	border_bg => [1, 1, 1, 1],
877	border => 0.6,	1263	border => 0.8,
878	toplevel => 1,	1264	style => 'single',
879	can_events => 1,	1265	%arg,
880	@_
881	);	1266	);
882		1267
883	$self->{title} &&= new CFClient::UI::Label
884	align => 0,
885	valign => 1,
886	text => $self->{title},
887	fontsize => $self->{border};
888
889	$self	1268	$self
		1269	}
		1270
		1271	sub add {
		1272	my ($self, @widgets) = @_;
		1273
		1274	$self->SUPER::add (@widgets);
		1275	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
890	}	1276	}
891		1277
892	sub border {	1278	sub border {
893	int $_[0]{border} * $::FONTSIZE	1279	int $_[0]{border} * $::FONTSIZE
894	}	1280	}
895		1281
896	sub size_request {	1282	sub size_request {
897	my ($self) = @_;	1283	my ($self) = @_;
		1284
		1285	($self->{label_w}, undef) = $self->{label}->size_request
		1286	if $self->{label};
898		1287
899	my ($w, $h) = $self->SUPER::size_request;	1288	my ($w, $h) = $self->SUPER::size_request;
900		1289
901	(	1290	(
902	$w + $self->border * 2,	1291	$w + $self->border * 2,
903	$h + $self->border * 2,	1292	$h + $self->border * 2,
904	)	1293	)
905	}	1294	}
906		1295
907	sub size_allocate {	1296	sub invoke_size_allocate {
908	my ($self, $w, $h) = @_;	1297	my ($self, $w, $h) = @_;
909		1298
910	$h -= List::Util::max 0, $self->border * 2;	1299	my $border = $self->border;
		1300
911	$w -= List::Util::max 0, $self->border * 2;	1301	$w -= List::Util::max 0, $border * 2;
		1302	$h -= List::Util::max 0, $border * 2;
912		1303
913	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)	1304	if (my $label = $self->{label}) {
914	if $self->{title};	1305	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1306	$label->{h} = List::Util::min $h, $border;
		1307	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1308	}
915		1309
916	$self->child->configure ($self->border, $self->border, $w, $h);	1310	$self->child->configure ($border, $border, $w, $h);
917	}
918		1311
		1312	1
		1313	}
		1314
		1315	sub _draw {
		1316	my ($self) = @_;
		1317
		1318	my $child = $self->{children}[0];
		1319
		1320	my $border = $self->border;
		1321	my ($w, $h) = ($self->{w}, $self->{h});
		1322
		1323	$child->draw;
		1324
		1325	glColor @{$self->{fg}};
		1326	glBegin GL_LINE_STRIP;
		1327	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1328	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1329	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1330	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1331	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1332	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1333	glEnd;
		1334
		1335	if ($self->{label}) {
		1336	glTranslate $border * 2, 0;
		1337	$self->{label}->_draw;
		1338	}
		1339	}
		1340
		1341	#############################################################################
		1342
		1343	package CFPlus::UI::Toplevel;
		1344
		1345	our @ISA = CFPlus::UI::Bin::;
		1346
		1347	use CFPlus::OpenGL;
		1348
		1349	my $bg =
		1350	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
		1351	mipmap => 1, wrap => 1;
		1352
		1353	my @border =
		1354	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1355	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1356
		1357	my @icon =
		1358	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1359	qw(x1_move.png x1_resize.png);
		1360
		1361	sub new {
		1362	my ($class, %arg) = @_;
		1363
		1364	my $self = $class->SUPER::new (
		1365	bg => [1, 1, 1, 1],
		1366	border_bg => [1, 1, 1, 1],
		1367	border => 0.6,
		1368	can_events => 1,
		1369	min_w => 64,
		1370	min_h => 32,
		1371	%arg,
		1372	);
		1373
		1374	$self->{title_widget} = new CFPlus::UI::Label
		1375	align => 0,
		1376	valign => 1,
		1377	text => $self->{title},
		1378	fontsize => $self->{border},
		1379	if exists $self->{title};
		1380
		1381	if ($self->{has_close_button}) {
		1382	$self->{close_button} =
		1383	new CFPlus::UI::ImageButton
		1384	path => 'x1_close.png',
		1385	on_activate => sub { $self->emit ("delete") };
		1386
		1387	$self->CFPlus::UI::Container::add ($self->{close_button});
		1388	}
		1389
		1390	$self
		1391	}
		1392
		1393	sub add {
		1394	my ($self, @widgets) = @_;
		1395
		1396	$self->SUPER::add (@widgets);
		1397	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
		1398	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
		1399	}
		1400
		1401	sub border {
		1402	int $_[0]{border} * $::FONTSIZE
		1403	}
		1404
		1405	sub size_request {
		1406	my ($self) = @_;
		1407
		1408	$self->{title_widget}->size_request
		1409	if $self->{title_widget};
		1410
		1411	$self->{close_button}->size_request
		1412	if $self->{close_button};
		1413
		1414	my ($w, $h) = $self->SUPER::size_request;
		1415
		1416	(
		1417	$w + $self->border * 2,
		1418	$h + $self->border * 2,
		1419	)
		1420	}
		1421
		1422	sub invoke_size_allocate {
		1423	my ($self, $w, $h) = @_;
		1424
		1425	if ($self->{title_widget}) {
		1426	$self->{title_widget}{w} = $w;
		1427	$self->{title_widget}{h} = $h;
		1428	$self->{title_widget}->invoke_size_allocate ($w, $h);
		1429	}
		1430
		1431	my $border = $self->border;
		1432
		1433	$h -= List::Util::max 0, $border * 2;
		1434	$w -= List::Util::max 0, $border * 2;
		1435
		1436	$self->child->configure ($border, $border, $w, $h);
		1437
		1438	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1439	if $self->{close_button};
		1440
		1441	1
		1442	}
		1443
		1444	sub invoke_delete {
		1445	my ($self) = @_;
		1446
		1447	$self->hide;
		1448
		1449	1
		1450	}
		1451
919	sub button_down {	1452	sub invoke_button_down {
920	my ($self, $ev, $x, $y) = @_;	1453	my ($self, $ev, $x, $y) = @_;
921		1454
922	my ($w, $h) = @$self{qw(w h)};	1455	my ($w, $h) = @$self{qw(w h)};
923	my $border = $self->border;	1456	my $border = $self->border;
924		1457
…		…
937	my ($ev, $x, $y) = @_;	1470	my ($ev, $x, $y) = @_;
938		1471
939	my $dx = $ev->{x} - $ox;	1472	my $dx = $ev->{x} - $ox;
940	my $dy = $ev->{y} - $oy;	1473	my $dy = $ev->{y} - $oy;
941		1474
942	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1475	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
943	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1476	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1477
944	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1478	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
945	$self->check_size;	1479	$self->realloc;
946	};	1480	};
947		1481
948	} elsif ($lr ^ $td) {	1482	} elsif ($lr ^ $td) {
949	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1483	my ($ox, $oy) = ($ev->{x}, $ev->{y});
950	my ($bx, $by) = ($self->{x}, $self->{y});	1484	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
952	$self->{motion} = sub {	1486	$self->{motion} = sub {
953	my ($ev, $x, $y) = @_;	1487	my ($ev, $x, $y) = @_;
954		1488
955	($x, $y) = ($ev->{x}, $ev->{y});	1489	($x, $y) = ($ev->{x}, $ev->{y});
956		1490
957	$self->move ($bx + $x - $ox, $by + $y - $oy);	1491	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
958	$self->update;	1492	# HACK: the next line is required to enforce placement
		1493	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
959	};	1494	};
		1495	} else {
		1496	return 0;
		1497	}
		1498
960	}	1499	1
961	}	1500	}
962		1501
963	sub button_up {	1502	sub invoke_button_up {
964	my ($self, $ev, $x, $y) = @_;	1503	my ($self, $ev, $x, $y) = @_;
965		1504
966	delete $self->{motion};	1505	! ! delete $self->{motion}
967	}	1506	}
968		1507
969	sub mouse_motion {	1508	sub invoke_mouse_motion {
970	my ($self, $ev, $x, $y) = @_;	1509	my ($self, $ev, $x, $y) = @_;
971		1510
972	$self->{motion}->($ev, $x, $y) if $self->{motion};	1511	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1512
		1513	! ! $self->{motion}
		1514	}
		1515
		1516	sub invoke_visibility_change {
		1517	my ($self, $visible) = @_;
		1518
		1519	delete $self->{motion} unless $visible;
		1520
		1521	0
973	}	1522	}
974		1523
975	sub _draw {	1524	sub _draw {
976	my ($self) = @_;	1525	my ($self) = @_;
977		1526
		1527	my $child = $self->{children}[0];
		1528
978	my ($w, $h ) = ($self->{w}, $self->{h});	1529	my ($w, $h ) = ($self->{w}, $self->{h});
979	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1530	my ($cw, $ch) = ($child->{w}, $child->{h});
980		1531
981	glEnable GL_TEXTURE_2D;	1532	glEnable GL_TEXTURE_2D;
982	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1533	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983		1534
984	my $border = $self->border;	1535	my $border = $self->border;
985		1536
986	glColor @{ $self->{border_bg} };	1537	glColor @{ $self->{border_bg} };
987	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1538	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
988	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1539	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
989	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1540	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1541	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1542
		1543	# move
		1544	my $w2 = ($w - $border) * .5;
		1545	my $h2 = ($h - $border) * .5;
		1546	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1547	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1548	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1549
		1550	# resize
		1551	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1553	unless $self->{has_close_button};
		1554	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
991		1556
992	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1557	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993	my $bg = $tex[0];	1558	glColor @{ $self->{bg} };
994		1559
995	# TODO: repeat texture not scale	1560	# TODO: repeat texture not scale
		1561	# solve this better(?)
996	my $rep_x = $cw / $bg->{w};	1562	$bg->{s} = $cw / $bg->{w};
997	my $rep_y = $ch / $bg->{h};	1563	$bg->{t} = $ch / $bg->{h};
998
999	glColor @{ $self->{bg} };
1000
1001	$bg->{s} = $rep_x;
1002	$bg->{t} = $rep_y;
1003	$bg->{wrap_mode} = 1;
1004	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1564	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005	}	1565	}
1006		1566
1007	glDisable GL_TEXTURE_2D;	1567	glDisable GL_TEXTURE_2D;
1008		1568
1009	$self->{title}->draw if $self->{title};
1010
1011	$self->child->draw;	1569	$child->draw;
		1570
		1571	if ($self->{title_widget}) {
		1572	glTranslate 0, $border - $self->{h};
		1573	$self->{title_widget}->_draw;
		1574
		1575	glTranslate 0, - ($border - $self->{h});
		1576	}
		1577
		1578	$self->{close_button}->draw
		1579	if $self->{close_button};
1012	}	1580	}
1013		1581
1014	#############################################################################	1582	#############################################################################
1015		1583
1016	package CFClient::UI::Table;	1584	package CFPlus::UI::Table;
1017		1585
1018	our @ISA = CFClient::UI::Base::;	1586	our @ISA = CFPlus::UI::Base::;
1019		1587
1020	use List::Util qw(max sum);	1588	use List::Util qw(max sum);
1021		1589
1022	use CFClient::OpenGL;	1590	use CFPlus::OpenGL;
1023		1591
1024	sub new {	1592	sub new {
1025	my $class = shift;	1593	my $class = shift;
1026		1594
1027	$class->SUPER::new (	1595	$class->SUPER::new (
		1596	children => [],
1028	col_expand => [],	1597	col_expand => [],
		1598	row_expand => [],
1029	@_	1599	@_,
1030	)	1600	)
1031	}
1032
1033	sub add {
1034	my ($self, $x, $y, $child) = @_;
1035
1036	$child->set_parent ($self);
1037	$self->{children}[$y][$x] = $child;
1038
1039	$child->check_size;
1040	}	1601	}
1041		1602
1042	sub children {	1603	sub children {
1043	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1604	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044	}	1605	}
1045		1606
		1607	# TODO: store row/col info in child widget and use standard add/del
		1608	sub add {
		1609	my $self = shift;
		1610
		1611	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
		1612	$self->add_at (@_);
		1613	}
		1614
		1615	sub add_at {
		1616	my $self = shift;
		1617
		1618	while (@_) {
		1619	my ($col, $row, $child) = splice @_, 0, 3, ();
		1620
		1621	$child->set_parent ($self);
		1622	$self->{children}[$row][$col] = $child;
		1623	}
		1624
		1625	$self->{force_realloc} = 1;
		1626	$self->{force_size_alloc} = 1;
		1627	$self->realloc;
		1628	}
		1629
		1630	sub remove {
		1631	my ($self, $child) = @_;
		1632
		1633	for (@{ $self->{children} }) {
		1634	for (@{ $_ || [] }) {
		1635	$_ = undef if $_ == $child;
		1636	}
		1637	}
		1638	}
		1639
1046	# TODO: move to container class maybe? send childs a signal on removal?	1640	# TODO: move to container class maybe? send children a signal on removal?
1047	sub clear {	1641	sub clear {
1048	my ($self) = @_;	1642	my ($self) = @_;
1049		1643
1050	my @children = $self->children;	1644	my @children = $self->children;
1051	delete $self->{children};	1645	delete $self->{children};
…		…
1053	for (@children) {	1647	for (@children) {
1054	delete $_->{parent};	1648	delete $_->{parent};
1055	$_->hide;	1649	$_->hide;
1056	}	1650	}
1057		1651
1058	$self->update;	1652	$self->realloc;
1059	}	1653	}
1060		1654
1061	sub get_wh {	1655	sub get_wh {
1062	my ($self) = @_;	1656	my ($self) = @_;
1063		1657
…		…
1089	(sum @$ws),	1683	(sum @$ws),
1090	(sum @$hs),	1684	(sum @$hs),
1091	)	1685	)
1092	}	1686	}
1093		1687
1094	sub size_allocate {	1688	sub invoke_size_allocate {
1095	my ($self, $w, $h) = @_;	1689	my ($self, $w, $h) = @_;
1096		1690
1097	my ($ws, $hs) = $self->get_wh;	1691	my ($ws, $hs) = $self->get_wh;
1098		1692
1099	my $req_w = sum @$ws;	1693	my $req_w = (sum @$ws) || 1;
1100	my $req_h = sum @$hs;	1694	my $req_h = (sum @$hs) || 1;
1101		1695
1102	# TODO: nicer code && do row_expand	1696	# TODO: nicer code
1103	my @col_expand = @{$self->{col_expand}};	1697	my @col_expand = @{$self->{col_expand}};
1104	@col_expand = (1) x @$ws unless @col_expand;	1698	@col_expand = (1) x @$ws unless @col_expand;
1105	my $col_expand = (sum @col_expand) || 1;	1699	my $col_expand = (sum @col_expand) || 1;
1106		1700
1107	# linearly scale sizes
1108	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1701	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1109	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1110		1702
1111	CFClient::UI::harmonize $ws;	1703	CFPlus::UI::harmonize $ws;
		1704
		1705	my @row_expand = @{$self->{row_expand}};
		1706	@row_expand = (1) x @$ws unless @row_expand;
		1707	my $row_expand = (sum @row_expand) || 1;
		1708
		1709	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1710
1112	CFClient::UI::harmonize $hs;	1711	CFPlus::UI::harmonize $hs;
1113		1712
1114	my $y;	1713	my $y;
1115		1714
1116	for my $r (0 .. $#{$self->{children}}) {	1715	for my $r (0 .. $#{$self->{children}}) {
1117	my $row = $self->{children}[$r]	1716	my $row = $self->{children}[$r]
…		…
1131	}	1730	}
1132		1731
1133	$y += $row_h;	1732	$y += $row_h;
1134	}	1733	}
1135		1734
		1735	1
1136	}	1736	}
1137		1737
1138	sub find_widget {	1738	sub find_widget {
1139	my ($self, $x, $y) = @_;	1739	my ($self, $x, $y) = @_;
1140		1740
…		…
1159	}	1759	}
1160	}	1760	}
1161		1761
1162	#############################################################################	1762	#############################################################################
1163		1763
1164	package CFClient::UI::HBox;	1764	package CFPlus::UI::Fixed;
1165		1765
1166	# TODO: wrap into common Box base class	1766	use List::Util qw(min max);
1167		1767
1168	our @ISA = CFClient::UI::Container::;	1768	our @ISA = CFPlus::UI::Container::;
		1769
		1770	sub add {
		1771	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1772
		1773	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1774	$self->SUPER::add ($child);
		1775	}
		1776
		1777	sub _scale($$$) {
		1778	my ($mode, $val, $max) = @_;
		1779
		1780	$mode eq "abs" ? $val
		1781	: $mode eq "rel" ? $val * $max
		1782	: 0
		1783	}
1169		1784
1170	sub size_request {	1785	sub size_request {
1171	my ($self) = @_;	1786	my ($self) = @_;
1172		1787
1173	my @alloc = map [$_->size_request], @{$self->{children}};	1788	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1174		1789
		1790	# determine overall size by querying abs widgets
		1791	for my $child ($self->visible_children) {
		1792	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1793
		1794	if ($pos eq "abs") {
		1795	$w = _scale $size, $w, $child->{req_w};
		1796	$h = _scale $size, $h, $child->{req_h};
		1797
		1798	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1799	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1800	}
1175	(	1801	}
1176	(List::Util::sum map $_->[0], @alloc),	1802
1177	(List::Util::max map $_->[1], @alloc),	1803	my $W = $x2 - $x1;
		1804	my $H = $y2 - $y1;
		1805
		1806	# now layout remaining widgets
		1807	for my $child ($self->visible_children) {
		1808	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1809
		1810	if ($pos ne "abs") {
		1811	$x = _scale $pos, $x, $W;
		1812	$y = _scale $pos, $x, $H;
		1813	$w = _scale $size, $w, $child->{req_w};
		1814	$h = _scale $size, $h, $child->{req_h};
		1815
		1816	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1817	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1818	}
		1819	}
		1820
		1821	my $W = $x2 - $x1;
		1822	my $H = $y2 - $y1;
		1823
		1824	($W, $H)
		1825	}
		1826
		1827	sub invoke_size_allocate {
		1828	my ($self, $W, $H) = @_;
		1829
		1830	for my $child ($self->visible_children) {
		1831	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1832
		1833	$x = _scale $pos, $x, $W;
		1834	$y = _scale $pos, $x, $H;
		1835	$w = _scale $size, $w, $child->{req_w};
		1836	$h = _scale $size, $h, $child->{req_h};
		1837
		1838	$child->configure ($x, $y, $w, $h);
		1839	}
		1840
		1841	1
		1842	}
		1843
		1844	#############################################################################
		1845
		1846	package CFPlus::UI::Box;
		1847
		1848	our @ISA = CFPlus::UI::Container::;
		1849
		1850	sub size_request {
		1851	my ($self) = @_;
		1852
		1853	$self->{vertical}
		1854	? (
		1855	(List::Util::max map $_->{req_w}, @{$self->{children}}),
		1856	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
		1857	)
		1858	: (
		1859	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1860	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1861	)
		1862	}
		1863
		1864	sub invoke_size_allocate {
		1865	my ($self, $w, $h) = @_;
		1866
		1867	my $space = $self->{vertical} ? $h : $w;
		1868	my @children = $self->visible_children;
		1869
		1870	my @req;
		1871
		1872	if ($self->{homogeneous}) {
		1873	@req = ($space / (@children || 1)) x @children;
		1874	} else {
		1875	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
		1876	my $req = List::Util::sum @req;
		1877
		1878	if ($req > $space) {
		1879	# ah well, not enough space
		1880	$_ *= $space / $req for @req;
		1881	} else {
		1882	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
		1883
		1884	$space = ($space - $req) / $expand; # remaining space to give away
		1885
		1886	$req[$_] += $space * $children[$_]{expand}
		1887	for 0 .. $#children;
		1888	}
		1889	}
		1890
		1891	CFPlus::UI::harmonize \@req;
		1892
		1893	my $pos = 0;
		1894	for (0 .. $#children) {
		1895	my $alloc = $req[$_];
		1896	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1897
		1898	$pos += $alloc;
		1899	}
		1900
		1901	1
		1902	}
		1903
		1904	#############################################################################
		1905
		1906	package CFPlus::UI::HBox;
		1907
		1908	our @ISA = CFPlus::UI::Box::;
		1909
		1910	sub new {
		1911	my $class = shift;
		1912
		1913	$class->SUPER::new (
		1914	vertical => 0,
		1915	@_,
1178	)	1916	)
1179	}	1917	}
1180		1918
1181	sub size_allocate {
1182	my ($self, $w, $h) = @_;
1183
1184	($h, $w) = ($w, $h);
1185
1186	my $children = $self->{children};
1187
1188	my @h = map $_->{req_w}, @$children;
1189
1190	my $req_h = List::Util::sum @h;
1191
1192	if ($req_h > $h) {
1193	# ah well, not enough space
1194	$_ *= $h / $req_h for @h;
1195	} else {
1196	my $exp = List::Util::sum map $_->{expand}, @$children;
1197	$exp ||= 1;
1198
1199	for (0 .. $#$children) {
1200	my $child = $children->[$_];
1201
1202	my $alloc_h = $h[$_];
1203	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1204	$h[$_] = $alloc_h;
1205	}
1206	}
1207
1208	CFClient::UI::harmonize \@h;
1209
1210	my $y = 0;
1211	for (0 .. $#$children) {
1212	my $child = $children->[$_];
1213	my $h = $h[$_];
1214	$child->configure ($y, 0, $h, $w);
1215
1216	$y += $h;
1217	}
1218
1219	1
1220	}
1221
1222	#############################################################################	1919	#############################################################################
1223		1920
1224	package CFClient::UI::VBox;	1921	package CFPlus::UI::VBox;
1225		1922
1226	# TODO: wrap into common Box base class	1923	our @ISA = CFPlus::UI::Box::;
1227		1924
1228	our @ISA = CFClient::UI::Container::;	1925	sub new {
		1926	my $class = shift;
1229		1927
1230	sub size_request {	1928	$class->SUPER::new (
1231	my ($self) = @_;	1929	vertical => 1,
1232		1930	@_,
1233	my @alloc = map [$_->size_request], @{$self->{children}};
1234
1235	(
1236	(List::Util::max map $_->[0], @alloc),
1237	(List::Util::sum map $_->[1], @alloc),
1238	)	1931	)
1239	}	1932	}
1240		1933
1241	sub size_allocate {
1242	my ($self, $w, $h) = @_;
1243
1244	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1246	my $children = $self->{children};
1247
1248	my @h = map $_->{req_h}, @$children;
1249
1250	my $req_h = List::Util::sum @h;
1251
1252	if ($req_h > $h) {
1253	# ah well, not enough space
1254	$_ *= $h / $req_h for @h;
1255	} else {
1256	my $exp = List::Util::sum map $_->{expand}, @$children;
1257	$exp ||= 1;
1258
1259	for (0 .. $#$children) {
1260	my $child = $children->[$_];
1261
1262	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1263	}
1264	}
1265
1266	CFClient::UI::harmonize \@h;
1267
1268	my $y = 0;
1269	for (0 .. $#$children) {
1270	my $child = $children->[$_];
1271	my $h = $h[$_];
1272	$child->configure (0, $y, $w, $h);
1273
1274	$y += $h;
1275	}
1276
1277	1
1278	}
1279
1280	#############################################################################	1934	#############################################################################
1281		1935
1282	package CFClient::UI::Label;	1936	package CFPlus::UI::Label;
1283		1937
1284	our @ISA = CFClient::UI::DrawBG::;	1938	our @ISA = CFPlus::UI::DrawBG::;
1285		1939
1286	use CFClient::OpenGL;	1940	use CFPlus::OpenGL;
1287		1941
1288	sub new {	1942	sub new {
1289	my ($class, %arg) = @_;	1943	my ($class, %arg) = @_;
1290		1944
1291	my $self = $class->SUPER::new (	1945	my $self = $class->SUPER::new (
…		…
1294	#active_bg => none	1948	#active_bg => none
1295	#font => default_font	1949	#font => default_font
1296	#text => initial text	1950	#text => initial text
1297	#markup => initial narkup	1951	#markup => initial narkup
1298	#max_w => maximum pixel width	1952	#max_w => maximum pixel width
		1953	#style => 0, # render flags
1299	ellipsise => 3, # end	1954	ellipsise => 3, # end
1300	layout => (new CFClient::Layout),	1955	layout => (new CFPlus::Layout),
1301	fontsize => 1,	1956	fontsize => 1,
1302	align => -1,	1957	align => -1,
1303	valign => -1,	1958	valign => -1,
1304	padding => 2,	1959	padding_x => 2,
		1960	padding_y => 2,
1305	can_events => 0,	1961	can_events => 0,
1306	%arg	1962	%arg
1307	);	1963	);
1308		1964
1309	if (exists $self->{template}) {	1965	if (exists $self->{template}) {
1310	my $layout = new CFClient::Layout;	1966	my $layout = new CFPlus::Layout;
1311	$layout->set_text (delete $self->{template});	1967	$layout->set_text (delete $self->{template});
1312	$self->{template} = $layout;	1968	$self->{template} = $layout;
1313	}	1969	}
1314		1970
1315	if (exists $self->{markup}) {	1971	if (exists $self->{markup}) {
…		…
1319	}	1975	}
1320		1976
1321	$self	1977	$self
1322	}	1978	}
1323		1979
1324	sub escape($) {
1325	local $_ = $_[0];
1326
1327	s/&/&amp;/g;
1328	s/>/&gt;/g;
1329	s/</&lt;/g;
1330
1331	$_
1332	}
1333
1334	sub update {	1980	sub update {
1335	my ($self) = @_;	1981	my ($self) = @_;
1336		1982
1337	delete $self->{texture};	1983	delete $self->{texture};
1338	$self->SUPER::update;	1984	$self->SUPER::update;
1339	}	1985	}
1340		1986
		1987	sub realloc {
		1988	my ($self) = @_;
		1989
		1990	delete $self->{ox};
		1991	$self->SUPER::realloc;
		1992	}
		1993
1341	sub set_text {	1994	sub set_text {
1342	my ($self, $text) = @_;	1995	my ($self, $text) = @_;
1343		1996
1344	return if $self->{text} eq "T$text";	1997	return if $self->{text} eq "T$text";
1345	$self->{text} = "T$text";	1998	$self->{text} = "T$text";
1346		1999
1347	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1348	$self->{layout}->set_text ($text);	2000	$self->{layout}->set_text ($text);
1349		2001
		2002	delete $self->{size_req};
		2003	$self->realloc;
1350	$self->update;	2004	$self->update;
1351	$self->check_size;
1352	}	2005	}
1353		2006
1354	sub set_markup {	2007	sub set_markup {
1355	my ($self, $markup) = @_;	2008	my ($self, $markup) = @_;
1356		2009
1357	return if $self->{text} eq "M$markup";	2010	return if $self->{text} eq "M$markup";
1358	$self->{text} = "M$markup";	2011	$self->{text} = "M$markup";
1359		2012
1360	my $rgba = $markup =~ /span.*(?:foreground|background)/;	2013	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361		2014
1362	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1363	$self->{layout}->set_markup ($markup);	2015	$self->{layout}->set_markup ($markup);
1364		2016
		2017	delete $self->{size_req};
		2018	$self->realloc;
1365	$self->update;	2019	$self->update;
1366	$self->check_size;
1367	}	2020	}
1368		2021
1369	sub size_request {	2022	sub size_request {
1370	my ($self) = @_;	2023	my ($self) = @_;
1371		2024
		2025	$self->{size_req} ||= do {
1372	$self->{layout}->set_font ($self->{font}) if $self->{font};	2026	$self->{layout}->set_font ($self->{font}) if $self->{font};
1373	$self->{layout}->set_width ($self->{max_w} || -1);	2027	$self->{layout}->set_width ($self->{max_w} || -1);
1374	$self->{layout}->set_ellipsise ($self->{ellipsise});	2028	$self->{layout}->set_ellipsise ($self->{ellipsise});
1375	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2029	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2030	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377		2031
1378	my ($w, $h) = $self->{layout}->size;	2032	my ($w, $h) = $self->{layout}->size;
1379		2033
1380	if (exists $self->{template}) {	2034	if (exists $self->{template}) {
1381	$self->{template}->set_font ($self->{font}) if $self->{font};	2035	$self->{template}->set_font ($self->{font}) if $self->{font};
		2036	$self->{template}->set_width ($self->{max_w} || -1);
1382	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2037	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1383		2038
1384	my ($w2, $h2) = $self->{template}->size;	2039	my ($w2, $h2) = $self->{template}->size;
1385		2040
1386	$w = List::Util::max $w, $w2;	2041	$w = List::Util::max $w, $w2;
1387	$h = List::Util::max $h, $h2;	2042	$h = List::Util::max $h, $h2;
		2043	}
		2044
		2045	[$w, $h]
1388	}	2046	};
1389		2047
1390	(	2048	@{ $self->{size_req} }
1391	$w + $self->{padding} * 2,
1392	$h + $self->{padding} * 2,
1393	)
1394	}	2049	}
1395		2050
		2051	sub baseline_shift {
		2052	$_[0]{layout}->descent
		2053	}
		2054
1396	sub size_allocate {	2055	sub invoke_size_allocate {
1397	my ($self, $w, $h) = @_;	2056	my ($self, $w, $h) = @_;
1398		2057
		2058	delete $self->{ox};
		2059
1399	delete $self->{texture};	2060	delete $self->{texture}
		2061	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		2062
		2063	1
1400	}	2064	}
1401		2065
1402	sub set_fontsize {	2066	sub set_fontsize {
1403	my ($self, $fontsize) = @_;	2067	my ($self, $fontsize) = @_;
1404		2068
1405	$self->{fontsize} = $fontsize;	2069	$self->{fontsize} = $fontsize;
		2070	delete $self->{size_req};
1406	delete $self->{texture};	2071	delete $self->{texture};
1407		2072
1408	$self->update;	2073	$self->realloc;
1409	$self->check_size;	2074	}
		2075
		2076	sub reconfigure {
		2077	my ($self) = @_;
		2078
		2079	delete $self->{size_req};
		2080	delete $self->{texture};
		2081
		2082	$self->SUPER::reconfigure;
1410	}	2083	}
1411		2084
1412	sub _draw {	2085	sub _draw {
1413	my ($self) = @_;	2086	my ($self) = @_;
1414		2087
1415	$self->SUPER::_draw; # draw background, if applicable	2088	$self->SUPER::_draw; # draw background, if applicable
1416		2089
1417	my $tex = $self->{texture} ||= do {	2090	my $size = $self->{texture} ||= do {
1418	$self->{layout}->set_foreground (@{$self->{fg}});	2091	$self->{layout}->set_foreground (@{$self->{fg}});
1419	$self->{layout}->set_font ($self->{font}) if $self->{font};	2092	$self->{layout}->set_font ($self->{font}) if $self->{font};
1420	$self->{layout}->set_width ($self->{w});	2093	$self->{layout}->set_width ($self->{w});
1421	$self->{layout}->set_ellipsise ($self->{ellipsise});	2094	$self->{layout}->set_ellipsise ($self->{ellipsise});
1422	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2095	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1423	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2096	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424		2097
1425	my $tex = new_from_layout CFClient::Texture $self->{layout};	2098	[$self->{layout}->size]
1426
1427	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1428	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1429	: ($self->{w} - $tex->{w}) * 0.5);
1430
1431	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1432	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1433	: ($self->{h} - $tex->{h}) * 0.5);
1434
1435	$tex
1436	};	2099	};
1437		2100
1438	glEnable GL_TEXTURE_2D;	2101	unless (exists $self->{ox}) {
1439	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2102	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
		2103	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
		2104	: ($self->{w} - $size->[0]) * 0.5);
1440		2105
1441	if ($tex->{format} == GL_ALPHA) {	2106	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1442	glColor @{$self->{fg}};	2107	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1443	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	2108	: ($self->{h} - $size->[1]) * 0.5);
1444	} else {
1445	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1446	}	2109	};
1447		2110
1448	glDisable GL_TEXTURE_2D;	2111	my $w = List::Util::min $self->{w} + 4, $size->[0];
		2112	my $h = List::Util::min $self->{h} + 2, $size->[1];
		2113
		2114	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1449	}	2115	}
1450		2116
1451	#############################################################################	2117	#############################################################################
1452		2118
1453	package CFClient::UI::EntryBase;	2119	package CFPlus::UI::EntryBase;
1454		2120
1455	our @ISA = CFClient::UI::Label::;	2121	our @ISA = CFPlus::UI::Label::;
1456		2122
1457	use CFClient::OpenGL;	2123	use CFPlus::OpenGL;
1458		2124
1459	sub new {	2125	sub new {
1460	my $class = shift;	2126	my $class = shift;
1461		2127
1462	$class->SUPER::new (	2128	$class->SUPER::new (
…		…
1466	active_fg => [0, 0, 0],	2132	active_fg => [0, 0, 0],
1467	can_hover => 1,	2133	can_hover => 1,
1468	can_focus => 1,	2134	can_focus => 1,
1469	valign => 0,	2135	valign => 0,
1470	can_events => 1,	2136	can_events => 1,
		2137	ellipsise => 0,
		2138	#text => ...
		2139	#hidden => "*",
1471	@_	2140	@_
1472	)	2141	)
1473	}	2142	}
1474		2143
1475	sub _set_text {	2144	sub _set_text {
…		…
1477		2146
1478	delete $self->{cur_h};	2147	delete $self->{cur_h};
1479		2148
1480	return if $self->{text} eq $text;	2149	return if $self->{text} eq $text;
1481		2150
1482	delete $self->{texture};
1483
1484	$self->{last_activity} = $::NOW;	2151	$self->{last_activity} = $::NOW;
1485	$self->{text} = $text;	2152	$self->{text} = $text;
1486		2153
1487	$text =~ s/./*/g if $self->{hidden};	2154	$text =~ s/./*/g if $self->{hidden};
1488	$self->{layout}->set_text ("$text ");	2155	$self->{layout}->set_text ("$text ");
		2156	delete $self->{size_req};
1489		2157
1490	$self->emit (changed => $self->{text});	2158	$self->emit (changed => $self->{text});
		2159
		2160	$self->realloc;
		2161	$self->update;
1491	}	2162	}
1492		2163
1493	sub set_text {	2164	sub set_text {
1494	my ($self, $text) = @_;	2165	my ($self, $text) = @_;
1495		2166
1496	$self->{cursor} = length $text;	2167	$self->{cursor} = length $text;
1497	$self->_set_text ($text);	2168	$self->_set_text ($text);
1498	$self->update;
1499	$self->check_size;
1500	}	2169	}
1501		2170
1502	sub get_text {	2171	sub get_text {
1503	$_[0]{text}	2172	$_[0]{text}
1504	}	2173	}
…		…
1509	my ($w, $h) = $self->SUPER::size_request;	2178	my ($w, $h) = $self->SUPER::size_request;
1510		2179
1511	($w + 1, $h) # add 1 for cursor	2180	($w + 1, $h) # add 1 for cursor
1512	}	2181	}
1513		2182
1514	sub size_allocate {
1515	my ($self, $w, $h) = @_;
1516
1517	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518	}
1519
1520	sub key_down {	2183	sub invoke_key_down {
1521	my ($self, $ev) = @_;	2184	my ($self, $ev) = @_;
1522		2185
1523	my $mod = $ev->{mod};	2186	my $mod = $ev->{mod};
1524	my $sym = $ev->{sym};	2187	my $sym = $ev->{sym};
1525	my $uni = $ev->{unicode};	2188	my $uni = $ev->{unicode};
1526		2189
1527	my $text = $self->get_text;	2190	my $text = $self->get_text;
		2191
		2192	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1528		2193
1529	if ($uni == 8) {	2194	if ($uni == 8) {
1530	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2195	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1531	} elsif ($uni == 127) {	2196	} elsif ($uni == 127) {
1532	substr $text, $self->{cursor}, 1, "";	2197	substr $text, $self->{cursor}, 1, "";
1533	} elsif ($sym == CFClient::SDLK_LEFT) {	2198	} elsif ($sym == CFPlus::SDLK_LEFT) {
1534	--$self->{cursor} if $self->{cursor};	2199	--$self->{cursor} if $self->{cursor};
1535	} elsif ($sym == CFClient::SDLK_RIGHT) {	2200	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1536	++$self->{cursor} if $self->{cursor} < length $self->{text};	2201	++$self->{cursor} if $self->{cursor} < length $self->{text};
1537	} elsif ($sym == CFClient::SDLK_HOME) {	2202	} elsif ($sym == CFPlus::SDLK_HOME) {
		2203	# what a hack
		2204	$self->{cursor} =
		2205	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2206	? length $1
		2207	: 0;
		2208	} elsif ($sym == CFPlus::SDLK_END) {
		2209	# uh, again
		2210	$self->{cursor} =
		2211	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2212	? $self->{cursor} + length $1
		2213	: length $self->{text};
		2214	} elsif ($uni == 21) { # ctrl-u
		2215	$text = "";
1538	$self->{cursor} = 0;	2216	$self->{cursor} = 0;
1539	} elsif ($sym == CFClient::SDLK_END) {
1540	$self->{cursor} = length $text;
1541	} elsif ($uni == 27) {	2217	} elsif ($uni == 27) {
1542	$self->emit ('escape');	2218	$self->emit ('escape');
1543	} elsif ($uni) {	2219	} elsif ($uni == 0x0d) {
		2220	substr $text, $self->{cursor}++, 0, "\012";
		2221	} elsif ($uni >= 0x20) {
1544	substr $text, $self->{cursor}++, 0, chr $uni;	2222	substr $text, $self->{cursor}++, 0, chr $uni;
		2223	} else {
		2224	return 0;
1545	}	2225	}
1546		2226
1547	$self->_set_text ($text);	2227	$self->_set_text ($text);
		2228
		2229	$self->realloc;
1548	$self->update;	2230	$self->update;
1549	$self->check_size;
1550	}
1551		2231
		2232	1
		2233	}
		2234
1552	sub focus_in {	2235	sub invoke_focus_in {
1553	my ($self) = @_;	2236	my ($self) = @_;
1554		2237
1555	$self->{last_activity} = $::NOW;	2238	$self->{last_activity} = $::NOW;
1556		2239
1557	$self->SUPER::focus_in;	2240	$self->SUPER::invoke_focus_in
1558	}	2241	}
1559		2242
1560	sub button_down {	2243	sub invoke_button_down {
1561	my ($self, $ev, $x, $y) = @_;	2244	my ($self, $ev, $x, $y) = @_;
1562		2245
1563	$self->SUPER::button_down ($ev, $x, $y);	2246	$self->SUPER::invoke_button_down ($ev, $x, $y);
1564		2247
1565	my $idx = $self->{layout}->xy_to_index ($x, $y);	2248	my $idx = $self->{layout}->xy_to_index ($x, $y);
1566		2249
1567	# byte-index to char-index	2250	# byte-index to char-index
1568	my $text = $self->{text};	2251	my $text = $self->{text};
1569	utf8::encode $text;	2252	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1570	$self->{cursor} = length substr $text, 0, $idx;	2253	$self->{cursor} = length $text;
1571		2254
1572	$self->_set_text ($self->{text});	2255	$self->_set_text ($self->{text});
1573	$self->update;	2256	$self->update;
		2257
		2258	1
1574	}	2259	}
1575		2260
1576	sub mouse_motion {	2261	sub invoke_mouse_motion {
1577	my ($self, $ev, $x, $y) = @_;	2262	my ($self, $ev, $x, $y) = @_;
1578	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2263	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		2264
		2265	1
1579	}	2266	}
1580		2267
1581	sub _draw {	2268	sub _draw {
1582	my ($self) = @_;	2269	my ($self) = @_;
1583		2270
1584	local $self->{fg} = $self->{fg};	2271	local $self->{fg} = $self->{fg};
1585		2272
1586	if ($FOCUS == $self) {	2273	if ($FOCUS == $self) {
1587	glColor @{$self->{active_bg}};	2274	glColor_premultiply @{$self->{active_bg}};
1588	$self->{fg} = $self->{active_fg};	2275	$self->{fg} = $self->{active_fg};
1589	} else {	2276	} else {
1590	glColor @{$self->{bg}};	2277	glColor_premultiply @{$self->{bg}};
1591	}	2278	}
1592		2279
1593	glEnable GL_BLEND;	2280	glEnable GL_BLEND;
1594	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2281	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1595	glBegin GL_QUADS;	2282	glBegin GL_QUADS;
1596	glVertex 0 , 0;	2283	glVertex 0 , 0;
1597	glVertex 0 , $self->{h};	2284	glVertex 0 , $self->{h};
1598	glVertex $self->{w}, $self->{h};	2285	glVertex $self->{w}, $self->{h};
1599	glVertex $self->{w}, 0;	2286	glVertex $self->{w}, 0;
…		…
1610	utf8::encode $text;	2297	utf8::encode $text;
1611		2298
1612	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2299	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1613	}	2300	}
1614		2301
1615	glColor @{$self->{fg}};
1616	glBegin GL_LINES;	2302	glBegin GL_LINES;
1617	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2303	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1618	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2304	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1619	glEnd;	2305	glEnd;
1620	}	2306	}
1621	}	2307	}
1622		2308
		2309	#############################################################################
		2310
1623	package CFClient::UI::Entry;	2311	package CFPlus::UI::Entry;
1624		2312
1625	our @ISA = CFClient::UI::EntryBase::;	2313	our @ISA = CFPlus::UI::EntryBase::;
1626		2314
1627	use CFClient::OpenGL;	2315	use CFPlus::OpenGL;
1628		2316
1629	sub key_down {	2317	sub invoke_key_down {
1630	my ($self, $ev) = @_;	2318	my ($self, $ev) = @_;
1631		2319
1632	my $sym = $ev->{sym};	2320	my $sym = $ev->{sym};
1633		2321
1634	if ($sym == 13) {	2322	if ($ev->{uni} == 0x0d || $sym == 13) {
1635	unshift @{$self->{history}},	2323	unshift @{$self->{history}},
1636	my $txt = $self->get_text;	2324	my $txt = $self->get_text;
		2325
1637	$self->{history_pointer} = -1;	2326	$self->{history_pointer} = -1;
1638	$self->{history_saveback} = '';	2327	$self->{history_saveback} = '';
1639	$self->emit (activate => $txt);	2328	$self->emit (activate => $txt);
1640	$self->update;	2329	$self->update;
1641		2330
1642	} elsif ($sym == CFClient::SDLK_UP) {	2331	} elsif ($sym == CFPlus::SDLK_UP) {
1643	if ($self->{history_pointer} < 0) {	2332	if ($self->{history_pointer} < 0) {
1644	$self->{history_saveback} = $self->get_text;	2333	$self->{history_saveback} = $self->get_text;
1645	}	2334	}
1646	if (@{$self->{history} || []} > 0) {	2335	if (@{$self->{history} || []} > 0) {
1647	$self->{history_pointer}++;	2336	$self->{history_pointer}++;
…		…
1649	$self->{history_pointer} = @{$self->{history} || []} - 1;	2338	$self->{history_pointer} = @{$self->{history} || []} - 1;
1650	}	2339	}
1651	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2340	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1652	}	2341	}
1653		2342
1654	} elsif ($sym == CFClient::SDLK_DOWN) {	2343	} elsif ($sym == CFPlus::SDLK_DOWN) {
1655	$self->{history_pointer}--;	2344	$self->{history_pointer}--;
1656	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2345	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1657		2346
1658	if ($self->{history_pointer} >= 0) {	2347	if ($self->{history_pointer} >= 0) {
1659	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2348	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1660	} else {	2349	} else {
1661	$self->set_text ($self->{history_saveback});	2350	$self->set_text ($self->{history_saveback});
1662	}	2351	}
1663		2352
1664	} else {	2353	} else {
1665	$self->SUPER::key_down ($ev);	2354	return $self->SUPER::invoke_key_down ($ev)
		2355	}
		2356
1666	}	2357	1
1667
1668	}	2358	}
1669		2359
1670	#############################################################################	2360	#############################################################################
1671		2361
		2362	package CFPlus::UI::TextEdit;
		2363
		2364	our @ISA = CFPlus::UI::EntryBase::;
		2365
		2366	use CFPlus::OpenGL;
		2367
		2368	sub move_cursor_ver {
		2369	my ($self, $dy) = @_;
		2370
		2371	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2372
		2373	$y += $dy;
		2374
		2375	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2376	$self->{cursor} = $index;
		2377	delete $self->{cur_h};
		2378	$self->update;
		2379	return;
		2380	}
		2381	}
		2382
		2383	sub invoke_key_down {
		2384	my ($self, $ev) = @_;
		2385
		2386	my $sym = $ev->{sym};
		2387
		2388	if ($sym == CFPlus::SDLK_UP) {
		2389	$self->move_cursor_ver (-1);
		2390	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2391	$self->move_cursor_ver (+1);
		2392	} else {
		2393	return $self->SUPER::invoke_key_down ($ev)
		2394	}
		2395
		2396	1
		2397	}
		2398
		2399	#############################################################################
		2400
1672	package CFClient::UI::Button;	2401	package CFPlus::UI::Button;
1673		2402
1674	our @ISA = CFClient::UI::Label::;	2403	our @ISA = CFPlus::UI::Label::;
1675		2404
1676	use CFClient::OpenGL;	2405	use CFPlus::OpenGL;
1677		2406
1678	my @tex =	2407	my @tex =
1679	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2408	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1680	qw(b1_button_active.png);	2409	qw(b1_button_inactive.png b1_button_active.png);
1681		2410
1682	sub new {	2411	sub new {
1683	my $class = shift;	2412	my $class = shift;
1684		2413
1685	$class->SUPER::new (	2414	$class->SUPER::new (
1686	padding => 4,	2415	padding_x => 4,
		2416	padding_y => 4,
1687	fg => [1, 1, 1],	2417	fg => [1.0, 1.0, 1.0],
1688	active_fg => [0, 0, 1],	2418	active_fg => [0.8, 0.8, 0.8],
1689	can_hover => 1,	2419	can_hover => 1,
1690	align => 0,	2420	align => 0,
1691	valign => 0,	2421	valign => 0,
1692	can_events => 1,	2422	can_events => 1,
1693	@_	2423	@_
1694	)	2424	)
1695	}	2425	}
1696		2426
1697	sub button_up {	2427	sub invoke_button_up {
1698	my ($self, $ev, $x, $y) = @_;	2428	my ($self, $ev, $x, $y) = @_;
1699		2429
		2430	$self->emit ("activate")
1700	if ($x >= 0 && $x < $self->{w}	2431	if $x >= 0 && $x < $self->{w}
1701	&& $y >= 0 && $y < $self->{h}) {	2432	&& $y >= 0 && $y < $self->{h};
1702	$self->emit ("activate");	2433
1703	}	2434	1
1704	}	2435	}
1705		2436
1706	sub _draw {	2437	sub _draw {
1707	my ($self) = @_;	2438	my ($self) = @_;
1708		2439
1709	local $self->{fg} = $self->{fg};	2440	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1710
1711	if ($GRAB == $self) {
1712	$self->{fg} = $self->{active_fg};
1713	}
1714		2441
1715	glEnable GL_TEXTURE_2D;	2442	glEnable GL_TEXTURE_2D;
1716	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2443	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1717	glColor 0, 0, 0, 1;	2444	glColor 0, 0, 0, 1;
1718		2445
		2446	my $tex = $tex[$GRAB == $self];
1719	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2447	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1720		2448
1721	glDisable GL_TEXTURE_2D;	2449	glDisable GL_TEXTURE_2D;
1722		2450
1723	$self->SUPER::_draw;	2451	$self->SUPER::_draw;
1724	}	2452	}
1725		2453
1726	#############################################################################	2454	#############################################################################
1727		2455
1728	package CFClient::UI::CheckBox;	2456	package CFPlus::UI::CheckBox;
1729		2457
1730	our @ISA = CFClient::UI::DrawBG::;	2458	our @ISA = CFPlus::UI::DrawBG::;
1731		2459
1732	my @tex =	2460	my @tex =
1733	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2461	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1734	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2462	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1735		2463
1736	use CFClient::OpenGL;	2464	use CFPlus::OpenGL;
1737		2465
1738	sub new {	2466	sub new {
1739	my $class = shift;	2467	my $class = shift;
1740		2468
1741	$class->SUPER::new (	2469	$class->SUPER::new (
1742	padding => 2,	2470	padding_x => 2,
		2471	padding_y => 2,
1743	fg => [1, 1, 1],	2472	fg => [1, 1, 1],
1744	active_fg => [1, 1, 0],	2473	active_fg => [1, 1, 0],
1745	bg => [0, 0, 0, 0.2],	2474	bg => [0, 0, 0, 0.2],
1746	active_bg => [1, 1, 1, 0.5],	2475	active_bg => [1, 1, 1, 0.5],
1747	state => 0,	2476	state => 0,
…		…
1751	}	2480	}
1752		2481
1753	sub size_request {	2482	sub size_request {
1754	my ($self) = @_;	2483	my ($self) = @_;
1755		2484
1756	($self->{padding} * 2 + 6) x 2	2485	(6) x 2
1757	}	2486	}
1758		2487
		2488	sub toggle {
		2489	my ($self) = @_;
		2490
		2491	$self->{state} = !$self->{state};
		2492	$self->emit (changed => $self->{state});
		2493	$self->update;
		2494	}
		2495
1759	sub button_down {	2496	sub invoke_button_down {
1760	my ($self, $ev, $x, $y) = @_;	2497	my ($self, $ev, $x, $y) = @_;
1761		2498
1762	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	2499	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1763	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	2500	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1764	$self->{state} = !$self->{state};	2501	$self->toggle;
1765	$self->emit (changed => $self->{state});	2502	} else {
		2503	return 0
		2504	}
		2505
1766	}	2506	1
1767	}	2507	}
1768		2508
1769	sub _draw {	2509	sub _draw {
1770	my ($self) = @_;	2510	my ($self) = @_;
1771		2511
1772	$self->SUPER::_draw;	2512	$self->SUPER::_draw;
1773		2513
1774	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	2514	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1775		2515
1776	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	2516	my ($w, $h) = @$self{qw(w h)};
		2517
		2518	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1777		2519
1778	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	2520	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1779		2521
1780	my $tex = $self->{state} ? $tex[1] : $tex[0];	2522	my $tex = $self->{state} ? $tex[1] : $tex[0];
1781		2523
…		…
1784	glDisable GL_TEXTURE_2D;	2526	glDisable GL_TEXTURE_2D;
1785	}	2527	}
1786		2528
1787	#############################################################################	2529	#############################################################################
1788		2530
1789	package CFClient::UI::Image;	2531	package CFPlus::UI::Image;
1790		2532
1791	our @ISA = CFClient::UI::Base::;	2533	our @ISA = CFPlus::UI::Base::;
1792		2534
1793	use CFClient::OpenGL;	2535	use CFPlus::OpenGL;
1794	use Carp qw/confess/;
1795		2536
1796	our %loaded_images;	2537	our %texture_cache;
1797		2538
1798	sub new {	2539	sub new {
1799	my $class = shift;	2540	my $class = shift;
1800		2541
1801	my $self = $class->SUPER::new (can_events => 0, @_);	2542	my $self = $class->SUPER::new (
		2543	can_events => 0,
		2544	@_,
		2545	);
1802		2546
1803	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2547	$self->{path} || $self->{tex}
		2548	or Carp::croak "'path' or 'tex' attributes required";
1804		2549
1805	$loaded_images{$self->{image}} ||=	2550	$self->{tex} ||= $texture_cache{$self->{path}} ||=
1806	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2551	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1807		2552
1808	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2553	CFPlus::weaken $texture_cache{$self->{path}};
1809		2554
1810	Scalar::Util::weaken $loaded_images{$self->{image}};	2555	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1811
1812	$self->{aspect} = $tex->{w} / $tex->{h};
1813		2556
1814	$self	2557	$self
1815	}	2558	}
1816		2559
		2560	sub STORABLE_freeze {
		2561	my ($self, $cloning) = @_;
		2562
		2563	$self->{path}
		2564	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2565
		2566	$self->{path}
		2567	}
		2568
		2569	sub STORABLE_attach {
		2570	my ($self, $cloning, $path) = @_;
		2571
		2572	$self->new (path => $path)
		2573	}
		2574
1817	sub size_request {	2575	sub size_request {
1818	my ($self) = @_;	2576	my ($self) = @_;
1819		2577
1820	($self->{tex}->{w}, $self->{tex}->{h})	2578	($self->{tex}{w}, $self->{tex}{h})
1821	}	2579	}
1822		2580
1823	sub _draw {	2581	sub _draw {
1824	my ($self) = @_;	2582	my ($self) = @_;
1825		2583
…		…
1835	}	2593	}
1836		2594
1837	glEnable GL_TEXTURE_2D;	2595	glEnable GL_TEXTURE_2D;
1838	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2596	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1839		2597
1840	$tex->draw_quad_alpha (0, 0, $w, $h);	2598	$tex->draw_quad (0, 0, $w, $h);
1841		2599
1842	glDisable GL_TEXTURE_2D;	2600	glDisable GL_TEXTURE_2D;
1843	}	2601	}
1844		2602
1845	#############################################################################	2603	#############################################################################
1846		2604
		2605	package CFPlus::UI::ImageButton;
		2606
		2607	our @ISA = CFPlus::UI::Image::;
		2608
		2609	use CFPlus::OpenGL;
		2610
		2611	my %textures;
		2612
		2613	sub new {
		2614	my $class = shift;
		2615
		2616	my $self = $class->SUPER::new (
		2617	padding_x => 4,
		2618	padding_y => 4,
		2619	fg => [1, 1, 1],
		2620	active_fg => [0, 0, 1],
		2621	can_hover => 1,
		2622	align => 0,
		2623	valign => 0,
		2624	can_events => 1,
		2625	@_
		2626	);
		2627	}
		2628
		2629	sub invoke_button_up {
		2630	my ($self, $ev, $x, $y) = @_;
		2631
		2632	$self->emit ("activate")
		2633	if $x >= 0 && $x < $self->{w}
		2634	&& $y >= 0 && $y < $self->{h};
		2635
		2636	1
		2637	}
		2638
		2639	#############################################################################
		2640
1847	package CFClient::UI::VGauge;	2641	package CFPlus::UI::VGauge;
1848		2642
1849	our @ISA = CFClient::UI::Base::;	2643	our @ISA = CFPlus::UI::Base::;
1850		2644
1851	use List::Util qw(min max);	2645	use List::Util qw(min max);
1852		2646
1853	use CFClient::OpenGL;	2647	use CFPlus::OpenGL;
1854		2648
1855	my %tex = (	2649	my %tex = (
1856	food => [	2650	food => [
1857	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2651	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1858	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2652	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1859	],	2653	],
1860	grace => [	2654	grace => [
1861	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2655	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1862	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2656	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1863	],	2657	],
1864	hp => [	2658	hp => [
1865	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2659	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1866	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2660	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1867	],	2661	],
1868	mana => [	2662	mana => [
1869	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2663	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1870	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2664	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1871	],	2665	],
1872	);	2666	);
1873		2667
1874	# eg. VGauge->new (gauge => 'food'), default gauge: food	2668	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
1934	my $ycut1 = max 0, min 1, $ycut;	2728	my $ycut1 = max 0, min 1, $ycut;
1935	my $ycut2 = max 0, min 1, $ycut - 1;	2729	my $ycut2 = max 0, min 1, $ycut - 1;
1936		2730
1937	my $h1 = $self->{h} * (1 - $ycut1);	2731	my $h1 = $self->{h} * (1 - $ycut1);
1938	my $h2 = $self->{h} * (1 - $ycut2);	2732	my $h2 = $self->{h} * (1 - $ycut2);
		2733	my $h3 = $self->{h};
		2734
		2735	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1939		2736
1940	glEnable GL_BLEND;	2737	glEnable GL_BLEND;
1941	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2738	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2739	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1942	glEnable GL_TEXTURE_2D;	2740	glEnable GL_TEXTURE_2D;
1943	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2741	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1944		2742
1945	glBindTexture GL_TEXTURE_2D, $t1->{name};	2743	glBindTexture GL_TEXTURE_2D, $t1->{name};
1946	glBegin GL_QUADS;	2744	glBegin GL_QUADS;
…		…
1961		2759
1962	if ($t3) {	2760	if ($t3) {
1963	glBindTexture GL_TEXTURE_2D, $t3->{name};	2761	glBindTexture GL_TEXTURE_2D, $t3->{name};
1964	glBegin GL_QUADS;	2762	glBegin GL_QUADS;
1965	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2763	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1966	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2764	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1967	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2765	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1968	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2766	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1969	glEnd;	2767	glEnd;
1970	}	2768	}
1971		2769
1972	glDisable GL_BLEND;	2770	glDisable GL_BLEND;
1973	glDisable GL_TEXTURE_2D;	2771	glDisable GL_TEXTURE_2D;
1974	}	2772	}
1975		2773
1976	#############################################################################	2774	#############################################################################
1977		2775
1978	package CFClient::UI::Gauge;	2776	package CFPlus::UI::Gauge;
1979		2777
1980	our @ISA = CFClient::UI::VBox::;	2778	our @ISA = CFPlus::UI::VBox::;
1981		2779
1982	sub new {	2780	sub new {
1983	my ($class, %arg) = @_;	2781	my ($class, %arg) = @_;
1984		2782
1985	my $self = $class->SUPER::new (	2783	my $self = $class->SUPER::new (
…		…
1987	can_hover => 1,	2785	can_hover => 1,
1988	can_events => 1,	2786	can_events => 1,
1989	%arg,	2787	%arg,
1990	);	2788	);
1991		2789
1992	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2790	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
1993	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2791	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1994	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2792	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
1995		2793
1996	$self	2794	$self
1997	}	2795	}
1998		2796
1999	sub set_fontsize {	2797	sub set_fontsize {
…		…
2020	$self->{value}->set_text ($val);	2818	$self->{value}->set_text ($val);
2021	}	2819	}
2022		2820
2023	#############################################################################	2821	#############################################################################
2024		2822
2025	package CFClient::UI::Slider;	2823	package CFPlus::UI::Slider;
2026		2824
2027	use strict;	2825	use strict;
2028		2826
2029	use CFClient::OpenGL;	2827	use CFPlus::OpenGL;
2030		2828
2031	our @ISA = CFClient::UI::DrawBG::;	2829	our @ISA = CFPlus::UI::DrawBG::;
2032		2830
2033	my @tex =	2831	my @tex =
2034	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2832	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2035	qw(s1_slider.png s1_slider_bg.png);	2833	qw(s1_slider.png s1_slider_bg.png);
2036		2834
2037	sub new {	2835	sub new {
2038	my $class = shift;	2836	my $class = shift;
2039		2837
…		…
2045	my $self = $class->SUPER::new (	2843	my $self = $class->SUPER::new (
2046	fg => [1, 1, 1],	2844	fg => [1, 1, 1],
2047	active_fg => [0, 0, 0],	2845	active_fg => [0, 0, 0],
2048	bg => [0, 0, 0, 0.2],	2846	bg => [0, 0, 0, 0.2],
2049	active_bg => [1, 1, 1, 0.5],	2847	active_bg => [1, 1, 1, 0.5],
2050	range => [0, 0, 100, 10],	2848	range => [0, 0, 100, 10, 0],
2051	req_w => $::WIDTH / 80,	2849	min_w => $::WIDTH / 80,
2052	req_h => $::WIDTH / 80,	2850	min_h => $::WIDTH / 80,
2053	vertical => 0,	2851	vertical => 0,
2054	can_hover => 1,	2852	can_hover => 1,
2055	inner_pad => .05,	2853	inner_pad => 0.02,
2056	@_	2854	@_
2057	);	2855	);
2058		2856
2059	$self->set_value ($self->{range}[0]);	2857	$self->set_value ($self->{range}[0]);
2060	$self->update;	2858	$self->update;
2061		2859
2062	$self	2860	$self
2063	}	2861	}
2064		2862
		2863	sub set_range {
		2864	my ($self, $range) = @_;
		2865
		2866	($range, $self->{range}) = ($self->{range}, $range);
		2867
		2868	if ("@$range" ne "@{$self->{range}}") {
		2869	$self->update;
		2870	$self->set_value ($self->{range}[0]);
		2871	}
		2872	}
		2873
2065	sub set_value {	2874	sub set_value {
2066	my ($self, $value) = @_;	2875	my ($self, $value) = @_;
2067		2876
2068	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2877	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069		2878
2070	$hi = $lo + 1 if $hi <= $lo;	2879	$hi = $lo + 1 if $hi <= $lo;
2071		2880
		2881	$page = $hi - $lo if $page > $hi - $lo;
		2882
2072	$value = $lo if $value < $lo;	2883	$value = $lo if $value < $lo;
2073	$value = $hi if $value > $hi;	2884	$value = $hi - $page if $value > $hi - $page;
2074		2885
2075	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2886	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076	if $unit;	2887	if $unit;
2077
2078	$page = $hi - $lo if $page > $hi - $lo;
2079		2888
2080	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2889	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081		2890
2082	if ($value != $old_value) {	2891	if ($value != $old_value) {
2083	$self->emit (changed => $value);	2892	$self->emit (changed => $value);
…		…
2086	}	2895	}
2087		2896
2088	sub size_request {	2897	sub size_request {
2089	my ($self) = @_;	2898	my ($self) = @_;
2090		2899
2091	my $w = $self->{req_w};	2900	($self->{req_w}, $self->{req_h})
2092	my $h = $self->{req_h};
2093
2094	$self->{vertical} ? ($h, $w) : ($w, $h)
2095	}	2901	}
2096		2902
2097	sub button_down {	2903	sub invoke_button_down {
2098	my ($self, $ev, $x, $y) = @_;	2904	my ($self, $ev, $x, $y) = @_;
2099		2905
2100	$self->SUPER::button_down ($ev, $x, $y);	2906	$self->SUPER::invoke_button_down ($ev, $x, $y);
		2907
		2908	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2909
2101	$self->mouse_motion ($ev, $x, $y);	2910	$self->invoke_mouse_motion ($ev, $x, $y)
2102	}	2911	}
2103		2912
2104	sub mouse_motion {	2913	sub invoke_mouse_motion {
2105	my ($self, $ev, $x, $y) = @_;	2914	my ($self, $ev, $x, $y) = @_;
2106		2915
2107	if ($GRAB == $self) {	2916	if ($GRAB == $self) {
2108	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2917	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109		2918
2110	my (undef, $lo, $hi, $page) = @{$self->{range}};	2919	my (undef, $lo, $hi, $page) = @{$self->{range}};
2111		2920
2112	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2921	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113		2922
2114	$self->set_value ($x * ($hi - $lo) + $lo);	2923	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2924	} else {
		2925	return 0;
		2926	}
		2927
2115	}	2928	1
		2929	}
		2930
		2931	sub invoke_mouse_wheel {
		2932	my ($self, $ev) = @_;
		2933
		2934	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2935
		2936	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2937
		2938	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2939
		2940	! ! $delta
2116	}	2941	}
2117		2942
2118	sub update {	2943	sub update {
2119	my ($self) = @_;	2944	my ($self) = @_;
2120		2945
2121	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2946	delete $self->{knob_w};
		2947	$self->SUPER::update;
		2948	}
		2949
		2950	sub _draw {
		2951	my ($self) = @_;
		2952
		2953	unless ($self->{knob_w}) {
2122	$self->set_value ($self->{range}[0]);	2954	$self->set_value ($self->{range}[0]);
2123		2955
2124	my ($value, $lo, $hi, $page) = @{$self->{range}};	2956	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2957	my $range = ($hi - $page - $lo) || 1e-100;
2125		2958
2126	my $inner_w = 1 - 2 * $self->{inner_pad};	2959	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127		2960
2128	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2961	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2962	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2129		2963
2130	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2964	$value = ($value - $lo) / $range;
2131	$value = $self->{scale} * ($value - $lo);	2965	$value = $value * $self->{scale} + $self->{offset};
2132		2966
2133	$value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135	$value = 0 if $value < 0;
2136	$page = 1 - $value if $value + $page > 1;
2137
2138	$self->{knob_x} = $value;	2967	$self->{knob_x} = $value - $knob_w * 0.5;
2139	$self->{knob_w} = $page;	2968	$self->{knob_w} = $knob_w;
2140	});	2969	}
2141
2142	$self->SUPER::update;
2143	}
2144
2145	sub _draw {
2146	my ($self) = @_;
2147		2970
2148	$self->SUPER::_draw ();	2971	$self->SUPER::_draw ();
2149		2972
2150	glScale $self->{w}, $self->{h};	2973	glScale $self->{w}, $self->{h};
2151		2974
…		…
2171	glDisable GL_TEXTURE_2D;	2994	glDisable GL_TEXTURE_2D;
2172	}	2995	}
2173		2996
2174	#############################################################################	2997	#############################################################################
2175		2998
2176	package CFClient::UI::TextView;	2999	package CFPlus::UI::ValSlider;
2177		3000
2178	our @ISA = CFClient::UI::HBox::;	3001	our @ISA = CFPlus::UI::HBox::;
2179		3002
		3003	sub new {
		3004	my ($class, %arg) = @_;
		3005
		3006	my $range = delete $arg{range};
		3007
		3008	my $self = $class->SUPER::new (
		3009	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
		3010	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
		3011	to_value => sub { shift },
		3012	from_value => sub { shift },
		3013	%arg,
		3014	);
		3015
		3016	$self->{slider}->connect (changed => sub {
		3017	my ($self, $value) = @_;
		3018	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		3019	$self->{parent}->emit (changed => $value);
		3020	});
		3021
		3022	# $self->{entry}->connect (changed => sub {
		3023	# my ($self, $value) = @_;
		3024	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		3025	# $self->{parent}->emit (changed => $value);
		3026	# });
		3027
		3028	$self->add ($self->{slider}, $self->{entry});
		3029
		3030	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		3031
		3032	$self
		3033	}
		3034
		3035	sub set_range { shift->{slider}->set_range (@_) }
		3036	sub set_value { shift->{slider}->set_value (@_) }
		3037
		3038	#############################################################################
		3039
		3040	package CFPlus::UI::TextScroller;
		3041
		3042	our @ISA = CFPlus::UI::HBox::;
		3043
2180	use CFClient::OpenGL;	3044	use CFPlus::OpenGL;
2181		3045
2182	sub new {	3046	sub new {
2183	my $class = shift;	3047	my $class = shift;
2184		3048
2185	my $self = $class->SUPER::new (	3049	my $self = $class->SUPER::new (
2186	fontsize => 1,	3050	fontsize => 1,
2187	can_events => 0,	3051	can_events => 1,
		3052	indent => 0,
2188	#font => default_font	3053	#font => default_font
2189	@_,	3054	@_,
2190		3055
2191	layout => (new CFClient::Layout 1),	3056	layout => (new CFPlus::Layout),
2192	par => [],	3057	par => [],
		3058	max_par => 0,
2193	height => 0,	3059	height => 0,
2194	children => [	3060	children => [
2195	(new CFClient::UI::Empty expand => 1),	3061	(new CFPlus::UI::Empty expand => 1),
2196	(new CFClient::UI::Slider vertical => 1),	3062	(new CFPlus::UI::Slider vertical => 1),
2197	],	3063	],
2198	);	3064	);
2199		3065
2200	$self->{children}[1]->connect (changed => sub { $self->update });	3066	$self->{children}[1]->connect (changed => sub { $self->update });
2201		3067
…		…
2207		3073
2208	$self->{fontsize} = $fontsize;	3074	$self->{fontsize} = $fontsize;
2209	$self->reflow;	3075	$self->reflow;
2210	}	3076	}
2211		3077
2212	sub text_height {	3078	sub size_request {
		3079	my ($self) = @_;
		3080
		3081	my ($empty, $slider) = @{ $self->{children} };
		3082
		3083	local $self->{children} = [$empty, $slider];
		3084	$self->SUPER::size_request
		3085	}
		3086
		3087	sub invoke_size_allocate {
		3088	my ($self, $w, $h) = @_;
		3089
		3090	my ($empty, $slider, @other) = @{ $self->{children} };
		3091	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		3092
		3093	$self->{layout}->set_font ($self->{font}) if $self->{font};
		3094	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		3095	$self->{layout}->set_width ($empty->{w});
		3096	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
		3097
		3098	$self->reflow;
		3099
		3100	local $self->{children} = [$empty, $slider];
		3101	$self->SUPER::invoke_size_allocate ($w, $h)
		3102	}
		3103
		3104	sub invoke_mouse_wheel {
2213	my ($self, $text) = @_;	3105	my ($self, $ev) = @_;
		3106
		3107	return 0 unless $ev->{dy}; # only vertical movements
		3108
		3109	$self->{children}[1]->emit (mouse_wheel => $ev);
		3110
		3111	1
		3112	}
		3113
		3114	sub get_layout {
		3115	my ($self, $para) = @_;
2214		3116
2215	my $layout = $self->{layout};	3117	my $layout = $self->{layout};
2216		3118
		3119	$layout->set_font ($self->{font}) if $self->{font};
		3120	$layout->set_foreground (@{$para->{fg}});
2217	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3121	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218	$layout->set_width ($self->{children}[0]{w});	3122	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		3123	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2219	$layout->set_markup ($text);	3124	$layout->set_markup ($para->{markup});
		3125
		3126	$layout->set_shapes (
		3127	map
		3128	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3129	@{$para->{widget}}
2220		3130	);
2221	($layout->size)[1]	3131
		3132	$layout
2222	}	3133	}
2223		3134
2224	sub reflow {	3135	sub reflow {
2225	my ($self) = @_;	3136	my ($self) = @_;
2226		3137
2227	$self->{need_reflow}++;	3138	$self->{need_reflow}++;
2228	$self->update;	3139	$self->update;
2229	}	3140	}
2230		3141
2231	sub size_allocate {	3142	sub set_offset {
		3143	my ($self, $offset) = @_;
		3144
		3145	# todo: base offset on lines or so, not on pixels
		3146	$self->{children}[1]->set_value ($offset);
		3147	}
		3148
		3149	sub current_paragraph {
		3150	my ($self) = @_;
		3151
		3152	$self->{top_paragraph} - 1
		3153	}
		3154
		3155	sub scroll_to {
2232	my ($self, $w, $h) = @_;	3156	my ($self, $para) = @_;
2233		3157
2234	$self->SUPER::size_allocate ($w, $h);	3158	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2235		3159
2236	$self->{layout}->set_font ($self->{font}) if $self->{font};	3160	$self->{scroll_to} = $para;
2237	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3161	$self->update;
2238	$self->{layout}->set_width ($self->{children}[0]{w});	3162	}
2239		3163
2240	$self->reflow;	3164	sub clear {
		3165	my ($self) = @_;
		3166
		3167	my (undef, undef, @other) = @{ $self->{children} };
		3168	$self->remove ($_) for @other;
		3169
		3170	$self->{par} = [];
		3171	$self->{height} = 0;
		3172	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2241	}	3173	}
2242		3174
2243	sub add_paragraph {	3175	sub add_paragraph {
2244	my ($self, $color, $text) = @_;	3176	my $self = shift;
2245		3177
2246	#TODO: intelligently "reformat" paragraph	3178	for my $para (@_) {
		3179	$para = {
		3180	fg => [1, 1, 1, 1],
		3181	indent => 0,
		3182	markup => "",
		3183	widget => [],
		3184	ref $para ? %$para : (markup => $para),
		3185	w => 1e10,
		3186	wrapped => 1,
		3187	};
2247		3188
2248	my $height = $self->text_height ($text);	3189	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3190	push @{$self->{par}}, $para;
		3191	}
2249		3192
		3193	if (my $max = $self->{max_par}) {
		3194	shift @{$self->{par}} while @{$self->{par}} > $max;
		3195	}
		3196
		3197	$self->{need_reflow}++;
		3198	$self->update;
		3199	}
		3200
		3201	sub scroll_to_bottom {
		3202	my ($self) = @_;
		3203
		3204	$self->{scroll_to} = $#{$self->{par}};
		3205	$self->update;
		3206	}
		3207
		3208	sub force_uptodate {
		3209	my ($self) = @_;
		3210
		3211	if (delete $self->{need_reflow}) {
		3212	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3213
		3214	my $height = 0;
		3215
		3216	for my $para (@{$self->{par}}) {
		3217	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3218	my $layout = $self->get_layout ($para);
		3219	my ($w, $h) = $layout->size;
		3220
		3221	$para->{w} = $w + $para->{indent};
		3222	$para->{h} = $h;
		3223	$para->{wrapped} = $layout->has_wrapped;
		3224	}
		3225
		3226	$para->{y} = $height;
		3227	$height += $para->{h};
		3228	}
		3229
2250	$self->{height} += $height;	3230	$self->{height} = $height;
		3231	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2251		3232
2252	push @{$self->{par}}, [$height, $color, $text];	3233	delete $self->{texture};
		3234	}
2253		3235
2254	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	3236	if (my $paridx = delete $self->{scroll_to}) {
2255	$self->{children}[1]->update;	3237	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3238	}
2256	}	3239	}
2257		3240
2258	sub update {	3241	sub update {
2259	my ($self) = @_;	3242	my ($self) = @_;
2260		3243
…		…
2262		3245
2263	return unless $self->{h} > 0;	3246	return unless $self->{h} > 0;
2264		3247
2265	delete $self->{texture};	3248	delete $self->{texture};
2266		3249
2267	$ROOT->on_post_alloc ($self, sub {	3250	$ROOT->on_post_alloc ($self => sub {
2268	if (delete $self->{need_reflow}) {	3251	$self->force_uptodate;
2269	my $height = 0;
2270		3252
2271	$height += $_->[0] = $self->text_height ($_->[2])	3253	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2272	for @{$self->{par}};
2273		3254
2274	$self->{height} = $height;	3255	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2275
2276	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2277
2278	delete $self->{texture};
2279	}
2280
2281	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2282	glClearColor 0.5, 0.5, 0.5, 0;	3256	glClearColor 0, 0, 0, 0;
2283	glClear GL_COLOR_BUFFER_BIT;	3257	glClear GL_COLOR_BUFFER_BIT;
2284		3258
2285	glEnable GL_TEXTURE_2D;	3259	package CFPlus::UI::Base;
2286	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3260	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3261	(0, 0, $self->{w}, $self->{h});
2287		3262
2288	my $top = int $self->{children}[1]{range}[0];	3263	my $top = int $self->{children}[1]{range}[0];
2289		3264
		3265	my $paridx = 0;
		3266	my $top_paragraph;
		3267	my $top = int $self->{children}[1]{range}[0];
		3268
2290	my $y0 = $top;	3269	my $y0 = $top;
2291	my $y1 = $top + $self->{h};	3270	my $y1 = $top + $H;
2292		3271
2293	my $y = 0;
2294
2295	my $layout = $self->{layout};
2296
2297	$layout->set_font ($self->{font}) if $self->{font};
2298
2299	for my $par (@{$self->{par}}) {	3272	for my $para (@{$self->{par}}) {
2300	my $h = $par->[0];	3273	my $h = $para->{h};
		3274	my $y = $para->{y};
2301		3275
2302	if ($y0 < $y + $h && $y < $y1) {	3276	if ($y0 < $y + $h && $y < $y1) {
2303	$layout->set_foreground (@{ $par->[1] });	3277	my $layout = $self->get_layout ($para);
2304	$layout->set_markup ($par->[2]);
2305		3278
2306	my ($W, $H) = $layout->size;	3279	$layout->render ($para->{indent}, $y - $y0);
2307	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	3280
		3281	if (my @w = @{ $para->{widget} }) {
		3282	my @s = $layout->get_shapes;
		3283
		3284	for (@w) {
		3285	my ($dx, $dy) = splice @s, 0, 2, ();
		3286
		3287	$_->{x} = $dx + $para->{indent};
		3288	$_->{y} = $dy + $y - $y0;
		3289
		3290	$_->draw;
		3291	}
		3292	}
2308	}	3293	}
2309		3294
2310	$y += $h;	3295	$paridx++;
		3296	$top_paragraph ||= $paridx if $y >= $top;
2311	}	3297	}
2312		3298
2313	glDisable GL_TEXTURE_2D;	3299	$self->{top_paragraph} = $top_paragraph;
2314	};	3300	};
2315	});	3301	});
2316	}	3302	}
2317		3303
		3304	sub reconfigure {
		3305	my ($self) = @_;
		3306
		3307	$self->SUPER::reconfigure;
		3308
		3309	$_->{w} = 1e10 for @{ $self->{par} };
		3310	$self->reflow;
		3311	}
		3312
2318	sub _draw {	3313	sub _draw {
2319	my ($self) = @_;	3314	my ($self) = @_;
2320		3315
2321	glEnable GL_TEXTURE_2D;	3316	glEnable GL_TEXTURE_2D;
2322	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3317	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2323	glColor 1, 1, 1, 1;	3318	glColor 0, 0, 0, 1;
2324	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3319	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2325	glDisable GL_TEXTURE_2D;	3320	glDisable GL_TEXTURE_2D;
2326		3321
2327	$self->{children}[1]->draw;	3322	$self->{children}[1]->draw;
2328
2329	}	3323	}
2330		3324
2331	#############################################################################	3325	#############################################################################
2332		3326
2333	package CFClient::UI::Animator;	3327	package CFPlus::UI::Animator;
2334		3328
2335	use CFClient::OpenGL;	3329	use CFPlus::OpenGL;
2336		3330
2337	our @ISA = CFClient::UI::Bin::;	3331	our @ISA = CFPlus::UI::Bin::;
2338		3332
2339	sub moveto {	3333	sub moveto {
2340	my ($self, $x, $y) = @_;	3334	my ($self, $x, $y) = @_;
2341		3335
2342	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3336	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2370	glPopMatrix;	3364	glPopMatrix;
2371	}	3365	}
2372		3366
2373	#############################################################################	3367	#############################################################################
2374		3368
2375	package CFClient::UI::Flopper;	3369	package CFPlus::UI::Flopper;
2376		3370
2377	our @ISA = CFClient::UI::Button::;	3371	our @ISA = CFPlus::UI::Button::;
2378		3372
2379	sub new {	3373	sub new {
2380	my $class = shift;	3374	my $class = shift;
2381		3375
2382	my $self = $class->SUPER::new (	3376	my $self = $class->SUPER::new (
2383	state => 0,	3377	state => 0,
2384	connect_activate => \&toggle_flopper,	3378	on_activate => \&toggle_flopper,
2385	@_	3379	@_
2386	);	3380	);
2387		3381
2388	if ($self->{state}) {
2389	$self->{state} = 0;
2390	$self->toggle_flopper;
2391	}
2392
2393	$self	3382	$self
2394	}	3383	}
2395		3384
2396	sub toggle_flopper {	3385	sub toggle_flopper {
2397	my ($self) = @_;	3386	my ($self) = @_;
2398		3387
2399	# TODO: use animation	3388	$self->{other}->toggle_visibility;
2400	if ($self->{state} = !$self->{state}) {
2401	$CFClient::UI::ROOT->add ($self->{other});
2402	$self->{other}->move ($self->coord2global (0, $self->{h}));
2403	$self->emit ("open");
2404	} else {
2405	$CFClient::UI::ROOT->remove ($self->{other});
2406	$self->emit ("close");
2407	}
2408
2409	$self->emit (changed => $self->{state});
2410	}	3389	}
2411		3390
2412	#############################################################################	3391	#############################################################################
2413		3392
2414	package CFClient::UI::Tooltip;	3393	package CFPlus::UI::Tooltip;
2415		3394
2416	our @ISA = CFClient::UI::Bin::;	3395	our @ISA = CFPlus::UI::Bin::;
2417		3396
2418	use CFClient::OpenGL;	3397	use CFPlus::OpenGL;
2419		3398
2420	sub new {	3399	sub new {
2421	my $class = shift;	3400	my $class = shift;
2422		3401
2423	$class->SUPER::new (	3402	$class->SUPER::new (
…		…
2427	}	3406	}
2428		3407
2429	sub set_tooltip_from {	3408	sub set_tooltip_from {
2430	my ($self, $widget) = @_;	3409	my ($self, $widget) = @_;
2431		3410
		3411	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3412	if $widget->{tooltip} =~ /^#(.*)$/;
		3413
		3414	my $tooltip = $widget->{tooltip};
		3415
		3416	if ($ENV{CFPLUS_DEBUG} & 2) {
		3417	$tooltip .= "\n\n" . (ref $widget) . "\n"
		3418	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		3419	. "req $widget->{req_w} $widget->{req_h}\n"
		3420	. "visible $widget->{visible}";
		3421	}
		3422
		3423	$tooltip =~ s/^\n+//;
		3424	$tooltip =~ s/\n+$//;
		3425
2432	$self->add (new CFClient::UI::Label	3426	$self->add (new CFPlus::UI::Label
2433	markup => $widget->{tooltip},	3427	markup => $tooltip,
2434	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3428	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435	fontsize => 0.8,	3429	fontsize => 0.8,
2436	fg => [0, 0, 0, 1],	3430	style => 1, # FLAG_INVERSE
2437	ellipsise => 0,	3431	ellipsise => 0,
2438	font => ($widget->{tooltip_font} || $::FONT_PROP),	3432	font => ($widget->{tooltip_font} || $::FONT_PROP),
2439	);	3433	);
2440	}	3434	}
2441		3435
…		…
2445	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3439	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2446		3440
2447	($w + 4, $h + 4)	3441	($w + 4, $h + 4)
2448	}	3442	}
2449		3443
2450	sub size_allocate {	3444	sub invoke_size_allocate {
2451	my ($self, $w, $h) = @_;	3445	my ($self, $w, $h) = @_;
2452		3446
2453	$self->SUPER::size_allocate ($w - 4, $h - 4);	3447	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
		3448	}
		3449
		3450	sub invoke_visibility_change {
		3451	my ($self, $visible) = @_;
		3452
		3453	return unless $visible;
		3454
		3455	$self->{root}->on_post_alloc ("move_$self" => sub {
		3456	my $widget = $self->{owner}
		3457	or return;
		3458
		3459	if ($widget->{visible}) {
		3460	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		3461
		3462	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		3463	if $x + $self->{w} > $self->{root}{w};
		3464
		3465	$self->move_abs ($x, $y);
		3466	} else {
		3467	$self->hide;
		3468	}
		3469	});
2454	}	3470	}
2455		3471
2456	sub _draw {	3472	sub _draw {
2457	my ($self) = @_;	3473	my ($self) = @_;
2458		3474
…		…
2475	glVertex $w, $h;	3491	glVertex $w, $h;
2476	glVertex $w, 0;	3492	glVertex $w, 0;
2477	glEnd;	3493	glEnd;
2478		3494
2479	glTranslate 2 - 0.375, 2 - 0.375;	3495	glTranslate 2 - 0.375, 2 - 0.375;
		3496
2480	$self->SUPER::_draw;	3497	$self->SUPER::_draw;
2481	}	3498	}
2482		3499
2483	#############################################################################	3500	#############################################################################
2484		3501
2485	package CFClient::UI::Face;	3502	package CFPlus::UI::Face;
2486		3503
2487	our @ISA = CFClient::UI::Base::;	3504	our @ISA = CFPlus::UI::DrawBG::;
2488		3505
2489	use CFClient::OpenGL;	3506	use CFPlus::OpenGL;
2490		3507
2491	sub new {	3508	sub new {
2492	my $class = shift;	3509	my $class = shift;
2493		3510
2494	$class->SUPER::new (	3511	my $self = $class->SUPER::new (
		3512	size_w => 32,
		3513	size_h => 8,
2495	aspect => 1,	3514	aspect => 1,
		3515	can_events => 0,
2496	@_,	3516	@_,
2497	)	3517	);
		3518
		3519	if ($self->{anim} && $self->{animspeed}) {
		3520	CFPlus::weaken (my $widget = $self);
		3521
		3522	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3523	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
		3524	$self->{timer} = Event->timer (
		3525	parked => 1,
		3526	cb => sub {
		3527	return unless $::CONN && $widget;
		3528
		3529	++$widget->{frame};
		3530	$widget->update_face;
		3531	$widget->update;
		3532
		3533	$widget->update_timer;
		3534	},
		3535	);
		3536
		3537	$self->update_face;
		3538	$self->update_timer;
		3539	}
		3540
		3541	$self
		3542	}
		3543
		3544	sub update_timer {
		3545	my ($self) = @_;
		3546
		3547	return unless $self->{timer};
		3548
		3549	if ($self->{visible}) {
		3550	$self->{timer}->at (
		3551	$self->{anim_start}
		3552	+ $self->{animspeed}
		3553	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3554	);
		3555	$self->{timer}->start;
		3556	} else {
		3557	$self->{timer}->stop;
		3558	}
		3559	}
		3560
		3561	sub update_face {
		3562	my ($self) = @_;
		3563
		3564	return unless $::CONN;
		3565
		3566	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3567	if ($anim && @$anim) {
		3568	delete $self->{wait_face};
		3569	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3570	}
		3571	}
2498	}	3572	}
2499		3573
2500	sub size_request {	3574	sub size_request {
2501	(32, 8)	3575	my ($self) = @_;
		3576
		3577	if ($::CONN) {
		3578	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3579	if (my $tex = $::CONN->{texture}[$faceid]) {
		3580	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3581	} else {
		3582	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3583	$self->realloc;
		3584	});
		3585	}
		3586	}
		3587	}
		3588
		3589	($self->{size_w} || 8, $self->{size_h} || 8)
		3590	}
		3591
		3592	sub update {
		3593	my ($self) = @_;
		3594
		3595	return unless $self->{visible};
		3596
		3597	$self->SUPER::update;
		3598	}
		3599
		3600	sub invoke_visibility_change {
		3601	my ($self) = @_;
		3602
		3603	$self->update_timer;
		3604
		3605	0
2502	}	3606	}
2503		3607
2504	sub _draw {	3608	sub _draw {
2505	my ($self) = @_;	3609	my ($self) = @_;
2506		3610
2507	return unless $::CONN;#d# manage and cache textures differently	3611	return unless $::CONN;
		3612
		3613	$self->SUPER::_draw;
		3614
		3615	my $faceid = $::CONN->{faceid}[$self->{face}]
		3616	or return;
		3617
2508	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	3618	my $tex = $::CONN->{texture}[$faceid];
2509		3619
2510	# TODO animation
2511	if ($tex) {	3620	if ($tex) {
2512	glEnable GL_TEXTURE_2D;	3621	glEnable GL_TEXTURE_2D;
2513	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3622	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514	glColor 1, 1, 1, 1;	3623	glColor 0, 0, 0, 1;
2515	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3624	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516	glDisable GL_TEXTURE_2D;	3625	glDisable GL_TEXTURE_2D;
2517	}	3626	}
2518	}	3627	}
2519		3628
		3629	sub destroy {
		3630	my ($self) = @_;
		3631
		3632	(delete $self->{timer})->cancel
		3633	if $self->{timer};
		3634
		3635	$self->SUPER::destroy;
		3636	}
		3637
2520	#############################################################################	3638	#############################################################################
2521		3639
2522	package CFClient::UI::InventoryItem;	3640	package CFPlus::UI::Buttonbar;
2523		3641
2524	our @ISA = CFClient::UI::HBox::;	3642	our @ISA = CFPlus::UI::HBox::;
2525		3643
2526	sub _item_to_desc {	3644	# TODO: should actually wrap buttons and other goodies.
2527	my ($item) = @_;
2528
2529	my $desc =
2530	$item->{nrof} < 2
2531	? $item->{name}
2532	: "$item->{nrof} $item->{name_pl}";
2533
2534	$item->{flags} & Crossfire::Protocol::F_OPEN
2535	and $desc .= " (open)";
2536	$item->{flags} & Crossfire::Protocol::F_APPLIED
2537	and $desc .= " (applied)";
2538	$item->{flags} & Crossfire::Protocol::F_UNPAID
2539	and $desc .= " (unpaid)";
2540	$item->{flags} & Crossfire::Protocol::F_MAGIC
2541	and $desc .= " (magic)";
2542	$item->{flags} & Crossfire::Protocol::F_CURSED
2543	and $desc .= " (cursed)";
2544	$item->{flags} & Crossfire::Protocol::F_DAMNED
2545	and $desc .= " (damned)";
2546	$item->{flags} & Crossfire::Protocol::F_LOCKED
2547	and $desc .= " *";
2548
2549	$desc
2550	}
2551
2552	sub new {
2553	my $class = shift;
2554
2555	my %args = @_;
2556
2557	my $item = delete $args{item};
2558
2559	my $desc = _item_to_desc ($item);
2560
2561	my $self = $class->SUPER::new (
2562	can_hover => 1,
2563	can_events => 1,
2564	tooltip => ((CFClient::UI::Label::escape $desc)
2565	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2566	connect_button_down => sub {
2567	my ($self, $ev, $x, $y) = @_;
2568
2569	# todo: maybe put examine on 1? but should just be a tooltip :(
2570	if ($ev->{button} == 1) {
2571	my $targ = $::CONN->{player}{tag};
2572
2573	if ($item->{container} == $::CONN->{player}{tag}) {
2574	$targ = $main::OPENCONT;
2575	}
2576
2577	$::CONN->send ("move $targ $item->{tag} 0");
2578	} elsif ($ev->{button} == 2) {
2579	$::CONN->send ("apply $item->{tag}");
2580	} elsif ($ev->{button} == 3) {
2581	my @menu_items = (
2582	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586	[
2587	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588	sub { $::CONN->send ("lock $item->{tag}") },
2589	],
2590	);
2591
2592	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593	}
2594
2595	1
2596	},
2597	%args
2598	);
2599
2600
2601	$self->add (new CFClient::UI::Face
2602	can_events => 0,
2603	face => $item->{face},
2604	anim => $item->{anim},
2605	animspeed => $item->{animspeed},
2606	);
2607
2608	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2609
2610	$self->{item} = $item;
2611
2612	$self->update_item;
2613
2614	$self
2615	}
2616
2617	sub update_item {
2618	my ($self) = @_;
2619
2620	my $desc = _item_to_desc ($self->{item});
2621
2622	$self->{name_lbl}->set_text ($desc);
2623	}
2624		3645
2625	#############################################################################	3646	#############################################################################
2626		3647
2627	package CFClient::UI::Inventory;
2628
2629	our @ISA = CFClient::UI::ScrolledWindow::;
2630
2631	sub new {
2632	my $class = shift;
2633
2634	my $self = $class->SUPER::new (
2635	scrolled => (new CFClient::UI::VBox),
2636	@_,
2637	);
2638
2639	$self
2640	}
2641
2642	sub set_items {
2643	my ($self, $items) = @_;
2644
2645	$self->{scrolled}->clear;
2646	return unless $items;
2647
2648	my @items = sort {
2649	($a->{type} <=> $b->{type})
2650	or ($a->{name} cmp $b->{name})
2651	} @$items;
2652
2653	$self->{real_items} = \@items;
2654
2655	for my $item (@items) {
2656	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2657	$item->update_item ();
2658	}
2659
2660	$self->{scrolled}->add (@items);
2661
2662	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2663	}
2664
2665	sub size_request {
2666	my ($self) = @_;
2667	($self->{req_w}, $self->{req_h});
2668	}
2669
2670	#############################################################################
2671
2672	package CFClient::UI::Menu;	3648	package CFPlus::UI::Menu;
2673		3649
2674	our @ISA = CFClient::UI::FancyFrame::;	3650	our @ISA = CFPlus::UI::Toplevel::;
2675		3651
2676	use CFClient::OpenGL;	3652	use CFPlus::OpenGL;
2677		3653
2678	sub new {	3654	sub new {
2679	my $class = shift;	3655	my $class = shift;
2680		3656
2681	my $self = $class->SUPER::new (	3657	my $self = $class->SUPER::new (
2682	items => [],	3658	items => [],
2683	z => 100,	3659	z => 100,
2684	@_,	3660	@_,
2685	);	3661	);
2686		3662
2687	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3663	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2688		3664
2689	for my $item (@{ $self->{items} }) {	3665	for my $item (@{ $self->{items} }) {
2690	my ($widget, $cb) = @$item;	3666	my ($widget, $cb, $tooltip) = @$item;
2691		3667
2692	# handle various types of items, only text for now	3668	# handle various types of items, only text for now
2693	if (!ref $widget) {	3669	if (!ref $widget) {
		3670	if ($widget =~ /\t/) {
		3671	my ($left, $right) = split /\t/, $widget, 2;
		3672
2694	$widget = new CFClient::UI::Label	3673	$widget = new CFPlus::UI::HBox
2695	can_hover => 1,	3674	can_hover => 1,
2696	can_events => 1,	3675	can_events => 1,
		3676	tooltip => $tooltip,
		3677	children => [
		3678	(new CFPlus::UI::Label markup => $left, expand => 1),
		3679	(new CFPlus::UI::Label markup => $right, align => +1),
		3680	],
		3681	;
		3682
		3683	} else {
		3684	$widget = new CFPlus::UI::Label
		3685	can_hover => 1,
		3686	can_events => 1,
2697	text => $widget;	3687	markup => $widget,
		3688	tooltip => $tooltip;
		3689	}
2698	}	3690	}
2699		3691
2700	$self->{item}{$widget} = $item;	3692	$self->{item}{$widget} = $item;
2701		3693
2702	$self->{vbox}->add ($widget);	3694	$self->{vbox}->add ($widget);
…		…
2714	# maybe save $GRAB? must be careful about events...	3706	# maybe save $GRAB? must be careful about events...
2715	$GRAB = $self;	3707	$GRAB = $self;
2716	$self->{button} = $ev->{button};	3708	$self->{button} = $ev->{button};
2717		3709
2718	$self->show;	3710	$self->show;
2719	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3711	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2720	}	3712	}
2721		3713
2722	sub mouse_motion {	3714	sub invoke_mouse_motion {
2723	my ($self, $ev, $x, $y) = @_;	3715	my ($self, $ev, $x, $y) = @_;
2724		3716
2725	# TODO: should use vbox->find_widget or so	3717	# TODO: should use vbox->find_widget or so
2726	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3718	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2727	$self->{hover} = $self->{item}{$HOVER};	3719	$self->{hover} = $self->{item}{$HOVER};
2728	}
2729		3720
		3721	0
		3722	}
		3723
2730	sub button_up {	3724	sub invoke_button_up {
2731	my ($self, $ev, $x, $y) = @_;	3725	my ($self, $ev, $x, $y) = @_;
2732		3726
2733	if ($ev->{button} == $self->{button}) {	3727	if ($ev->{button} == $self->{button}) {
2734	undef $GRAB;	3728	undef $GRAB;
2735	$self->hide;	3729	$self->hide;
2736		3730
2737	$self->emit ("popdown");	3731	$self->emit ("popdown");
2738	$self->{hover}[1]->() if $self->{hover};	3732	$self->{hover}[1]->() if $self->{hover};
		3733	} else {
		3734	return 0
		3735	}
		3736
2739	}	3737	1
2740	}	3738	}
2741		3739
2742	#############################################################################	3740	#############################################################################
2743		3741
2744	package CFClient::UI::Statusbox;	3742	package CFPlus::UI::Multiplexer;
2745		3743
2746	our @ISA = CFClient::UI::VBox::;	3744	our @ISA = CFPlus::UI::Container::;
2747		3745
2748	sub new {	3746	sub new {
2749	my $class = shift;	3747	my $class = shift;
2750		3748
2751	$class->SUPER::new (	3749	my $self = $class->SUPER::new (
		3750	@_,
		3751	);
		3752
		3753	$self->{current} = $self->{children}[0]
		3754	if @{ $self->{children} };
		3755
		3756	$self
		3757	}
		3758
		3759	sub add {
		3760	my ($self, @widgets) = @_;
		3761
		3762	$self->SUPER::add (@widgets);
		3763
		3764	$self->{current} = $self->{children}[0]
		3765	if @{ $self->{children} };
		3766	}
		3767
		3768	sub get_current_page {
		3769	my ($self) = @_;
		3770
		3771	$self->{current}
		3772	}
		3773
		3774	sub set_current_page {
		3775	my ($self, $page_or_widget) = @_;
		3776
		3777	my $widget = ref $page_or_widget
		3778	? $page_or_widget
		3779	: $self->{children}[$page_or_widget];
		3780
		3781	$self->{current} = $widget;
		3782	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3783
		3784	$self->emit (page_changed => $self->{current});
		3785
		3786	$self->realloc;
		3787	}
		3788
		3789	sub visible_children {
		3790	$_[0]{current}
		3791	}
		3792
		3793	sub size_request {
		3794	my ($self) = @_;
		3795
		3796	$self->{current}->size_request
		3797	}
		3798
		3799	sub invoke_size_allocate {
		3800	my ($self, $w, $h) = @_;
		3801
		3802	$self->{current}->configure (0, 0, $w, $h);
		3803
		3804	1
		3805	}
		3806
		3807	sub _draw {
		3808	my ($self) = @_;
		3809
		3810	$self->{current}->draw;
		3811	}
		3812
		3813	#############################################################################
		3814
		3815	package CFPlus::UI::Notebook;
		3816
		3817	our @ISA = CFPlus::UI::VBox::;
		3818
		3819	sub new {
		3820	my $class = shift;
		3821
		3822	my $self = $class->SUPER::new (
		3823	buttonbar => (new CFPlus::UI::Buttonbar),
		3824	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3825	# filter => # will be put between multiplexer and $self
		3826	@_,
		3827	);
		3828
		3829	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3830	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3831
		3832	$self
		3833	}
		3834
		3835	sub add {
		3836	my ($self, $title, $widget, $tooltip) = @_;
		3837
		3838	CFPlus::weaken $self;
		3839
		3840	$self->{buttonbar}->add (new CFPlus::UI::Button
		3841	markup => $title,
		3842	tooltip => $tooltip,
		3843	on_activate => sub { $self->set_current_page ($widget) },
		3844	);
		3845
		3846	$self->{multiplexer}->add ($widget);
		3847	}
		3848
		3849	sub get_current_page {
		3850	my ($self) = @_;
		3851
		3852	$self->{multiplexer}->get_current_page
		3853	}
		3854
		3855	sub set_current_page {
		3856	my ($self, $page) = @_;
		3857
		3858	$self->{multiplexer}->set_current_page ($page);
		3859	$self->emit (page_changed => $self->{multiplexer}{current});
		3860	}
		3861
		3862	#############################################################################
		3863
		3864	package CFPlus::UI::Selector;
		3865
		3866	use utf8;
		3867
		3868	our @ISA = CFPlus::UI::Button::;
		3869
		3870	sub new {
		3871	my $class = shift;
		3872
		3873	my $self = $class->SUPER::new (
		3874	options => [], # [value, title, longdesc], ...
		3875	value => undef,
		3876	@_,
		3877	);
		3878
		3879	$self->_set_value ($self->{value});
		3880
		3881	$self
		3882	}
		3883
		3884	sub invoke_button_down {
		3885	my ($self, $ev) = @_;
		3886
		3887	my @menu_items;
		3888
		3889	for (@{ $self->{options} }) {
		3890	my ($value, $title, $tooltip) = @$_;
		3891
		3892	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3893	}
		3894
		3895	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3896	}
		3897
		3898	sub _set_value {
		3899	my ($self, $value) = @_;
		3900
		3901	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3902	or return;
		3903
		3904	$self->{value} = $item->[0];
		3905	$self->set_markup ("$item->[1] ⇓");
		3906	$self->set_tooltip ($item->[2]);
		3907	}
		3908
		3909	sub set_value {
		3910	my ($self, $value) = @_;
		3911
		3912	return unless $self->{value} ne $value;
		3913
		3914	$self->_set_value ($value);
		3915	$self->emit (changed => $value);
		3916	}
		3917
		3918	#############################################################################
		3919
		3920	package CFPlus::UI::Statusbox;
		3921
		3922	our @ISA = CFPlus::UI::VBox::;
		3923
		3924	sub new {
		3925	my $class = shift;
		3926
		3927	my $self = $class->SUPER::new (
2752	fontsize => 0.8,	3928	fontsize => 0.8,
2753	@_,	3929	@_,
2754	)	3930	);
		3931
		3932	CFPlus::weaken (my $this = $self);
		3933
		3934	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3935
		3936	$self
2755	}	3937	}
2756		3938
2757	sub reorder {	3939	sub reorder {
2758	my ($self) = @_;	3940	my ($self) = @_;
2759	my $NOW = time;	3941	my $NOW = Time::HiRes::time;
		3942
		3943	# freeze display when hovering over any label
		3944	return if $CFPlus::UI::TOOLTIP->{owner}
		3945	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
		3946	values %{ $self->{item} };
2760		3947
2761	while (my ($k, $v) = each %{ $self->{item} }) {	3948	while (my ($k, $v) = each %{ $self->{item} }) {
2762	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3949	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2763	}	3950	}
2764		3951
…		…
2767	my @items = sort {	3954	my @items = sort {
2768	$a->{pri} <=> $b->{pri}	3955	$a->{pri} <=> $b->{pri}
2769	or $b->{id} <=> $a->{id}	3956	or $b->{id} <=> $a->{id}
2770	} values %{ $self->{item} };	3957	} values %{ $self->{item} };
2771		3958
		3959	$self->{timer}->interval (1);
		3960
2772	my $count = 10 + 1;	3961	my $count = 10 + 1;
2773	for my $item (@items) {	3962	for my $item (@items) {
2774	last unless --$count;	3963	last unless --$count;
2775		3964
2776	push @widgets, $item->{label} ||= do {	3965	my $label = $item->{label} ||= do {
2777	# TODO: doesn't handle markup well (read as: at all)	3966	# TODO: doesn't handle markup well (read as: at all)
2778	my $short = $item->{count} > 1	3967	my $short = $item->{count} > 1
2779	? "<b>$item->{count} ×</b> $item->{text}"	3968	? "<b>$item->{count} ×</b> $item->{text}"
2780	: $item->{text};	3969	: $item->{text};
2781		3970
2782	for ($short) {	3971	for ($short) {
2783	s/^\s+//;	3972	s/^\s+//;
2784	s/\s+/ /g;	3973	s/\s+/ /g;
2785	}	3974	}
2786		3975
2787	new CFClient::UI::Label	3976	new CFPlus::UI::Label
2788	markup => $short,	3977	markup => $short,
2789	tooltip => $item->{tooltip},	3978	tooltip => $item->{tooltip},
2790	tooltip_font => $::FONT_PROP,	3979	tooltip_font => $::FONT_PROP,
2791	tooltip_width => 0.67,	3980	tooltip_width => 0.67,
2792	fontsize => $item->{fontsize} || $self->{fontsize},	3981	fontsize => $item->{fontsize} || $self->{fontsize},
2793	max_w => $::WIDTH * 0.44,	3982	max_w => $::WIDTH * 0.44,
2794	fg => $item->{fg},	3983	fg => [@{ $item->{fg} }],
2795	can_events => 1,	3984	can_events => 1,
2796	can_hover => 1	3985	can_hover => 1
2797	};	3986	};
		3987
		3988	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3989	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3990	$label->update;
		3991	$label->set_max_size (undef, $label->{req_h} * $diff)
		3992	if $diff < 1;
		3993	$self->{timer}->interval (1/30);
		3994	} else {
		3995	$label->{fg}[3] = $item->{fg}[3] || 1;
		3996	}
		3997
		3998	push @widgets, $label;
2798	}	3999	}
2799		4000
2800	$self->clear;	4001	$self->clear;
2801	$self->SUPER::add (reverse @widgets);	4002	$self->SUPER::add (reverse @widgets);
2802	}	4003	}
…		…
2805	my ($self, $text, %arg) = @_;	4006	my ($self, $text, %arg) = @_;
2806		4007
2807	$text =~ s/^\s+//;	4008	$text =~ s/^\s+//;
2808	$text =~ s/\s+$//;	4009	$text =~ s/\s+$//;
2809		4010
		4011	return unless $text;
		4012
2810	my $timeout = time + ((delete $arg{timeout}) || 60);	4013	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2811		4014
2812	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	4015	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813		4016
2814	if (my $item = $self->{item}{$group}) {	4017	if (my $item = $self->{item}{$group}) {
2815	if ($item->{text} eq $text) {	4018	if ($item->{text} eq $text) {
2816	$item->{count}++;	4019	$item->{count}++;
2817	} else {	4020	} else {
2818	$item->{count} = 1;	4021	$item->{count} = 1;
2819	$item->{text} = $item->{tooltip} = $text;	4022	$item->{text} = $item->{tooltip} = $text;
2820	}	4023	}
2821	$item->{id} = ++$self->{id};	4024	$item->{id} += 0.2;#d#
2822	$item->{timeout} = $timeout;	4025	$item->{timeout} = $timeout;
2823	delete $item->{label};	4026	delete $item->{label};
2824	} else {	4027	} else {
2825	$self->{item}{$group} = {	4028	$self->{item}{$group} = {
2826	id => ++$self->{id},	4029	id => ++$self->{id},
…		…
2832	count => 1,	4035	count => 1,
2833	%arg,	4036	%arg,
2834	};	4037	};
2835	}	4038	}
2836		4039
		4040	$ROOT->on_refresh (reorder => sub {
2837	$self->reorder;	4041	$self->reorder;
		4042	});
2838	}	4043	}
2839		4044
2840	sub reconfigure {	4045	sub reconfigure {
2841	my ($self) = @_;	4046	my ($self) = @_;
2842		4047
…		…
2845		4050
2846	$self->reorder;	4051	$self->reorder;
2847	$self->SUPER::reconfigure;	4052	$self->SUPER::reconfigure;
2848	}	4053	}
2849		4054
		4055	sub destroy {
		4056	my ($self) = @_;
		4057
		4058	$self->{timer}->cancel;
		4059
		4060	$self->SUPER::destroy;
		4061	}
		4062
2850	#############################################################################	4063	#############################################################################
2851		4064
2852	package CFClient::UI::Root;	4065	package CFPlus::UI::Root;
2853		4066
2854	our @ISA = CFClient::UI::Container::;	4067	our @ISA = CFPlus::UI::Container::;
2855		4068
		4069	use List::Util qw(min max);
		4070
2856	use CFClient::OpenGL;	4071	use CFPlus::OpenGL;
2857		4072
2858	sub new {	4073	sub new {
2859	my $class = shift;	4074	my $class = shift;
2860		4075
2861	$class->SUPER::new (	4076	my $self = $class->SUPER::new (
		4077	visible => 1,
2862	@_,	4078	@_,
2863	)	4079	);
2864	}
2865		4080
2866	sub configure {	4081	CFPlus::weaken ($self->{root} = $self);
2867	my ($self, $x, $y, $w, $h) = @_;
2868		4082
2869	$self->{w} = $w;	4083	$self
2870	$self->{h} = $h;
2871	}
2872
2873	sub check_size {
2874	my ($self) = @_;
2875
2876	$self->size_allocate ($self->{w}, $self->{h})
2877	if $self->{w};
2878	}	4084	}
2879		4085
2880	sub size_request {	4086	sub size_request {
2881	my ($self) = @_;	4087	my ($self) = @_;
2882		4088
2883	($self->{w}, $self->{h})	4089	($self->{w}, $self->{h})
2884	}	4090	}
2885		4091
		4092	sub _to_pixel {
		4093	my ($coord, $size, $max) = @_;
		4094
		4095	$coord =
		4096	$coord eq "center" ? ($max - $size) * 0.5
		4097	: $coord eq "max" ? $max
		4098	: $coord;
		4099
		4100	$coord = 0 if $coord < 0;
		4101	$coord = $max - $size if $coord > $max - $size;
		4102
		4103	int $coord + 0.5
		4104	}
		4105
2886	sub size_allocate {	4106	sub invoke_size_allocate {
2887	my ($self, $w, $h) = @_;	4107	my ($self, $w, $h) = @_;
2888
2889	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2890	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2891
2892	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2893	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2894		4108
2895	for my $child ($self->children) {	4109	for my $child ($self->children) {
2896	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	4110	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2897		4111
2898	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	4112	$X = $child->{force_x} if exists $child->{force_x};
2899	if exists $child->{req_x};	4113	$Y = $child->{force_y} if exists $child->{force_y};
2900		4114
2901	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	4115	$X = _to_pixel $X, $W, $self->{w};
2902	if exists $child->{req_y};	4116	$Y = _to_pixel $Y, $H, $self->{h};
2903
2904	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2905	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906		4117
2907	$child->configure ($X, $Y, $W, $H);	4118	$child->configure ($X, $Y, $W, $H);
2908	}	4119	}
		4120
		4121	1
2909	}	4122	}
2910		4123
2911	sub coord2local {	4124	sub coord2local {
2912	my ($self, $x, $y) = @_;	4125	my ($self, $x, $y) = @_;
2913		4126
…		…
2921	}	4134	}
2922		4135
2923	sub update {	4136	sub update {
2924	my ($self) = @_;	4137	my ($self) = @_;
2925		4138
2926	$self->check_size;
2927	$::WANT_REFRESH++;	4139	$::WANT_REFRESH++;
2928	}	4140	}
2929		4141
2930	sub add {	4142	sub add {
2931	my ($self, @children) = @_;	4143	my ($self, @children) = @_;
2932		4144
2933	for my $child (@children) {
2934	$child->{toplevel} = 1;	4145	$_->{is_toplevel} = 1
2935		4146	for @children;
2936	# integerise window positions
2937	$child->{x} = int $child->{x};
2938	$child->{y} = int $child->{y};
2939	}
2940		4147
2941	$self->SUPER::add (@children);	4148	$self->SUPER::add (@children);
		4149	}
		4150
		4151	sub remove {
		4152	my ($self, @children) = @_;
		4153
		4154	$self->SUPER::remove (@children);
		4155
		4156	delete $self->{is_toplevel}
		4157	for @children;
		4158
		4159	while (@children) {
		4160	my $w = pop @children;
		4161	push @children, $w->children;
		4162	$w->set_invisible;
		4163	}
2942	}	4164	}
2943		4165
2944	sub on_refresh {	4166	sub on_refresh {
2945	my ($self, $id, $cb) = @_;	4167	my ($self, $id, $cb) = @_;
2946		4168
…		…
2959	while ($self->{refresh_hook}) {	4181	while ($self->{refresh_hook}) {
2960	$_->()	4182	$_->()
2961	for values %{delete $self->{refresh_hook}};	4183	for values %{delete $self->{refresh_hook}};
2962	}	4184	}
2963		4185
2964	if ($self->{check_size}) {	4186	if ($self->{realloc}) {
2965	my @queue = ([], []);	4187	my %queue;
		4188	my @queue;
		4189	my $widget;
2966		4190
2967	for (;;) {	4191	outer:
2968	if ($self->{check_size}) {	4192	while () {
2969	# heuristic: check containers last	4193	if (my $realloc = delete $self->{realloc}) {
2970	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	4194	for $widget (values %$realloc) {
2971	for values %{delete $self->{check_size}}	4195	$widget->{visible} or next; # do not resize invisible widgets
		4196
		4197	$queue{$widget+0}++ and next; # duplicates are common
		4198
		4199	push @{ $queue[$widget->{visible}] }, $widget;
		4200	}
2972	}	4201	}
2973		4202
2974	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	4203	while () {
		4204	@queue or last outer;
2975		4205
2976	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	4206	$widget = pop @{ $queue[-1] || [] }
2977	? @$widget{qw(user_w user_h)}	4207	and last;
2978	: $widget->size_request;
2979
2980	if (delete $widget->{force_alloc}
2981	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2982	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2983		4208
		4209	pop @queue;
		4210	}
		4211
		4212	delete $queue{$widget+0};
		4213
		4214	my ($w, $h) = $widget->size_request;
		4215
		4216	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		4217	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		4218
		4219	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4220	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4221
		4222	$w = $widget->{force_w} if exists $widget->{force_w};
		4223	$h = $widget->{force_h} if exists $widget->{force_h};
		4224
		4225	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		4226	|| delete $widget->{force_realloc}) {
2984	$widget->{req_w} = $w;	4227	$widget->{req_w} = $w;
2985	$widget->{req_h} = $h;	4228	$widget->{req_h} = $h;
2986		4229
2987	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	4230	$self->{size_alloc}{$widget+0} = $widget;
2988		4231
2989	$widget->{parent}->check_size
2990	if $widget->{parent};	4232	if (my $parent = $widget->{parent}) {
		4233	$self->{realloc}{$parent+0} = $parent
		4234	unless $queue{$parent+0};
		4235
		4236	$parent->{force_size_alloc} = 1;
		4237	$self->{size_alloc}{$parent+0} = $parent;
		4238	}
2991	}	4239	}
		4240
		4241	delete $self->{realloc}{$widget+0};
2992	}	4242	}
2993	}	4243	}
2994		4244
2995	while ($self->{size_alloc}) {	4245	while (my $size_alloc = delete $self->{size_alloc}) {
2996	for (values %{delete $self->{size_alloc}}) {	4246	my @queue = sort { $b->{visible} <=> $a->{visible} }
2997	my ($widget, $w, $h) = @$_;	4247	values %$size_alloc;
		4248
		4249	while () {
		4250	my $widget = pop @queue || last;
		4251
		4252	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2998		4253
2999	$w = 0 if $w < 0;	4254	$w = 0 if $w < 0;
3000	$h = 0 if $h < 0;	4255	$h = 0 if $h < 0;
3001		4256
		4257	$w = max $widget->{min_w}, $w;
		4258	$h = max $widget->{min_h}, $h;
		4259
		4260	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4261	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4262
		4263	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4264	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4265
		4266	$w = int $w + 0.5;
		4267	$h = int $h + 0.5;
		4268
		4269	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		4270	$widget->{old_w} = $widget->{w};
		4271	$widget->{old_h} = $widget->{h};
		4272
3002	$widget->{w} = $w;	4273	$widget->{w} = $w;
3003	$widget->{h} = $h;	4274	$widget->{h} = $h;
3004	$widget->size_allocate ($w, $h);	4275
3005	$widget->emit (size_allocate => $w, $h);	4276	$widget->emit (size_allocate => $w, $h);
		4277	}
3006	}	4278	}
3007	}	4279	}
3008		4280
3009	while ($self->{post_alloc_hook}) {	4281	while ($self->{post_alloc_hook}) {
3010	$_->()	4282	$_->()
…		…
3015	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4287	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016	glClear GL_COLOR_BUFFER_BIT;	4288	glClear GL_COLOR_BUFFER_BIT;
3017		4289
3018	glMatrixMode GL_PROJECTION;	4290	glMatrixMode GL_PROJECTION;
3019	glLoadIdentity;	4291	glLoadIdentity;
3020	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	4292	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021	glMatrixMode GL_MODELVIEW;	4293	glMatrixMode GL_MODELVIEW;
3022	glLoadIdentity;	4294	glLoadIdentity;
3023		4295
		4296	{
		4297	package CFPlus::UI::Base;
		4298
		4299	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		4300	(0, 0, $self->{w}, $self->{h});
		4301
3024	$self->_draw;	4302	$self->_draw;
		4303	}
3025	}	4304	}
3026		4305
3027	#############################################################################	4306	#############################################################################
3028		4307
3029	package CFClient::UI;	4308	package CFPlus::UI;
3030		4309
3031	$ROOT = new CFClient::UI::Root;	4310	$ROOT = new CFPlus::UI::Root;
3032	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4311	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3033		4312
3034	1	4313	1
3035		4314

Diff Legend

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