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.370 by root, Sun Jul 15 21:02:20 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	vp => (new CFPlus::UI::ViewPort expand => 1),
		1067	can_events => 1,
867	slider => $slider,	1068	hslider => $hslider,
868	@_,	1069	vslider => $vslider,
		1070	col_expand => [1, 0],
		1071	row_expand => [1, 0],
		1072	%arg,
869	);	1073	);
870		1074
871	$self->{vp}->add ($self->{scrolled});
872	$self->add ($self->{vp});	1075	$self->SUPER::add (0, 0, $self->{vp});
873	$self->add ($self->{slider});	1076	$self->SUPER::add (1, 0, $self->{vslider});
		1077	$self->SUPER::add (0, 1, $self->{hslider});
		1078
		1079	$self->add ($child) if $child;
874		1080
875	$self	1081	$self
876	}	1082	}
877		1083
		1084	#TODO# update range on size_allocate depending on child
		1085
		1086	sub add {
		1087	my ($self, $widget) = @_;
		1088
		1089	$self->{vp}->add ($self->{child} = $widget);
		1090	}
		1091
		1092	sub invoke_mouse_wheel {
		1093	my ($self, $ev) = @_;
		1094
		1095	return 0 unless $ev->{dy}; # only vertical movements
		1096
		1097	$self->{vslider}->emit (mouse_wheel => $ev);
		1098
		1099	1
		1100	}
		1101
		1102	sub update_slider {
		1103	my ($self) = @_;
		1104
		1105	my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w});
		1106	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1107	#$self->{hslider}->set_visibility ($w1 != $w2);
		1108
		1109	my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h});
		1110	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1111	#$self->{vslider}->set_visibility ($h1 != $h2);
		1112	}
		1113
		1114	sub update {
		1115	my ($self) = @_;
		1116
		1117	$self->SUPER::update;
		1118	$self->update_slider;
		1119	}
		1120
878	sub size_allocate {	1121	sub invoke_size_allocate {
879	my ($self, $w, $h) = @_;	1122	my ($self, $w, $h) = @_;
880		1123
		1124	$self->update_slider;
881	$self->SUPER::size_allocate ($w, $h);	1125	$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	}	1126	}
886
887	#TODO# update range on size_allocate depending on child
888	# update viewport offset on scroll
889		1127
890	#############################################################################	1128	#############################################################################
891		1129
892	package CFClient::UI::Frame;	1130	package CFPlus::UI::Frame;
893		1131
894	our @ISA = CFClient::UI::Bin::;	1132	our @ISA = CFPlus::UI::Bin::;
895		1133
896	use CFClient::OpenGL;	1134	use CFPlus::OpenGL;
897		1135
898	sub new {	1136	sub new {
899	my $class = shift;	1137	my $class = shift;
900		1138
901	$class->SUPER::new (	1139	$class->SUPER::new (
…		…
909		1147
910	if ($self->{bg}) {	1148	if ($self->{bg}) {
911	my ($w, $h) = @$self{qw(w h)};	1149	my ($w, $h) = @$self{qw(w h)};
912		1150
913	glEnable GL_BLEND;	1151	glEnable GL_BLEND;
914	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1152	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
915	glColor @{ $self->{bg} };	1153	glColor_premultiply @{ $self->{bg} };
916		1154
917	glBegin GL_QUADS;	1155	glBegin GL_QUADS;
918	glVertex 0 , 0;	1156	glVertex 0 , 0;
919	glVertex 0 , $h;	1157	glVertex 0 , $h;
920	glVertex $w, $h;	1158	glVertex $w, $h;
…		…
927	$self->SUPER::_draw;	1165	$self->SUPER::_draw;
928	}	1166	}
929		1167
930	#############################################################################	1168	#############################################################################
931		1169
932	package CFClient::UI::FancyFrame;	1170	package CFPlus::UI::FancyFrame;
933		1171
934	our @ISA = CFClient::UI::Bin::;	1172	our @ISA = CFPlus::UI::Bin::;
935		1173
936	use CFClient::OpenGL;	1174	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		1175
942	sub new {	1176	sub new {
943	my $class = shift;	1177	my ($class, %arg) = @_;
944		1178
945	# TODO: user_x, user_y, overwrite moveto?	1179	if ((exists $arg{label}) && !ref $arg{label}) {
		1180	$arg{label} = new CFPlus::UI::Label
		1181	align => 1,
		1182	valign => 0,
		1183	text => $arg{label},
		1184	fontsize => ($arg{border} || 0.8) * 0.75;
		1185	}
		1186
		1187	my $self = $class->SUPER::new (
		1188	# label => "",
		1189	fg => [0.6, 0.3, 0.1],
		1190	border => 0.8,
		1191	style => 'single',
		1192	%arg,
		1193	);
		1194
		1195	$self
		1196	}
		1197
		1198	sub add {
		1199	my ($self, @widgets) = @_;
		1200
		1201	$self->SUPER::add (@widgets);
		1202	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1203	}
		1204
		1205	sub border {
		1206	int $_[0]{border} * $::FONTSIZE
		1207	}
		1208
		1209	sub size_request {
		1210	my ($self) = @_;
		1211
		1212	($self->{label_w}, undef) = $self->{label}->size_request
		1213	if $self->{label};
		1214
		1215	my ($w, $h) = $self->SUPER::size_request;
		1216
		1217	(
		1218	$w + $self->border * 2,
		1219	$h + $self->border * 2,
		1220	)
		1221	}
		1222
		1223	sub invoke_size_allocate {
		1224	my ($self, $w, $h) = @_;
		1225
		1226	my $border = $self->border;
		1227
		1228	$w -= List::Util::max 0, $border * 2;
		1229	$h -= List::Util::max 0, $border * 2;
		1230
		1231	if (my $label = $self->{label}) {
		1232	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1233	$label->{h} = List::Util::min $h, $border;
		1234	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1235	}
		1236
		1237	$self->child->configure ($border, $border, $w, $h);
		1238
		1239	1
		1240	}
		1241
		1242	sub _draw {
		1243	my ($self) = @_;
		1244
		1245	my $child = $self->{children}[0];
		1246
		1247	my $border = $self->border;
		1248	my ($w, $h) = ($self->{w}, $self->{h});
		1249
		1250	$child->draw;
		1251
		1252	glColor @{$self->{fg}};
		1253	glBegin GL_LINE_STRIP;
		1254	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1255	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1256	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1257	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1258	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1259	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1260	glEnd;
		1261
		1262	if ($self->{label}) {
		1263	glTranslate $border * 2, 0;
		1264	$self->{label}->_draw;
		1265	}
		1266	}
		1267
		1268	#############################################################################
		1269
		1270	package CFPlus::UI::Toplevel;
		1271
		1272	our @ISA = CFPlus::UI::Bin::;
		1273
		1274	use CFPlus::OpenGL;
		1275
		1276	my $bg =
		1277	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
		1278	mipmap => 1, wrap => 1;
		1279
		1280	my @border =
		1281	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1282	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1283
		1284	sub new {
		1285	my ($class, %arg) = @_;
946		1286
947	my $self = $class->SUPER::new (	1287	my $self = $class->SUPER::new (
948	bg => [1, 1, 1, 1],	1288	bg => [1, 1, 1, 1],
949	border_bg => [1, 1, 1, 1],	1289	border_bg => [1, 1, 1, 1],
950	border => 0.6,	1290	border => 0.6,
951	is_toplevel => 1,
952	can_events => 1,	1291	can_events => 1,
953	@_	1292	min_w => 64,
		1293	min_h => 32,
		1294	%arg,
954	);	1295	);
955		1296
956	$self->{title} &&= new CFClient::UI::Label	1297	$self->{title_widget} = new CFPlus::UI::Label
957	align => 0,	1298	align => 0,
958	valign => 1,	1299	valign => 1,
959	text => $self->{title},	1300	text => $self->{title},
960	fontsize => $self->{border};	1301	fontsize => $self->{border},
		1302	if exists $self->{title};
		1303
		1304	if ($self->{has_close_button}) {
		1305	$self->{close_button} =
		1306	new CFPlus::UI::ImageButton
		1307	path => 'x1_close.png',
		1308	on_activate => sub { $self->emit ("delete") };
		1309
		1310	$self->CFPlus::UI::Container::add ($self->{close_button});
		1311	}
961		1312
962	$self	1313	$self
		1314	}
		1315
		1316	sub add {
		1317	my ($self, @widgets) = @_;
		1318
		1319	$self->SUPER::add (@widgets);
		1320	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
		1321	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
963	}	1322	}
964		1323
965	sub border {	1324	sub border {
966	int $_[0]{border} * $::FONTSIZE	1325	int $_[0]{border} * $::FONTSIZE
967	}	1326	}
968		1327
969	sub size_request {	1328	sub size_request {
970	my ($self) = @_;	1329	my ($self) = @_;
		1330
		1331	$self->{title_widget}->size_request
		1332	if $self->{title_widget};
		1333
		1334	$self->{close_button}->size_request
		1335	if $self->{close_button};
971		1336
972	my ($w, $h) = $self->SUPER::size_request;	1337	my ($w, $h) = $self->SUPER::size_request;
973		1338
974	(	1339	(
975	$w + $self->border * 2,	1340	$w + $self->border * 2,
976	$h + $self->border * 2,	1341	$h + $self->border * 2,
977	)	1342	)
978	}	1343	}
979		1344
980	sub size_allocate {	1345	sub invoke_size_allocate {
981	my ($self, $w, $h) = @_;	1346	my ($self, $w, $h) = @_;
982		1347
		1348	if ($self->{title_widget}) {
		1349	$self->{title_widget}{w} = $w;
		1350	$self->{title_widget}{h} = $h;
		1351	$self->{title_widget}->invoke_size_allocate ($w, $h);
		1352	}
		1353
		1354	my $border = $self->border;
		1355
983	$h -= List::Util::max 0, $self->border * 2;	1356	$h -= List::Util::max 0, $border * 2;
984	$w -= List::Util::max 0, $self->border * 2;	1357	$w -= List::Util::max 0, $border * 2;
985		1358
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);	1359	$self->child->configure ($border, $border, $w, $h);
990	}
991		1360
		1361	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1362	if $self->{close_button};
		1363
		1364	1
		1365	}
		1366
		1367	sub invoke_delete {
		1368	my ($self) = @_;
		1369
		1370	$self->hide;
		1371
		1372	1
		1373	}
		1374
992	sub button_down {	1375	sub invoke_button_down {
993	my ($self, $ev, $x, $y) = @_;	1376	my ($self, $ev, $x, $y) = @_;
994		1377
995	my ($w, $h) = @$self{qw(w h)};	1378	my ($w, $h) = @$self{qw(w h)};
996	my $border = $self->border;	1379	my $border = $self->border;
997		1380
…		…
1010	my ($ev, $x, $y) = @_;	1393	my ($ev, $x, $y) = @_;
1011		1394
1012	my $dx = $ev->{x} - $ox;	1395	my $dx = $ev->{x} - $ox;
1013	my $dy = $ev->{y} - $oy;	1396	my $dy = $ev->{y} - $oy;
1014		1397
1015	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1398	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1399	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1400
1017	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1401	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018	$self->check_size;	1402	$self->realloc;
1019	};	1403	};
1020		1404
1021	} elsif ($lr ^ $td) {	1405	} elsif ($lr ^ $td) {
1022	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1406	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023	my ($bx, $by) = ($self->{x}, $self->{y});	1407	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1025	$self->{motion} = sub {	1409	$self->{motion} = sub {
1026	my ($ev, $x, $y) = @_;	1410	my ($ev, $x, $y) = @_;
1027		1411
1028	($x, $y) = ($ev->{x}, $ev->{y});	1412	($x, $y) = ($ev->{x}, $ev->{y});
1029		1413
1030	$self->move ($bx + $x - $ox, $by + $y - $oy);	1414	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031	$self->update;	1415	# HACK: the next line is required to enforce placement
		1416	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1032	};	1417	};
		1418	} else {
		1419	return 0;
		1420	}
		1421
1033	}	1422	1
1034	}	1423	}
1035		1424
1036	sub button_up {	1425	sub invoke_button_up {
1037	my ($self, $ev, $x, $y) = @_;	1426	my ($self, $ev, $x, $y) = @_;
1038		1427
1039	delete $self->{motion};	1428	! ! delete $self->{motion}
1040	}	1429	}
1041		1430
1042	sub mouse_motion {	1431	sub invoke_mouse_motion {
1043	my ($self, $ev, $x, $y) = @_;	1432	my ($self, $ev, $x, $y) = @_;
1044		1433
1045	$self->{motion}->($ev, $x, $y) if $self->{motion};	1434	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1435
		1436	! ! $self->{motion}
		1437	}
		1438
		1439	sub invoke_visibility_change {
		1440	my ($self, $visible) = @_;
		1441
		1442	delete $self->{motion} unless $visible;
		1443
		1444	0
1046	}	1445	}
1047		1446
1048	sub _draw {	1447	sub _draw {
1049	my ($self) = @_;	1448	my ($self) = @_;
1050		1449
		1450	my $child = $self->{children}[0];
		1451
1051	my ($w, $h ) = ($self->{w}, $self->{h});	1452	my ($w, $h ) = ($self->{w}, $self->{h});
1052	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1453	my ($cw, $ch) = ($child->{w}, $child->{h});
1053		1454
1054	glEnable GL_TEXTURE_2D;	1455	glEnable GL_TEXTURE_2D;
1055	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1456	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056		1457
1057	my $border = $self->border;	1458	my $border = $self->border;
1058		1459
1059	glColor @{ $self->{border_bg} };	1460	glColor @{ $self->{border_bg} };
1060	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1461	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1061	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1462	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1463	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1464	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064		1465
1065	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1466	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066	my $bg = $tex[0];	1467	glColor @{ $self->{bg} };
1067		1468
1068	# TODO: repeat texture not scale	1469	# TODO: repeat texture not scale
		1470	# solve this better(?)
1069	my $rep_x = $cw / $bg->{w};	1471	$bg->{s} = $cw / $bg->{w};
1070	my $rep_y = $ch / $bg->{h};	1472	$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);	1473	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078	}	1474	}
1079		1475
1080	glDisable GL_TEXTURE_2D;	1476	glDisable GL_TEXTURE_2D;
1081		1477
1082	$self->{title}->draw if $self->{title};
1083
1084	$self->child->draw;	1478	$child->draw;
		1479
		1480	if ($self->{title_widget}) {
		1481	glTranslate 0, $border - $self->{h};
		1482	$self->{title_widget}->_draw;
		1483
		1484	glTranslate 0, - ($border - $self->{h});
		1485	}
		1486
		1487	$self->{close_button}->draw
		1488	if $self->{close_button};
