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.282 by root, Mon Jun 5 02:25:10 2006 UTC vs.
Revision 1.344 by root, Sun Aug 13 16:29:36 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 {
…		…
397		420
398	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
399		422
400	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
401		424
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
404	CFClient::UI::check_tooltip;	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	428	}
406	}	429	}
407		430
408	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
409	sub coord2local {	432	sub coord2local {
410	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
411		434
		435	Carp::confess unless $self->{parent};#d#
		436
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	438	}
414		439
415	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
416	sub coord2global {	441	sub coord2global {
417	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
418		443
		444	Carp::confess unless $self->{parent};#d#
		445
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	447	}
421		448
422	sub focus_in {	449	sub invoke_focus_in {
423	my ($self) = @_;	450	my ($self) = @_;
424		451
425	return if $FOCUS == $self;	452	return if $FOCUS == $self;
426	return unless $self->{can_focus};	453	return unless $self->{can_focus};
427		454
428	my $focus = $FOCUS; $FOCUS = $self;	455	$FOCUS = $self;
429		456
430	$self->_emit (focus_in => $focus);	457	$self->update;
431		458
432	$focus->update if $focus;	459	0
433	$FOCUS->update;
434	}	460	}
435		461
436	sub focus_out {	462	sub invoke_focus_out {
437	my ($self) = @_;	463	my ($self) = @_;
438		464
439	return unless $FOCUS == $self;	465	return unless $FOCUS == $self;
440		466
441	my $focus = $FOCUS; undef $FOCUS;	467	undef $FOCUS;
442		468
443	$self->_emit (focus_out => $focus);	469	$self->update;
444		470
445	$focus->update if $focus; #?
446
447	$::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
448	unless $FOCUS;	472	unless $FOCUS;
449	}
450		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
451	sub mouse_motion { 0 }	484	sub invoke_mouse_motion { 0 }
452	sub button_up { 0 }	485	sub invoke_button_up { 0 }
453	sub key_down { 0 }	486	sub invoke_key_down { 0 }
454	sub key_up { 0 }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
455		489
456	sub button_down {	490	sub invoke_button_down {
457	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
458		492
459	$self->focus_in;	493	$self->grab_focus;
460		494
461	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 dislike duplication
		520	# and needlessly verbose code, too.
		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
462	}	532	}
463		533
464	sub find_widget {	534	sub find_widget {
465	my ($self, $x, $y) = @_;	535	my ($self, $x, $y) = @_;
466		536
…		…
476	sub set_parent {	546	sub set_parent {
477	my ($self, $parent) = @_;	547	my ($self, $parent) = @_;
478		548
479	Scalar::Util::weaken ($self->{parent} = $parent);	549	Scalar::Util::weaken ($self->{parent} = $parent);
480	$self->set_visible if $parent->{visible};	550	$self->set_visible if $parent->{visible};
481	}
482
483	sub connect {
484	my ($self, $signal, $cb) = @_;
485
486	push @{ $self->{signal_cb}{$signal} }, $cb;
487	}
488
489	sub _emit {
490	my ($self, $signal, @args) = @_;
491
492	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493	}
494
495	sub emit {
496	my ($self, $signal, @args) = @_;
497
498	$self->_emit ($signal, @args)
499	|| $self->$signal (@args);
500	}
501
502	sub visibility_change {
503	#my ($self, $visible) = @_;
504	}	551	}
505		552
506	sub realloc {	553	sub realloc {
507	my ($self) = @_;	554	my ($self) = @_;
508		555
…		…
541	return unless $self->{h} && $self->{w};	588	return unless $self->{h} && $self->{w};
542		589
543	# update screen rectangle	590	# update screen rectangle
544	local $draw_x = $draw_x + $self->{x};	591	local $draw_x = $draw_x + $self->{x};
545	local $draw_y = $draw_y + $self->{y};	592	local $draw_y = $draw_y + $self->{y};
546	local $draw_w = $draw_x + $self->{w};
547	local $draw_h = $draw_y + $self->{h};
548		593
549	# skip widgets that are entirely outside the drawing area	594	# skip widgets that are entirely outside the drawing area
550	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	595	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	596	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
552		597
…		…
575	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
576	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
577	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
578	glEnd;	623	glEnd;
579	glPopMatrix;	624	glPopMatrix;
580	#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;
581	}	626	}
582		627
583	$self->_draw;	628	$self->_draw;
584	glPopMatrix;	629	glPopMatrix;
585	}	630	}
…		…
591	}	636	}
592		637
593	sub DESTROY {	638	sub DESTROY {
594	my ($self) = @_;	639	my ($self) = @_;
595		640
		641	return if CFPlus::in_destruct;
		642
596	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
597	#$self->deactivate;	644
		645	eval { $self->destroy };
		646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598	}	647	}
599		648
600	#############################################################################	649	#############################################################################
601		650
602	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
603		652
604	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
605		654
606	use strict;	655	use strict;
607	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
608		657
609	sub new {	658	sub new {
610	my $class = shift;	659	my $class = shift;
611		660
612	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
643	}	692	}
644	}	693	}
645		694
646	#############################################################################	695	#############################################################################
647		696
648	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
649		698
650	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
651		700
652	sub new {	701	sub new {
653	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
654	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
655	}	704	}
…		…
662		711
663	sub draw { }	712	sub draw { }
664		713
665	#############################################################################	714	#############################################################################
666		715
667	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
668		717
669	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
670		719
671	sub new {	720	sub new {
672	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
673		722
674	my $children = delete $arg{children};	723	my $children = delete $arg{children};
…		…
683	if $children;	732	if $children;
684		733
685	$self	734	$self
686	}	735	}
687		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
688	sub add {	745	sub add {
689	my ($self, @widgets) = @_;	746	my ($self, @widgets) = @_;
690		747
691	$_->set_parent ($self)	748	$_->set_parent ($self)
692	for @widgets;	749	for @widgets;
…		…
752	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
753	}	810	}
754		811
755	#############################################################################	812	#############################################################################
756		813
757	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
758		815
759	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
760		817
761	sub new {	818	sub new {
762	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
763		820
764	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765		822
766	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
767	}	824	}
768		825
769	sub add {	826	sub add {
770	my ($self, $child) = @_;	827	my ($self, $child) = @_;
771		828
772	$self->{children} = [];	829	$self->SUPER::remove ($_) for @{ $self->{children} };
773
774	$self->SUPER::add ($child);	830	$self->SUPER::add ($child);
775	}	831	}
776		832
777	sub remove {	833	sub remove {
778	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
779		835
780	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
781		837
782	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
783	unless @{$self->{children}};	839	unless @{$self->{children}};
784	}	840	}
785		841
786	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
787		843
788	sub size_request {	844	sub size_request {
789	$_[0]{children}[0]->size_request	845	$_[0]{children}[0]->size_request
790	}	846	}
791		847
792	sub size_allocate {	848	sub invoke_size_allocate {
793	my ($self, $w, $h) = @_;	849	my ($self, $w, $h) = @_;
794		850
795	$self->{children}[0]->configure (0, 0, $w, $h);	851	$self->{children}[0]->configure (0, 0, $w, $h);
		852
		853	1
796	}	854	}
797		855
798	#############################################################################	856	#############################################################################
799		857
800	# back-buffered drawing area	858	# back-buffered drawing area
801		859
802	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
803		861
804	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
805		863
806	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
807		865
808	sub new {	866	sub new {
809	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
810		868
811	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
816		874
817	$ROOT->on_post_alloc ($self => sub { $self->render_child });	875	$ROOT->on_post_alloc ($self => sub { $self->render_child });
818	$self->SUPER::update;	876	$self->SUPER::update;
819	}	877	}
820		878
821	sub size_allocate {	879	sub invoke_size_allocate {
822	my ($self, $w, $h) = @_;	880	my ($self, $w, $h) = @_;
823		881
824	$self->SUPER::size_allocate ($w, $h);
825	$self->update;	882	$self->update;
		883
		884	$self->SUPER::invoke_size_allocate ($w, $h)
826	}	885	}
827		886
828	sub _render {	887	sub _render {
829	my ($self) = @_;	888	my ($self) = @_;
830		889
…		…
832	}	891	}
833		892
834	sub render_child {	893	sub render_child {
835	my ($self) = @_;	894	my ($self) = @_;
836		895
837	$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 {
838	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
840		899
841	{	900	{
842	package CFClient::UI::Base;	901	package CFPlus::UI::Base;
843		902
844	($draw_x, $draw_y, $draw_w, $draw_h) =	903	($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
846	}	905	}
847		906
…		…
850	}	909	}
851		910
852	sub _draw {	911	sub _draw {
853	my ($self) = @_;	912	my ($self) = @_;
854		913
855	my ($w, $h) = @$self{qw(w h)};
856
857	my $tex = $self->{texture}	914	my $tex = $self->{texture}
858	or return;	915	or return;
859		916
860	glEnable GL_TEXTURE_2D;	917	glEnable GL_TEXTURE_2D;
861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862	glColor 0, 0, 0, 1;	919	glColor 0, 0, 0, 1;
863		920
864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	921	$tex->draw_quad_alpha_premultiplied (0, 0);
865		922
866	glDisable GL_TEXTURE_2D;	923	glDisable GL_TEXTURE_2D;
867	}	924	}
868		925
869	#############################################################################	926	#############################################################################
870		927
871	package CFClient::UI::ViewPort;	928	package CFPlus::UI::ViewPort;
872		929
873	our @ISA = CFClient::UI::Window::;	930	our @ISA = CFPlus::UI::Window::;
874		931
875	sub new {	932	sub new {
876	my $class = shift;	933	my $class = shift;
877		934
878	$class->SUPER::new (	935	$class->SUPER::new (
…		…
891	$h = 10 if $self->{scroll_y};	948	$h = 10 if $self->{scroll_y};
892		949
893	($w, $h)	950	($w, $h)
894	}	951	}
895		952
896	sub size_allocate {	953	sub invoke_size_allocate {
897	my ($self, $w, $h) = @_;	954	my ($self, $w, $h) = @_;
898		955
899	my $child = $self->child;	956	my $child = $self->child;
900		957
901	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	958	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	959	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903		960
904	$self->child->configure (0, 0, $w, $h);	961	$self->child->configure (0, 0, $w, $h);
905	$self->update;	962	$self->update;
		963
		964	1
906	}	965	}
907		966
908	sub set_offset {	967	sub set_offset {
909	my ($self, $x, $y) = @_;	968	my ($self, $x, $y) = @_;
910		969
…		…
936	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
938	) {	997	) {
939	$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})
940	} else {	999	} else {
941	$self->CFClient::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
942	}	1001	}
943	}	1002	}
944		1003
945	sub _render {	1004	sub _render {
946	my ($self) = @_;	1005	my ($self) = @_;
947		1006
948	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};
949	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};
950		1009
951	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1010	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952		1011
953	$self->SUPER::_render;	1012	$self->SUPER::_render;
954	}	1013	}
955		1014
956	#############################################################################	1015	#############################################################################
957		1016
958	package CFClient::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
959		1018
960	our @ISA = CFClient::UI::HBox::;	1019	our @ISA = CFPlus::UI::HBox::;
961		1020
962	sub new {	1021	sub new {
963	my ($class, %arg) = @_;	1022	my ($class, %arg) = @_;
964		1023
965	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
966		1025
967	my $self;	1026	my $self;
968		1027
969	my $slider = new CFClient::UI::Slider	1028	my $slider = new CFPlus::UI::Slider
970	vertical => 1,	1029	vertical => 1,
971	range => [0, 0, 1, 0.01], # HACK fix	1030	range => [0, 0, 1, 0.01], # HACK fix
972	on_changed => sub {	1031	on_changed => sub {
973	$self->{vp}->set_offset (0, $_[1]);	1032	$self->{vp}->set_offset (0, $_[1]);
974	},	1033	},
975	;	1034	;
976		1035
977	$self = $class->SUPER::new (	1036	$self = $class->SUPER::new (
978	vp => (new CFClient::UI::ViewPort expand => 1),	1037	vp => (new CFPlus::UI::ViewPort expand => 1),
		1038	can_events => 1,
979	slider => $slider,	1039	slider => $slider,
980	%arg,	1040	%arg,
981	);	1041	);
982		1042
983	$self->SUPER::add ($self->{vp}, $self->{slider});	1043	$self->SUPER::add ($self->{vp}, $self->{slider});
984	$self->add ($child) if $child;	1044	$self->add ($child) if $child;
985		1045
986	$self	1046	$self
987	}	1047	}
988		1048
		1049	#TODO# update range on size_allocate depending on child
		1050
