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.239 by root, Thu May 25 22:29:57 2006 UTC vs.
Revision 1.369 by root, Sun Jul 15 20:25:26 2007 UTC

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

Diff Legend

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