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

Diff Legend

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