989	sub add {	1051	sub add {
990	my ($self, $widget) = @_;	1052	my ($self, $widget) = @_;
991		1053
992	$self->{vp}->add ($self->{child} = $widget);	1054	$self->{vp}->add ($self->{child} = $widget);
993	}	1055	}
994		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
995	sub update {	1073	sub update {
996	my ($self) = @_;	1074	my ($self) = @_;
997		1075
998	$self->SUPER::update;	1076	$self->SUPER::update;
999		1077
1000	# todo: overwrite size_allocate of child	1078	$self->update_slider;
1001	my $child = $self->{vp}->child;
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003	}	1079	}
1004		1080
1005	sub size_allocate {	1081	sub invoke_size_allocate {
1006	my ($self, $w, $h) = @_;	1082	my ($self, $w, $h) = @_;
1007		1083
		1084	$self->update_slider;
		1085
1008	$self->SUPER::size_allocate ($w, $h);	1086	$self->SUPER::invoke_size_allocate ($w, $h)
1009
1010	my $child = $self->{vp}->child;
1011	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012	}	1087	}
1013
1014	#TODO# update range on size_allocate depending on child
1015	# update viewport offset on scroll
1016		1088
1017	#############################################################################	1089	#############################################################################
1018		1090
1019	package CFClient::UI::Frame;	1091	package CFPlus::UI::Frame;
1020		1092
1021	our @ISA = CFClient::UI::Bin::;	1093	our @ISA = CFPlus::UI::Bin::;
1022		1094
1023	use CFClient::OpenGL;	1095	use CFPlus::OpenGL;
1024		1096
1025	sub new {	1097	sub new {
1026	my $class = shift;	1098	my $class = shift;
1027		1099
1028	$class->SUPER::new (	1100	$class->SUPER::new (
…		…
1054	$self->SUPER::_draw;	1126	$self->SUPER::_draw;
1055	}	1127	}
1056		1128
1057	#############################################################################	1129	#############################################################################
1058		1130
1059	package CFClient::UI::FancyFrame;	1131	package CFPlus::UI::FancyFrame;
1060		1132
1061	our @ISA = CFClient::UI::Bin::;	1133	our @ISA = CFPlus::UI::Bin::;
1062		1134
1063	use CFClient::OpenGL;	1135	use CFPlus::OpenGL;
1064		1136
1065	my $bg =	1137	my $bg =
1066	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1138	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067	mipmap => 1, wrap => 1;	1139	mipmap => 1, wrap => 1;
1068		1140
1069	my @border =	1141	my @border =
1070	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1142	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1071	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1143	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072		1144
1073	sub new {	1145	sub new {
1074	my ($class, %arg) = @_;	1146	my ($class, %arg) = @_;
1075
1076	my $title = delete $arg{title};
1077		1147
1078	my $self = $class->SUPER::new (	1148	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1149	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1150	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1151	border => 0.6,
1082	can_events => 1,	1152	can_events => 1,
1083	min_w => 16,	1153	min_w => 64,
1084	min_h => 16,	1154	min_h => 32,
1085	%arg,	1155	%arg,
1086	);	1156	);
1087		1157
1088	$self->{title} = new CFClient::UI::Label	1158	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1159	align => 0,
1090	valign => 1,	1160	valign => 1,
1091	text => $title,	1161	text => $self->{title},
1092	fontsize => $self->{border}	1162	fontsize => $self->{border},
1093	if defined $title;	1163	if exists $self->{title};
		1164
		1165	if ($self->{has_close_button}) {
		1166	$self->{close_button} =
		1167	new CFPlus::UI::ImageButton
		1168	path => 'x1_close.png',
		1169	on_activate => sub { $self->emit ("delete") };
		1170
		1171	$self->CFPlus::UI::Container::add ($self->{close_button});
		1172	}
1094		1173
1095	$self	1174	$self
1096	}	1175	}
1097		1176
1098	sub add {	1177	sub add {
1099	my ($self, @widgets) = @_;	1178	my ($self, @widgets) = @_;
1100		1179
1101	$self->SUPER::add (@widgets);	1180	$self->SUPER::add (@widgets);
		1181	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1182	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103	}	1183	}
1104		1184
1105	sub border {	1185	sub border {
1106	int $_[0]{border} * $::FONTSIZE	1186	int $_[0]{border} * $::FONTSIZE
1107	}	1187	}
1108		1188
1109	sub size_request {	1189	sub size_request {
1110	my ($self) = @_;	1190	my ($self) = @_;
1111		1191
1112	$self->{title}->size_request	1192	$self->{title_widget}->size_request
1113	if $self->{title};	1193	if $self->{title_widget};
		1194
		1195	$self->{close_button}->size_request
		1196	if $self->{close_button};
1114		1197
1115	my ($w, $h) = $self->SUPER::size_request;	1198	my ($w, $h) = $self->SUPER::size_request;
1116		1199
1117	(	1200	(
1118	$w + $self->border * 2,	1201	$w + $self->border * 2,
1119	$h + $self->border * 2,	1202	$h + $self->border * 2,
1120	)	1203	)
1121	}	1204	}
1122		1205
1123	sub size_allocate {	1206	sub invoke_size_allocate {
1124	my ($self, $w, $h) = @_;	1207	my ($self, $w, $h) = @_;
1125		1208
1126	if ($self->{title}) {	1209	if ($self->{title_widget}) {
1127	$self->{title}{w} = $w;	1210	$self->{title_widget}{w} = $w;
1128	$self->{title}{h} = $h;	1211	$self->{title_widget}{h} = $h;
1129	$self->{title}->size_allocate ($w, $h);	1212	$self->{title_widget}->invoke_size_allocate ($w, $h);
1130	}	1213	}
1131		1214
1132	my $border = $self->border;	1215	my $border = $self->border;
1133		1216
1134	$h -= List::Util::max 0, $border * 2;	1217	$h -= List::Util::max 0, $border * 2;
1135	$w -= List::Util::max 0, $border * 2;	1218	$w -= List::Util::max 0, $border * 2;
		1219
		1220	$self->child->configure ($border, $border, $w, $h);
		1221
		1222	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1223	if $self->{close_button};
		1224
		1225	1
		1226	}
		1227
		1228	sub invoke_delete {
		1229	my ($self) = @_;
		1230
		1231	$self->hide;
1136		1232
1137	$self->child->configure ($border, $border, $w, $h);	1233	1
1138	}	1234	}
1139		1235
1140	sub button_down {	1236	sub invoke_button_down {
1141	my ($self, $ev, $x, $y) = @_;	1237	my ($self, $ev, $x, $y) = @_;
1142		1238
1143	my ($w, $h) = @$self{qw(w h)};	1239	my ($w, $h) = @$self{qw(w h)};
1144	my $border = $self->border;	1240	my $border = $self->border;
1145		1241
…		…
1176		1272
1177	($x, $y) = ($ev->{x}, $ev->{y});	1273	($x, $y) = ($ev->{x}, $ev->{y});
1178		1274
1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1275	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180	# HACK: the next line is required to enforce placement	1276	# HACK: the next line is required to enforce placement
1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1277	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182	};	1278	};
1183	} else {	1279	} else {
1184	return 0;	1280	return 0;
1185	}	1281	}
1186		1282
1187	1	1283	1
1188	}	1284	}
1189		1285
1190	sub button_up {	1286	sub invoke_button_up {
1191	my ($self, $ev, $x, $y) = @_;	1287	my ($self, $ev, $x, $y) = @_;
1192		1288
1193	!!delete $self->{motion}	1289	! ! delete $self->{motion}
1194	}	1290	}
1195		1291
1196	sub mouse_motion {	1292	sub invoke_mouse_motion {
1197	my ($self, $ev, $x, $y) = @_;	1293	my ($self, $ev, $x, $y) = @_;
1198		1294
1199	$self->{motion}->($ev, $x, $y) if $self->{motion};	1295	$self->{motion}->($ev, $x, $y) if $self->{motion};
1200		1296
1201	!!$self->{motion}	1297	! ! $self->{motion}
		1298	}
		1299
		1300	sub invoke_visibility_change {
		1301	my ($self, $visible) = @_;
		1302
		1303	delete $self->{motion} unless $visible;
		1304
		1305	0
1202	}	1306	}
1203		1307
1204	sub _draw {	1308	sub _draw {
1205	my ($self) = @_;	1309	my ($self) = @_;
1206		1310
…		…
1232		1336
1233	glDisable GL_TEXTURE_2D;	1337	glDisable GL_TEXTURE_2D;
1234		1338
1235	$child->draw;	1339	$child->draw;
1236		1340
1237	if ($self->{title}) {	1341	if ($self->{title_widget}) {
1238	glTranslate 0, $border - $self->{h};	1342	glTranslate 0, $border - $self->{h};
1239	$self->{title}->_draw;	1343	$self->{title_widget}->_draw;
		1344
		1345	glTranslate 0, - ($border - $self->{h});
1240	}	1346	}
		1347
		1348	$self->{close_button}->draw
		1349	if $self->{close_button};
1241	}	1350	}
1242		1351
1243	#############################################################################	1352	#############################################################################
1244		1353
1245	package CFClient::UI::Table;	1354	package CFPlus::UI::Table;
1246		1355
1247	our @ISA = CFClient::UI::Base::;	1356	our @ISA = CFPlus::UI::Base::;
1248		1357
1249	use List::Util qw(max sum);	1358	use List::Util qw(max sum);
1250		1359
1251	use CFClient::OpenGL;	1360	use CFPlus::OpenGL;
1252		1361
1253	sub new {	1362	sub new {
1254	my $class = shift;	1363	my $class = shift;
1255		1364
1256	$class->SUPER::new (	1365	$class->SUPER::new (
…		…
1262	sub children {	1371	sub children {
1263	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1372	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264	}	1373	}
1265		1374
1266	sub add {	1375	sub add {
1267	my ($self, $x, $y, $child) = @_;	1376	my ($self) = shift;
1268		1377
		1378	while (@_) {
		1379	my ($x, $y, $child) = splice @_, 0, 3, ();
1269	$child->set_parent ($self);	1380	$child->set_parent ($self);
1270	$self->{children}[$y][$x] = $child;	1381	$self->{children}[$y][$x] = $child;
		1382	}
1271		1383
		1384	$self->{force_realloc} = 1;
		1385	$self->{force_size_alloc} = 1;
1272	$self->realloc;	1386	$self->realloc;
		1387	}
		1388
		1389	sub remove {
		1390	my ($self, $child) = @_;
		1391
		1392	# TODO: not yet implemented
1273	}	1393	}
1274		1394
1275	# TODO: move to container class maybe? send children a signal on removal?	1395	# TODO: move to container class maybe? send children a signal on removal?
1276	sub clear {	1396	sub clear {
1277	my ($self) = @_;	1397	my ($self) = @_;
…		…
1318	(sum @$ws),	1438	(sum @$ws),
1319	(sum @$hs),	1439	(sum @$hs),
1320	)	1440	)
1321	}	1441	}
1322		1442
1323	sub size_allocate {	1443	sub invoke_size_allocate {
1324	my ($self, $w, $h) = @_;	1444	my ($self, $w, $h) = @_;
1325		1445
1326	my ($ws, $hs) = $self->get_wh;	1446	my ($ws, $hs) = $self->get_wh;
1327		1447
1328	my $req_w = (sum @$ws) || 1;	1448	my $req_w = (sum @$ws) || 1;
…		…
1335		1455
1336	# linearly scale sizes	1456	# linearly scale sizes
1337	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1457	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1338	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1458	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1339		1459
1340	CFClient::UI::harmonize $ws;	1460	CFPlus::UI::harmonize $ws;
1341	CFClient::UI::harmonize $hs;	1461	CFPlus::UI::harmonize $hs;
1342		1462
1343	my $y;	1463	my $y;
1344		1464
1345	for my $r (0 .. $#{$self->{children}}) {	1465	for my $r (0 .. $#{$self->{children}}) {
1346	my $row = $self->{children}[$r]	1466	my $row = $self->{children}[$r]
…		…
1360	}	1480	}
1361		1481
1362	$y += $row_h;	1482	$y += $row_h;
1363	}	1483	}
1364		1484
		1485	1
1365	}	1486	}
1366		1487
1367	sub find_widget {	1488	sub find_widget {
1368	my ($self, $x, $y) = @_;	1489	my ($self, $x, $y) = @_;
1369		1490
…		…
1388	}	1509	}
1389	}	1510	}
1390		1511
1391	#############################################################################	1512	#############################################################################
1392		1513
1393	package CFClient::UI::Box;	1514	package CFPlus::UI::Box;
1394		1515
1395	our @ISA = CFClient::UI::Container::;	1516	our @ISA = CFPlus::UI::Container::;
1396		1517
1397	sub size_request {	1518	sub size_request {
1398	my ($self) = @_;	1519	my ($self) = @_;
1399		1520
1400	$self->{vertical}	1521	$self->{vertical}
…		…
1406	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1527	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1528	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1408	)	1529	)
1409	}	1530	}
1410		1531
1411	sub size_allocate {	1532	sub invoke_size_allocate {
1412	my ($self, $w, $h) = @_;	1533	my ($self, $w, $h) = @_;
1413		1534
1414	my $space = $self->{vertical} ? $h : $w;	1535	my $space = $self->{vertical} ? $h : $w;
1415	my $children = $self->{children};	1536	my @children = $self->visible_children;
1416		1537
1417	my @req;	1538	my @req;
1418		1539
1419	if ($self->{homogeneous}) {	1540	if ($self->{homogeneous}) {
1420	@req = ($space / (@$children || 1)) x @$children;	1541	@req = ($space / (@children || 1)) x @children;
1421	} else {	1542	} else {
1422	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1543	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423	my $req = List::Util::sum @req;	1544	my $req = List::Util::sum @req;
1424		1545
1425	if ($req > $space) {	1546	if ($req > $space) {
1426	# ah well, not enough space	1547	# ah well, not enough space
1427	$_ *= $space / $req for @req;	1548	$_ *= $space / $req for @req;
1428	} else {	1549	} else {
1429	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1550	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430		1551
1431	$space = ($space - $req) / $expand; # remaining space to give away	1552	$space = ($space - $req) / $expand; # remaining space to give away
1432		1553
1433	$req[$_] += $space * $children->[$_]{expand}	1554	$req[$_] += $space * $children[$_]{expand}
1434	for 0 .. $#$children;	1555	for 0 .. $#children;
1435	}	1556	}
1436	}	1557	}
1437		1558
1438	CFClient::UI::harmonize \@req;	1559	CFPlus::UI::harmonize \@req;
1439		1560
1440	my $pos = 0;	1561	my $pos = 0;
1441	for (0 .. $#$children) {	1562	for (0 .. $#children) {
1442	my $alloc = $req[$_];	1563	my $alloc = $req[$_];
1443	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1564	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444		1565
1445	$pos += $alloc;	1566	$pos += $alloc;
1446	}	1567	}
1447		1568
1448	1	1569	1
1449	}	1570	}
1450		1571
1451	#############################################################################	1572	#############################################################################
1452		1573
1453	package CFClient::UI::HBox;	1574	package CFPlus::UI::HBox;
1454		1575
1455	our @ISA = CFClient::UI::Box::;	1576	our @ISA = CFPlus::UI::Box::;
1456		1577
1457	sub new {	1578	sub new {
1458	my $class = shift;	1579	my $class = shift;
1459		1580
1460	$class->SUPER::new (	1581	$class->SUPER::new (
…		…
1463	)	1584	)
1464	}	1585	}
1465		1586
1466	#############################################################################	1587	#############################################################################
1467		1588
1468	package CFClient::UI::VBox;	1589	package CFPlus::UI::VBox;
1469		1590
1470	our @ISA = CFClient::UI::Box::;	1591	our @ISA = CFPlus::UI::Box::;
1471		1592
1472	sub new {	1593	sub new {
1473	my $class = shift;	1594	my $class = shift;
1474		1595
1475	$class->SUPER::new (	1596	$class->SUPER::new (
…		…
1478	)	1599	)
1479	}	1600	}
1480		1601
1481	#############################################################################	1602	#############################################################################
1482		1603
1483	package CFClient::UI::Label;	1604	package CFPlus::UI::Label;
1484		1605
1485	our @ISA = CFClient::UI::DrawBG::;	1606	our @ISA = CFPlus::UI::DrawBG::;
1486		1607
1487	use CFClient::OpenGL;	1608	use CFPlus::OpenGL;
1488		1609
1489	sub new {	1610	sub new {
1490	my ($class, %arg) = @_;	1611	my ($class, %arg) = @_;
1491		1612
1492	my $self = $class->SUPER::new (	1613	my $self = $class->SUPER::new (
…		…
1495	#active_bg => none	1616	#active_bg => none
1496	#font => default_font	1617	#font => default_font
1497	#text => initial text	1618	#text => initial text
1498	#markup => initial narkup	1619	#markup => initial narkup
1499	#max_w => maximum pixel width	1620	#max_w => maximum pixel width
		1621	#style => 0, # render flags
1500	ellipsise => 3, # end	1622	ellipsise => 3, # end
1501	layout => (new CFClient::Layout),	1623	layout => (new CFPlus::Layout),
1502	fontsize => 1,	1624	fontsize => 1,
1503	align => -1,	1625	align => -1,
1504	valign => -1,	1626	valign => -1,
1505	padding_x => 2,	1627	padding_x => 2,
1506	padding_y => 2,	1628	padding_y => 2,
1507	can_events => 0,	1629	can_events => 0,
1508	%arg	1630	%arg
1509	);	1631	);
1510		1632
1511	if (exists $self->{template}) {	1633	if (exists $self->{template}) {
1512	my $layout = new CFClient::Layout;	1634	my $layout = new CFPlus::Layout;
1513	$layout->set_text (delete $self->{template});	1635	$layout->set_text (delete $self->{template});
1514	$self->{template} = $layout;	1636	$self->{template} = $layout;
1515	}	1637	}
1516		1638
1517	if (exists $self->{markup}) {	1639	if (exists $self->{markup}) {
…		…
1521	}	1643	}
1522		1644
1523	$self	1645	$self
1524	}	1646	}
1525		1647
1526	sub escape($) {
1527	local $_ = $_[0];
1528
1529	s/&/&amp;/g;
1530	s/>/&gt;/g;
1531	s/</&lt;/g;
1532
1533	$_
1534	}
1535
1536	sub update {	1648	sub update {
1537	my ($self) = @_;	1649	my ($self) = @_;
1538		1650
1539	delete $self->{texture};	1651	delete $self->{texture};
1540	$self->SUPER::update;	1652	$self->SUPER::update;
…		…
1542		1654
1543	sub realloc {	1655	sub realloc {
1544	my ($self) = @_;	1656	my ($self) = @_;
1545		1657
1546	delete $self->{ox};	1658	delete $self->{ox};
1547	delete $self->{req_h};
1548	$self->SUPER::realloc;	1659	$self->SUPER::realloc;
1549	}	1660	}
1550		1661
1551	sub set_text {	1662	sub set_text {
1552	my ($self, $text) = @_;	1663	my ($self, $text) = @_;
1553		1664
1554	return if $self->{text} eq "T$text";	1665	return if $self->{text} eq "T$text";
1555	$self->{text} = "T$text";	1666	$self->{text} = "T$text";
1556		1667
1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558	$self->{layout}->set_text ($text);	1668	$self->{layout}->set_text ($text);
1559		1669
		1670	delete $self->{size_req};
1560	$self->realloc;	1671	$self->realloc;
1561	$self->update;	1672	$self->update;
1562	}	1673	}
1563		1674
1564	sub set_markup {	1675	sub set_markup {
…		…
1567	return if $self->{text} eq "M$markup";	1678	return if $self->{text} eq "M$markup";
1568	$self->{text} = "M$markup";	1679	$self->{text} = "M$markup";
1569		1680
1570	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1681	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571		1682
1572	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1573	$self->{layout}->set_markup ($markup);	1683	$self->{layout}->set_markup ($markup);
1574		1684
		1685	delete $self->{size_req};
1575	$self->realloc;	1686	$self->realloc;
1576	$self->update;	1687	$self->update;
1577	}	1688	}
1578		1689
1579	sub size_request {	1690	sub size_request {
1580	my ($self) = @_;	1691	my ($self) = @_;
1581		1692
1582	if (exists $self->{req_h}) {	1693	$self->{size_req} ||= do {
1583	@$self{qw(req_w req_h)}
1584	} else {
1585	$self->{layout}->set_font ($self->{font}) if $self->{font};	1694	$self->{layout}->set_font ($self->{font}) if $self->{font};
1586	$self->{layout}->set_width ($self->{max_w} || -1);	1695	$self->{layout}->set_width ($self->{max_w} || -1);
1587	$self->{layout}->set_ellipsise ($self->{ellipsise});	1696	$self->{layout}->set_ellipsise ($self->{ellipsise});
1588	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1697	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1589	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1698	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1590		1699
1591	my ($w, $h) = $self->{layout}->size;	1700	my ($w, $h) = $self->{layout}->size;
1592		1701
1593	if (exists $self->{template}) {	1702	if (exists $self->{template}) {
1594	$self->{template}->set_font ($self->{font}) if $self->{font};	1703	$self->{template}->set_font ($self->{font}) if $self->{font};
		1704	$self->{template}->set_width ($self->{max_w} || -1);
1595	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1705	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596		1706
1597	my ($w2, $h2) = $self->{template}->size;	1707	my ($w2, $h2) = $self->{template}->size;
1598		1708
1599	$w = List::Util::max $w, $w2;	1709	$w = List::Util::max $w, $w2;
1600	$h = List::Util::max $h, $h2;	1710	$h = List::Util::max $h, $h2;
1601	}	1711	}
1602		1712
1603	($w, $h)	1713	[$w, $h]
1604	}	1714	};
1605	}
1606		1715
		1716	@{ $self->{size_req} }
		1717	}
		1718
		1719	sub baseline_shift {
		1720	$_[0]{layout}->descent
		1721	}
		1722
1607	sub size_allocate {	1723	sub invoke_size_allocate {
1608	my ($self, $w, $h) = @_;	1724	my ($self, $w, $h) = @_;
1609		1725
1610	delete $self->{ox};	1726	delete $self->{ox};
1611		1727
1612	delete $self->{texture}	1728	delete $self->{texture}
1613	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1729	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1730
		1731	1
1614	}	1732	}
1615		1733
1616	sub set_fontsize {	1734	sub set_fontsize {
1617	my ($self, $fontsize) = @_;	1735	my ($self, $fontsize) = @_;
1618		1736
1619	$self->{fontsize} = $fontsize;	1737	$self->{fontsize} = $fontsize;
		1738	delete $self->{size_req};
1620	delete $self->{texture};	1739	delete $self->{texture};
1621		1740
1622	$self->realloc;	1741	$self->realloc;
1623	}	1742	}
1624		1743
		1744	sub reconfigure {
		1745	my ($self) = @_;
		1746
		1747	delete $self->{size_req};
		1748	delete $self->{texture};
		1749
		1750	$self->SUPER::reconfigure;
		1751	}
		1752
1625	sub _draw {	1753	sub _draw {
1626	my ($self) = @_;	1754	my ($self) = @_;
1627		1755
1628	$self->SUPER::_draw; # draw background, if applicable	1756	$self->SUPER::_draw; # draw background, if applicable
1629		1757
1630	my $tex = $self->{texture} ||= do {	1758	my $size = $self->{texture} ||= do {
1631	$self->{layout}->set_foreground (@{$self->{fg}});	1759	$self->{layout}->set_foreground (@{$self->{fg}});
1632	$self->{layout}->set_font ($self->{font}) if $self->{font};	1760	$self->{layout}->set_font ($self->{font}) if $self->{font};
1633	$self->{layout}->set_width ($self->{w});	1761	$self->{layout}->set_width ($self->{w});
1634	$self->{layout}->set_ellipsise ($self->{ellipsise});	1762	$self->{layout}->set_ellipsise ($self->{ellipsise});
1635	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1763	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1636	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1764	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1637		1765
1638	new_from_layout CFClient::Texture $self->{layout}	1766	[$self->{layout}->size]
1639	};	1767	};
1640		1768
1641	unless (exists $self->{ox}) {	1769	unless (exists $self->{ox}) {
1642	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1770	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1643	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1771	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1644	: ($self->{w} - $tex->{w}) * 0.5);	1772	: ($self->{w} - $size->[0]) * 0.5);
1645		1773
1646	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1774	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1647	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1775	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1648	: ($self->{h} - $tex->{h}) * 0.5);	1776	: ($self->{h} - $size->[1]) * 0.5);
1649	};	1777	};
1650		1778
1651	glEnable GL_TEXTURE_2D;	1779	my $w = List::Util::min $self->{w} + 4, $size->[0];
1652	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1780	my $h = List::Util::min $self->{h} + 2, $size->[1];
1653		1781
1654	glColor_premultiply @{$self->{fg}}	1782	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1655	if $tex->{format} == GL_ALPHA;
1656
1657	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1658
1659	glDisable GL_TEXTURE_2D;
1660	}	1783	}
1661		1784
1662	#############################################################################	1785	#############################################################################
1663		1786
1664	package CFClient::UI::EntryBase;	1787	package CFPlus::UI::EntryBase;
1665		1788
1666	our @ISA = CFClient::UI::Label::;	1789	our @ISA = CFPlus::UI::Label::;
1667		1790
1668	use CFClient::OpenGL;	1791	use CFPlus::OpenGL;
1669		1792
1670	sub new {	1793	sub new {
1671	my $class = shift;	1794	my $class = shift;
1672		1795
1673	$class->SUPER::new (	1796	$class->SUPER::new (
…		…
1678	can_hover => 1,	1801	can_hover => 1,
1679	can_focus => 1,	1802	can_focus => 1,
1680	valign => 0,	1803	valign => 0,
1681	can_events => 1,	1804	can_events => 1,
1682	#text => ...	1805	#text => ...
		1806	#hidden => "*",
1683	@_	1807	@_
1684	)	1808	)
1685	}	1809	}
1686		1810
1687	sub _set_text {	1811	sub _set_text {
…		…
1694	$self->{last_activity} = $::NOW;	1818	$self->{last_activity} = $::NOW;
1695	$self->{text} = $text;	1819	$self->{text} = $text;
1696		1820
1697	$text =~ s/./*/g if $self->{hidden};	1821	$text =~ s/./*/g if $self->{hidden};
1698	$self->{layout}->set_text ("$text ");	1822	$self->{layout}->set_text ("$text ");
		1823	delete $self->{size_req};
1699		1824
1700	$self->_emit (changed => $self->{text});	1825	$self->emit (changed => $self->{text});
		1826
		1827	$self->realloc;
1701	$self->update;	1828	$self->update;
1702	}	1829	}
1703		1830
1704	sub set_text {	1831	sub set_text {
1705	my ($self, $text) = @_;	1832	my ($self, $text) = @_;
1706		1833
1707	$self->{cursor} = length $text;	1834	$self->{cursor} = length $text;
1708	$self->_set_text ($text);	1835	$self->_set_text ($text);
1709
1710	$self->realloc;
1711	}	1836	}
1712		1837
1713	sub get_text {	1838	sub get_text {
1714	$_[0]{text}	1839	$_[0]{text}
1715	}	1840	}
…		…
1720	my ($w, $h) = $self->SUPER::size_request;	1845	my ($w, $h) = $self->SUPER::size_request;
1721		1846
1722	($w + 1, $h) # add 1 for cursor	1847	($w + 1, $h) # add 1 for cursor
1723	}	1848	}
1724		1849
1725	sub key_down {	1850	sub invoke_key_down {
1726	my ($self, $ev) = @_;	1851	my ($self, $ev) = @_;
1727		1852
1728	my $mod = $ev->{mod};	1853	my $mod = $ev->{mod};
1729	my $sym = $ev->{sym};	1854	my $sym = $ev->{sym};
1730	my $uni = $ev->{unicode};	1855	my $uni = $ev->{unicode};
…		…
1733		1858
1734	if ($uni == 8) {	1859	if ($uni == 8) {
1735	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1860	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1736	} elsif ($uni == 127) {	1861	} elsif ($uni == 127) {
1737	substr $text, $self->{cursor}, 1, "";	1862	substr $text, $self->{cursor}, 1, "";
1738	} elsif ($sym == CFClient::SDLK_LEFT) {	1863	} elsif ($sym == CFPlus::SDLK_LEFT) {
1739	--$self->{cursor} if $self->{cursor};	1864	--$self->{cursor} if $self->{cursor};
1740	} elsif ($sym == CFClient::SDLK_RIGHT) {	1865	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1741	++$self->{cursor} if $self->{cursor} < length $self->{text};	1866	++$self->{cursor} if $self->{cursor} < length $self->{text};
1742	} elsif ($sym == CFClient::SDLK_HOME) {	1867	} elsif ($sym == CFPlus::SDLK_HOME) {
1743	$self->{cursor} = 0;	1868	$self->{cursor} = 0;
1744	} elsif ($sym == CFClient::SDLK_END) {	1869	} elsif ($sym == CFPlus::SDLK_END) {
1745	$self->{cursor} = length $text;	1870	$self->{cursor} = length $text;
1746	} elsif ($uni == 27) {	1871	} elsif ($uni == 27) {
1747	$self->_emit ('escape');	1872	$self->emit ('escape');
1748	} elsif ($uni) {	1873	} elsif ($uni) {
1749	substr $text, $self->{cursor}++, 0, chr $uni;	1874	substr $text, $self->{cursor}++, 0, chr $uni;
1750	} else {	1875	} else {
1751	return 0;	1876	return 0;
1752	}	1877	}
…		…
1756	$self->realloc;	1881	$self->realloc;
1757		1882
1758	1	1883	1
1759	}	1884	}
1760		1885
1761	sub focus_in {	1886	sub invoke_focus_in {
1762	my ($self) = @_;	1887	my ($self) = @_;
1763		1888
1764	$self->{last_activity} = $::NOW;	1889	$self->{last_activity} = $::NOW;
1765		1890
1766	$self->SUPER::focus_in;	1891	$self->SUPER::invoke_focus_in
1767	}	1892	}
1768		1893
1769	sub button_down {	1894	sub invoke_button_down {
1770	my ($self, $ev, $x, $y) = @_;	1895	my ($self, $ev, $x, $y) = @_;
1771		1896
1772	$self->SUPER::button_down ($ev, $x, $y);	1897	$self->SUPER::invoke_button_down ($ev, $x, $y);
1773		1898
1774	my $idx = $self->{layout}->xy_to_index ($x, $y);	1899	my $idx = $self->{layout}->xy_to_index ($x, $y);
1775		1900
1776	# byte-index to char-index	1901	# byte-index to char-index
1777	my $text = $self->{text};	1902	my $text = $self->{text};
1778	utf8::encode $text;	1903	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1779	$self->{cursor} = length substr $text, 0, $idx;	1904	$self->{cursor} = length $text;
1780		1905
1781	$self->_set_text ($self->{text});	1906	$self->_set_text ($self->{text});
1782	$self->update;	1907	$self->update;
1783		1908
1784	1	1909	1
1785	}	1910	}
1786		1911
1787	sub mouse_motion {	1912	sub invoke_mouse_motion {
1788	my ($self, $ev, $x, $y) = @_;	1913	my ($self, $ev, $x, $y) = @_;
1789	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1914	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1790		1915
1791	0	1916	1
1792	}	1917	}
1793		1918
1794	sub _draw {	1919	sub _draw {
1795	my ($self) = @_;	1920	my ($self) = @_;
1796		1921
…		…
1823	utf8::encode $text;	1948	utf8::encode $text;
1824		1949
1825	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	1950	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1826	}	1951	}
1827		1952
1828	glColor @{$self->{fg}};
1829	glBegin GL_LINES;	1953	glBegin GL_LINES;
1830	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	1954	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1831	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	1955	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1832	glEnd;	1956	glEnd;
1833	}	1957	}
1834	}	1958	}
1835		1959
1836	package CFClient::UI::Entry;	1960	package CFPlus::UI::Entry;
1837		1961
1838	our @ISA = CFClient::UI::EntryBase::;	1962	our @ISA = CFPlus::UI::EntryBase::;
1839		1963
1840	use CFClient::OpenGL;	1964	use CFPlus::OpenGL;
1841		1965
1842	sub key_down {	1966	sub invoke_key_down {
1843	my ($self, $ev) = @_;	1967	my ($self, $ev) = @_;
1844		1968
1845	my $sym = $ev->{sym};	1969	my $sym = $ev->{sym};
1846		1970
1847	if ($sym == 13) {	1971	if ($sym == 13) {
1848	unshift @{$self->{history}},	1972	unshift @{$self->{history}},
1849	my $txt = $self->get_text;	1973	my $txt = $self->get_text;
		1974
1850	$self->{history_pointer} = -1;	1975	$self->{history_pointer} = -1;
1851	$self->{history_saveback} = '';	1976	$self->{history_saveback} = '';
1852	$self->_emit (activate => $txt);	1977	$self->emit (activate => $txt);
1853	$self->update;	1978	$self->update;
1854		1979
1855	} elsif ($sym == CFClient::SDLK_UP) {	1980	} elsif ($sym == CFPlus::SDLK_UP) {
1856	if ($self->{history_pointer} < 0) {	1981	if ($self->{history_pointer} < 0) {
1857	$self->{history_saveback} = $self->get_text;	1982	$self->{history_saveback} = $self->get_text;
1858	}	1983	}
1859	if (@{$self->{history} || []} > 0) {	1984	if (@{$self->{history} || []} > 0) {
1860	$self->{history_pointer}++;	1985	$self->{history_pointer}++;
…		…
1862	$self->{history_pointer} = @{$self->{history} || []} - 1;	1987	$self->{history_pointer} = @{$self->{history} || []} - 1;
1863	}	1988	}
1864	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1989	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1865	}	1990	}
1866		1991
1867	} elsif ($sym == CFClient::SDLK_DOWN) {	1992	} elsif ($sym == CFPlus::SDLK_DOWN) {
1868	$self->{history_pointer}--;	1993	$self->{history_pointer}--;
1869	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	1994	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1870		1995
1871	if ($self->{history_pointer} >= 0) {	1996	if ($self->{history_pointer} >= 0) {
1872	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1997	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1873	} else {	1998	} else {
1874	$self->set_text ($self->{history_saveback});	1999	$self->set_text ($self->{history_saveback});
1875	}	2000	}
1876		2001
1877	} else {	2002	} else {
1878	return $self->SUPER::key_down ($ev)	2003	return $self->SUPER::invoke_key_down ($ev)
1879	}	2004	}
1880		2005
1881	1	2006	1
1882	}	2007	}
1883		2008
1884	#############################################################################	2009	#############################################################################
1885		2010
1886	package CFClient::UI::Button;	2011	package CFPlus::UI::Button;
1887		2012
1888	our @ISA = CFClient::UI::Label::;	2013	our @ISA = CFPlus::UI::Label::;
1889		2014
1890	use CFClient::OpenGL;	2015	use CFPlus::OpenGL;
1891		2016
1892	my @tex =	2017	my @tex =
1893	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2018	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1894	qw(b1_button_active.png);	2019	qw(b1_button_active.png);
1895		2020
1896	sub new {	2021	sub new {
1897	my $class = shift;	2022	my $class = shift;
1898		2023
…		…
1907	can_events => 1,	2032	can_events => 1,
1908	@_	2033	@_
1909	)	2034	)
1910	}	2035	}
1911		2036
1912	sub activate { }
1913
1914	sub button_up {	2037	sub invoke_button_up {
1915	my ($self, $ev, $x, $y) = @_;	2038	my ($self, $ev, $x, $y) = @_;
1916		2039
1917	$self->emit ("activate")	2040	$self->emit ("activate")
1918	if $x >= 0 && $x < $self->{w}	2041	if $x >= 0 && $x < $self->{w}
1919	&& $y >= 0 && $y < $self->{h};	2042	&& $y >= 0 && $y < $self->{h};
…		…
1937	$self->SUPER::_draw;	2060	$self->SUPER::_draw;
1938	}	2061	}
1939		2062
1940	#############################################################################	2063	#############################################################################
1941		2064
1942	package CFClient::UI::CheckBox;	2065	package CFPlus::UI::CheckBox;
1943		2066
1944	our @ISA = CFClient::UI::DrawBG::;	2067	our @ISA = CFPlus::UI::DrawBG::;
1945		2068
1946	my @tex =	2069	my @tex =
1947	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2070	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2071	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1949		2072
1950	use CFClient::OpenGL;	2073	use CFPlus::OpenGL;
1951		2074
1952	sub new {	2075	sub new {
1953	my $class = shift;	2076	my $class = shift;
1954		2077
1955	$class->SUPER::new (	2078	$class->SUPER::new (
…		…
1969	my ($self) = @_;	2092	my ($self) = @_;
1970		2093
1971	(6) x 2	2094	(6) x 2
1972	}	2095	}
1973		2096
		2097	sub toggle {
		2098	my ($self) = @_;
		2099
		2100	$self->{state} = !$self->{state};
		2101	$self->emit (changed => $self->{state});
		2102	$self->update;
		2103	}
		2104
1974	sub button_down {	2105	sub invoke_button_down {
1975	my ($self, $ev, $x, $y) = @_;	2106	my ($self, $ev, $x, $y) = @_;
1976		2107
1977	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2108	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1978	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2109	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1979	$self->{state} = !$self->{state};	2110	$self->toggle;
1980	$self->_emit (changed => $self->{state});
1981	} else {	2111	} else {
1982	return 0	2112	return 0
1983	}	2113	}
1984		2114
1985	1	2115	1
…		…
2005	glDisable GL_TEXTURE_2D;	2135	glDisable GL_TEXTURE_2D;
2006	}	2136	}
2007		2137
2008	#############################################################################	2138	#############################################################################
2009		2139
2010	package CFClient::UI::Image;	2140	package CFPlus::UI::Image;
2011		2141
2012	our @ISA = CFClient::UI::Base::;	2142	our @ISA = CFPlus::UI::Base::;
2013		2143
2014	use CFClient::OpenGL;	2144	use CFPlus::OpenGL;
2015	use Carp qw/confess/;
2016		2145
2017	our %loaded_images;	2146	our %texture_cache;
2018		2147
2019	sub new {	2148	sub new {
2020	my $class = shift;	2149	my $class = shift;
2021		2150
2022	my $self = $class->SUPER::new (can_events => 0, @_);	2151	my $self = $class->SUPER::new (
		2152	can_events => 0,
		2153	@_,
		2154	);
2023		2155
2024	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2156	$self->{path} || $self->{tex}
		2157	or Carp::croak "'path' or 'tex' attributes required";
2025		2158
2026	$loaded_images{$self->{image}} ||=	2159	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2027	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2160	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2028		2161
2029	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2162	Scalar::Util::weaken $texture_cache{$self->{path}};
2030		2163
2031	Scalar::Util::weaken $loaded_images{$self->{image}};	2164	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2032
2033	$self->{aspect} = $tex->{w} / $tex->{h};
2034		2165
2035	$self	2166	$self
2036	}	2167	}
2037		2168
		2169	sub STORABLE_freeze {
		2170	my ($self, $cloning) = @_;
		2171
		2172	$self->{path}
		2173	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2174
		2175	$self->{path}
		2176	}
		2177
		2178	sub STORABLE_attach {
		2179	my ($self, $cloning, $path) = @_;
		2180
		2181	$self->new (path => $path)
		2182	}
		2183
