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

Diff Legend

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