1085	}	1489	}
1086		1490
1087	#############################################################################	1491	#############################################################################
1088		1492
1089	package CFClient::UI::Table;	1493	package CFPlus::UI::Table;
1090		1494
1091	our @ISA = CFClient::UI::Base::;	1495	our @ISA = CFPlus::UI::Base::;
1092		1496
1093	use List::Util qw(max sum);	1497	use List::Util qw(max sum);
1094		1498
1095	use CFClient::OpenGL;	1499	use CFPlus::OpenGL;
1096		1500
1097	sub new {	1501	sub new {
1098	my $class = shift;	1502	my $class = shift;
1099		1503
1100	$class->SUPER::new (	1504	$class->SUPER::new (
1101	col_expand => [],	1505	col_expand => [],
		1506	row_expand => [],
1102	@_,	1507	@_,
1103	)	1508	)
1104	}	1509	}
1105		1510
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 {	1511	sub children {
1116	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1512	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1117	}	1513	}
1118		1514
		1515	sub add {
		1516	my ($self) = shift;
		1517
		1518	while (@_) {
		1519	my ($x, $y, $child) = splice @_, 0, 3, ();
		1520	$child->set_parent ($self);
		1521	$self->{children}[$y][$x] = $child;
		1522	}
		1523
		1524	$self->{force_realloc} = 1;
		1525	$self->{force_size_alloc} = 1;
		1526	$self->realloc;
		1527	}
		1528
		1529	sub remove {
		1530	my ($self, $child) = @_;
		1531
		1532	# TODO: not yet implemented
		1533	}
		1534
1119	# TODO: move to container class maybe? send childs a signal on removal?	1535	# TODO: move to container class maybe? send children a signal on removal?
1120	sub clear {	1536	sub clear {
1121	my ($self) = @_;	1537	my ($self) = @_;
1122		1538
1123	my @children = $self->children;	1539	my @children = $self->children;
1124	delete $self->{children};	1540	delete $self->{children};
…		…
1126	for (@children) {	1542	for (@children) {
1127	delete $_->{parent};	1543	delete $_->{parent};
1128	$_->hide;	1544	$_->hide;
1129	}	1545	}
1130		1546
1131	$self->update;	1547	$self->realloc;
1132	}	1548	}
1133		1549
1134	sub get_wh {	1550	sub get_wh {
1135	my ($self) = @_;	1551	my ($self) = @_;
1136		1552
…		…
1162	(sum @$ws),	1578	(sum @$ws),
1163	(sum @$hs),	1579	(sum @$hs),
1164	)	1580	)
1165	}	1581	}
1166		1582
1167	sub size_allocate {	1583	sub invoke_size_allocate {
1168	my ($self, $w, $h) = @_;	1584	my ($self, $w, $h) = @_;
1169		1585
1170	my ($ws, $hs) = $self->get_wh;	1586	my ($ws, $hs) = $self->get_wh;
1171		1587
1172	my $req_w = sum @$ws;	1588	my $req_w = (sum @$ws) || 1;
1173	my $req_h = sum @$hs;	1589	my $req_h = (sum @$hs) || 1;
1174		1590
1175	# TODO: nicer code && do row_expand	1591	# TODO: nicer code
1176	my @col_expand = @{$self->{col_expand}};	1592	my @col_expand = @{$self->{col_expand}};
1177	@col_expand = (1) x @$ws unless @col_expand;	1593	@col_expand = (1) x @$ws unless @col_expand;
1178	my $col_expand = (sum @col_expand) || 1;	1594	my $col_expand = (sum @col_expand) || 1;
1179		1595
1180	# linearly scale sizes
1181	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1596	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1182	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1183		1597
1184	CFClient::UI::harmonize $ws;	1598	CFPlus::UI::harmonize $ws;
		1599
		1600	my @row_expand = @{$self->{row_expand}};
		1601	@row_expand = (1) x @$ws unless @row_expand;
		1602	my $row_expand = (sum @row_expand) || 1;
		1603
		1604	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1605
1185	CFClient::UI::harmonize $hs;	1606	CFPlus::UI::harmonize $hs;
1186		1607
1187	my $y;	1608	my $y;
1188		1609
1189	for my $r (0 .. $#{$self->{children}}) {	1610	for my $r (0 .. $#{$self->{children}}) {
1190	my $row = $self->{children}[$r]	1611	my $row = $self->{children}[$r]
…		…
1204	}	1625	}
1205		1626
1206	$y += $row_h;	1627	$y += $row_h;
1207	}	1628	}
1208		1629
		1630	1
1209	}	1631	}
1210		1632
1211	sub find_widget {	1633	sub find_widget {
1212	my ($self, $x, $y) = @_;	1634	my ($self, $x, $y) = @_;
1213		1635
…		…
1232	}	1654	}
1233	}	1655	}
1234		1656
1235	#############################################################################	1657	#############################################################################
1236		1658
1237	package CFClient::UI::HBox;	1659	package CFPlus::UI::Box;
1238		1660
1239	# TODO: wrap into common Box base class
1240
1241	our @ISA = CFClient::UI::Container::;	1661	our @ISA = CFPlus::UI::Container::;
1242		1662
1243	sub size_request {	1663	sub size_request {
1244	my ($self) = @_;	1664	my ($self) = @_;
1245		1665
1246	my @alloc = map [$_->size_request], @{$self->{children}};	1666	$self->{vertical}
		1667	? (
		1668	(List::Util::max map $_->{req_w}, @{$self->{children}}),
		1669	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
		1670	)
		1671	: (
		1672	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1673	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1674	)
		1675	}
1247		1676
		1677	sub invoke_size_allocate {
		1678	my ($self, $w, $h) = @_;
		1679
		1680	my $space = $self->{vertical} ? $h : $w;
		1681	my @children = $self->visible_children;
		1682
		1683	my @req;
		1684
		1685	if ($self->{homogeneous}) {
		1686	@req = ($space / (@children || 1)) x @children;
		1687	} else {
		1688	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
		1689	my $req = List::Util::sum @req;
		1690
		1691	if ($req > $space) {
		1692	# ah well, not enough space
		1693	$_ *= $space / $req for @req;
		1694	} else {
		1695	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
		1696
		1697	$space = ($space - $req) / $expand; # remaining space to give away
		1698
		1699	$req[$_] += $space * $children[$_]{expand}
		1700	for 0 .. $#children;
		1701	}
1248	(	1702	}
1249	(List::Util::sum map $_->[0], @alloc),	1703
1250	(List::Util::max map $_->[1], @alloc),	1704	CFPlus::UI::harmonize \@req;
		1705
		1706	my $pos = 0;
		1707	for (0 .. $#children) {
		1708	my $alloc = $req[$_];
		1709	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1710
		1711	$pos += $alloc;
		1712	}
		1713
		1714	1
		1715	}
		1716
		1717	#############################################################################
		1718
		1719	package CFPlus::UI::HBox;
		1720
		1721	our @ISA = CFPlus::UI::Box::;
		1722
		1723	sub new {
		1724	my $class = shift;
		1725
		1726	$class->SUPER::new (
		1727	vertical => 0,
		1728	@_,
1251	)	1729	)
1252	}	1730	}
1253		1731
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	#############################################################################	1732	#############################################################################
1296		1733
1297	package CFClient::UI::VBox;	1734	package CFPlus::UI::VBox;
1298		1735
1299	# TODO: wrap into common Box base class	1736	our @ISA = CFPlus::UI::Box::;
1300		1737
1301	our @ISA = CFClient::UI::Container::;	1738	sub new {
		1739	my $class = shift;
1302		1740
1303	sub size_request {	1741	$class->SUPER::new (
1304	my ($self) = @_;	1742	vertical => 1,
1305		1743	@_,
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	)	1744	)
1312	}	1745	}
1313		1746
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	#############################################################################	1747	#############################################################################
1354		1748
1355	package CFClient::UI::Label;	1749	package CFPlus::UI::Label;
1356		1750
1357	our @ISA = CFClient::UI::DrawBG::;	1751	our @ISA = CFPlus::UI::DrawBG::;
1358		1752
1359	use CFClient::OpenGL;	1753	use CFPlus::OpenGL;
1360		1754
1361	sub new {	1755	sub new {
1362	my ($class, %arg) = @_;	1756	my ($class, %arg) = @_;
1363		1757
1364	my $self = $class->SUPER::new (	1758	my $self = $class->SUPER::new (
…		…
1367	#active_bg => none	1761	#active_bg => none
1368	#font => default_font	1762	#font => default_font
1369	#text => initial text	1763	#text => initial text
1370	#markup => initial narkup	1764	#markup => initial narkup
1371	#max_w => maximum pixel width	1765	#max_w => maximum pixel width
		1766	#style => 0, # render flags
1372	ellipsise => 3, # end	1767	ellipsise => 3, # end
1373	layout => (new CFClient::Layout),	1768	layout => (new CFPlus::Layout),
1374	fontsize => 1,	1769	fontsize => 1,
1375	align => -1,	1770	align => -1,
1376	valign => -1,	1771	valign => -1,
1377	padding => 2,	1772	padding_x => 2,
		1773	padding_y => 2,
1378	can_events => 0,	1774	can_events => 0,
1379	%arg	1775	%arg
1380	);	1776	);
1381		1777
1382	if (exists $self->{template}) {	1778	if (exists $self->{template}) {
1383	my $layout = new CFClient::Layout;	1779	my $layout = new CFPlus::Layout;
1384	$layout->set_text (delete $self->{template});	1780	$layout->set_text (delete $self->{template});
1385	$self->{template} = $layout;	1781	$self->{template} = $layout;
1386	}	1782	}
1387		1783
1388	if (exists $self->{markup}) {	1784	if (exists $self->{markup}) {
…		…
1392	}	1788	}
1393		1789
1394	$self	1790	$self
1395	}	1791	}
1396		1792
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 {	1793	sub update {
1408	my ($self) = @_;	1794	my ($self) = @_;
1409		1795
1410	delete $self->{texture};	1796	delete $self->{texture};
1411	$self->SUPER::update;	1797	$self->SUPER::update;
1412	}	1798	}
1413		1799
		1800	sub realloc {
		1801	my ($self) = @_;
		1802
		1803	delete $self->{ox};
		1804	$self->SUPER::realloc;
		1805	}
		1806
1414	sub set_text {	1807	sub set_text {
1415	my ($self, $text) = @_;	1808	my ($self, $text) = @_;
1416		1809
1417	return if $self->{text} eq "T$text";	1810	return if $self->{text} eq "T$text";
1418	$self->{text} = "T$text";	1811	$self->{text} = "T$text";
1419		1812
1420	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1421	$self->{layout}->set_text ($text);	1813	$self->{layout}->set_text ($text);
1422		1814
		1815	delete $self->{size_req};
		1816	$self->realloc;
1423	$self->update;	1817	$self->update;
1424	$self->check_size;
1425	}	1818	}
1426		1819
1427	sub set_markup {	1820	sub set_markup {
1428	my ($self, $markup) = @_;	1821	my ($self, $markup) = @_;
1429		1822
1430	return if $self->{text} eq "M$markup";	1823	return if $self->{text} eq "M$markup";
1431	$self->{text} = "M$markup";	1824	$self->{text} = "M$markup";
1432		1825
1433	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1826	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434		1827
1435	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1436	$self->{layout}->set_markup ($markup);	1828	$self->{layout}->set_markup ($markup);
1437		1829
		1830	delete $self->{size_req};
		1831	$self->realloc;
1438	$self->update;	1832	$self->update;
1439	$self->check_size;
1440	}	1833	}
1441		1834
1442	sub size_request {	1835	sub size_request {
1443	my ($self) = @_;	1836	my ($self) = @_;
1444		1837
		1838	$self->{size_req} ||= do {
1445	$self->{layout}->set_font ($self->{font}) if $self->{font};	1839	$self->{layout}->set_font ($self->{font}) if $self->{font};
1446	$self->{layout}->set_width ($self->{max_w} || -1);	1840	$self->{layout}->set_width ($self->{max_w} || -1);
1447	$self->{layout}->set_ellipsise ($self->{ellipsise});	1841	$self->{layout}->set_ellipsise ($self->{ellipsise});
1448	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1842	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1449	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1843	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1450		1844
1451	my ($w, $h) = $self->{layout}->size;	1845	my ($w, $h) = $self->{layout}->size;
1452		1846
1453	if (exists $self->{template}) {	1847	if (exists $self->{template}) {
1454	$self->{template}->set_font ($self->{font}) if $self->{font};	1848	$self->{template}->set_font ($self->{font}) if $self->{font};
		1849	$self->{template}->set_width ($self->{max_w} || -1);
1455	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1850	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1456		1851
1457	my ($w2, $h2) = $self->{template}->size;	1852	my ($w2, $h2) = $self->{template}->size;
1458		1853
1459	$w = List::Util::max $w, $w2;	1854	$w = List::Util::max $w, $w2;
1460	$h = List::Util::max $h, $h2;	1855	$h = List::Util::max $h, $h2;
		1856	}
		1857
		1858	[$w, $h]
1461	}	1859	};
1462		1860
1463	(	1861	@{ $self->{size_req} }
1464	$w + $self->{padding} * 2,
1465	$h + $self->{padding} * 2,
1466	)
1467	}	1862	}
1468		1863
		1864	sub baseline_shift {
		1865	$_[0]{layout}->descent
		1866	}
		1867
