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.257 by root, Tue May 30 02:22:02 2006 UTC vs.
Revision 1.375 by root, Mon Jul 16 20:12:19 2007 UTC

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

Diff Legend

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