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.245 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.361 by root, Sat Dec 9 02:21:25 2006 UTC

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

Diff Legend

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