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.234 by root, Thu May 25 16:24:44 2006 UTC vs.
Revision 1.372 by root, Sun Jul 15 22:13:43 2007 UTC

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

Diff Legend

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