1469	sub size_allocate {	1868	sub invoke_size_allocate {
1470	my ($self, $w, $h) = @_;	1869	my ($self, $w, $h) = @_;
1471		1870
		1871	delete $self->{ox};
		1872
1472	delete $self->{texture};	1873	delete $self->{texture}
		1874	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1875
		1876	1
1473	}	1877	}
1474		1878
1475	sub set_fontsize {	1879	sub set_fontsize {
1476	my ($self, $fontsize) = @_;	1880	my ($self, $fontsize) = @_;
1477		1881
1478	$self->{fontsize} = $fontsize;	1882	$self->{fontsize} = $fontsize;
		1883	delete $self->{size_req};
1479	delete $self->{texture};	1884	delete $self->{texture};
1480		1885
1481	$self->update;	1886	$self->realloc;
1482	$self->check_size;	1887	}
		1888
		1889	sub reconfigure {
		1890	my ($self) = @_;
		1891
		1892	delete $self->{size_req};
		1893	delete $self->{texture};
		1894
		1895	$self->SUPER::reconfigure;
1483	}	1896	}
1484		1897
1485	sub _draw {	1898	sub _draw {
1486	my ($self) = @_;	1899	my ($self) = @_;
1487		1900
1488	$self->SUPER::_draw; # draw background, if applicable	1901	$self->SUPER::_draw; # draw background, if applicable
1489		1902
1490	my $tex = $self->{texture} ||= do {	1903	my $size = $self->{texture} ||= do {
1491	$self->{layout}->set_foreground (@{$self->{fg}});	1904	$self->{layout}->set_foreground (@{$self->{fg}});
1492	$self->{layout}->set_font ($self->{font}) if $self->{font};	1905	$self->{layout}->set_font ($self->{font}) if $self->{font};
1493	$self->{layout}->set_width ($self->{w});	1906	$self->{layout}->set_width ($self->{w});
1494	$self->{layout}->set_ellipsise ($self->{ellipsise});	1907	$self->{layout}->set_ellipsise ($self->{ellipsise});
1495	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1908	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1496	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1909	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497		1910
1498	my $tex = new_from_layout CFClient::Texture $self->{layout};	1911	[$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	};	1912	};
1510		1913
1511	glEnable GL_TEXTURE_2D;	1914	unless (exists $self->{ox}) {
1512	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1915	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
		1916	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
		1917	: ($self->{w} - $size->[0]) * 0.5);
1513		1918
1514	if ($tex->{format} == GL_ALPHA) {	1919	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1515	glColor @{$self->{fg}};	1920	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1516	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1921	: ($self->{h} - $size->[1]) * 0.5);
1517	} else {
1518	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1519	}	1922	};
1520		1923
1521	glDisable GL_TEXTURE_2D;	1924	my $w = List::Util::min $self->{w} + 4, $size->[0];
		1925	my $h = List::Util::min $self->{h} + 2, $size->[1];
		1926
		1927	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1522	}	1928	}
1523		1929
1524	#############################################################################	1930	#############################################################################
1525		1931
1526	package CFClient::UI::EntryBase;	1932	package CFPlus::UI::EntryBase;
1527		1933
1528	our @ISA = CFClient::UI::Label::;	1934	our @ISA = CFPlus::UI::Label::;
1529		1935
1530	use CFClient::OpenGL;	1936	use CFPlus::OpenGL;
1531		1937
1532	sub new {	1938	sub new {
1533	my $class = shift;	1939	my $class = shift;
1534		1940
1535	$class->SUPER::new (	1941	$class->SUPER::new (
…		…
1539	active_fg => [0, 0, 0],	1945	active_fg => [0, 0, 0],
1540	can_hover => 1,	1946	can_hover => 1,
1541	can_focus => 1,	1947	can_focus => 1,
1542	valign => 0,	1948	valign => 0,
1543	can_events => 1,	1949	can_events => 1,
		1950	ellipsise => 0,
1544	#text => ...	1951	#text => ...
		1952	#hidden => "*",
1545	@_	1953	@_
1546	)	1954	)
1547	}	1955	}
1548		1956
1549	sub _set_text {	1957	sub _set_text {
…		…
1551		1959
1552	delete $self->{cur_h};	1960	delete $self->{cur_h};
1553		1961
1554	return if $self->{text} eq $text;	1962	return if $self->{text} eq $text;
1555		1963
1556	delete $self->{texture};
1557
1558	$self->{last_activity} = $::NOW;	1964	$self->{last_activity} = $::NOW;
1559	$self->{text} = $text;	1965	$self->{text} = $text;
1560		1966
1561	$text =~ s/./*/g if $self->{hidden};	1967	$text =~ s/./*/g if $self->{hidden};
1562	$self->{layout}->set_text ("$text ");	1968	$self->{layout}->set_text ("$text ");
		1969	delete $self->{size_req};
1563		1970
1564	$self->_emit (changed => $self->{text});	1971	$self->emit (changed => $self->{text});
		1972
		1973	$self->realloc;
		1974	$self->update;
1565	}	1975	}
1566		1976
1567	sub set_text {	1977	sub set_text {
1568	my ($self, $text) = @_;	1978	my ($self, $text) = @_;
1569		1979
1570	$self->{cursor} = length $text;	1980	$self->{cursor} = length $text;
1571	$self->_set_text ($text);	1981	$self->_set_text ($text);
1572	$self->update;
1573	$self->check_size;
1574	}	1982	}
1575		1983
1576	sub get_text {	1984	sub get_text {
1577	$_[0]{text}	1985	$_[0]{text}
1578	}	1986	}
…		…
1583	my ($w, $h) = $self->SUPER::size_request;	1991	my ($w, $h) = $self->SUPER::size_request;
1584		1992
1585	($w + 1, $h) # add 1 for cursor	1993	($w + 1, $h) # add 1 for cursor
1586	}	1994	}
1587		1995
1588	sub key_down {	1996	sub invoke_key_down {
1589	my ($self, $ev) = @_;	1997	my ($self, $ev) = @_;
1590		1998
1591	my $mod = $ev->{mod};	1999	my $mod = $ev->{mod};
1592	my $sym = $ev->{sym};	2000	my $sym = $ev->{sym};
1593	my $uni = $ev->{unicode};	2001	my $uni = $ev->{unicode};
1594		2002
1595	my $text = $self->get_text;	2003	my $text = $self->get_text;
		2004
		2005	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1596		2006
1597	if ($uni == 8) {	2007	if ($uni == 8) {
1598	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2008	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1599	} elsif ($uni == 127) {	2009	} elsif ($uni == 127) {
1600	substr $text, $self->{cursor}, 1, "";	2010	substr $text, $self->{cursor}, 1, "";
1601	} elsif ($sym == CFClient::SDLK_LEFT) {	2011	} elsif ($sym == CFPlus::SDLK_LEFT) {
1602	--$self->{cursor} if $self->{cursor};	2012	--$self->{cursor} if $self->{cursor};
1603	} elsif ($sym == CFClient::SDLK_RIGHT) {	2013	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1604	++$self->{cursor} if $self->{cursor} < length $self->{text};	2014	++$self->{cursor} if $self->{cursor} < length $self->{text};
1605	} elsif ($sym == CFClient::SDLK_HOME) {	2015	} elsif ($sym == CFPlus::SDLK_HOME) {
		2016	# what a hack
		2017	$self->{cursor} =
		2018	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2019	? length $1
		2020	: 0;
		2021	} elsif ($sym == CFPlus::SDLK_END) {
		2022	# uh, again
		2023	$self->{cursor} =
		2024	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2025	? $self->{cursor} + length $1
		2026	: length $self->{text};
		2027	} elsif ($uni == 21) { # ctrl-u
		2028	$text = "";
1606	$self->{cursor} = 0;	2029	$self->{cursor} = 0;
1607	} elsif ($sym == CFClient::SDLK_END) {
1608	$self->{cursor} = length $text;
1609	} elsif ($uni == 27) {	2030	} elsif ($uni == 27) {
1610	$self->_emit ('escape');	2031	$self->emit ('escape');
1611	} elsif ($uni) {	2032	} elsif ($uni == 0x0d) {
		2033	substr $text, $self->{cursor}++, 0, "\012";
		2034	} elsif ($uni >= 0x20) {
1612	substr $text, $self->{cursor}++, 0, chr $uni;	2035	substr $text, $self->{cursor}++, 0, chr $uni;
		2036	} else {
		2037	return 0;
1613	}	2038	}
1614		2039
1615	$self->_set_text ($text);	2040	$self->_set_text ($text);
		2041
		2042	$self->realloc;
1616	$self->update;	2043	$self->update;
1617	$self->check_size;
1618	}
1619		2044
		2045	1
		2046	}
		2047
1620	sub focus_in {	2048	sub invoke_focus_in {
1621	my ($self) = @_;	2049	my ($self) = @_;
1622		2050
1623	$self->{last_activity} = $::NOW;	2051	$self->{last_activity} = $::NOW;
1624		2052
1625	$self->SUPER::focus_in;	2053	$self->SUPER::invoke_focus_in
1626	}	2054	}
1627		2055
1628	sub button_down {	2056	sub invoke_button_down {
1629	my ($self, $ev, $x, $y) = @_;	2057	my ($self, $ev, $x, $y) = @_;
1630		2058
1631	$self->SUPER::button_down ($ev, $x, $y);	2059	$self->SUPER::invoke_button_down ($ev, $x, $y);
1632		2060
1633	my $idx = $self->{layout}->xy_to_index ($x, $y);	2061	my $idx = $self->{layout}->xy_to_index ($x, $y);
1634		2062
1635	# byte-index to char-index	2063	# byte-index to char-index
1636	my $text = $self->{text};	2064	my $text = $self->{text};
1637	utf8::encode $text;	2065	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1638	$self->{cursor} = length substr $text, 0, $idx;	2066	$self->{cursor} = length $text;
1639		2067
1640	$self->_set_text ($self->{text});	2068	$self->_set_text ($self->{text});
1641	$self->update;	2069	$self->update;
		2070
		2071	1
1642	}	2072	}
1643		2073
1644	sub mouse_motion {	2074	sub invoke_mouse_motion {
1645	my ($self, $ev, $x, $y) = @_;	2075	my ($self, $ev, $x, $y) = @_;
1646	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2076	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		2077
		2078	1
1647	}	2079	}
1648		2080
1649	sub _draw {	2081	sub _draw {
1650	my ($self) = @_;	2082	my ($self) = @_;
1651		2083
1652	local $self->{fg} = $self->{fg};	2084	local $self->{fg} = $self->{fg};
1653		2085
1654	if ($FOCUS == $self) {	2086	if ($FOCUS == $self) {
1655	glColor @{$self->{active_bg}};	2087	glColor_premultiply @{$self->{active_bg}};
1656	$self->{fg} = $self->{active_fg};	2088	$self->{fg} = $self->{active_fg};
1657	} else {	2089	} else {
1658	glColor @{$self->{bg}};	2090	glColor_premultiply @{$self->{bg}};
1659	}	2091	}
1660		2092
1661	glEnable GL_BLEND;	2093	glEnable GL_BLEND;
1662	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2094	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1663	glBegin GL_QUADS;	2095	glBegin GL_QUADS;
1664	glVertex 0 , 0;	2096	glVertex 0 , 0;
1665	glVertex 0 , $self->{h};	2097	glVertex 0 , $self->{h};
1666	glVertex $self->{w}, $self->{h};	2098	glVertex $self->{w}, $self->{h};
1667	glVertex $self->{w}, 0;	2099	glVertex $self->{w}, 0;
…		…
1678	utf8::encode $text;	2110	utf8::encode $text;
1679		2111
1680	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2112	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1681	}	2113	}
1682		2114
1683	glColor @{$self->{fg}};
1684	glBegin GL_LINES;	2115	glBegin GL_LINES;
1685	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2116	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};	2117	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1687	glEnd;	2118	glEnd;
1688	}	2119	}
1689	}	2120	}
1690		2121
		2122	#############################################################################
		2123
