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

Diff Legend

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