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

Diff Legend

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