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

Diff Legend

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