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.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.366 by root, Mon Apr 23 19:17:41 2007 UTC

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

Diff Legend

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