1691	package CFClient::UI::Entry;	2124	package CFPlus::UI::Entry;
1692		2125
1693	our @ISA = CFClient::UI::EntryBase::;	2126	our @ISA = CFPlus::UI::EntryBase::;
1694		2127
1695	use CFClient::OpenGL;	2128	use CFPlus::OpenGL;
1696		2129
1697	sub key_down {	2130	sub invoke_key_down {
1698	my ($self, $ev) = @_;	2131	my ($self, $ev) = @_;
1699		2132
1700	my $sym = $ev->{sym};	2133	my $sym = $ev->{sym};
1701		2134
1702	if ($sym == 13) {	2135	if ($ev->{uni} == 0x0d || $sym == 13) {
1703	unshift @{$self->{history}},	2136	unshift @{$self->{history}},
1704	my $txt = $self->get_text;	2137	my $txt = $self->get_text;
		2138
1705	$self->{history_pointer} = -1;	2139	$self->{history_pointer} = -1;
1706	$self->{history_saveback} = '';	2140	$self->{history_saveback} = '';
1707	$self->_emit (activate => $txt);	2141	$self->emit (activate => $txt);
1708	$self->update;	2142	$self->update;
1709		2143
1710	} elsif ($sym == CFClient::SDLK_UP) {	2144	} elsif ($sym == CFPlus::SDLK_UP) {
1711	if ($self->{history_pointer} < 0) {	2145	if ($self->{history_pointer} < 0) {
1712	$self->{history_saveback} = $self->get_text;	2146	$self->{history_saveback} = $self->get_text;
1713	}	2147	}
1714	if (@{$self->{history} || []} > 0) {	2148	if (@{$self->{history} || []} > 0) {
1715	$self->{history_pointer}++;	2149	$self->{history_pointer}++;
…		…
1717	$self->{history_pointer} = @{$self->{history} || []} - 1;	2151	$self->{history_pointer} = @{$self->{history} || []} - 1;
1718	}	2152	}
1719	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2153	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1720	}	2154	}
1721		2155
1722	} elsif ($sym == CFClient::SDLK_DOWN) {	2156	} elsif ($sym == CFPlus::SDLK_DOWN) {
1723	$self->{history_pointer}--;	2157	$self->{history_pointer}--;
1724	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2158	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1725		2159
1726	if ($self->{history_pointer} >= 0) {	2160	if ($self->{history_pointer} >= 0) {
1727	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2161	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1728	} else {	2162	} else {
1729	$self->set_text ($self->{history_saveback});	2163	$self->set_text ($self->{history_saveback});
1730	}	2164	}
1731		2165
1732	} else {	2166	} else {
1733	$self->SUPER::key_down ($ev);	2167	return $self->SUPER::invoke_key_down ($ev)
		2168	}
		2169
1734	}	2170	1
1735
1736	}	2171	}
1737		2172
1738	#############################################################################	2173	#############################################################################
1739		2174
		2175	package CFPlus::UI::TextEdit;
		2176
		2177	our @ISA = CFPlus::UI::EntryBase::;
		2178
		2179	use CFPlus::OpenGL;
		2180
		2181	sub move_cursor_ver {
		2182	my ($self, $dy) = @_;
		2183
		2184	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2185
		2186	$y += $dy;
		2187
		2188	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2189	$self->{cursor} = $index;
		2190	delete $self->{cur_h};
		2191	$self->update;
		2192	return;
		2193	}
		2194	}
		2195
		2196	sub invoke_key_down {
		2197	my ($self, $ev) = @_;
		2198
		2199	my $sym = $ev->{sym};
		2200
		2201	if ($sym == CFPlus::SDLK_UP) {
		2202	$self->move_cursor_ver (-1);
		2203	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2204	$self->move_cursor_ver (+1);
		2205	} else {
		2206	return $self->SUPER::invoke_key_down ($ev)
		2207	}
		2208
		2209	1
		2210	}
		2211
		2212	#############################################################################
		2213
1740	package CFClient::UI::Button;	2214	package CFPlus::UI::Button;
1741		2215
1742	our @ISA = CFClient::UI::Label::;	2216	our @ISA = CFPlus::UI::Label::;
1743		2217
1744	use CFClient::OpenGL;	2218	use CFPlus::OpenGL;
1745		2219
1746	my @tex =	2220	my @tex =
1747	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2221	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1748	qw(b1_button_active.png);	2222	qw(b1_button_active.png);
1749		2223
1750	sub new {	2224	sub new {
1751	my $class = shift;	2225	my $class = shift;
1752		2226
1753	$class->SUPER::new (	2227	$class->SUPER::new (
1754	padding => 4,	2228	padding_x => 4,
		2229	padding_y => 4,
1755	fg => [1, 1, 1],	2230	fg => [1, 1, 1],
1756	active_fg => [0, 0, 1],	2231	active_fg => [0, 0, 1],
1757	can_hover => 1,	2232	can_hover => 1,
1758	align => 0,	2233	align => 0,
1759	valign => 0,	2234	valign => 0,
1760	can_events => 1,	2235	can_events => 1,
1761	@_	2236	@_
1762	)	2237	)
1763	}	2238	}
1764		2239
1765	sub activate { }
1766
1767	sub button_up {	2240	sub invoke_button_up {
1768	my ($self, $ev, $x, $y) = @_;	2241	my ($self, $ev, $x, $y) = @_;
1769		2242
1770	$self->emit ("activate")	2243	$self->emit ("activate")
1771	if $x >= 0 && $x < $self->{w}	2244	if $x >= 0 && $x < $self->{w}
1772	&& $y >= 0 && $y < $self->{h};	2245	&& $y >= 0 && $y < $self->{h};
		2246
		2247	1
1773	}	2248	}
1774		2249
1775	sub _draw {	2250	sub _draw {
1776	my ($self) = @_;	2251	my ($self) = @_;
1777		2252
1778	local $self->{fg} = $self->{fg};	2253	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1779
1780	if ($GRAB == $self) {
1781	$self->{fg} = $self->{active_fg};
1782	}
1783		2254
1784	glEnable GL_TEXTURE_2D;	2255	glEnable GL_TEXTURE_2D;
1785	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2256	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1786	glColor 0, 0, 0, 1;	2257	glColor 0, 0, 0, 1;
1787		2258
…		…
1792	$self->SUPER::_draw;	2263	$self->SUPER::_draw;
1793	}	2264	}
1794		2265
1795	#############################################################################	2266	#############################################################################
1796		2267
1797	package CFClient::UI::CheckBox;	2268	package CFPlus::UI::CheckBox;
1798		2269
1799	our @ISA = CFClient::UI::DrawBG::;	2270	our @ISA = CFPlus::UI::DrawBG::;
1800		2271
1801	my @tex =	2272	my @tex =
1802	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2273	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1803	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2274	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1804		2275
1805	use CFClient::OpenGL;	2276	use CFPlus::OpenGL;
1806		2277
1807	sub new {	2278	sub new {
1808	my $class = shift;	2279	my $class = shift;
1809		2280
1810	$class->SUPER::new (	2281	$class->SUPER::new (
1811	padding => 2,	2282	padding_x => 2,
		2283	padding_y => 2,
1812	fg => [1, 1, 1],	2284	fg => [1, 1, 1],
1813	active_fg => [1, 1, 0],	2285	active_fg => [1, 1, 0],
1814	bg => [0, 0, 0, 0.2],	2286	bg => [0, 0, 0, 0.2],
1815	active_bg => [1, 1, 1, 0.5],	2287	active_bg => [1, 1, 1, 0.5],
1816	state => 0,	2288	state => 0,
…		…
1820	}	2292	}
1821		2293
1822	sub size_request {	2294	sub size_request {
1823	my ($self) = @_;	2295	my ($self) = @_;
1824		2296
1825	($self->{padding} * 2 + 6) x 2	2297	(6) x 2
1826	}	2298	}
1827		2299
		2300	sub toggle {
		2301	my ($self) = @_;
		2302
		2303	$self->{state} = !$self->{state};
		2304	$self->emit (changed => $self->{state});
		2305	$self->update;
		2306	}
		2307
1828	sub button_down {	2308	sub invoke_button_down {
1829	my ($self, $ev, $x, $y) = @_;	2309	my ($self, $ev, $x, $y) = @_;
1830		2310
1831	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	2311	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1832	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	2312	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1833	$self->{state} = !$self->{state};	2313	$self->toggle;
1834	$self->_emit (changed => $self->{state});	2314	} else {
		2315	return 0
		2316	}
		2317
1835	}	2318	1
1836	}	2319	}
1837		2320
1838	sub _draw {	2321	sub _draw {
1839	my ($self) = @_;	2322	my ($self) = @_;
1840		2323
1841	$self->SUPER::_draw;	2324	$self->SUPER::_draw;
1842		2325
1843	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	2326	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1844		2327
1845	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	2328	my ($w, $h) = @$self{qw(w h)};
		2329
		2330	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1846		2331
1847	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	2332	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1848		2333
1849	my $tex = $self->{state} ? $tex[1] : $tex[0];	2334	my $tex = $self->{state} ? $tex[1] : $tex[0];
1850		2335
…		…
1853	glDisable GL_TEXTURE_2D;	2338	glDisable GL_TEXTURE_2D;
1854	}	2339	}
1855		2340
1856	#############################################################################	2341	#############################################################################
1857		2342
1858	package CFClient::UI::Image;	2343	package CFPlus::UI::Image;
1859		2344
1860	our @ISA = CFClient::UI::Base::;	2345	our @ISA = CFPlus::UI::Base::;
1861		2346
1862	use CFClient::OpenGL;	2347	use CFPlus::OpenGL;
1863	use Carp qw/confess/;
1864		2348
1865	our %loaded_images;	2349	our %texture_cache;
1866		2350
1867	sub new {	2351	sub new {
1868	my $class = shift;	2352	my $class = shift;
1869		2353
1870	my $self = $class->SUPER::new (can_events => 0, @_);	2354	my $self = $class->SUPER::new (
		2355	can_events => 0,
		2356	@_,
		2357	);
1871		2358
1872	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2359	$self->{path} || $self->{tex}
		2360	or Carp::croak "'path' or 'tex' attributes required";
1873		2361
1874	$loaded_images{$self->{image}} ||=	2362	$self->{tex} ||= $texture_cache{$self->{path}} ||=
1875	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2363	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1876		2364
1877	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2365	CFPlus::weaken $texture_cache{$self->{path}};
1878		2366
1879	Scalar::Util::weaken $loaded_images{$self->{image}};	2367	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1880
1881	$self->{aspect} = $tex->{w} / $tex->{h};
1882		2368
1883	$self	2369	$self
1884	}	2370	}
1885		2371
		2372	sub STORABLE_freeze {
		2373	my ($self, $cloning) = @_;
		2374
		2375	$self->{path}
		2376	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2377
		2378	$self->{path}
		2379	}
		2380
		2381	sub STORABLE_attach {
		2382	my ($self, $cloning, $path) = @_;
		2383
		2384	$self->new (path => $path)
		2385	}
		2386
1886	sub size_request {	2387	sub size_request {
1887	my ($self) = @_;	2388	my ($self) = @_;
1888		2389
1889	($self->{tex}->{w}, $self->{tex}->{h})	2390	($self->{tex}{w}, $self->{tex}{h})
1890	}	2391	}
1891		2392
1892	sub _draw {	2393	sub _draw {
1893	my ($self) = @_;	2394	my ($self) = @_;
1894		2395
…		…
1904	}	2405	}
1905		2406
1906	glEnable GL_TEXTURE_2D;	2407	glEnable GL_TEXTURE_2D;
1907	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2408	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1908		2409
1909	$tex->draw_quad_alpha (0, 0, $w, $h);	2410	$tex->draw_quad (0, 0, $w, $h);
1910		2411
1911	glDisable GL_TEXTURE_2D;	2412	glDisable GL_TEXTURE_2D;
1912	}	2413	}
1913		2414
1914	#############################################################################	2415	#############################################################################
1915		2416
		2417	package CFPlus::UI::ImageButton;
		2418
		2419	our @ISA = CFPlus::UI::Image::;
		2420
		2421	use CFPlus::OpenGL;
		2422
		2423	my %textures;
		2424
		2425	sub new {
		2426	my $class = shift;
		2427
		2428	my $self = $class->SUPER::new (
		2429	padding_x => 4,
		2430	padding_y => 4,
		2431	fg => [1, 1, 1],
		2432	active_fg => [0, 0, 1],
		2433	can_hover => 1,
		2434	align => 0,
		2435	valign => 0,
		2436	can_events => 1,
		2437	@_
		2438	);
		2439	}
		2440
		2441	sub invoke_button_up {
		2442	my ($self, $ev, $x, $y) = @_;
		2443
		2444	$self->emit ("activate")
		2445	if $x >= 0 && $x < $self->{w}
		2446	&& $y >= 0 && $y < $self->{h};
		2447
		2448	1
		2449	}
		2450
		2451	#############################################################################
		2452
1916	package CFClient::UI::VGauge;	2453	package CFPlus::UI::VGauge;
1917		2454
1918	our @ISA = CFClient::UI::Base::;	2455	our @ISA = CFPlus::UI::Base::;
1919		2456
1920	use List::Util qw(min max);	2457	use List::Util qw(min max);
1921		2458
1922	use CFClient::OpenGL;	2459	use CFPlus::OpenGL;
1923		2460
1924	my %tex = (	2461	my %tex = (
1925	food => [	2462	food => [
1926	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2463	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1927	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2464	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1928	],	2465	],
1929	grace => [	2466	grace => [
1930	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2467	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/	2468	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1932	],	2469	],
1933	hp => [	2470	hp => [
1934	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2471	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1935	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2472	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1936	],	2473	],
1937	mana => [	2474	mana => [
1938	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2475	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/	2476	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1940	],	2477	],
1941	);	2478	);
1942		2479
1943	# eg. VGauge->new (gauge => 'food'), default gauge: food	2480	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2003	my $ycut1 = max 0, min 1, $ycut;	2540	my $ycut1 = max 0, min 1, $ycut;
2004	my $ycut2 = max 0, min 1, $ycut - 1;	2541	my $ycut2 = max 0, min 1, $ycut - 1;
2005		2542
2006	my $h1 = $self->{h} * (1 - $ycut1);	2543	my $h1 = $self->{h} * (1 - $ycut1);
2007	my $h2 = $self->{h} * (1 - $ycut2);	2544	my $h2 = $self->{h} * (1 - $ycut2);
		2545	my $h3 = $self->{h};
		2546
		2547	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2008		2548
