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.268 by root, Thu Jun 1 05:04:41 2006 UTC vs.
Revision 1.404 by root, Sat Jul 21 22:54:52 2007 UTC

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

Diff Legend

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