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.254 by root, Mon May 29 01:53:23 2006 UTC vs.
Revision 1.379 by root, Tue Jul 17 12:04:18 2007 UTC

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

Diff Legend

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