2009	glEnable GL_BLEND;	2549	glEnable GL_BLEND;
2010	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2550	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2551	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2011	glEnable GL_TEXTURE_2D;	2552	glEnable GL_TEXTURE_2D;
2012	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2553	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013		2554
2014	glBindTexture GL_TEXTURE_2D, $t1->{name};	2555	glBindTexture GL_TEXTURE_2D, $t1->{name};
2015	glBegin GL_QUADS;	2556	glBegin GL_QUADS;
…		…
2030		2571
2031	if ($t3) {	2572	if ($t3) {
2032	glBindTexture GL_TEXTURE_2D, $t3->{name};	2573	glBindTexture GL_TEXTURE_2D, $t3->{name};
2033	glBegin GL_QUADS;	2574	glBegin GL_QUADS;
2034	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2575	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2035	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2576	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2036	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2577	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2037	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2578	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2038	glEnd;	2579	glEnd;
2039	}	2580	}
2040		2581
2041	glDisable GL_BLEND;	2582	glDisable GL_BLEND;
2042	glDisable GL_TEXTURE_2D;	2583	glDisable GL_TEXTURE_2D;
2043	}	2584	}
2044		2585
2045	#############################################################################	2586	#############################################################################
2046		2587
2047	package CFClient::UI::Gauge;	2588	package CFPlus::UI::Gauge;
2048		2589
2049	our @ISA = CFClient::UI::VBox::;	2590	our @ISA = CFPlus::UI::VBox::;
2050		2591
2051	sub new {	2592	sub new {
2052	my ($class, %arg) = @_;	2593	my ($class, %arg) = @_;
2053		2594
2054	my $self = $class->SUPER::new (	2595	my $self = $class->SUPER::new (
…		…
2056	can_hover => 1,	2597	can_hover => 1,
2057	can_events => 1,	2598	can_events => 1,
2058	%arg,	2599	%arg,
2059	);	2600	);
2060		2601
2061	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2602	$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);	2603	$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");	2604	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2064		2605
2065	$self	2606	$self
2066	}	2607	}
2067		2608
2068	sub set_fontsize {	2609	sub set_fontsize {
…		…
2089	$self->{value}->set_text ($val);	2630	$self->{value}->set_text ($val);
2090	}	2631	}
2091		2632
2092	#############################################################################	2633	#############################################################################
2093		2634
2094	package CFClient::UI::Slider;	2635	package CFPlus::UI::Slider;
2095		2636
2096	use strict;	2637	use strict;
2097		2638
2098	use CFClient::OpenGL;	2639	use CFPlus::OpenGL;
2099		2640
2100	our @ISA = CFClient::UI::DrawBG::;	2641	our @ISA = CFPlus::UI::DrawBG::;
2101		2642
2102	my @tex =	2643	my @tex =
2103	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2644	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2104	qw(s1_slider.png s1_slider_bg.png);	2645	qw(s1_slider.png s1_slider_bg.png);
2105		2646
2106	sub new {	2647	sub new {
2107	my $class = shift;	2648	my $class = shift;
2108		2649
…		…
2115	fg => [1, 1, 1],	2656	fg => [1, 1, 1],
2116	active_fg => [0, 0, 0],	2657	active_fg => [0, 0, 0],
2117	bg => [0, 0, 0, 0.2],	2658	bg => [0, 0, 0, 0.2],
2118	active_bg => [1, 1, 1, 0.5],	2659	active_bg => [1, 1, 1, 0.5],
2119	range => [0, 0, 100, 10, 0],	2660	range => [0, 0, 100, 10, 0],
2120	req_w => $::WIDTH / 80,	2661	min_w => $::WIDTH / 80,
2121	req_h => $::WIDTH / 80,	2662	min_h => $::WIDTH / 80,
2122	vertical => 0,	2663	vertical => 0,
2123	can_hover => 1,	2664	can_hover => 1,
2124	inner_pad => 0.02,	2665	inner_pad => 0.02,
2125	@_	2666	@_
2126	);	2667	);
…		…
2132	}	2673	}
2133		2674
2134	sub set_range {	2675	sub set_range {
2135	my ($self, $range) = @_;	2676	my ($self, $range) = @_;
2136		2677
2137	$self->{range} = $range;	2678	($range, $self->{range}) = ($self->{range}, $range);
2138		2679
		2680	if ("@$range" ne "@{$self->{range}}") {
2139	$self->update;	2681	$self->update;
		2682	$self->set_value ($self->{range}[0]);
		2683	}
2140	}	2684	}
2141		2685
2142	sub set_value {	2686	sub set_value {
2143	my ($self, $value) = @_;	2687	my ($self, $value) = @_;
2144		2688
…		…
2155	if $unit;	2699	if $unit;
2156		2700
2157	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2701	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2158		2702
2159	if ($value != $old_value) {	2703	if ($value != $old_value) {
2160	$self->_emit (changed => $value);	2704	$self->emit (changed => $value);
2161	$self->update;	2705	$self->update;
2162	}	2706	}
2163	}	2707	}
2164		2708
2165	sub size_request {	2709	sub size_request {
2166	my ($self) = @_;	2710	my ($self) = @_;
2167		2711
2168	my $w = $self->{req_w};	2712	($self->{req_w}, $self->{req_h})
2169	my $h = $self->{req_h};
2170
2171	$self->{vertical} ? ($h, $w) : ($w, $h)
2172	}	2713	}
2173		2714
2174	sub button_down {	2715	sub invoke_button_down {
2175	my ($self, $ev, $x, $y) = @_;	2716	my ($self, $ev, $x, $y) = @_;
2176		2717
2177	$self->SUPER::button_down ($ev, $x, $y);	2718	$self->SUPER::invoke_button_down ($ev, $x, $y);
2178		2719
2179	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2720	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2180		2721
2181	$self->mouse_motion ($ev, $x, $y);	2722	$self->invoke_mouse_motion ($ev, $x, $y)
2182	}	2723	}
2183		2724
2184	sub mouse_motion {	2725	sub invoke_mouse_motion {
2185	my ($self, $ev, $x, $y) = @_;	2726	my ($self, $ev, $x, $y) = @_;
2186		2727
2187	if ($GRAB == $self) {	2728	if ($GRAB == $self) {
2188	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2729	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2189		2730
2190	my (undef, $lo, $hi, $page) = @{$self->{range}};	2731	my (undef, $lo, $hi, $page) = @{$self->{range}};
2191		2732
2192	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2733	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2193		2734
2194	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2735	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2736	} else {
		2737	return 0;
		2738	}
		2739
2195	}	2740	1
		2741	}
		2742
		2743	sub invoke_mouse_wheel {
		2744	my ($self, $ev) = @_;
		2745
		2746	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2747
		2748	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2749
		2750	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2751
		2752	! ! $delta
2196	}	2753	}
2197		2754
2198	sub update {	2755	sub update {
2199	my ($self) = @_;	2756	my ($self) = @_;
2200		2757
2201	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2758	delete $self->{knob_w};
		2759	$self->SUPER::update;
		2760	}
		2761
		2762	sub _draw {
		2763	my ($self) = @_;
		2764
		2765	unless ($self->{knob_w}) {
2202	$self->set_value ($self->{range}[0]);	2766	$self->set_value ($self->{range}[0]);
2203		2767
2204	my ($value, $lo, $hi, $page) = @{$self->{range}};	2768	my ($value, $lo, $hi, $page) = @{$self->{range}};
2205	my $range = ($hi - $page - $lo) || 1e-100;	2769	my $range = ($hi - $page - $lo) || 1e-100;
2206		2770
…		…
2212	$value = ($value - $lo) / $range;	2776	$value = ($value - $lo) / $range;
2213	$value = $value * $self->{scale} + $self->{offset};	2777	$value = $value * $self->{scale} + $self->{offset};
2214		2778
2215	$self->{knob_x} = $value - $knob_w * 0.5;	2779	$self->{knob_x} = $value - $knob_w * 0.5;
2216	$self->{knob_w} = $knob_w;	2780	$self->{knob_w} = $knob_w;
2217	});	2781	}
2218
2219	$self->SUPER::update;
2220	}
2221
2222	sub _draw {
2223	my ($self) = @_;
2224		2782
2225	$self->SUPER::_draw ();	2783	$self->SUPER::_draw ();
2226		2784
2227	glScale $self->{w}, $self->{h};	2785	glScale $self->{w}, $self->{h};
2228		2786
…		…
2248	glDisable GL_TEXTURE_2D;	2806	glDisable GL_TEXTURE_2D;
2249	}	2807	}
2250		2808
2251	#############################################################################	2809	#############################################################################
2252		2810
2253	package CFClient::UI::ValSlider;	2811	package CFPlus::UI::ValSlider;
2254		2812
2255	our @ISA = CFClient::UI::HBox::;	2813	our @ISA = CFPlus::UI::HBox::;
2256		2814
2257	sub new {	2815	sub new {
2258	my ($class, %arg) = @_;	2816	my ($class, %arg) = @_;
2259		2817
2260	my $range = delete $arg{range};	2818	my $range = delete $arg{range};
2261		2819
2262	my $self = $class->SUPER::new (	2820	my $self = $class->SUPER::new (
2263	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2821	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2264	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2822	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2265	to_value => sub { shift },	2823	to_value => sub { shift },
2266	from_value => sub { shift },	2824	from_value => sub { shift },
2267	%arg,	2825	%arg,
2268	);	2826	);
2269		2827
…		…
2289	sub set_range { shift->{slider}->set_range (@_) }	2847	sub set_range { shift->{slider}->set_range (@_) }
2290	sub set_value { shift->{slider}->set_value (@_) }	2848	sub set_value { shift->{slider}->set_value (@_) }
2291		2849
2292	#############################################################################	2850	#############################################################################
2293		2851
2294	package CFClient::UI::TextView;	2852	package CFPlus::UI::TextScroller;
2295		2853
2296	our @ISA = CFClient::UI::HBox::;	2854	our @ISA = CFPlus::UI::HBox::;
2297		2855
2298	use CFClient::OpenGL;	2856	use CFPlus::OpenGL;
2299		2857
2300	sub new {	2858	sub new {
2301	my $class = shift;	2859	my $class = shift;
2302		2860
2303	my $self = $class->SUPER::new (	2861	my $self = $class->SUPER::new (
2304	fontsize => 1,	2862	fontsize => 1,
2305	can_events => 0,	2863	can_events => 1,
		2864	indent => 0,
2306	#font => default_font	2865	#font => default_font
2307	@_,	2866	@_,
2308		2867
2309	layout => (new CFClient::Layout 1),	2868	layout => (new CFPlus::Layout),
2310	par => [],	2869	par => [],
		2870	max_par => 0,
2311	height => 0,	2871	height => 0,
2312	children => [	2872	children => [
2313	(new CFClient::UI::Empty expand => 1),	2873	(new CFPlus::UI::Empty expand => 1),
2314	(new CFClient::UI::Slider vertical => 1),	2874	(new CFPlus::UI::Slider vertical => 1),
2315	],	2875	],
2316	);	2876	);
2317		2877
2318	$self->{children}[1]->connect (changed => sub { $self->update });	2878	$self->{children}[1]->connect (changed => sub { $self->update });
2319		2879
…		…
2325		2885
2326	$self->{fontsize} = $fontsize;	2886	$self->{fontsize} = $fontsize;
2327	$self->reflow;	2887	$self->reflow;
2328	}	2888	}
2329		2889
		2890	sub size_request {
		2891	my ($self) = @_;
		2892
		2893	my ($empty, $slider) = @{ $self->{children} };
		2894
		2895	local $self->{children} = [$empty, $slider];
		2896	$self->SUPER::size_request
		2897	}
		2898
2330	sub size_allocate {	2899	sub invoke_size_allocate {
2331	my ($self, $w, $h) = @_;	2900	my ($self, $w, $h) = @_;
2332		2901
2333	$self->SUPER::size_allocate ($w, $h);	2902	my ($empty, $slider, @other) = @{ $self->{children} };
		2903	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2334		2904
2335	$self->{layout}->set_font ($self->{font}) if $self->{font};	2905	$self->{layout}->set_font ($self->{font}) if $self->{font};
2336	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2906	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2337	$self->{layout}->set_width ($self->{children}[0]{w});	2907	$self->{layout}->set_width ($empty->{w});
		2908	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2338		2909
2339	$self->reflow;	2910	$self->reflow;
2340	}
2341		2911
2342	sub text_size {	2912	local $self->{children} = [$empty, $slider];
		2913	$self->SUPER::invoke_size_allocate ($w, $h)
		2914	}
		2915
		2916	sub invoke_mouse_wheel {
2343	my ($self, $text, $indent) = @_;	2917	my ($self, $ev) = @_;
		2918
		2919	return 0 unless $ev->{dy}; # only vertical movements
		2920
		2921	$self->{children}[1]->emit (mouse_wheel => $ev);
		2922
		2923	1
		2924	}
		2925
		2926	sub get_layout {
		2927	my ($self, $para) = @_;
2344		2928
2345	my $layout = $self->{layout};	2929	my $layout = $self->{layout};
2346		2930
		2931	$layout->set_font ($self->{font}) if $self->{font};
		2932	$layout->set_foreground (@{$para->{fg}});
2347	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2933	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2348	$layout->set_width ($self->{children}[0]{w} - $indent);	2934	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		2935	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2349	$layout->set_markup ($text);	2936	$layout->set_markup ($para->{markup});
		2937
		2938	$layout->set_shapes (
		2939	map
		2940	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2941	@{$para->{widget}}
2350		2942	);
		2943
2351	$layout->size	2944	$layout
2352	}	2945	}
2353		2946
2354	sub reflow {	2947	sub reflow {
2355	my ($self) = @_;	2948	my ($self) = @_;
2356		2949
…		…
2363		2956
2364	# todo: base offset on lines or so, not on pixels	2957	# todo: base offset on lines or so, not on pixels
2365	$self->{children}[1]->set_value ($offset);	2958	$self->{children}[1]->set_value ($offset);
2366	}	2959	}
2367		2960
		2961	sub current_paragraph {
		2962	my ($self) = @_;
		2963
		2964	$self->{top_paragraph} - 1
		2965	}
		2966
		2967	sub scroll_to {
		2968	my ($self, $para) = @_;
		2969
		2970	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2971
		2972	$self->{scroll_to} = $para;
		2973	$self->update;
		2974	}
		2975
2368	sub clear {	2976	sub clear {
2369	my ($self) = @_;	2977	my ($self) = @_;
		2978
		2979	my (undef, undef, @other) = @{ $self->{children} };
		2980	$self->remove ($_) for @other;
2370		2981
2371	$self->{par} = [];	2982	$self->{par} = [];
2372	$self->{height} = 0;	2983	$self->{height} = 0;
2373	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2984	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2374	}	2985	}
2375		2986
2376	sub add_paragraph {	2987	sub add_paragraph {
2377	my ($self, $color, $text, $indent) = @_;	2988	my $self = shift;
2378		2989
2379	for my $line (split /\n/, $text) {	2990	for my $para (@_) {
2380	my ($w, $h) = $self->text_size ($line);	2991	$para = {
		2992	fg => [1, 1, 1, 1],
		2993	indent => 0,
		2994	markup => "",
		2995	widget => [],
		2996	ref $para ? %$para : (markup => $para),
		2997	w => 1e10,
		2998	wrapped => 1,
		2999	};
		3000
		3001	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3002	push @{$self->{par}}, $para;
		3003	}
		3004
		3005	if (my $max = $self->{max_par}) {
		3006	shift @{$self->{par}} while @{$self->{par}} > $max;
		3007	}
		3008
		3009	$self->{need_reflow}++;
		3010	$self->update;
		3011	}
		3012
		3013	sub scroll_to_bottom {
		3014	my ($self) = @_;
		3015
		3016	$self->{scroll_to} = $#{$self->{par}};
		3017	$self->update;
		3018	}
		3019
		3020	sub force_uptodate {
		3021	my ($self) = @_;
		3022
		3023	if (delete $self->{need_reflow}) {
		3024	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3025
		3026	my $height = 0;
		3027
		3028	for my $para (@{$self->{par}}) {
		3029	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3030	my $layout = $self->get_layout ($para);
		3031	my ($w, $h) = $layout->size;
		3032
		3033	$para->{w} = $w + $para->{indent};
		3034	$para->{h} = $h;
		3035	$para->{wrapped} = $layout->has_wrapped;
		3036	}
		3037
		3038	$para->{y} = $height;
		3039	$height += $para->{h};
		3040	}
		3041
2381	$self->{height} += $h;	3042	$self->{height} = $height;
2382	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3043	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2383	}
2384		3044
2385	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3045	delete $self->{texture};
		3046	}
		3047
		3048	if (my $paridx = delete $self->{scroll_to}) {
		3049	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3050	}
2386	}	3051	}
2387		3052
2388	sub update {	3053	sub update {
2389	my ($self) = @_;	3054	my ($self) = @_;
2390		3055
…		…
2392		3057
2393	return unless $self->{h} > 0;	3058	return unless $self->{h} > 0;
2394		3059
2395	delete $self->{texture};	3060	delete $self->{texture};
2396		3061
2397	$ROOT->on_post_alloc ($self, sub {	3062	$ROOT->on_post_alloc ($self => sub {
		3063	$self->force_uptodate;
		3064
2398	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3065	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2399		3066
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 {	3067	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2427	glClearColor 0.5, 0.5, 0.5, 0;	3068	glClearColor 0, 0, 0, 0;
2428	glClear GL_COLOR_BUFFER_BIT;	3069	glClear GL_COLOR_BUFFER_BIT;
2429		3070
		3071	package CFPlus::UI::Base;
		3072	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3073	(0, 0, $self->{w}, $self->{h});
		3074
		3075	my $top = int $self->{children}[1]{range}[0];
		3076
		3077	my $paridx = 0;
		3078	my $top_paragraph;
2430	my $top = int $self->{children}[1]{range}[0];	3079	my $top = int $self->{children}[1]{range}[0];
2431		3080
2432	my $y0 = $top;	3081	my $y0 = $top;
2433	my $y1 = $top + $H;	3082	my $y1 = $top + $H;
2434		3083
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}}) {	3084	for my $para (@{$self->{par}}) {
2446	my $h = $par->[1];	3085	my $h = $para->{h};
		3086	my $y = $para->{y};
2447		3087
2448	if ($y0 < $y + $h && $y < $y1) {	3088	if ($y0 < $y + $h && $y < $y1) {
2449	$layout->set_foreground (@{ $par->[2] });	3089	my $layout = $self->get_layout ($para);
2450	$layout->set_width ($W - $par->[3]);
2451	$layout->set_markup ($par->[4]);
2452		3090
2453	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3091	$layout->render ($para->{indent}, $y - $y0);
2454		3092
2455	glRasterPos $par->[3], $y - $y0;	3093	if (my @w = @{ $para->{widget} }) {
2456	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3094	my @s = $layout->get_shapes;
		3095
		3096	for (@w) {
		3097	my ($dx, $dy) = splice @s, 0, 2, ();
		3098
		3099	$_->{x} = $dx + $para->{indent};
		3100	$_->{y} = $dy + $y - $y0;
		3101
		3102	$_->draw;
		3103	}
		3104	}
2457	}	3105	}
2458		3106
2459	$y += $h;	3107	$paridx++;
		3108	$top_paragraph ||= $paridx if $y >= $top;
2460	}	3109	}
2461		3110
2462	glDisable GL_BLEND;	3111	$self->{top_paragraph} = $top_paragraph;
2463	};	3112	};
2464	});	3113	});
2465	}	3114	}
2466		3115
		3116	sub reconfigure {
		3117	my ($self) = @_;
		3118
		3119	$self->SUPER::reconfigure;
		3120
		3121	$_->{w} = 1e10 for @{ $self->{par} };
		3122	$self->reflow;
		3123	}
		3124