2038	sub size_request {	2184	sub size_request {
2039	my ($self) = @_;	2185	my ($self) = @_;
2040		2186
2041	($self->{tex}->{w}, $self->{tex}->{h})	2187	($self->{tex}{w}, $self->{tex}{h})
2042	}	2188	}
2043		2189
2044	sub _draw {	2190	sub _draw {
2045	my ($self) = @_;	2191	my ($self) = @_;
2046		2192
…		…
2056	}	2202	}
2057		2203
2058	glEnable GL_TEXTURE_2D;	2204	glEnable GL_TEXTURE_2D;
2059	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2205	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060		2206
2061	$tex->draw_quad_alpha (0, 0, $w, $h);	2207	$tex->draw_quad (0, 0, $w, $h);
2062		2208
2063	glDisable GL_TEXTURE_2D;	2209	glDisable GL_TEXTURE_2D;
2064	}	2210	}
2065		2211
2066	#############################################################################	2212	#############################################################################
2067		2213
		2214	package CFPlus::UI::ImageButton;
		2215
		2216	our @ISA = CFPlus::UI::Image::;
		2217
		2218	use CFPlus::OpenGL;
		2219
		2220	my %textures;
		2221
		2222	sub new {
		2223	my $class = shift;
		2224
		2225	my $self = $class->SUPER::new (
		2226	padding_x => 4,
		2227	padding_y => 4,
		2228	fg => [1, 1, 1],
		2229	active_fg => [0, 0, 1],
		2230	can_hover => 1,
		2231	align => 0,
		2232	valign => 0,
		2233	can_events => 1,
		2234	@_
		2235	);
		2236	}
		2237
		2238	sub invoke_button_up {
		2239	my ($self, $ev, $x, $y) = @_;
		2240
		2241	$self->emit ("activate")
		2242	if $x >= 0 && $x < $self->{w}
		2243	&& $y >= 0 && $y < $self->{h};
		2244
		2245	1
		2246	}
		2247
		2248	#############################################################################
		2249
