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.231 by root, Thu May 25 00:26:19 2006 UTC vs.
Revision 1.371 by root, Sun Jul 15 22:07:48 2007 UTC

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

Diff Legend

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