2467	sub _draw {	3125	sub _draw {
2468	my ($self) = @_;	3126	my ($self) = @_;
2469		3127
2470	glEnable GL_TEXTURE_2D;	3128	glEnable GL_TEXTURE_2D;
2471	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3129	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2472	glColor 1, 1, 1, 1;	3130	glColor 0, 0, 0, 1;
2473	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3131	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2474	glDisable GL_TEXTURE_2D;	3132	glDisable GL_TEXTURE_2D;
2475		3133
2476	$self->{children}[1]->draw;	3134	$self->{children}[1]->draw;
2477
2478	}	3135	}
2479		3136
2480	#############################################################################	3137	#############################################################################
2481		3138
2482	package CFClient::UI::Animator;	3139	package CFPlus::UI::Animator;
2483		3140
2484	use CFClient::OpenGL;	3141	use CFPlus::OpenGL;
2485		3142
2486	our @ISA = CFClient::UI::Bin::;	3143	our @ISA = CFPlus::UI::Bin::;
2487		3144
2488	sub moveto {	3145	sub moveto {
2489	my ($self, $x, $y) = @_;	3146	my ($self, $x, $y) = @_;
2490		3147
2491	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3148	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2519	glPopMatrix;	3176	glPopMatrix;
2520	}	3177	}
2521		3178
2522	#############################################################################	3179	#############################################################################
2523		3180
2524	package CFClient::UI::Flopper;	3181	package CFPlus::UI::Flopper;
2525		3182
2526	our @ISA = CFClient::UI::Button::;	3183	our @ISA = CFPlus::UI::Button::;
2527		3184
2528	sub new {	3185	sub new {
2529	my $class = shift;	3186	my $class = shift;
2530		3187
2531	my $self = $class->SUPER::new (	3188	my $self = $class->SUPER::new (
2532	state => 0,	3189	state => 0,
2533	connect_activate => \&toggle_flopper,	3190	on_activate => \&toggle_flopper,
2534	@_	3191	@_
2535	);	3192	);
2536		3193
2537	if ($self->{state}) {
2538	$self->{state} = 0;
2539	$self->toggle_flopper;
2540	}
2541
2542	$self	3194	$self
2543	}	3195	}
2544		3196
2545	sub toggle_flopper {	3197	sub toggle_flopper {
2546	my ($self) = @_;	3198	my ($self) = @_;
2547		3199
2548	# TODO: use animation	3200	$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	}	3201	}
2560		3202
2561	#############################################################################	3203	#############################################################################
2562		3204
2563	package CFClient::UI::Tooltip;	3205	package CFPlus::UI::Tooltip;
2564		3206
2565	our @ISA = CFClient::UI::Bin::;	3207	our @ISA = CFPlus::UI::Bin::;
2566		3208
2567	use CFClient::OpenGL;	3209	use CFPlus::OpenGL;
2568		3210
2569	sub new {	3211	sub new {
2570	my $class = shift;	3212	my $class = shift;
2571		3213
2572	$class->SUPER::new (	3214	$class->SUPER::new (
…		…
2576	}	3218	}
2577		3219
2578	sub set_tooltip_from {	3220	sub set_tooltip_from {
2579	my ($self, $widget) = @_;	3221	my ($self, $widget) = @_;
2580		3222
		3223	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3224	if $widget->{tooltip} =~ /^#(.*)$/;
		3225
		3226	my $tooltip = $widget->{tooltip};
		3227
		3228	if ($ENV{CFPLUS_DEBUG} & 2) {
		3229	$tooltip .= "\n\n" . (ref $widget) . "\n"
		3230	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		3231	. "req $widget->{req_w} $widget->{req_h}\n"
		3232	. "visible $widget->{visible}";
		3233	}
		3234
		3235	$tooltip =~ s/^\n+//;
		3236	$tooltip =~ s/\n+$//;
		3237
2581	$self->add (new CFClient::UI::Label	3238	$self->add (new CFPlus::UI::Label
2582	markup => $widget->{tooltip},	3239	markup => $tooltip,
2583	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3240	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2584	fontsize => 0.8,	3241	fontsize => 0.8,
2585	fg => [0, 0, 0, 1],	3242	style => 1, # FLAG_INVERSE
2586	ellipsise => 0,	3243	ellipsise => 0,
2587	font => ($widget->{tooltip_font} || $::FONT_PROP),	3244	font => ($widget->{tooltip_font} || $::FONT_PROP),
2588	);	3245	);
2589	}	3246	}
2590		3247
…		…
2594	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3251	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2595		3252
2596	($w + 4, $h + 4)	3253	($w + 4, $h + 4)
2597	}	3254	}
2598		3255
2599	sub size_allocate {	3256	sub invoke_size_allocate {
2600	my ($self, $w, $h) = @_;	3257	my ($self, $w, $h) = @_;
2601		3258
2602	$self->SUPER::size_allocate ($w - 4, $h - 4);	3259	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
		3260	}
		3261
		3262	sub invoke_visibility_change {
		3263	my ($self, $visible) = @_;
		3264
		3265	return unless $visible;
		3266
		3267	$self->{root}->on_post_alloc ("move_$self" => sub {
		3268	my $widget = $self->{owner}
		3269	or return;
		3270
		3271	if ($widget->{visible}) {
		3272	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		3273
		3274	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		3275	if $x + $self->{w} > $self->{root}{w};
		3276
		3277	$self->move_abs ($x, $y);
		3278	} else {
		3279	$self->hide;
		3280	}
		3281	});
2603	}	3282	}
2604		3283
2605	sub _draw {	3284	sub _draw {
2606	my ($self) = @_;	3285	my ($self) = @_;
2607		3286
…		…
2624	glVertex $w, $h;	3303	glVertex $w, $h;
2625	glVertex $w, 0;	3304	glVertex $w, 0;
2626	glEnd;	3305	glEnd;
2627		3306
2628	glTranslate 2 - 0.375, 2 - 0.375;	3307	glTranslate 2 - 0.375, 2 - 0.375;
		3308
2629	$self->SUPER::_draw;	3309	$self->SUPER::_draw;
2630	}	3310	}
2631		3311
2632	#############################################################################	3312	#############################################################################
2633		3313
2634	package CFClient::UI::Face;	3314	package CFPlus::UI::Face;
2635		3315
2636	our @ISA = CFClient::UI::Base::;	3316	our @ISA = CFPlus::UI::DrawBG::;
2637		3317
2638	use CFClient::OpenGL;	3318	use CFPlus::OpenGL;
2639		3319
2640	sub new {	3320	sub new {
2641	my $class = shift;	3321	my $class = shift;
2642		3322
2643	my $self = $class->SUPER::new (	3323	my $self = $class->SUPER::new (
…		…
2645	can_events => 0,	3325	can_events => 0,
2646	@_,	3326	@_,
2647	);	3327	);
2648		3328
2649	if ($self->{anim} && $self->{animspeed}) {	3329	if ($self->{anim} && $self->{animspeed}) {
2650	Scalar::Util::weaken (my $widget = $self);	3330	CFPlus::weaken (my $widget = $self);
2651		3331
2652	$self->{timer} = Event->timer (	3332	$self->{timer} = Event->timer (
2653	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3333	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2654	hard => 1,	3334	hard => 1,
2655	interval => $self->{animspeed},	3335	interval => $self->{animspeed},
…		…
2678	sub _draw {	3358	sub _draw {
2679	my ($self) = @_;	3359	my ($self) = @_;
2680		3360
2681	return unless $::CONN;	3361	return unless $::CONN;
2682		3362
		3363	$self->SUPER::_draw;
		3364
2683	my $face;	3365	my $face;
2684		3366
2685	if ($self->{frame}) {	3367	if ($self->{frame}) {
2686	my $anim = $::CONN->{anim}[$self->{anim}];	3368	my $anim = $::CONN->{anim}[$self->{anim}];
2687		3369
…		…
2692	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3374	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2693		3375
2694	if ($tex) {	3376	if ($tex) {
2695	glEnable GL_TEXTURE_2D;	3377	glEnable GL_TEXTURE_2D;
2696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3378	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2697	glColor 1, 1, 1, 1;	3379	glColor 0, 0, 0, 1;
2698	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3380	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2699	glDisable GL_TEXTURE_2D;	3381	glDisable GL_TEXTURE_2D;
2700	}	3382	}
2701	}	3383	}
2702		3384
2703	sub DESTROY {	3385	sub destroy {
2704	my ($self) = @_;	3386	my ($self) = @_;
2705		3387
2706	$self->{timer}->cancel	3388	$self->{timer}->cancel
2707	if $self->{timer};	3389	if $self->{timer};
2708		3390
2709	$self->SUPER::DESTROY;	3391	$self->SUPER::destroy;
2710	}	3392	}
2711		3393
2712	#############################################################################	3394	#############################################################################
2713		3395
2714	package CFClient::UI::InventoryItem;	3396	package CFPlus::UI::Buttonbar;
2715		3397
2716	our @ISA = CFClient::UI::HBox::;	3398	our @ISA = CFPlus::UI::HBox::;
2717		3399
2718	sub new {	3400	# 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		3401
2798	#############################################################################	3402	#############################################################################
2799		3403
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;	3404	package CFPlus::UI::Menu;
2850		3405
2851	our @ISA = CFClient::UI::FancyFrame::;	3406	our @ISA = CFPlus::UI::Toplevel::;
2852		3407
2853	use CFClient::OpenGL;	3408	use CFPlus::OpenGL;
2854		3409
2855	sub new {	3410	sub new {
2856	my $class = shift;	3411	my $class = shift;
2857		3412
2858	my $self = $class->SUPER::new (	3413	my $self = $class->SUPER::new (
2859	items => [],	3414	items => [],
2860	z => 100,	3415	z => 100,
2861	@_,	3416	@_,
2862	);	3417	);
2863		3418
2864	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3419	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2865		3420
2866	for my $item (@{ $self->{items} }) {	3421	for my $item (@{ $self->{items} }) {
2867	my ($widget, $cb) = @$item;	3422	my ($widget, $cb, $tooltip) = @$item;
2868		3423
2869	# handle various types of items, only text for now	3424	# handle various types of items, only text for now
2870	if (!ref $widget) {	3425	if (!ref $widget) {
		3426	if ($widget =~ /\t/) {
		3427	my ($left, $right) = split /\t/, $widget, 2;
		3428
2871	$widget = new CFClient::UI::Label	3429	$widget = new CFPlus::UI::HBox
2872	can_hover => 1,	3430	can_hover => 1,
2873	can_events => 1,	3431	can_events => 1,
		3432	tooltip => $tooltip,
		3433	children => [
		3434	(new CFPlus::UI::Label markup => $left, expand => 1),
		3435	(new CFPlus::UI::Label markup => $right, align => +1),
		3436	],
		3437	;
		3438
		3439	} else {
		3440	$widget = new CFPlus::UI::Label
		3441	can_hover => 1,
		3442	can_events => 1,
2874	text => $widget;	3443	markup => $widget,
		3444	tooltip => $tooltip;
		3445	}
2875	}	3446	}
2876		3447
2877	$self->{item}{$widget} = $item;	3448	$self->{item}{$widget} = $item;
2878		3449
2879	$self->{vbox}->add ($widget);	3450	$self->{vbox}->add ($widget);
…		…
2884		3455
2885	# popup given the event (must be a mouse button down event currently)	3456	# popup given the event (must be a mouse button down event currently)
2886	sub popup {	3457	sub popup {
2887	my ($self, $ev) = @_;	3458	my ($self, $ev) = @_;
2888		3459
2889	$self->_emit ("popdown");	3460	$self->emit ("popdown");
2890		3461
2891	# maybe save $GRAB? must be careful about events...	3462	# maybe save $GRAB? must be careful about events...
2892	$GRAB = $self;	3463	$GRAB = $self;
2893	$self->{button} = $ev->{button};	3464	$self->{button} = $ev->{button};
2894		3465
2895	$self->show;	3466	$self->show;
2896	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3467	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2897	}	3468	}
2898		3469
2899	sub mouse_motion {	3470	sub invoke_mouse_motion {
2900	my ($self, $ev, $x, $y) = @_;	3471	my ($self, $ev, $x, $y) = @_;
2901		3472
2902	# TODO: should use vbox->find_widget or so	3473	# TODO: should use vbox->find_widget or so
2903	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3474	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2904	$self->{hover} = $self->{item}{$HOVER};	3475	$self->{hover} = $self->{item}{$HOVER};
2905	}
2906		3476
		3477	0
		3478	}
		3479
2907	sub button_up {	3480	sub invoke_button_up {
2908	my ($self, $ev, $x, $y) = @_;	3481	my ($self, $ev, $x, $y) = @_;
2909		3482
2910	if ($ev->{button} == $self->{button}) {	3483	if ($ev->{button} == $self->{button}) {
2911	undef $GRAB;	3484	undef $GRAB;
2912	$self->hide;	3485	$self->hide;
2913		3486
2914	$self->_emit ("popdown");	3487	$self->emit ("popdown");
2915	$self->{hover}[1]->() if $self->{hover};	3488	$self->{hover}[1]->() if $self->{hover};
		3489	} else {
		3490	return 0
		3491	}
		3492
2916	}	3493	1
2917	}	3494	}
2918		3495
2919	#############################################################################	3496	#############################################################################
2920		3497
2921	package CFClient::UI::Statusbox;	3498	package CFPlus::UI::Multiplexer;
2922		3499
2923	our @ISA = CFClient::UI::VBox::;	3500	our @ISA = CFPlus::UI::Container::;
2924		3501
2925	sub new {	3502	sub new {
2926	my $class = shift;	3503	my $class = shift;
2927		3504
2928	$class->SUPER::new (	3505	my $self = $class->SUPER::new (
		3506	@_,
		3507	);
		3508
		3509	$self->{current} = $self->{children}[0]
		3510	if @{ $self->{children} };
		3511
		3512	$self
		3513	}
		3514
		3515	sub add {
		3516	my ($self, @widgets) = @_;
		3517
		3518	$self->SUPER::add (@widgets);
		3519
		3520	$self->{current} = $self->{children}[0]
		3521	if @{ $self->{children} };
		3522	}
		3523
		3524	sub get_current_page {
		3525	my ($self) = @_;
		3526
		3527	$self->{current}
		3528	}
		3529
		3530	sub set_current_page {
		3531	my ($self, $page_or_widget) = @_;
		3532
		3533	my $widget = ref $page_or_widget
		3534	? $page_or_widget
		3535	: $self->{children}[$page_or_widget];
		3536
		3537	$self->{current} = $widget;
		3538	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3539
		3540	$self->emit (page_changed => $self->{current});
		3541
		3542	$self->realloc;
		3543	}
		3544
		3545	sub visible_children {
		3546	$_[0]{current}
		3547	}
		3548
		3549	sub size_request {
		3550	my ($self) = @_;
		3551
		3552	$self->{current}->size_request
		3553	}
		3554
		3555	sub invoke_size_allocate {
		3556	my ($self, $w, $h) = @_;
		3557
		3558	$self->{current}->configure (0, 0, $w, $h);
		3559
		3560	1
		3561	}
		3562
		3563	sub _draw {
		3564	my ($self) = @_;
		3565
		3566	$self->{current}->draw;
		3567	}
		3568
		3569	#############################################################################
		3570
		3571	package CFPlus::UI::Notebook;
		3572
		3573	our @ISA = CFPlus::UI::VBox::;
		3574
		3575	sub new {
		3576	my $class = shift;
		3577
		3578	my $self = $class->SUPER::new (
		3579	buttonbar => (new CFPlus::UI::Buttonbar),
		3580	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3581	# filter => # will be put between multiplexer and $self
		3582	@_,
		3583	);
		3584
		3585	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3586	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3587
		3588	$self
		3589	}
		3590
		3591	sub add {
		3592	my ($self, $title, $widget, $tooltip) = @_;
		3593
		3594	CFPlus::weaken $self;
		3595
		3596	$self->{buttonbar}->add (new CFPlus::UI::Button
		3597	markup => $title,
		3598	tooltip => $tooltip,
		3599	on_activate => sub { $self->set_current_page ($widget) },
		3600	);
		3601
		3602	$self->{multiplexer}->add ($widget);
		3603	}
		3604
		3605	sub get_current_page {
		3606	my ($self) = @_;
		3607
		3608	$self->{multiplexer}->get_current_page
		3609	}
		3610
		3611	sub set_current_page {
		3612	my ($self, $page) = @_;
		3613
		3614	$self->{multiplexer}->set_current_page ($page);
		3615	$self->emit (page_changed => $self->{multiplexer}{current});
		3616	}
		3617
		3618	#############################################################################
		3619
		3620	package CFPlus::UI::Selector;
		3621
		3622	use utf8;
		3623
		3624	our @ISA = CFPlus::UI::Button::;
		3625
		3626	sub new {
		3627	my $class = shift;
		3628
		3629	my $self = $class->SUPER::new (
		3630	options => [], # [value, title, longdesc], ...
		3631	value => undef,
		3632	@_,
		3633	);
		3634
		3635	$self->_set_value ($self->{value});
		3636
		3637	$self
		3638	}
		3639
		3640	sub invoke_button_down {
		3641	my ($self, $ev) = @_;
		3642
		3643	my @menu_items;
		3644
		3645	for (@{ $self->{options} }) {
		3646	my ($value, $title, $tooltip) = @$_;
		3647
		3648	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3649	}
		3650
		3651	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3652	}
		3653
		3654	sub _set_value {
		3655	my ($self, $value) = @_;
		3656
		3657	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3658	or return;
		3659
		3660	$self->{value} = $item->[0];
		3661	$self->set_markup ("$item->[1] ⇓");
		3662	$self->set_tooltip ($item->[2]);
		3663	}
		3664
		3665	sub set_value {
		3666	my ($self, $value) = @_;
		3667
		3668	return unless $self->{value} ne $value;
		3669
		3670	$self->_set_value ($value);
		3671	$self->emit (changed => $value);
		3672	}
		3673
		3674	#############################################################################
		3675
		3676	package CFPlus::UI::Statusbox;
		3677
		3678	our @ISA = CFPlus::UI::VBox::;
		3679
		3680	sub new {
		3681	my $class = shift;
		3682
		3683	my $self = $class->SUPER::new (
2929	fontsize => 0.8,	3684	fontsize => 0.8,
2930	@_,	3685	@_,
2931	)	3686	);
		3687
		3688	CFPlus::weaken (my $this = $self);
		3689
		3690	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3691
		3692	$self
2932	}	3693	}
2933		3694
2934	sub reorder {	3695	sub reorder {
2935	my ($self) = @_;	3696	my ($self) = @_;
2936	my $NOW = time;	3697	my $NOW = Time::HiRes::time;
		3698
		3699	# freeze display when hovering over any label
		3700	return if $CFPlus::UI::TOOLTIP->{owner}
		3701	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
		3702	values %{ $self->{item} };
2937		3703
2938	while (my ($k, $v) = each %{ $self->{item} }) {	3704	while (my ($k, $v) = each %{ $self->{item} }) {
2939	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3705	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2940	}	3706	}
2941		3707
…		…
2944	my @items = sort {	3710	my @items = sort {
2945	$a->{pri} <=> $b->{pri}	3711	$a->{pri} <=> $b->{pri}
2946	or $b->{id} <=> $a->{id}	3712	or $b->{id} <=> $a->{id}
2947	} values %{ $self->{item} };	3713	} values %{ $self->{item} };
2948		3714
		3715	$self->{timer}->interval (1);
		3716
2949	my $count = 10 + 1;	3717	my $count = 10 + 1;
2950	for my $item (@items) {	3718	for my $item (@items) {
2951	last unless --$count;	3719	last unless --$count;
2952		3720
2953	push @widgets, $item->{label} ||= do {	3721	my $label = $item->{label} ||= do {
2954	# TODO: doesn't handle markup well (read as: at all)	3722	# TODO: doesn't handle markup well (read as: at all)
2955	my $short = $item->{count} > 1	3723	my $short = $item->{count} > 1
2956	? "<b>$item->{count} ×</b> $item->{text}"	3724	? "<b>$item->{count} ×</b> $item->{text}"
2957	: $item->{text};	3725	: $item->{text};
2958		3726
2959	for ($short) {	3727	for ($short) {
2960	s/^\s+//;	3728	s/^\s+//;
2961	s/\s+/ /g;	3729	s/\s+/ /g;
2962	}	3730	}
2963		3731
2964	new CFClient::UI::Label	3732	new CFPlus::UI::Label
2965	markup => $short,	3733	markup => $short,
2966	tooltip => $item->{tooltip},	3734	tooltip => $item->{tooltip},
2967	tooltip_font => $::FONT_PROP,	3735	tooltip_font => $::FONT_PROP,
2968	tooltip_width => 0.67,	3736	tooltip_width => 0.67,
2969	fontsize => $item->{fontsize} || $self->{fontsize},	3737	fontsize => $item->{fontsize} || $self->{fontsize},
2970	max_w => $::WIDTH * 0.44,	3738	max_w => $::WIDTH * 0.44,
2971	fg => $item->{fg},	3739	fg => [@{ $item->{fg} }],
2972	can_events => 1,	3740	can_events => 1,
2973	can_hover => 1	3741	can_hover => 1
2974	};	3742	};
		3743
		3744	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3745	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3746	$label->update;
		3747	$label->set_max_size (undef, $label->{req_h} * $diff)
		3748	if $diff < 1;
		3749	$self->{timer}->interval (1/30);
		3750	} else {
		3751	$label->{fg}[3] = $item->{fg}[3] || 1;
		3752	}
		3753
		3754	push @widgets, $label;
2975	}	3755	}
2976		3756
2977	$self->clear;	3757	$self->clear;
2978	$self->SUPER::add (reverse @widgets);	3758	$self->SUPER::add (reverse @widgets);
2979	}	3759	}
…		…
2984	$text =~ s/^\s+//;	3764	$text =~ s/^\s+//;
2985	$text =~ s/\s+$//;	3765	$text =~ s/\s+$//;
2986		3766
2987	return unless $text;	3767	return unless $text;
2988		3768
2989	my $timeout = time + ((delete $arg{timeout}) || 60);	3769	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2990		3770
2991	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3771	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2992		3772
2993	if (my $item = $self->{item}{$group}) {	3773	if (my $item = $self->{item}{$group}) {
2994	if ($item->{text} eq $text) {	3774	if ($item->{text} eq $text) {
2995	$item->{count}++;	3775	$item->{count}++;
2996	} else {	3776	} else {
2997	$item->{count} = 1;	3777	$item->{count} = 1;
2998	$item->{text} = $item->{tooltip} = $text;	3778	$item->{text} = $item->{tooltip} = $text;
2999	}	3779	}
3000	$item->{id} = ++$self->{id};	3780	$item->{id} += 0.2;#d#
3001	$item->{timeout} = $timeout;	3781	$item->{timeout} = $timeout;
3002	delete $item->{label};	3782	delete $item->{label};
3003	} else {	3783	} else {
3004	$self->{item}{$group} = {	3784	$self->{item}{$group} = {
3005	id => ++$self->{id},	3785	id => ++$self->{id},
…		…
3011	count => 1,	3791	count => 1,
3012	%arg,	3792	%arg,
3013	};	3793	};
3014	}	3794	}
3015		3795
		3796	$ROOT->on_refresh (reorder => sub {
3016	$self->reorder;	3797	$self->reorder;
		3798	});
3017	}	3799	}
3018		3800
3019	sub reconfigure {	3801	sub reconfigure {
3020	my ($self) = @_;	3802	my ($self) = @_;
3021		3803
…		…
3024		3806
3025	$self->reorder;	3807	$self->reorder;
3026	$self->SUPER::reconfigure;	3808	$self->SUPER::reconfigure;
3027	}	3809	}
3028		3810
		3811	sub destroy {
		3812	my ($self) = @_;
		3813
		3814	$self->{timer}->cancel;
		3815
		3816	$self->SUPER::destroy;
		3817	}
		3818
3029	#############################################################################	3819	#############################################################################
3030		3820
3031	package CFClient::UI::Root;	3821	package CFPlus::UI::Root;
3032		3822
3033	our @ISA = CFClient::UI::Container::;	3823	our @ISA = CFPlus::UI::Container::;
3034		3824
		3825	use List::Util qw(min max);
		3826
3035	use CFClient::OpenGL;	3827	use CFPlus::OpenGL;
3036		3828
3037	sub new {	3829	sub new {
3038	my $class = shift;	3830	my $class = shift;
3039		3831
3040	$class->SUPER::new (	3832	my $self = $class->SUPER::new (
		3833	visible => 1,
3041	@_,	3834	@_,
3042	)	3835	);
3043	}
3044		3836
3045	sub configure {	3837	CFPlus::weaken ($self->{root} = $self);
3046	my ($self, $x, $y, $w, $h) = @_;
3047		3838
3048	$self->{w} = $w;	3839	$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	}	3840	}
3058		3841
3059	sub size_request {	3842	sub size_request {
3060	my ($self) = @_;	3843	my ($self) = @_;
3061		3844
3062	($self->{w}, $self->{h})	3845	($self->{w}, $self->{h})
3063	}	3846	}
3064		3847
		3848	sub _to_pixel {
		3849	my ($coord, $size, $max) = @_;
		3850
		3851	$coord =
		3852	$coord eq "center" ? ($max - $size) * 0.5
		3853	: $coord eq "max" ? $max
		3854	: $coord;
		3855
		3856	$coord = 0 if $coord < 0;
		3857	$coord = $max - $size if $coord > $max - $size;
		3858
		3859	int $coord + 0.5
		3860	}
		3861
3065	sub size_allocate {	3862	sub invoke_size_allocate {
3066	my ($self, $w, $h) = @_;	3863	my ($self, $w, $h) = @_;
3067		3864
3068	for my $child ($self->children) {	3865	for my $child ($self->children) {
3069	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3866	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3070		3867
3071	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3868	$X = $child->{force_x} if exists $child->{force_x};
3072	if exists $child->{req_x};	3869	$Y = $child->{force_y} if exists $child->{force_y};
3073		3870
3074	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3871	$X = _to_pixel $X, $W, $self->{w};
3075	if exists $child->{req_y};	3872	$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		3873
3080	$child->configure ($X, $Y, $W, $H);	3874	$child->configure ($X, $Y, $W, $H);
3081	}	3875	}
		3876
		3877	1
3082	}	3878	}
3083		3879
3084	sub coord2local {	3880	sub coord2local {
3085	my ($self, $x, $y) = @_;	3881	my ($self, $x, $y) = @_;
3086		3882
…		…
3094	}	3890	}
3095		3891
3096	sub update {	3892	sub update {
3097	my ($self) = @_;	3893	my ($self) = @_;
3098		3894
3099	$self->check_size;
3100	$::WANT_REFRESH++;	3895	$::WANT_REFRESH++;
3101	}	3896	}
3102		3897
3103	sub add {	3898	sub add {
3104	my ($self, @children) = @_;	3899	my ($self, @children) = @_;
3105		3900
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;	3901	$_->{is_toplevel} = 1
3114		3902	for @children;
3115	# integerise window positions
3116	$child->{x} = int $child->{x};
3117	$child->{y} = int $child->{y};
3118	}
3119		3903
3120	$self->SUPER::add (@children);	3904	$self->SUPER::add (@children);
3121	}	3905	}
3122		3906
3123	sub remove {	3907	sub remove {
3124	my ($self, @children) = @_;	3908	my ($self, @children) = @_;
3125		3909
3126	$self->SUPER::remove (@children);	3910	$self->SUPER::remove (@children);
		3911
		3912	delete $self->{is_toplevel}
		3913	for @children;
3127		3914
3128	while (@children) {	3915	while (@children) {
3129	my $w = pop @children;	3916	my $w = pop @children;
3130	push @children, $w->children;	3917	push @children, $w->children;
3131	$w->set_invisible;	3918	$w->set_invisible;
…		…
3150	while ($self->{refresh_hook}) {	3937	while ($self->{refresh_hook}) {
3151	$_->()	3938	$_->()
3152	for values %{delete $self->{refresh_hook}};	3939	for values %{delete $self->{refresh_hook}};
3153	}	3940	}
3154		3941
3155	if ($self->{check_size}) {	3942	if ($self->{realloc}) {
3156	my @queue = ([], []);	3943	my %queue;
		3944	my @queue;
		3945	my $widget;
3157		3946
3158	for (;;) {	3947	outer:
3159	if ($self->{check_size}) {	3948	while () {
3160	# heuristic: check containers last	3949	if (my $realloc = delete $self->{realloc}) {
3161	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3950	for $widget (values %$realloc) {
3162	for values %{delete $self->{check_size}}	3951	$widget->{visible} or next; # do not resize invisible widgets
		3952
		3953	$queue{$widget+0}++ and next; # duplicates are common
		3954
		3955	push @{ $queue[$widget->{visible}] }, $widget;
		3956	}
3163	}	3957	}
3164		3958
3165	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3959	while () {
		3960	@queue or last outer;
3166		3961
3167	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3962	$widget = pop @{ $queue[-1] || [] }
3168	? @$widget{qw(user_w user_h)}	3963	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		3964
		3965	pop @queue;
		3966	}
		3967
		3968	delete $queue{$widget+0};
		3969
		3970	my ($w, $h) = $widget->size_request;
		3971
		3972	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3973	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3974
		3975	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3976	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3977
		3978	$w = $widget->{force_w} if exists $widget->{force_w};
		3979	$h = $widget->{force_h} if exists $widget->{force_h};
		3980
		3981	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3982	|| delete $widget->{force_realloc}) {
3175	$widget->{req_w} = $w;	3983	$widget->{req_w} = $w;
3176	$widget->{req_h} = $h;	3984	$widget->{req_h} = $h;
3177		3985
3178	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3986	$self->{size_alloc}{$widget+0} = $widget;
3179		3987
3180	$widget->{parent}->check_size
3181	if $widget->{parent};	3988	if (my $parent = $widget->{parent}) {
		3989	$self->{realloc}{$parent+0} = $parent
		3990	unless $queue{$parent+0};
		3991
		3992	$parent->{force_size_alloc} = 1;
		3993	$self->{size_alloc}{$parent+0} = $parent;
		3994	}
3182	}	3995	}
		3996
		3997	delete $self->{realloc}{$widget+0};
3183	}	3998	}
3184	}	3999	}
3185		4000
3186	while ($self->{size_alloc}) {	4001	while (my $size_alloc = delete $self->{size_alloc}) {
3187	for (values %{delete $self->{size_alloc}}) {	4002	my @queue = sort { $b->{visible} <=> $a->{visible} }
3188	my ($widget, $w, $h) = @$_;	4003	values %$size_alloc;
		4004
		4005	while () {
		4006	my $widget = pop @queue || last;
		4007
		4008	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3189		4009
3190	$w = 0 if $w < 0;	4010	$w = 0 if $w < 0;
3191	$h = 0 if $h < 0;	4011	$h = 0 if $h < 0;
3192		4012
		4013	$w = max $widget->{min_w}, $w;
		4014	$h = max $widget->{min_h}, $h;
		4015
		4016	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4017	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4018
		4019	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4020	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4021
		4022	$w = int $w + 0.5;
		4023	$h = int $h + 0.5;
		4024
		4025	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		4026	$widget->{old_w} = $widget->{w};
		4027	$widget->{old_h} = $widget->{h};
		4028
3193	$widget->{w} = $w;	4029	$widget->{w} = $w;
3194	$widget->{h} = $h;	4030	$widget->{h} = $h;
		4031
3195	$widget->emit (size_allocate => $w, $h);	4032	$widget->emit (size_allocate => $w, $h);
		4033	}
3196	}	4034	}
3197	}	4035	}
3198		4036
3199	while ($self->{post_alloc_hook}) {	4037	while ($self->{post_alloc_hook}) {
3200	$_->()	4038	$_->()
3201	for values %{delete $self->{post_alloc_hook}};	4039	for values %{delete $self->{post_alloc_hook}};
3202	}	4040	}
		4041
3203		4042
3204	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4043	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3205	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4044	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3206	glClear GL_COLOR_BUFFER_BIT;	4045	glClear GL_COLOR_BUFFER_BIT;
3207		4046
…		…
3209	glLoadIdentity;	4048	glLoadIdentity;
3210	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4049	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3211	glMatrixMode GL_MODELVIEW;	4050	glMatrixMode GL_MODELVIEW;
3212	glLoadIdentity;	4051	glLoadIdentity;
3213		4052
		4053	{
		4054	package CFPlus::UI::Base;
		4055
		4056	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		4057	(0, 0, $self->{w}, $self->{h});
		4058
3214	$self->_draw;	4059	$self->_draw;
		4060	}
3215	}	4061	}
3216		4062
3217	#############################################################################	4063	#############################################################################
3218		4064
3219	package CFClient::UI;	4065	package CFPlus::UI;
3220		4066
3221	$ROOT = new CFClient::UI::Root;	4067	$ROOT = new CFPlus::UI::Root;
3222	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4068	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3223		4069
3224	1	4070	1
3225		4071

Diff Legend

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