2068	package CFClient::UI::VGauge;	2250	package CFPlus::UI::VGauge;
2069		2251
2070	our @ISA = CFClient::UI::Base::;	2252	our @ISA = CFPlus::UI::Base::;
2071		2253
2072	use List::Util qw(min max);	2254	use List::Util qw(min max);
2073		2255
2074	use CFClient::OpenGL;	2256	use CFPlus::OpenGL;
2075		2257
2076	my %tex = (	2258	my %tex = (
2077	food => [	2259	food => [
2078	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2260	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2079	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2261	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2080	],	2262	],
2081	grace => [	2263	grace => [
2082	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2264	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2083	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2265	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2084	],	2266	],
2085	hp => [	2267	hp => [
2086	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2268	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2087	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2269	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2088	],	2270	],
2089	mana => [	2271	mana => [
2090	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2272	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2091	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2273	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2092	],	2274	],
2093	);	2275	);
2094		2276
2095	# eg. VGauge->new (gauge => 'food'), default gauge: food	2277	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2155	my $ycut1 = max 0, min 1, $ycut;	2337	my $ycut1 = max 0, min 1, $ycut;
2156	my $ycut2 = max 0, min 1, $ycut - 1;	2338	my $ycut2 = max 0, min 1, $ycut - 1;
2157		2339
2158	my $h1 = $self->{h} * (1 - $ycut1);	2340	my $h1 = $self->{h} * (1 - $ycut1);
2159	my $h2 = $self->{h} * (1 - $ycut2);	2341	my $h2 = $self->{h} * (1 - $ycut2);
		2342	my $h3 = $self->{h};
		2343
		2344	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2160		2345
