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

Diff Legend

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