2161	glEnable GL_BLEND;	2346	glEnable GL_BLEND;
2162	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2347	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2163	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2348	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2164	glEnable GL_TEXTURE_2D;	2349	glEnable GL_TEXTURE_2D;
…		…
2183		2368
2184	if ($t3) {	2369	if ($t3) {
2185	glBindTexture GL_TEXTURE_2D, $t3->{name};	2370	glBindTexture GL_TEXTURE_2D, $t3->{name};
2186	glBegin GL_QUADS;	2371	glBegin GL_QUADS;
2187	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2372	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2188	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2373	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2189	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2374	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2190	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2375	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2191	glEnd;	2376	glEnd;
2192	}	2377	}
2193		2378
2194	glDisable GL_BLEND;	2379	glDisable GL_BLEND;
2195	glDisable GL_TEXTURE_2D;	2380	glDisable GL_TEXTURE_2D;
2196	}	2381	}
2197		2382
2198	#############################################################################	2383	#############################################################################
2199		2384
2200	package CFClient::UI::Gauge;	2385	package CFPlus::UI::Gauge;
2201		2386
2202	our @ISA = CFClient::UI::VBox::;	2387	our @ISA = CFPlus::UI::VBox::;
2203		2388
2204	sub new {	2389	sub new {
2205	my ($class, %arg) = @_;	2390	my ($class, %arg) = @_;
2206		2391
2207	my $self = $class->SUPER::new (	2392	my $self = $class->SUPER::new (
…		…
2209	can_hover => 1,	2394	can_hover => 1,
2210	can_events => 1,	2395	can_events => 1,
2211	%arg,	2396	%arg,
2212	);	2397	);
2213		2398
2214	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2399	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2215	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2400	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2216	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2401	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2217		2402
2218	$self	2403	$self
2219	}	2404	}
2220		2405
2221	sub set_fontsize {	2406	sub set_fontsize {
…		…
2242	$self->{value}->set_text ($val);	2427	$self->{value}->set_text ($val);
2243	}	2428	}
2244		2429
2245	#############################################################################	2430	#############################################################################
2246		2431
2247	package CFClient::UI::Slider;	2432	package CFPlus::UI::Slider;
2248		2433
2249	use strict;	2434	use strict;
2250		2435
2251	use CFClient::OpenGL;	2436	use CFPlus::OpenGL;
2252		2437
2253	our @ISA = CFClient::UI::DrawBG::;	2438	our @ISA = CFPlus::UI::DrawBG::;
2254		2439
2255	my @tex =	2440	my @tex =
2256	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2441	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2257	qw(s1_slider.png s1_slider_bg.png);	2442	qw(s1_slider.png s1_slider_bg.png);
2258		2443
2259	sub new {	2444	sub new {
2260	my $class = shift;	2445	my $class = shift;
2261		2446
…		…
2282	$self->update;	2467	$self->update;
2283		2468
2284	$self	2469	$self
2285	}	2470	}
2286		2471
2287	sub changed { }
2288
2289	sub set_range {	2472	sub set_range {
2290	my ($self, $range) = @_;	2473	my ($self, $range) = @_;
2291		2474
2292	($range, $self->{range}) = ($self->{range}, $range);	2475	($range, $self->{range}) = ($self->{range}, $range);
2293		2476
2294	$self->update
2295	if "@$range" ne "@{$self->{range}}";	2477	if ("@$range" ne "@{$self->{range}}") {
		2478	$self->update;
		2479	$self->set_value ($self->{range}[0]);
		2480	}
2296	}	2481	}
2297		2482
2298	sub set_value {	2483	sub set_value {
2299	my ($self, $value) = @_;	2484	my ($self, $value) = @_;
2300		2485
…		…
2311	if $unit;	2496	if $unit;
2312		2497
2313	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2498	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2314		2499
2315	if ($value != $old_value) {	2500	if ($value != $old_value) {
2316	$self->_emit (changed => $value);	2501	$self->emit (changed => $value);
2317	$self->update;	2502	$self->update;
2318	}	2503	}
2319	}	2504	}
2320		2505
2321	sub size_request {	2506	sub size_request {
2322	my ($self) = @_;	2507	my ($self) = @_;
2323		2508
2324	($self->{req_w}, $self->{req_h})	2509	($self->{req_w}, $self->{req_h})
2325	}	2510	}
2326		2511
2327	sub button_down {	2512	sub invoke_button_down {
2328	my ($self, $ev, $x, $y) = @_;	2513	my ($self, $ev, $x, $y) = @_;
2329		2514
2330	$self->SUPER::button_down ($ev, $x, $y);	2515	$self->SUPER::invoke_button_down ($ev, $x, $y);
2331		2516
2332	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2517	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2333		2518
2334	$self->mouse_motion ($ev, $x, $y)	2519	$self->invoke_mouse_motion ($ev, $x, $y)
2335	}	2520	}
2336		2521
2337	sub mouse_motion {	2522	sub invoke_mouse_motion {
2338	my ($self, $ev, $x, $y) = @_;	2523	my ($self, $ev, $x, $y) = @_;
2339		2524
2340	if ($GRAB == $self) {	2525	if ($GRAB == $self) {
2341	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2526	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2342		2527
…		…
2348	} else {	2533	} else {
2349	return 0;	2534	return 0;
2350	}	2535	}
2351		2536
2352	1	2537	1
		2538	}
		2539
		2540	sub invoke_mouse_wheel {
		2541	my ($self, $ev) = @_;
		2542
		2543	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2544
		2545	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2546
		2547	! ! $delta
2353	}	2548	}
2354		2549
2355	sub update {	2550	sub update {
2356	my ($self) = @_;	2551	my ($self) = @_;
2357		2552
…		…
2406	glDisable GL_TEXTURE_2D;	2601	glDisable GL_TEXTURE_2D;
2407	}	2602	}
2408		2603
2409	#############################################################################	2604	#############################################################################
2410		2605
2411	package CFClient::UI::ValSlider;	2606	package CFPlus::UI::ValSlider;
2412		2607
2413	our @ISA = CFClient::UI::HBox::;	2608	our @ISA = CFPlus::UI::HBox::;
2414		2609
2415	sub new {	2610	sub new {
2416	my ($class, %arg) = @_;	2611	my ($class, %arg) = @_;
2417		2612
2418	my $range = delete $arg{range};	2613	my $range = delete $arg{range};
2419		2614
2420	my $self = $class->SUPER::new (	2615	my $self = $class->SUPER::new (
2421	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2616	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2422	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2617	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2423	to_value => sub { shift },	2618	to_value => sub { shift },
2424	from_value => sub { shift },	2619	from_value => sub { shift },
2425	%arg,	2620	%arg,
2426	);	2621	);
2427		2622
…		…
2447	sub set_range { shift->{slider}->set_range (@_) }	2642	sub set_range { shift->{slider}->set_range (@_) }
2448	sub set_value { shift->{slider}->set_value (@_) }	2643	sub set_value { shift->{slider}->set_value (@_) }
2449		2644
2450	#############################################################################	2645	#############################################################################
2451		2646
2452	package CFClient::UI::TextView;	2647	package CFPlus::UI::TextScroller;
2453		2648
2454	our @ISA = CFClient::UI::HBox::;	2649	our @ISA = CFPlus::UI::HBox::;
2455		2650
2456	use CFClient::OpenGL;	2651	use CFPlus::OpenGL;
2457		2652
2458	sub new {	2653	sub new {
2459	my $class = shift;	2654	my $class = shift;
2460		2655
2461	my $self = $class->SUPER::new (	2656	my $self = $class->SUPER::new (
2462	fontsize => 1,	2657	fontsize => 1,
2463	can_events => 0,	2658	can_events => 1,
		2659	indent => 0,
2464	#font => default_font	2660	#font => default_font
2465	@_,	2661	@_,
2466		2662
2467	layout => (new CFClient::Layout 1),	2663	layout => (new CFPlus::Layout),
2468	par => [],	2664	par => [],
2469	height => 0,	2665	height => 0,
2470	children => [	2666	children => [
2471	(new CFClient::UI::Empty expand => 1),	2667	(new CFPlus::UI::Empty expand => 1),
2472	(new CFClient::UI::Slider vertical => 1),	2668	(new CFPlus::UI::Slider vertical => 1),
2473	],	2669	],
2474	);	2670	);
2475		2671
2476	$self->{children}[1]->connect (changed => sub { $self->update });	2672	$self->{children}[1]->connect (changed => sub { $self->update });
2477		2673
…		…
2483		2679
2484	$self->{fontsize} = $fontsize;	2680	$self->{fontsize} = $fontsize;
2485	$self->reflow;	2681	$self->reflow;
2486	}	2682	}
2487		2683
		2684	sub size_request {
		2685	my ($self) = @_;
		2686
		2687	my ($empty, $slider) = @{ $self->{children} };
		2688
		2689	local $self->{children} = [$empty, $slider];
		2690	$self->SUPER::size_request
		2691	}
		2692
2488	sub size_allocate {	2693	sub invoke_size_allocate {
2489	my ($self, $w, $h) = @_;	2694	my ($self, $w, $h) = @_;
2490		2695
2491	$self->SUPER::size_allocate ($w, $h);	2696	my ($empty, $slider, @other) = @{ $self->{children} };
		2697	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2492		2698
2493	$self->{layout}->set_font ($self->{font}) if $self->{font};	2699	$self->{layout}->set_font ($self->{font}) if $self->{font};
2494	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2700	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2495	$self->{layout}->set_width ($self->{children}[0]{w});	2701	$self->{layout}->set_width ($empty->{w});
		2702	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2496		2703
2497	$self->reflow;	2704	$self->reflow;
2498	}
2499		2705
2500	sub text_size {	2706	local $self->{children} = [$empty, $slider];
		2707	$self->SUPER::invoke_size_allocate ($w, $h)
		2708	}
		2709
		2710	sub invoke_mouse_wheel {
2501	my ($self, $text, $indent) = @_;	2711	my ($self, $ev) = @_;
		2712
		2713	return 0 unless $ev->{dy}; # only vertical movements
		2714
		2715	$self->{children}[1]->emit (mouse_wheel => $ev);
		2716
		2717	1
		2718	}
		2719
		2720	sub get_layout {
		2721	my ($self, $para) = @_;
2502		2722
2503	my $layout = $self->{layout};	2723	my $layout = $self->{layout};
2504		2724
		2725	$layout->set_font ($self->{font}) if $self->{font};
		2726	$layout->set_foreground (@{$para->{fg}});
2505	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2727	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2506	$layout->set_width ($self->{children}[0]{w} - $indent);	2728	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		2729	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2507	$layout->set_markup ($text);	2730	$layout->set_markup ($para->{markup});
		2731
		2732	$layout->set_shapes (
		2733	map
		2734	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2735	@{$para->{widget}}
2508		2736	);
		2737
2509	$layout->size	2738	$layout
2510	}	2739	}
2511		2740
2512	sub reflow {	2741	sub reflow {
2513	my ($self) = @_;	2742	my ($self) = @_;
2514		2743
…		…
2523	$self->{children}[1]->set_value ($offset);	2752	$self->{children}[1]->set_value ($offset);
2524	}	2753	}
2525		2754
2526	sub clear {	2755	sub clear {
2527	my ($self) = @_;	2756	my ($self) = @_;
		2757
		2758	my (undef, undef, @other) = @{ $self->{children} };
		2759	$self->remove ($_) for @other;
2528		2760
2529	$self->{par} = [];	2761	$self->{par} = [];
2530	$self->{height} = 0;	2762	$self->{height} = 0;
2531	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2763	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2532	}	2764	}
2533		2765
2534	sub add_paragraph {	2766	sub add_paragraph {
2535	my ($self, $color, $text, $indent) = @_;	2767	my $self = shift;
2536		2768
2537	for my $line (split /\n/, $text) {	2769	for my $para (@_) {
2538	my ($w, $h) = $self->text_size ($line);	2770	$para = {
2539	$self->{height} += $h;	2771	fg => [1, 1, 1, 1],
2540	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2772	indent => 0,
2541	}	2773	markup => "",
		2774	widget => [],
		2775	ref $para ? %$para : (markup => $para),
		2776	w => 1e10,
		2777	wrapped => 1,
		2778	};
2542		2779
2543	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2780	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2781	push @{$self->{par}}, $para;
		2782	}
		2783
		2784	$self->{need_reflow}++;
		2785	$self->update;
		2786	}
		2787
		2788	sub scroll_to_bottom {
		2789	my ($self) = @_;
		2790
		2791	$self->{scroll_to_bottom} = 1;
		2792	$self->update;
2544	}	2793	}
2545		2794
2546	sub update {	2795	sub update {
2547	my ($self) = @_;	2796	my ($self) = @_;
2548		2797
…		…
2550		2799
2551	return unless $self->{h} > 0;	2800	return unless $self->{h} > 0;
2552		2801
2553	delete $self->{texture};	2802	delete $self->{texture};
2554		2803
2555	$ROOT->on_post_alloc ($self, sub {	2804	$ROOT->on_post_alloc ($self => sub {
2556	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2805	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2557		2806
2558	if (delete $self->{need_reflow}) {	2807	if (delete $self->{need_reflow}) {
2559	my $height = 0;	2808	my $height = 0;
2560		2809
2561	my $layout = $self->{layout};
2562
2563	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2564
2565	for (@{$self->{par}}) {	2810	for my $para (@{$self->{par}}) {
2566	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2811	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2567	$layout->set_width ($W - $_->[3]);	2812	my $layout = $self->get_layout ($para);
2568	$layout->set_markup ($_->[4]);
2569	my ($w, $h) = $layout->size;	2813	my ($w, $h) = $layout->size;
2570	$_->[0] = $w + $_->[3];	2814
2571	$_->[1] = $h;	2815	$para->{w} = $w + $para->{indent};
		2816	$para->{h} = $h;
		2817	$para->{wrapped} = $layout->has_wrapped;
2572	}	2818	}
2573		2819
2574	$height += $_->[1];	2820	$height += $para->{h};
2575	}	2821	}
2576		2822
2577	$self->{height} = $height;	2823	$self->{height} = $height;
2578		2824
2579	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2825	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2580		2826
2581	delete $self->{texture};	2827	delete $self->{texture};
2582	}	2828	}
2583		2829
		2830	if (delete $self->{scroll_to_bottom}) {
		2831	$self->{children}[1]->set_value (1e10);
		2832	}
		2833
2584	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2834	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2585	glClearColor 0, 0, 0, 0;	2835	glClearColor 0, 0, 0, 0;
2586	glClear GL_COLOR_BUFFER_BIT;	2836	glClear GL_COLOR_BUFFER_BIT;
2587		2837
2588	my $top = int $self->{children}[1]{range}[0];	2838	my $top = int $self->{children}[1]{range}[0];
2589		2839
2590	my $y0 = $top;	2840	my $y0 = $top;
2591	my $y1 = $top + $H;	2841	my $y1 = $top + $H;
2592		2842
2593	my $y = 0;	2843	my $y = 0;
2594		2844
2595	my $layout = $self->{layout};
2596
2597	$layout->set_font ($self->{font}) if $self->{font};
2598
2599	glEnable GL_BLEND;
2600	#TODO# not correct in windows where rgba is forced off
2601	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2602
2603	for my $par (@{$self->{par}}) {	2845	for my $para (@{$self->{par}}) {
2604	my $h = $par->[1];	2846	my $h = $para->{h};
2605		2847
2606	if ($y0 < $y + $h && $y < $y1) {	2848	if ($y0 < $y + $h && $y < $y1) {
2607	$layout->set_foreground (@{ $par->[2] });
2608	$layout->set_width ($W - $par->[3]);
2609	$layout->set_markup ($par->[4]);
2610		2849
2611	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2850	my $layout = $self->get_layout ($para);
2612		2851
2613	glRasterPos $par->[3], $y - $y0;	2852	$layout->render ($para->{indent}, $y - $y0);
2614	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2853
		2854	if (my @w = @{ $para->{widget} }) {
		2855	my @s = $layout->get_shapes;
		2856
		2857	for (@w) {
		2858	my ($dx, $dy) = splice @s, 0, 2, ();
		2859
		2860	$_->{x} = $dx + $para->{indent};
		2861	$_->{y} = $dy + $y - $y0;
		2862
		2863	$_->draw;
		2864	}
		2865	}
2615	}	2866	}
2616		2867
2617	$y += $h;	2868	$y += $h;
2618	}	2869	}
2619
2620	glDisable GL_BLEND;
2621	};	2870	};
2622	});	2871	});
		2872	}
		2873
		2874	sub reconfigure {
		2875	my ($self) = @_;
		2876
		2877	$self->SUPER::reconfigure;
		2878
		2879	$_->{w} = 1e10 for @{ $self->{par} };
		2880	$self->reflow;
2623	}	2881	}
2624		2882
2625	sub _draw {	2883	sub _draw {
2626	my ($self) = @_;	2884	my ($self) = @_;
2627		2885
…		…
2630	glColor 0, 0, 0, 1;	2888	glColor 0, 0, 0, 1;
2631	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2889	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2632	glDisable GL_TEXTURE_2D;	2890	glDisable GL_TEXTURE_2D;
2633		2891
2634	$self->{children}[1]->draw;	2892	$self->{children}[1]->draw;
2635
2636	}	2893	}
2637		2894
2638	#############################################################################	2895	#############################################################################
2639		2896
2640	package CFClient::UI::Animator;	2897	package CFPlus::UI::Animator;
2641		2898
2642	use CFClient::OpenGL;	2899	use CFPlus::OpenGL;
2643		2900
2644	our @ISA = CFClient::UI::Bin::;	2901	our @ISA = CFPlus::UI::Bin::;
2645		2902
2646	sub moveto {	2903	sub moveto {
2647	my ($self, $x, $y) = @_;	2904	my ($self, $x, $y) = @_;
2648		2905
2649	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	2906	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2677	glPopMatrix;	2934	glPopMatrix;
2678	}	2935	}
2679		2936
2680	#############################################################################	2937	#############################################################################
2681		2938
2682	package CFClient::UI::Flopper;	2939	package CFPlus::UI::Flopper;
2683		2940
2684	our @ISA = CFClient::UI::Button::;	2941	our @ISA = CFPlus::UI::Button::;
2685		2942
2686	sub new {	2943	sub new {
2687	my $class = shift;	2944	my $class = shift;
2688		2945
2689	my $self = $class->SUPER::new (	2946	my $self = $class->SUPER::new (
…		…
2701	$self->{other}->toggle_visibility;	2958	$self->{other}->toggle_visibility;
2702	}	2959	}
2703		2960
2704	#############################################################################	2961	#############################################################################
2705		2962
2706	package CFClient::UI::Tooltip;	2963	package CFPlus::UI::Tooltip;
2707		2964
2708	our @ISA = CFClient::UI::Bin::;	2965	our @ISA = CFPlus::UI::Bin::;
2709		2966
2710	use CFClient::OpenGL;	2967	use CFPlus::OpenGL;
2711		2968
2712	sub new {	2969	sub new {
2713	my $class = shift;	2970	my $class = shift;
2714		2971
2715	$class->SUPER::new (	2972	$class->SUPER::new (
…		…
2718	)	2975	)
2719	}	2976	}
2720		2977
2721	sub set_tooltip_from {	2978	sub set_tooltip_from {
2722	my ($self, $widget) = @_;	2979	my ($self, $widget) = @_;
		2980
		2981	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		2982	if $widget->{tooltip} =~ /^#(.*)$/;
2723		2983
2724	my $tooltip = $widget->{tooltip};	2984	my $tooltip = $widget->{tooltip};
2725		2985
2726	if ($ENV{CFPLUS_DEBUG} & 2) {	2986	if ($ENV{CFPLUS_DEBUG} & 2) {
2727	$tooltip .= "\n\n" . (ref $widget) . "\n"	2987	$tooltip .= "\n\n" . (ref $widget) . "\n"
2728	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2988	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2729	. "req $widget->{req_w} $widget->{req_h}\n"	2989	. "req $widget->{req_w} $widget->{req_h}\n"
2730	. "visible $widget->{visible}";	2990	. "visible $widget->{visible}";
2731	}	2991	}
2732		2992
		2993	$tooltip =~ s/^\n+//;
		2994	$tooltip =~ s/\n+$//;
		2995
2733	$self->add (new CFClient::UI::Label	2996	$self->add (new CFPlus::UI::Label
2734	markup => $tooltip,	2997	markup => $tooltip,
2735	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2998	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2736	fontsize => 0.8,	2999	fontsize => 0.8,
2737	fg => [0, 0, 0, 1],	3000	style => 1, # FLAG_INVERSE
2738	ellipsise => 0,	3001	ellipsise => 0,
2739	font => ($widget->{tooltip_font} || $::FONT_PROP),	3002	font => ($widget->{tooltip_font} || $::FONT_PROP),
2740	);	3003	);
2741	}	3004	}
2742		3005
…		…
2746	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3009	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2747		3010
2748	($w + 4, $h + 4)	3011	($w + 4, $h + 4)
2749	}	3012	}
2750		3013
2751	sub size_allocate {	3014	sub invoke_size_allocate {
2752	my ($self, $w, $h) = @_;	3015	my ($self, $w, $h) = @_;
2753		3016
2754	$self->SUPER::size_allocate ($w - 4, $h - 4);	3017	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2755	}	3018	}
2756		3019
2757	sub visibility_change {	3020	sub invoke_visibility_change {
2758	my ($self, $visible) = @_;	3021	my ($self, $visible) = @_;
2759		3022
2760	return unless $visible;	3023	return unless $visible;
2761		3024
2762	$self->{root}->on_post_alloc ("move_$self" => sub {	3025	$self->{root}->on_post_alloc ("move_$self" => sub {
2763	my $widget = $self->{owner}	3026	my $widget = $self->{owner}
2764	or return;	3027	or return;
2765		3028
		3029	if ($widget->{visible}) {
2766	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3030	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2767		3031
2768	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3032	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2769	if $x + $self->{w} > $::WIDTH;	3033	if $x + $self->{w} > $self->{root}{w};
2770		3034
2771	$self->move_abs ($x, $y);	3035	$self->move_abs ($x, $y);
		3036	} else {
		3037	$self->hide;
		3038	}
2772	});	3039	});
2773	}	3040	}
2774		3041
2775	sub _draw {	3042	sub _draw {
2776	my ($self) = @_;	3043	my ($self) = @_;
…		…
2800	$self->SUPER::_draw;	3067	$self->SUPER::_draw;
2801	}	3068	}
2802		3069
2803	#############################################################################	3070	#############################################################################
2804		3071
2805	package CFClient::UI::Face;	3072	package CFPlus::UI::Face;
2806		3073
2807	our @ISA = CFClient::UI::Base::;	3074	our @ISA = CFPlus::UI::DrawBG::;
2808		3075
2809	use CFClient::OpenGL;	3076	use CFPlus::OpenGL;
2810		3077
2811	sub new {	3078	sub new {
2812	my $class = shift;	3079	my $class = shift;
2813		3080
2814	my $self = $class->SUPER::new (	3081	my $self = $class->SUPER::new (
…		…
2849	sub _draw {	3116	sub _draw {
2850	my ($self) = @_;	3117	my ($self) = @_;
2851		3118
2852	return unless $::CONN;	3119	return unless $::CONN;
2853		3120
		3121	$self->SUPER::_draw;
		3122
2854	my $face;	3123	my $face;
2855		3124
2856	if ($self->{frame}) {	3125	if ($self->{frame}) {
2857	my $anim = $::CONN->{anim}[$self->{anim}];	3126	my $anim = $::CONN->{anim}[$self->{anim}];
2858		3127
…		…
2869	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3138	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2870	glDisable GL_TEXTURE_2D;	3139	glDisable GL_TEXTURE_2D;
2871	}	3140	}
2872	}	3141	}
2873		3142
2874	sub DESTROY {	3143	sub destroy {
2875	my ($self) = @_;	3144	my ($self) = @_;
2876		3145
2877	$self->{timer}->cancel	3146	$self->{timer}->cancel
2878	if $self->{timer};	3147	if $self->{timer};
2879		3148
2880	$self->SUPER::DESTROY;	3149	$self->SUPER::destroy;
2881	}	3150	}
2882		3151
2883	#############################################################################	3152	#############################################################################
2884		3153
2885	package CFClient::UI::Buttonbar;	3154	package CFPlus::UI::Buttonbar;
2886		3155
2887	our @ISA = CFClient::UI::HBox::;	3156	our @ISA = CFPlus::UI::HBox::;
2888		3157
2889	# TODO: should actualyl wrap buttons and other goodies.	3158	# TODO: should actualyl wrap buttons and other goodies.
2890		3159
2891	#############################################################################	3160	#############################################################################
2892		3161
2893	package CFClient::UI::Menu;	3162	package CFPlus::UI::Menu;
2894		3163
2895	our @ISA = CFClient::UI::FancyFrame::;	3164	our @ISA = CFPlus::UI::FancyFrame::;
2896		3165
2897	use CFClient::OpenGL;	3166	use CFPlus::OpenGL;
2898		3167
2899	sub new {	3168	sub new {
2900	my $class = shift;	3169	my $class = shift;
2901		3170
2902	my $self = $class->SUPER::new (	3171	my $self = $class->SUPER::new (
2903	items => [],	3172	items => [],
2904	z => 100,	3173	z => 100,
2905	@_,	3174	@_,
2906	);	3175	);
2907		3176
2908	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3177	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2909		3178
2910	for my $item (@{ $self->{items} }) {	3179	for my $item (@{ $self->{items} }) {
2911	my ($widget, $cb) = @$item;	3180	my ($widget, $cb, $tooltip) = @$item;
2912		3181
2913	# handle various types of items, only text for now	3182	# handle various types of items, only text for now
2914	if (!ref $widget) {	3183	if (!ref $widget) {
		3184	if ($widget =~ /\t/) {
		3185	my ($left, $right) = split /\t/, $widget, 2;
		3186
2915	$widget = new CFClient::UI::Label	3187	$widget = new CFPlus::UI::HBox
2916	can_hover => 1,	3188	can_hover => 1,
2917	can_events => 1,	3189	can_events => 1,
		3190	tooltip => $tooltip,
		3191	children => [
		3192	(new CFPlus::UI::Label markup => $left, expand => 1),
		3193	(new CFPlus::UI::Label markup => $right, align => +1),
		3194	],
		3195	;
		3196
		3197	} else {
		3198	$widget = new CFPlus::UI::Label
		3199	can_hover => 1,
		3200	can_events => 1,
2918	text => $widget;	3201	markup => $widget,
		3202	tooltip => $tooltip;
		3203	}
2919	}	3204	}
2920		3205
2921	$self->{item}{$widget} = $item;	3206	$self->{item}{$widget} = $item;
2922		3207
2923	$self->{vbox}->add ($widget);	3208	$self->{vbox}->add ($widget);
…		…
2928		3213
2929	# popup given the event (must be a mouse button down event currently)	3214	# popup given the event (must be a mouse button down event currently)
2930	sub popup {	3215	sub popup {
2931	my ($self, $ev) = @_;	3216	my ($self, $ev) = @_;
2932		3217
2933	$self->_emit ("popdown");	3218	$self->emit ("popdown");
2934		3219
2935	# maybe save $GRAB? must be careful about events...	3220	# maybe save $GRAB? must be careful about events...
2936	$GRAB = $self;	3221	$GRAB = $self;
2937	$self->{button} = $ev->{button};	3222	$self->{button} = $ev->{button};
2938		3223
2939	$self->show;	3224	$self->show;
2940	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3225	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2941	}	3226	}
2942		3227
2943	sub mouse_motion {	3228	sub invoke_mouse_motion {
2944	my ($self, $ev, $x, $y) = @_;	3229	my ($self, $ev, $x, $y) = @_;
2945		3230
2946	# TODO: should use vbox->find_widget or so	3231	# TODO: should use vbox->find_widget or so
2947	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3232	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2948	$self->{hover} = $self->{item}{$HOVER};	3233	$self->{hover} = $self->{item}{$HOVER};
2949		3234
2950	0	3235	0
2951	}	3236	}
2952		3237
2953	sub button_up {	3238	sub invoke_button_up {
2954	my ($self, $ev, $x, $y) = @_;	3239	my ($self, $ev, $x, $y) = @_;
2955		3240
2956	if ($ev->{button} == $self->{button}) {	3241	if ($ev->{button} == $self->{button}) {
2957	undef $GRAB;	3242	undef $GRAB;
2958	$self->hide;	3243	$self->hide;
2959		3244
2960	$self->_emit ("popdown");	3245	$self->emit ("popdown");
2961	$self->{hover}[1]->() if $self->{hover};	3246	$self->{hover}[1]->() if $self->{hover};
2962	} else {	3247	} else {
2963	return 0	3248	return 0
2964	}	3249	}
2965		3250
2966	1	3251	1
2967	}	3252	}
2968		3253
2969	#############################################################################	3254	#############################################################################
2970		3255
2971	package CFClient::UI::Multiplexer;	3256	package CFPlus::UI::Multiplexer;
2972		3257
2973	our @ISA = CFClient::UI::Container::;	3258	our @ISA = CFPlus::UI::Container::;
2974		3259
2975	sub new {	3260	sub new {
2976	my $class = shift;	3261	my $class = shift;
2977		3262
2978	my $self = $class->SUPER::new (	3263	my $self = $class->SUPER::new (
…		…
2992		3277
2993	$self->{current} = $self->{children}[0]	3278	$self->{current} = $self->{children}[0]
2994	if @{ $self->{children} };	3279	if @{ $self->{children} };
2995	}	3280	}
2996		3281
		3282	sub get_current_page {
		3283	my ($self) = @_;
		3284
		3285	$self->{current}
		3286	}
		3287
2997	sub set_current_page {	3288	sub set_current_page {
2998	my ($self, $page_or_widget) = @_;	3289	my ($self, $page_or_widget) = @_;
2999		3290
3000	my $widget = ref $page_or_widget	3291	my $widget = ref $page_or_widget
3001	? $page_or_widget	3292	? $page_or_widget
3002	: $self->{children}[$page_or_widget];	3293	: $self->{children}[$page_or_widget];
3003		3294
3004	$self->{current} = $widget;	3295	$self->{current} = $widget;
3005	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3296	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3006		3297
3007	$self->_emit (page_changed => $self->{current});	3298	$self->emit (page_changed => $self->{current});
3008		3299
3009	$self->realloc;	3300	$self->realloc;
3010	}	3301	}
3011		3302
3012	sub visible_children {	3303	sub visible_children {
…		…
3017	my ($self) = @_;	3308	my ($self) = @_;
3018		3309
3019	$self->{current}->size_request	3310	$self->{current}->size_request
3020	}	3311	}
3021		3312
3022	sub size_allocate {	3313	sub invoke_size_allocate {
3023	my ($self, $w, $h) = @_;	3314	my ($self, $w, $h) = @_;
3024		3315
3025	$self->{current}->configure (0, 0, $w, $h);	3316	$self->{current}->configure (0, 0, $w, $h);
		3317
		3318	1
3026	}	3319	}
3027		3320
3028	sub _draw {	3321	sub _draw {
3029	my ($self) = @_;	3322	my ($self) = @_;
3030		3323
3031	$self->{current}->draw;	3324	$self->{current}->draw;
3032	}	3325	}
3033		3326
3034	#############################################################################	3327	#############################################################################
3035		3328
3036	package CFClient::UI::Notebook;	3329	package CFPlus::UI::Notebook;
3037		3330
3038	our @ISA = CFClient::UI::VBox::;	3331	our @ISA = CFPlus::UI::VBox::;
3039		3332
3040	sub new {	3333	sub new {
3041	my $class = shift;	3334	my $class = shift;
3042		3335
3043	my $self = $class->SUPER::new (	3336	my $self = $class->SUPER::new (
3044	buttonbar => (new CFClient::UI::Buttonbar),	3337	buttonbar => (new CFPlus::UI::Buttonbar),
3045	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3338	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3046	# filter => # will be put between multiplexer and $self	3339	# filter => # will be put between multiplexer and $self
3047	@_,	3340	@_,
3048	);	3341	);
3049		3342
3050	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3343	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3056	sub add {	3349	sub add {
3057	my ($self, $title, $widget, $tooltip) = @_;	3350	my ($self, $title, $widget, $tooltip) = @_;
3058		3351
3059	Scalar::Util::weaken $self;	3352	Scalar::Util::weaken $self;
3060		3353
3061	$self->{buttonbar}->add (new CFClient::UI::Button	3354	$self->{buttonbar}->add (new CFPlus::UI::Button
3062	markup => $title,	3355	markup => $title,
3063	tooltip => $tooltip,	3356	tooltip => $tooltip,
3064	on_activate => sub { $self->set_current_page ($widget) },	3357	on_activate => sub { $self->set_current_page ($widget) },
3065	);	3358	);
3066		3359
3067	$self->{multiplexer}->add ($widget);	3360	$self->{multiplexer}->add ($widget);
3068	}	3361	}
3069		3362
		3363	sub get_current_page {
		3364	my ($self) = @_;
		3365
		3366	$self->{multiplexer}->get_current_page
		3367	}
		3368
3070	sub set_current_page {	3369	sub set_current_page {
3071	my ($self, $page) = @_;	3370	my ($self, $page) = @_;
3072		3371
3073	$self->{multiplexer}->set_current_page ($page);	3372	$self->{multiplexer}->set_current_page ($page);
3074	$self->_emit (page_changed => $self->{multiplexer}{current});	3373	$self->emit (page_changed => $self->{multiplexer}{current});
3075	}	3374	}
3076		3375
3077	#############################################################################	3376	#############################################################################
3078		3377
		3378	package CFPlus::UI::Selector;
		3379
		3380	use utf8;
		3381
		3382	our @ISA = CFPlus::UI::Button::;
		3383
		3384	sub new {
		3385	my $class = shift;
		3386
		3387	my $self = $class->SUPER::new (
		3388	options => [], # [value, title, longdesc], ...
		3389	value => undef,
		3390	@_,
		3391	);
		3392
		3393	$self->_set_value ($self->{value});
		3394
		3395	$self
		3396	}
		3397
		3398	sub invoke_button_down {
		3399	my ($self, $ev) = @_;
		3400
		3401	my @menu_items;
		3402
		3403	for (@{ $self->{options} }) {
		3404	my ($value, $title, $tooltip) = @$_;
		3405
		3406	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3407	}
		3408
		3409	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3410	}
		3411
		3412	sub _set_value {
		3413	my ($self, $value) = @_;
		3414
		3415	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3416	or return;
		3417
		3418	$self->{value} = $item->[0];
		3419	$self->set_markup ("$item->[1] ⇓");
		3420	$self->set_tooltip ($item->[2]);
		3421	}
		3422
		3423	sub set_value {
		3424	my ($self, $value) = @_;
		3425
		3426	return unless $self->{value} ne $value;
		3427
		3428	$self->_set_value ($value);
		3429	$self->emit (changed => $value);
		3430	}
		3431
		3432	#############################################################################
		3433
3079	package CFClient::UI::Statusbox;	3434	package CFPlus::UI::Statusbox;
3080		3435
3081	our @ISA = CFClient::UI::VBox::;	3436	our @ISA = CFPlus::UI::VBox::;
3082		3437
3083	sub new {	3438	sub new {
3084	my $class = shift;	3439	my $class = shift;
3085		3440
3086	my $self = $class->SUPER::new (	3441	my $self = $class->SUPER::new (
…		…
3098	sub reorder {	3453	sub reorder {
3099	my ($self) = @_;	3454	my ($self) = @_;
3100	my $NOW = Time::HiRes::time;	3455	my $NOW = Time::HiRes::time;
3101		3456
3102	# freeze display when hovering over any label	3457	# freeze display when hovering over any label
3103	return if $CFClient::UI::TOOLTIP->{owner}	3458	return if $CFPlus::UI::TOOLTIP->{owner}
3104	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3459	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3105	values %{ $self->{item} };	3460	values %{ $self->{item} };
3106		3461
3107	while (my ($k, $v) = each %{ $self->{item} }) {	3462	while (my ($k, $v) = each %{ $self->{item} }) {
3108	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3463	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3109	}	3464	}
…		…
3130	for ($short) {	3485	for ($short) {
3131	s/^\s+//;	3486	s/^\s+//;
3132	s/\s+/ /g;	3487	s/\s+/ /g;
3133	}	3488	}
3134		3489
3135	new CFClient::UI::Label	3490	new CFPlus::UI::Label
3136	markup => $short,	3491	markup => $short,
3137	tooltip => $item->{tooltip},	3492	tooltip => $item->{tooltip},
3138	tooltip_font => $::FONT_PROP,	3493	tooltip_font => $::FONT_PROP,
3139	tooltip_width => 0.67,	3494	tooltip_width => 0.67,
3140	fontsize => $item->{fontsize} || $self->{fontsize},	3495	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3178	$item->{count}++;	3533	$item->{count}++;
3179	} else {	3534	} else {
3180	$item->{count} = 1;	3535	$item->{count} = 1;
3181	$item->{text} = $item->{tooltip} = $text;	3536	$item->{text} = $item->{tooltip} = $text;
3182	}	3537	}
3183	$item->{id} = ++$self->{id};	3538	$item->{id} += 0.2;#d#
3184	$item->{timeout} = $timeout;	3539	$item->{timeout} = $timeout;
3185	delete $item->{label};	3540	delete $item->{label};
3186	} else {	3541	} else {
3187	$self->{item}{$group} = {	3542	$self->{item}{$group} = {
3188	id => ++$self->{id},	3543	id => ++$self->{id},
…		…
3194	count => 1,	3549	count => 1,
3195	%arg,	3550	%arg,
3196	};	3551	};
3197	}	3552	}
3198		3553
		3554	$ROOT->on_refresh (reorder => sub {
3199	$self->reorder;	3555	$self->reorder;
		3556	});
3200	}	3557	}
3201		3558
3202	sub reconfigure {	3559	sub reconfigure {
3203	my ($self) = @_;	3560	my ($self) = @_;
3204		3561
…		…
3207		3564
3208	$self->reorder;	3565	$self->reorder;
3209	$self->SUPER::reconfigure;	3566	$self->SUPER::reconfigure;
3210	}	3567	}
3211		3568
3212	sub DESTROY {	3569	sub destroy {
3213	my ($self) = @_;	3570	my ($self) = @_;
3214		3571
3215	$self->{timer}->cancel;	3572	$self->{timer}->cancel;
3216		3573
3217	$self->SUPER::DESTROY;	3574	$self->SUPER::destroy;
3218	}	3575	}
3219		3576
3220	#############################################################################	3577	#############################################################################
3221		3578
3222	package CFClient::UI::Inventory;	3579	package CFPlus::UI::Inventory;
3223		3580
3224	our @ISA = CFClient::UI::ScrolledWindow::;	3581	our @ISA = CFPlus::UI::Table::;
3225		3582
3226	sub new {	3583	sub new {
3227	my $class = shift;	3584	my $class = shift;
3228		3585
3229	my $self = $class->SUPER::new (	3586	my $self = $class->SUPER::new (
3230	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3587	col_expand => [0, 1, 0],
		3588	items => [],
3231	@_,	3589	@_,
3232	);	3590	);
3233		3591
		3592	$self->set_sort_order (undef);
		3593
3234	$self	3594	$self
		3595	}
		3596
		3597	sub update_items {
		3598	my ($self) = @_;
		3599
		3600	$self->clear;
		3601
		3602	my @item = $self->{sort}->(@{ $self->{items} });
		3603
		3604	my @adds;
		3605	my $row = 0;
		3606	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3607	CFPlus::Item::update_widgets $item;
		3608
		3609	push @adds, 0, $row, $item->{face_widget};
		3610	push @adds, 1, $row, $item->{desc_widget};
		3611	push @adds, 2, $row, $item->{weight_widget};
		3612
		3613	$row++;
		3614	}
		3615
		3616	$self->add (@adds);
		3617	}
		3618
		3619	sub set_sort_order {
		3620	my ($self, $order) = @_;
		3621
		3622	$self->{sort} = $order ||= sub {
		3623	sort {
		3624	$a->{type} <=> $b->{type}
		3625	or $a->{name} cmp $b->{name}
		3626	} @_
		3627	};
		3628
		3629	$self->update_items;
3235	}	3630	}
3236		3631
3237	sub set_items {	3632	sub set_items {
3238	my ($self, $items) = @_;	3633	my ($self, $items) = @_;
3239		3634
3240	$self->{child}->clear;	3635	$self->{items} = [$items ? values %$items : ()];
3241	return unless $items;	3636	$self->update_items;
3242
3243	my @items = sort {
3244	($a->{type} <=> $b->{type})
3245	or ($a->{name} cmp $b->{name})
3246	} @$items;
3247
3248	$self->{real_items} = \@items;
3249
3250	my $row = 0;
3251	for my $item (@items) {
3252	CFClient::Item::update_widgets $item;
3253
3254	$self->{child}->add (0, $row, $item->{face_widget});
3255	$self->{child}->add (1, $row, $item->{desc_widget});
3256	$self->{child}->add (2, $row, $item->{weight_widget});
3257
3258	$row++;
3259	}
3260	}	3637	}
3261		3638
3262	#############################################################################	3639	#############################################################################
3263		3640
3264	package CFClient::UI::BindEditor;
3265
3266	our @ISA = CFClient::UI::FancyFrame::;
3267
3268	sub new {
3269	my $class = shift;
3270
3271	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3272
3273	$self->add (my $vb = new CFClient::UI::VBox);
3274
3275
3276	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3277	text => "start recording",
3278	tooltip => "Start/Stops recording of actions."
3279	."All subsequent actions after the recording started will be captured."
3280	."The actions are displayed after the record was stopped."
3281	."To bind the action you have to click on the 'Bind' button",
3282	on_activate => sub {
3283	unless ($self->{recording}) {
3284	$self->start;
3285	} else {
3286	$self->stop;
3287	}
3288	});
3289
3290	$vb->add (new CFClient::UI::Label text => "Actions:");
3291	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3292
3293	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3294	$vb->add (my $hb = new CFClient::UI::HBox);
3295	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3296	$hb->add (new CFClient::UI::Button
3297	text => "bind",
3298	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3299	on_activate => sub {
3300	$self->ask_for_bind;
3301	});
3302
3303	$vb->add (my $hb = new CFClient::UI::HBox);
3304	$hb->add (new CFClient::UI::Button
3305	text => "ok",
3306	expand => 1,
3307	tooltip => "This closes the binding editor and saves the binding",
3308	on_activate => sub {
3309	$self->hide;
3310	$self->commit;
3311	});
3312
3313	$hb->add (new CFClient::UI::Button
3314	text => "cancel",
3315	expand => 1,
3316	tooltip => "This closes the binding editor without saving",
3317	on_activate => sub {
3318	$self->hide;
3319	$self->{binding_cancel}->()
3320	if $self->{binding_cancel};
3321	});
3322
3323	$self->update_binding_widgets;
3324
3325	$self
3326	}
3327
3328	sub commit {
3329	my ($self) = @_;
3330	my ($mod, $sym, $cmds) = $self->get_binding;
3331	if ($sym != 0 && @$cmds > 0) {
3332	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3333	."'. Don't forget 'Save Config'!");
3334	$self->{binding_change}->($mod, $sym, $cmds)
3335	if $self->{binding_change};
3336	} else {
3337	$::STATUSBOX->add ("No action bound, no key or action specified!");
3338	$self->{binding_cancel}->()
3339	if $self->{binding_cancel};
3340	}
3341	}
3342
3343	sub start {
3344	my ($self) = @_;
3345
3346	$self->{rec_btn}->set_text ("stop recording");
3347	$self->{recording} = 1;
3348	$self->clear_command_list;
3349	$::CONN->start_record if $::CONN;
3350	}
3351
3352	sub stop {
3353	my ($self) = @_;
3354
3355	$self->{rec_btn}->set_text ("start recording");
3356	$self->{recording} = 0;
3357
3358	my $rec;
3359	$rec = $::CONN->stop_record if $::CONN;
3360	return unless ref $rec eq 'ARRAY';
3361	$self->set_command_list ($rec);
3362	}
3363
3364
3365	sub ask_for_bind_and_commit {
3366	my ($self) = @_;
3367	$self->ask_for_bind (1);
3368	}
3369
3370	sub ask_for_bind {
3371	my ($self, $commit) = @_;
3372
3373	CFClient::Binder::open_binding_dialog (sub {
3374	my ($mod, $sym) = @_;
3375	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3376	$self->update_binding_widgets;
3377	$self->commit if $commit;
3378	});
3379	}
3380
3381	# $mod and $sym are the modifiers and key symbol
3382	# $cmds is a array ref of strings (the commands)
3383	# $cb is the callback that is executed on OK
3384	# $ccb is the callback that is executed on CANCEL and
3385	# when the binding was unsuccessful on OK
3386	sub set_binding {
3387	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3388
3389	$self->clear_command_list;
3390	$self->{recording} = 0;
3391	$self->{rec_btn}->set_text ("start recording");
3392
3393	$self->{binding} = [$mod, $sym];
3394	$self->{commands} = $cmds;
3395
3396	$self->{binding_change} = $cb;
3397	$self->{binding_cancel} = $ccb;
3398
3399	$self->update_binding_widgets;
3400	}
3401
3402	# this is a shortcut method that asks for a binding
3403	# and then just binds it.
3404	sub do_quick_binding {
3405	my ($self, $cmds) = @_;
3406	$self->set_binding (undef, undef, $cmds, sub {
3407	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3408	});
3409	$self->ask_for_bind (1);
3410	}
3411
3412	sub update_binding_widgets {
3413	my ($self) = @_;
3414	my ($mod, $sym, $cmds) = $self->get_binding;
3415	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3416	$self->set_command_list ($cmds);
3417	}
3418
3419	sub get_binding {
3420	my ($self) = @_;
3421	return (
3422	$self->{binding}->[0],
3423	$self->{binding}->[1],
3424	[ grep { defined $_ } @{$self->{commands}} ]
3425	);
3426	}
3427
3428	sub clear_command_list {
3429	my ($self) = @_;
3430	$self->{cmdbox}->clear ();
3431	}
3432
3433	sub set_command_list {
3434	my ($self, $cmds) = @_;
3435
3436	$self->{cmdbox}->clear ();
3437	$self->{commands} = $cmds;
3438
3439	my $idx = 0;
3440
3441	for (@$cmds) {
3442	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3443
3444	my $i = $idx;
3445	$hb->add (new CFClient::UI::Label text => $_);
3446	$hb->add (new CFClient::UI::Button
3447	text => "delete",
3448	tooltip => "Deletes the action from the record",
3449	on_activate => sub {
3450	$self->{cmdbox}->remove ($hb);
3451	$cmds->[$i] = undef;
3452	});
3453
3454
3455	$idx++
3456	}
3457	}
3458
3459	#############################################################################
3460
3461	package CFClient::UI::SpellList;	3641	package CFPlus::UI::SpellList;
3462		3642
3463	our @ISA = CFClient::UI::Table::;	3643	our @ISA = CFPlus::UI::Table::;
3464		3644
3465	sub new {	3645	sub new {
3466	my $class = shift;	3646	my $class = shift;
3467		3647
3468	my $self = $class->SUPER::new (	3648	my $self = $class->SUPER::new (
…		…
3470	commands => [],	3650	commands => [],
3471	@_,	3651	@_,
3472	)	3652	)
3473	}	3653	}
3474		3654
3475	# XXX: Do sorting? Argl...	3655	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3656
		3657	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3658	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3659	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3660	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
		3661	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3662	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
		3663	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3664	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
		3665	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3666	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
		3667
		3668	sub rebuild_spell_list {
		3669	my ($self) = @_;
		3670
		3671	$CFPlus::UI::ROOT->on_refresh ($self => sub {
		3672	$self->clear;
		3673
		3674	return unless $::CONN;
		3675
		3676	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3677	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
		3678	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3679	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3680	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3681
		3682	my $row = 0;
		3683
		3684	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3685	my $spell = $self->{spell}{$_};
		3686
		3687	$row++;
		3688
		3689	my $spell_cb = sub {
		3690	my ($widget, $ev) = @_;
		3691
		3692	if ($ev->{button} == 1) {
		3693	$::CONN->user_send ("cast $spell->{name}");
		3694	} elsif ($ev->{button} == 2) {
		3695	$::CONN->user_send ("invoke $spell->{name}");
		3696	} elsif ($ev->{button} == 3) {
		3697	(new CFPlus::UI::Menu
		3698	items => [
		3699	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3700	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3701	],
		3702	)->popup ($ev);
		3703	} else {
		3704	return 0;
		3705	}
		3706
		3707	1
		3708	};
		3709
		3710	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
		3711
		3712	#TODO: add path info to tooltip
		3713	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
		3714
		3715	$self->add (0, $row, new CFPlus::UI::Face
		3716	face => $spell->{face},
		3717	can_hover => 1,
		3718	can_events => 1,
		3719	tooltip => $tooltip,
		3720	on_button_down => $spell_cb,
		3721	);
		3722
		3723	$self->add (1, $row, new CFPlus::UI::Label
		3724	expand => 1,
		3725	text => $spell->{name},
		3726	can_hover => 1,
		3727	can_events => 1,
		3728	tooltip => $tooltip,
		3729	on_button_down => $spell_cb,
		3730	);
		3731
		3732	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
		3733	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3734	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
		3735	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3736	}
		3737	});
		3738	}
		3739
3476	sub add_spell {	3740	sub add_spell {
3477	my ($self, $spell) = @_;	3741	my ($self, $spell) = @_;
		3742
3478	$self->{spells}->{$spell->{name}} = $spell;	3743	$self->{spell}->{$spell->{name}} = $spell;
3479		3744	$self->rebuild_spell_list;
3480	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3481	face => $spell->{face},
3482	can_hover => 1,
3483	can_events => 1,
3484	tooltip => $spell->{message});
3485
3486	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3487	text => $spell->{name},
3488	can_hover => 1,
3489	can_events => 1,
3490	tooltip => $spell->{message},
3491	expand => 1);
3492
3493	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3494	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3495	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3496	expand => 1);
3497
3498	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3499	text => "bind to key",
3500	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3501	}
3502
3503	sub rebuild_spell_list {
3504	my ($self) = @_;
3505	$self->{tbl_idx} = 0;
3506	$self->add_spell ($_) for values %{$self->{spells}};
3507	}	3745	}
3508		3746
3509	sub remove_spell {	3747	sub remove_spell {
3510	my ($self, $spell) = @_;	3748	my ($self, $spell) = @_;
		3749
3511	delete $self->{spells}->{$spell->{name}};	3750	delete $self->{spell}->{$spell->{name}};
3512	$self->rebuild_spell_list;	3751	$self->rebuild_spell_list;
3513	}	3752	}
3514		3753
		3754	sub clear_spells {
		3755	my ($self) = @_;
		3756
		3757	$self->{spell} = {};
		3758	$self->rebuild_spell_list;
		3759	}
		3760
3515	#############################################################################	3761	#############################################################################
3516		3762
3517	package CFClient::UI::Root;	3763	package CFPlus::UI::Root;
3518		3764
3519	our @ISA = CFClient::UI::Container::;	3765	our @ISA = CFPlus::UI::Container::;
3520		3766
3521	use List::Util qw(min max);	3767	use List::Util qw(min max);
3522		3768
3523	use CFClient::OpenGL;	3769	use CFPlus::OpenGL;
3524		3770
3525	sub new {	3771	sub new {
3526	my $class = shift;	3772	my $class = shift;
3527		3773
3528	my $self = $class->SUPER::new (	3774	my $self = $class->SUPER::new (
…		…
3553	$coord = $max - $size if $coord > $max - $size;	3799	$coord = $max - $size if $coord > $max - $size;
3554		3800
3555	int $coord + 0.5	3801	int $coord + 0.5
3556	}	3802	}
3557		3803
3558	sub size_allocate {	3804	sub invoke_size_allocate {
3559	my ($self, $w, $h) = @_;	3805	my ($self, $w, $h) = @_;
3560		3806
3561	for my $child ($self->children) {	3807	for my $child ($self->children) {
3562	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3808	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3563		3809
…		…
3567	$X = _to_pixel $X, $W, $self->{w};	3813	$X = _to_pixel $X, $W, $self->{w};
3568	$Y = _to_pixel $Y, $H, $self->{h};	3814	$Y = _to_pixel $Y, $H, $self->{h};
3569		3815
3570	$child->configure ($X, $Y, $W, $H);	3816	$child->configure ($X, $Y, $W, $H);
3571	}	3817	}
		3818
		3819	1
3572	}	3820	}
3573		3821
3574	sub coord2local {	3822	sub coord2local {
3575	my ($self, $x, $y) = @_;	3823	my ($self, $x, $y) = @_;
3576		3824
…		…
3702	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3950	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3703		3951
3704	$w = 0 if $w < 0;	3952	$w = 0 if $w < 0;
3705	$h = 0 if $h < 0;	3953	$h = 0 if $h < 0;
3706		3954
		3955	$w = max $widget->{min_w}, $w;
		3956	$h = max $widget->{min_h}, $h;
		3957
		3958	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3959	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3960
		3961	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3962	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3963
3707	$w = int $w + 0.5;	3964	$w = int $w + 0.5;
3708	$h = int $h + 0.5;	3965	$h = int $h + 0.5;
3709		3966
3710	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3967	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3711	$widget->{old_w} = $widget->{w};	3968	$widget->{old_w} = $widget->{w};
…		…
3734	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3991	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3735	glMatrixMode GL_MODELVIEW;	3992	glMatrixMode GL_MODELVIEW;
3736	glLoadIdentity;	3993	glLoadIdentity;
3737		3994
3738	{	3995	{
3739	package CFClient::UI::Base;	3996	package CFPlus::UI::Base;
3740		3997
3741	($draw_x, $draw_y, $draw_w, $draw_h) =	3998	($draw_x, $draw_y, $draw_w, $draw_h) =
3742	(0, 0, $self->{w}, $self->{h});	3999	(0, 0, $self->{w}, $self->{h});
3743	}	4000	}
3744		4001
3745	$self->_draw;	4002	$self->_draw;
3746	}	4003	}
3747		4004
3748	#############################################################################	4005	#############################################################################
3749		4006
3750	package CFClient::UI;	4007	package CFPlus::UI;
3751		4008
3752	$ROOT = new CFClient::UI::Root;	4009	$ROOT = new CFPlus::UI::Root;
3753	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4010	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3754		4011
3755	1	4012	1
3756		4013

Diff Legend

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