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.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.368 by root, Mon Jun 25 05:43:37 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
		273	sub TO_JSON {
		274	{ __widget_ref__ => $_[0]{s_id} }
		275	}
		276
247	sub show {	277	sub show {
248	my ($self) = @_;	278	my ($self) = @_;
249		279
250	return if $self->{parent};	280	return if $self->{parent};
251		281
252	$CFClient::UI::ROOT->add ($self);	282	$CFPlus::UI::ROOT->add ($self);
253	}	283	}
254		284
255	sub set_visible {	285	sub set_visible {
256	my ($self) = @_;	286	my ($self) = @_;
257		287
…		…
278	delete $self->{root};	308	delete $self->{root};
279		309
280	undef $GRAB if $GRAB == $self;	310	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	311	undef $HOVER if $HOVER == $self;
282		312
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	313	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	314	if $TOOLTIP->{owner} == $self;
285		315
286	$self->emit ("focus_out");	316	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	317	$self->emit (visibility_change => 0);
288	}	318	}
…		…
335	sub size_request {	365	sub size_request {
336	require Carp;	366	require Carp;
337	Carp::confess "size_request is abstract";	367	Carp::confess "size_request is abstract";
338	}	368	}
339		369
		370	sub baseline_shift {
		371	0
		372	}
		373
340	sub configure {	374	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	375	my ($self, $x, $y, $w, $h) = @_;
342		376
343	if ($self->{aspect}) {	377	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	378	my ($ow, $oh) = ($w, $h);
345		379
346	$w = List::Util::min $w, int $h * $self->{aspect};	380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347	$h = List::Util::min $h, int $w / $self->{aspect};	381	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348		382
349	# use alignment to adjust x, y	383	# use alignment to adjust x, y
350		384
351	$x += int 0.5 * ($ow - $w);	385	$x += int 0.5 * ($ow - $w);
352	$y += int 0.5 * ($oh - $h);	386	$y += int 0.5 * ($oh - $h);
…		…
393		427
394	return if $self->{tooltip} eq $tooltip;	428	return if $self->{tooltip} eq $tooltip;
395		429
396	$self->{tooltip} = $tooltip;	430	$self->{tooltip} = $tooltip;
397		431
398	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399	delete $CFClient::UI::TOOLTIP->{owner};	433	delete $CFPlus::UI::TOOLTIP->{owner};
400	$CFClient::UI::TOOLTIP_WATCHER->cb->();	434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
401	}	435	}
402	}	436	}
403		437
404	# translate global coordinates to local coordinate system	438	# translate global coordinates to local coordinate system
405	sub coord2local {	439	sub coord2local {
406	my ($self, $x, $y) = @_;	440	my ($self, $x, $y) = @_;
407		441
		442	Carp::confess unless $self->{parent};#d#
		443
408	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	444	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409	}	445	}
410		446
411	# translate local coordinates to global coordinate system	447	# translate local coordinates to global coordinate system
412	sub coord2global {	448	sub coord2global {
413	my ($self, $x, $y) = @_;	449	my ($self, $x, $y) = @_;
414		450
		451	Carp::confess unless $self->{parent};#d#
		452
415	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416	}	454	}
417		455
418	sub invoke_focus_in {	456	sub invoke_focus_in {
419	my ($self) = @_;	457	my ($self) = @_;
420		458
421	return if $FOCUS == $self;	459	return if $FOCUS == $self;
422	return unless $self->{can_focus};	460	return unless $self->{can_focus};
423		461
424	my $focus = $FOCUS; $FOCUS = $self;	462	$FOCUS = $self;
425		463
426	$focus->update if $focus;	464	$self->update;
427	$FOCUS->update;
428		465
429	0	466	0
430	}	467	}
431		468
432	sub invoke_focus_out {	469	sub invoke_focus_out {
433	my ($self) = @_;	470	my ($self) = @_;
434		471
435	return unless $FOCUS == $self;	472	return unless $FOCUS == $self;
436		473
437	my $focus = $FOCUS; undef $FOCUS;	474	undef $FOCUS;
438		475
439	$focus->update if $focus; #?	476	$self->update;
440		477
441	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	478	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442	unless $FOCUS;	479	unless $FOCUS;
443		480
444	0	481	0
445	}	482	}
446		483
447	sub grab_focus {	484	sub grab_focus {
448	my ($self) = @_;	485	my ($self) = @_;
449		486
		487	$FOCUS->emit ("focus_out") if $FOCUS;
450	$self->emit ("focus_in");	488	$self->emit ("focus_in");
451	}	489	}
452		490
453	sub invoke_mouse_motion { 1 }	491	sub invoke_mouse_motion { 0 }
454	sub invoke_button_up { 1 }	492	sub invoke_button_up { 0 }
455	sub invoke_key_down { 1 }	493	sub invoke_key_down { 0 }
456	sub invoke_key_up { 1 }	494	sub invoke_key_up { 0 }
		495	sub invoke_mouse_wheel { 0 }
457		496
458	sub invoke_button_down {	497	sub invoke_button_down {
459	my ($self, $ev, $x, $y) = @_;	498	my ($self, $ev, $x, $y) = @_;
460		499
461	$self->grab_focus;	500	$self->grab_focus;
462		501
463	1	502	0
464	}	503	}
465		504
466	sub connect {	505	sub connect {
467	my ($self, $signal, $cb) = @_;	506	my ($self, $signal, $cb) = @_;
468		507
469	push @{ $self->{signal_cb}{$signal} }, $cb;	508	push @{ $self->{signal_cb}{$signal} }, $cb;
		509
		510	defined wantarray and CFPlus::guard {
		511	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		512	@{ $self->{signal_cb}{$signal} };
		513	}
470	}	514	}
		515
		516	sub disconnect_all {
		517	my ($self, $signal) = @_;
		518
		519	delete $self->{signal_cb}{$signal};
		520	}
		521
		522	my %has_coords = (
		523	button_down => 1,
		524	button_up => 1,
		525	mouse_motion => 1,
		526	mouse_wheel => 1,
		527	);
471		528
472	sub emit {	529	sub emit {
473	my ($self, $signal, @args) = @_;	530	my ($self, $signal, @args) = @_;
474		531
475	#d##TODO# stop propagating at first true, do not use sum	532	# I do not really like this solution, but I do not like duplication
476	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	533	# and needlessly verbose code, either.
		534	my @append
		535	= $has_coords{$signal}
		536	? $args[0]->xy ($self)
		537	: ();
		538
		539	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		540
		541	for my $cb (
		542	@{$self->{signal_cb}{$signal} || []}, # before
477	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	543	($self->can ("invoke_$signal") || sub { 1 }), # closure
		544	) {
		545	return $cb->($self, @args, @append) || next;
		546	}
		547
		548	# parent
478	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
479	}	550	}
480		551
481	sub find_widget {	552	sub find_widget {
482	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
483		554
…		…
491	}	562	}
492		563
493	sub set_parent {	564	sub set_parent {
494	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
495		566
496	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
497	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
498	}	569	}
499		570
500	sub realloc {	571	sub realloc {
501	my ($self) = @_;	572	my ($self) = @_;
…		…
535	return unless $self->{h} && $self->{w};	606	return unless $self->{h} && $self->{w};
536		607
537	# update screen rectangle	608	# update screen rectangle
538	local $draw_x = $draw_x + $self->{x};	609	local $draw_x = $draw_x + $self->{x};
539	local $draw_y = $draw_y + $self->{y};	610	local $draw_y = $draw_y + $self->{y};
540	local $draw_w = $draw_x + $self->{w};
541	local $draw_h = $draw_y + $self->{h};
542		611
543	# skip widgets that are entirely outside the drawing area	612	# skip widgets that are entirely outside the drawing area
544	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	613	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	614	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546		615
…		…
569	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
570	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
571	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
572	glEnd;	641	glEnd;
573	glPopMatrix;	642	glPopMatrix;
574	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	643	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
575	}	644	}
576		645
577	$self->_draw;	646	$self->_draw;
578	glPopMatrix;	647	glPopMatrix;
579	}	648	}
…		…
582	my ($self) = @_;	651	my ($self) = @_;
583		652
584	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
585	}	654	}
586		655
		656	my $cntx;#d#
587	sub DESTROY {	657	sub DESTROY {
588	my ($self) = @_;	658	my ($self) = @_;
589		659
590	delete $WIDGET{$self+0};	660	return if CFPlus::in_destruct;
591		661
592	eval { $self->destroy };	662	eval { $self->destroy };
593	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	663	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		664
		665	delete $WIDGET{$self+0};
594	}	666	}
595		667
596	#############################################################################	668	#############################################################################
597		669
598	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
599		671
600	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
601		673
602	use strict;	674	use strict;
603	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
604		676
605	sub new {	677	sub new {
606	my $class = shift;	678	my $class = shift;
607		679
608	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
639	}	711	}
640	}	712	}
641		713
642	#############################################################################	714	#############################################################################
643		715
644	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
645		717
646	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
647		719
648	sub new {	720	sub new {
649	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
650	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
651	}	723	}
…		…
658		730
659	sub draw { }	731	sub draw { }
660		732
661	#############################################################################	733	#############################################################################
662		734
663	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
664		736
665	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
666		738
667	sub new {	739	sub new {
668	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
669		741
670	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
679	if $children;	751	if $children;
680		752
681	$self	753	$self
682	}	754	}
683		755
		756	sub realloc {
		757	my ($self) = @_;
		758
		759	$self->{force_realloc} = 1;
		760	$self->{force_size_alloc} = 1;
		761	$self->SUPER::realloc;
		762	}
		763
684	sub add {	764	sub add {
685	my ($self, @widgets) = @_;	765	my ($self, @widgets) = @_;
686		766
687	$_->set_parent ($self)	767	$_->set_parent ($self)
688	for @widgets;	768	for @widgets;
…		…
748	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
749	}	829	}
750		830
751	#############################################################################	831	#############################################################################
752		832
753	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
754		834
755	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
756		836
757	sub new {	837	sub new {
758	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
759		839
760	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
761		841
762	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
763	}	843	}
764		844
765	sub add {	845	sub add {
…		…
772	sub remove {	852	sub remove {
773	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
774		854
775	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
776		856
777	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
778	unless @{$self->{children}};	858	unless @{$self->{children}};
779	}	859	}
780		860
781	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
782		862
…		…
794		874
795	#############################################################################	875	#############################################################################
796		876
797	# back-buffered drawing area	877	# back-buffered drawing area
798		878
799	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
800		880
801	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
802		882
803	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
804		884
805	sub new {	885	sub new {
806	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
807		887
808	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
830	}	910	}
831		911
832	sub render_child {	912	sub render_child {
833	my ($self) = @_;	913	my ($self) = @_;
834		914
835	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	915	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
836	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
837	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
838		918
839	{	919	{
840	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
841		921
842	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
843	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
844	}	926	}
845
846	$self->_render;
847	};	927	};
848	}	928	}
849		929
850	sub _draw {	930	sub _draw {
851	my ($self) = @_;	931	my ($self) = @_;
852
853	my ($w, $h) = @$self{qw(w h)};
854		932
855	my $tex = $self->{texture}	933	my $tex = $self->{texture}
856	or return;	934	or return;
857		935
858	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
861		939
862	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
863		941
864	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
865	}	943	}
866		944
867	#############################################################################	945	#############################################################################
868		946
869	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
870		948
871	our @ISA = CFClient::UI::Window::;	949	our @ISA = CFPlus::UI::Window::;
872		950
873	sub new {	951	sub new {
874	my $class = shift;	952	my $class = shift;
875		953
876	$class->SUPER::new (	954	$class->SUPER::new (
…		…
936	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
938	) {	1016	) {
939	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1017	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940	} else {	1018	} else {
941	$self->CFClient::UI::Base::find_widget ($x, $y)	1019	$self->CFPlus::UI::Base::find_widget ($x, $y)
942	}	1020	}
943	}	1021	}
944		1022
945	sub _render {	1023	sub _render {
946	my ($self) = @_;	1024	my ($self) = @_;
947		1025
948	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1026	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
949	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1027	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950		1028
951	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1029	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952		1030
953	$self->SUPER::_render;	1031	$self->SUPER::_render;
954	}	1032	}
955		1033
956	#############################################################################	1034	#############################################################################
957		1035
958	package CFClient::UI::ScrolledWindow;	1036	package CFPlus::UI::ScrolledWindow;
959		1037
960	our @ISA = CFClient::UI::HBox::;	1038	our @ISA = CFPlus::UI::HBox::;
961		1039
962	sub new {	1040	sub new {
963	my ($class, %arg) = @_;	1041	my ($class, %arg) = @_;
964		1042
965	my $child = delete $arg{child};	1043	my $child = delete $arg{child};
966		1044
967	my $self;	1045	my $self;
968		1046
969	my $slider = new CFClient::UI::Slider	1047	my $slider = new CFPlus::UI::Slider
970	vertical => 1,	1048	vertical => 1,
971	range => [0, 0, 1, 0.01], # HACK fix	1049	range => [0, 0, 1, 0.01], # HACK fix
972	on_changed => sub {	1050	on_changed => sub {
973	$self->{vp}->set_offset (0, $_[1]);	1051	$self->{vp}->set_offset (0, $_[1]);
974	},	1052	},
975	;	1053	;
976		1054
977	$self = $class->SUPER::new (	1055	$self = $class->SUPER::new (
978	vp => (new CFClient::UI::ViewPort expand => 1),	1056	vp => (new CFPlus::UI::ViewPort expand => 1),
		1057	can_events => 1,
979	slider => $slider,	1058	slider => $slider,
980	%arg,	1059	%arg,
981	);	1060	);
982		1061
983	$self->SUPER::add ($self->{vp}, $self->{slider});	1062	$self->SUPER::add ($self->{vp}, $self->{slider});
984	$self->add ($child) if $child;	1063	$self->add ($child) if $child;
985		1064
986	$self	1065	$self
987	}	1066	}
988		1067
		1068	#TODO# update range on size_allocate depending on child
		1069
989	sub add {	1070	sub add {
990	my ($self, $widget) = @_;	1071	my ($self, $widget) = @_;
991		1072
992	$self->{vp}->add ($self->{child} = $widget);	1073	$self->{vp}->add ($self->{child} = $widget);
993	}	1074	}
994		1075
		1076	sub invoke_mouse_wheel {
		1077	my ($self, $ev) = @_;
		1078
		1079	return 0 unless $ev->{dy}; # only vertical movements
		1080
		1081	$self->{slider}->emit (mouse_wheel => $ev);
		1082
		1083	1
		1084	}
		1085
		1086	sub update_slider {
		1087	my ($self) = @_;
		1088
		1089	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1090	}
		1091
995	sub update {	1092	sub update {
996	my ($self) = @_;	1093	my ($self) = @_;
997		1094
998	$self->SUPER::update;	1095	$self->SUPER::update;
999		1096
1000	# todo: overwrite size_allocate of child	1097	$self->update_slider;
1001	my $child = $self->{vp}->child;
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003	}	1098	}
1004		1099
1005	sub invoke_size_allocate {	1100	sub invoke_size_allocate {
1006	my ($self, $w, $h) = @_;	1101	my ($self, $w, $h) = @_;
1007		1102
1008	my $child = $self->{vp}->child;	1103	$self->update_slider;
1009	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010		1104
1011	$self->SUPER::invoke_size_allocate ($w, $h)	1105	$self->SUPER::invoke_size_allocate ($w, $h)
1012	}	1106	}
1013		1107
1014	#TODO# update range on size_allocate depending on child
1015	# update viewport offset on scroll
1016
1017	#############################################################################	1108	#############################################################################
1018		1109
1019	package CFClient::UI::Frame;	1110	package CFPlus::UI::Frame;
1020		1111
1021	our @ISA = CFClient::UI::Bin::;	1112	our @ISA = CFPlus::UI::Bin::;
1022		1113
1023	use CFClient::OpenGL;	1114	use CFPlus::OpenGL;
1024		1115
1025	sub new {	1116	sub new {
1026	my $class = shift;	1117	my $class = shift;
1027		1118
1028	$class->SUPER::new (	1119	$class->SUPER::new (
…		…
1054	$self->SUPER::_draw;	1145	$self->SUPER::_draw;
1055	}	1146	}
1056		1147
1057	#############################################################################	1148	#############################################################################
1058		1149
1059	package CFClient::UI::FancyFrame;	1150	package CFPlus::UI::FancyFrame;
1060		1151
1061	our @ISA = CFClient::UI::Bin::;	1152	our @ISA = CFPlus::UI::Bin::;
1062		1153
1063	use CFClient::OpenGL;	1154	use CFPlus::OpenGL;
		1155
		1156	sub new {
		1157	my ($class, %arg) = @_;
		1158
		1159	if ((exists $arg{label}) && !ref $arg{label}) {
		1160	$arg{label} = new CFPlus::UI::Label
		1161	align => 1,
		1162	valign => 0,
		1163	text => $arg{label},
		1164	fontsize => ($arg{border} || 0.8) * 0.75;
		1165	}
		1166
		1167	my $self = $class->SUPER::new (
		1168	# label => "",
		1169	fg => [0.6, 0.3, 0.1],
		1170	border => 0.8,
		1171	style => 'single',
		1172	%arg,
		1173	);
		1174
		1175	$self
		1176	}
		1177
		1178	sub add {
		1179	my ($self, @widgets) = @_;
		1180
		1181	$self->SUPER::add (@widgets);
		1182	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1183	}
		1184
		1185	sub border {
		1186	int $_[0]{border} * $::FONTSIZE
		1187	}
		1188
		1189	sub size_request {
		1190	my ($self) = @_;
		1191
		1192	($self->{label_w}, undef) = $self->{label}->size_request
		1193	if $self->{label};
		1194
		1195	my ($w, $h) = $self->SUPER::size_request;
		1196
		1197	(
		1198	$w + $self->border * 2,
		1199	$h + $self->border * 2,
		1200	)
		1201	}
		1202
		1203	sub invoke_size_allocate {
		1204	my ($self, $w, $h) = @_;
		1205
		1206	my $border = $self->border;
		1207
		1208	$w -= List::Util::max 0, $border * 2;
		1209	$h -= List::Util::max 0, $border * 2;
		1210
		1211	if (my $label = $self->{label}) {
		1212	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1213	$label->{h} = List::Util::min $h, $border;
		1214	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1215	}
		1216
		1217	$self->child->configure ($border, $border, $w, $h);
		1218
		1219	1
		1220	}
		1221
		1222	sub _draw {
		1223	my ($self) = @_;
		1224
		1225	my $child = $self->{children}[0];
		1226
		1227	my $border = $self->border;
		1228	my ($w, $h) = ($self->{w}, $self->{h});
		1229
		1230	$child->draw;
		1231
		1232	glColor @{$self->{fg}};
		1233	glBegin GL_LINE_STRIP;
		1234	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1235	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1236	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1237	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1238	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1239	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1240	glEnd;
		1241
		1242	if ($self->{label}) {
		1243	glTranslate $border * 2, 0;
		1244	$self->{label}->_draw;
		1245	}
		1246	}
		1247
		1248	#############################################################################
		1249
		1250	package CFPlus::UI::Toplevel;
		1251
		1252	our @ISA = CFPlus::UI::Bin::;
		1253
		1254	use CFPlus::OpenGL;
1064		1255
1065	my $bg =	1256	my $bg =
1066	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1257	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067	mipmap => 1, wrap => 1;	1258	mipmap => 1, wrap => 1;
1068		1259
1069	my @border =	1260	my @border =
1070	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1261	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1071	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1262	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072		1263
1073	sub new {	1264	sub new {
1074	my ($class, %arg) = @_;	1265	my ($class, %arg) = @_;
1075		1266
1076	my $self = $class->SUPER::new (	1267	my $self = $class->SUPER::new (
1077	bg => [1, 1, 1, 1],	1268	bg => [1, 1, 1, 1],
1078	border_bg => [1, 1, 1, 1],	1269	border_bg => [1, 1, 1, 1],
1079	border => 0.6,	1270	border => 0.6,
1080	can_events => 1,	1271	can_events => 1,
1081	min_w => 16,	1272	min_w => 64,
1082	min_h => 16,	1273	min_h => 32,
1083	%arg,	1274	%arg,
1084	);	1275	);
1085		1276
1086	$self->{title_widget} = new CFClient::UI::Label	1277	$self->{title_widget} = new CFPlus::UI::Label
1087	align => 0,	1278	align => 0,
1088	valign => 1,	1279	valign => 1,
1089	text => $self->{title},	1280	text => $self->{title},
1090	fontsize => $self->{border},	1281	fontsize => $self->{border},
1091	if exists $self->{title};	1282	if exists $self->{title};
1092		1283
1093	if ($self->{has_close_button}) {	1284	if ($self->{has_close_button}) {
1094	$self->{close_button} =	1285	$self->{close_button} =
1095	new CFClient::UI::ImageButton	1286	new CFPlus::UI::ImageButton
1096	image => 'x1_close.png',	1287	path => 'x1_close.png',
1097	on_activate => sub { $self->hide };	1288	on_activate => sub { $self->emit ("delete") };
1098		1289
1099	$self->CFClient::UI::Container::add ($self->{close_button});	1290	$self->CFPlus::UI::Container::add ($self->{close_button});
1100	}	1291	}
1101		1292
1102	$self	1293	$self
1103	}	1294	}
1104		1295
1105	sub add {	1296	sub add {
1106	my ($self, @widgets) = @_;	1297	my ($self, @widgets) = @_;
1107		1298
1108	$self->SUPER::add (@widgets);	1299	$self->SUPER::add (@widgets);
1109	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1300	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1110	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1301	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1111	}	1302	}
1112		1303
1113	sub border {	1304	sub border {
1114	int $_[0]{border} * $::FONTSIZE	1305	int $_[0]{border} * $::FONTSIZE
1115	}	1306	}
…		…
1148	$self->child->configure ($border, $border, $w, $h);	1339	$self->child->configure ($border, $border, $w, $h);
1149		1340
1150	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1341	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151	if $self->{close_button};	1342	if $self->{close_button};
1152		1343
		1344	1
		1345	}
		1346
		1347	sub invoke_delete {
		1348	my ($self) = @_;
		1349
		1350	$self->hide;
		1351
1153	1	1352	1
1154	}	1353	}
1155		1354
1156	sub invoke_button_down {	1355	sub invoke_button_down {
1157	my ($self, $ev, $x, $y) = @_;	1356	my ($self, $ev, $x, $y) = @_;
…		…
1215	$self->{motion}->($ev, $x, $y) if $self->{motion};	1414	$self->{motion}->($ev, $x, $y) if $self->{motion};
1216		1415
1217	! ! $self->{motion}	1416	! ! $self->{motion}
1218	}	1417	}
1219		1418
		1419	sub invoke_visibility_change {
		1420	my ($self, $visible) = @_;
		1421
		1422	delete $self->{motion} unless $visible;
		1423
		1424	0
		1425	}
		1426
1220	sub _draw {	1427	sub _draw {
1221	my ($self) = @_;	1428	my ($self) = @_;
1222		1429
1223	my $child = $self->{children}[0];	1430	my $child = $self->{children}[0];
1224		1431
…		…
1261	if $self->{close_button};	1468	if $self->{close_button};
1262	}	1469	}
1263		1470
1264	#############################################################################	1471	#############################################################################
1265		1472
1266	package CFClient::UI::Table;	1473	package CFPlus::UI::Table;
1267		1474
1268	our @ISA = CFClient::UI::Base::;	1475	our @ISA = CFPlus::UI::Base::;
1269		1476
1270	use List::Util qw(max sum);	1477	use List::Util qw(max sum);
1271		1478
1272	use CFClient::OpenGL;	1479	use CFPlus::OpenGL;
1273		1480
1274	sub new {	1481	sub new {
1275	my $class = shift;	1482	my $class = shift;
1276		1483
1277	$class->SUPER::new (	1484	$class->SUPER::new (
…		…
1283	sub children {	1490	sub children {
1284	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1491	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285	}	1492	}
1286		1493
1287	sub add {	1494	sub add {
1288	my ($self, $x, $y, $child) = @_;	1495	my ($self) = shift;
1289		1496
		1497	while (@_) {
		1498	my ($x, $y, $child) = splice @_, 0, 3, ();
1290	$child->set_parent ($self);	1499	$child->set_parent ($self);
1291	$self->{children}[$y][$x] = $child;	1500	$self->{children}[$y][$x] = $child;
		1501	}
1292		1502
		1503	$self->{force_realloc} = 1;
		1504	$self->{force_size_alloc} = 1;
1293	$self->realloc;	1505	$self->realloc;
1294	}	1506	}
1295		1507
1296	sub remove {	1508	sub remove {
1297	my ($self, $child) = @_;	1509	my ($self, $child) = @_;
…		…
1362		1574
1363	# linearly scale sizes	1575	# linearly scale sizes
1364	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1576	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1365	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1577	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1366		1578
1367	CFClient::UI::harmonize $ws;	1579	CFPlus::UI::harmonize $ws;
1368	CFClient::UI::harmonize $hs;	1580	CFPlus::UI::harmonize $hs;
1369		1581
1370	my $y;	1582	my $y;
1371		1583
1372	for my $r (0 .. $#{$self->{children}}) {	1584	for my $r (0 .. $#{$self->{children}}) {
1373	my $row = $self->{children}[$r]	1585	my $row = $self->{children}[$r]
…		…
1416	}	1628	}
1417	}	1629	}
1418		1630
1419	#############################################################################	1631	#############################################################################
1420		1632
1421	package CFClient::UI::Box;	1633	package CFPlus::UI::Box;
1422		1634
1423	our @ISA = CFClient::UI::Container::;	1635	our @ISA = CFPlus::UI::Container::;
1424		1636
1425	sub size_request {	1637	sub size_request {
1426	my ($self) = @_;	1638	my ($self) = @_;
1427		1639
1428	$self->{vertical}	1640	$self->{vertical}
…		…
1438		1650
1439	sub invoke_size_allocate {	1651	sub invoke_size_allocate {
1440	my ($self, $w, $h) = @_;	1652	my ($self, $w, $h) = @_;
1441		1653
1442	my $space = $self->{vertical} ? $h : $w;	1654	my $space = $self->{vertical} ? $h : $w;
1443	my $children = $self->{children};	1655	my @children = $self->visible_children;
1444		1656
1445	my @req;	1657	my @req;
1446		1658
1447	if ($self->{homogeneous}) {	1659	if ($self->{homogeneous}) {
1448	@req = ($space / (@$children || 1)) x @$children;	1660	@req = ($space / (@children || 1)) x @children;
1449	} else {	1661	} else {
1450	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1662	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1451	my $req = List::Util::sum @req;	1663	my $req = List::Util::sum @req;
1452		1664
1453	if ($req > $space) {	1665	if ($req > $space) {
1454	# ah well, not enough space	1666	# ah well, not enough space
1455	$_ *= $space / $req for @req;	1667	$_ *= $space / $req for @req;
1456	} else {	1668	} else {
1457	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1669	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1458		1670
1459	$space = ($space - $req) / $expand; # remaining space to give away	1671	$space = ($space - $req) / $expand; # remaining space to give away
1460		1672
1461	$req[$_] += $space * $children->[$_]{expand}	1673	$req[$_] += $space * $children[$_]{expand}
1462	for 0 .. $#$children;	1674	for 0 .. $#children;
1463	}	1675	}
1464	}	1676	}
1465		1677
1466	CFClient::UI::harmonize \@req;	1678	CFPlus::UI::harmonize \@req;
1467		1679
1468	my $pos = 0;	1680	my $pos = 0;
1469	for (0 .. $#$children) {	1681	for (0 .. $#children) {
1470	my $alloc = $req[$_];	1682	my $alloc = $req[$_];
1471	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1683	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1472		1684
1473	$pos += $alloc;	1685	$pos += $alloc;
1474	}	1686	}
1475		1687
1476	1	1688	1
1477	}	1689	}
1478		1690
1479	#############################################################################	1691	#############################################################################
1480		1692
1481	package CFClient::UI::HBox;	1693	package CFPlus::UI::HBox;
1482		1694
1483	our @ISA = CFClient::UI::Box::;	1695	our @ISA = CFPlus::UI::Box::;
1484		1696
1485	sub new {	1697	sub new {
1486	my $class = shift;	1698	my $class = shift;
1487		1699
1488	$class->SUPER::new (	1700	$class->SUPER::new (
…		…
1491	)	1703	)
1492	}	1704	}
1493		1705
1494	#############################################################################	1706	#############################################################################
1495		1707
1496	package CFClient::UI::VBox;	1708	package CFPlus::UI::VBox;
1497		1709
1498	our @ISA = CFClient::UI::Box::;	1710	our @ISA = CFPlus::UI::Box::;
1499		1711
1500	sub new {	1712	sub new {
1501	my $class = shift;	1713	my $class = shift;
1502		1714
1503	$class->SUPER::new (	1715	$class->SUPER::new (
…		…
1506	)	1718	)
1507	}	1719	}
1508		1720
1509	#############################################################################	1721	#############################################################################
1510		1722
1511	package CFClient::UI::Label;	1723	package CFPlus::UI::Label;
1512		1724
1513	our @ISA = CFClient::UI::DrawBG::;	1725	our @ISA = CFPlus::UI::DrawBG::;
1514		1726
1515	use CFClient::OpenGL;	1727	use CFPlus::OpenGL;
1516		1728
1517	sub new {	1729	sub new {
1518	my ($class, %arg) = @_;	1730	my ($class, %arg) = @_;
1519		1731
1520	my $self = $class->SUPER::new (	1732	my $self = $class->SUPER::new (
…		…
1523	#active_bg => none	1735	#active_bg => none
1524	#font => default_font	1736	#font => default_font
1525	#text => initial text	1737	#text => initial text
1526	#markup => initial narkup	1738	#markup => initial narkup
1527	#max_w => maximum pixel width	1739	#max_w => maximum pixel width
		1740	#style => 0, # render flags
1528	ellipsise => 3, # end	1741	ellipsise => 3, # end
1529	layout => (new CFClient::Layout),	1742	layout => (new CFPlus::Layout),
1530	fontsize => 1,	1743	fontsize => 1,
1531	align => -1,	1744	align => -1,
1532	valign => -1,	1745	valign => -1,
1533	padding_x => 2,	1746	padding_x => 2,
1534	padding_y => 2,	1747	padding_y => 2,
1535	can_events => 0,	1748	can_events => 0,
1536	%arg	1749	%arg
1537	);	1750	);
1538		1751
1539	if (exists $self->{template}) {	1752	if (exists $self->{template}) {
1540	my $layout = new CFClient::Layout;	1753	my $layout = new CFPlus::Layout;
1541	$layout->set_text (delete $self->{template});	1754	$layout->set_text (delete $self->{template});
1542	$self->{template} = $layout;	1755	$self->{template} = $layout;
1543	}	1756	}
1544		1757
1545	if (exists $self->{markup}) {	1758	if (exists $self->{markup}) {
…		…
1549	}	1762	}
1550		1763
1551	$self	1764	$self
1552	}	1765	}
1553		1766
1554	sub escape($) {
1555	local $_ = $_[0];
1556
1557	s/&/&amp;/g;
1558	s/>/&gt;/g;
1559	s/</&lt;/g;
1560
1561	$_
1562	}
1563
1564	sub update {	1767	sub update {
1565	my ($self) = @_;	1768	my ($self) = @_;
1566		1769
1567	delete $self->{texture};	1770	delete $self->{texture};
1568	$self->SUPER::update;	1771	$self->SUPER::update;
…		…
1579	my ($self, $text) = @_;	1782	my ($self, $text) = @_;
1580		1783
1581	return if $self->{text} eq "T$text";	1784	return if $self->{text} eq "T$text";
1582	$self->{text} = "T$text";	1785	$self->{text} = "T$text";
1583		1786
1584	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585	$self->{layout}->set_text ($text);	1787	$self->{layout}->set_text ($text);
1586		1788
1587	delete $self->{size_req};	1789	delete $self->{size_req};
1588	$self->realloc;	1790	$self->realloc;
1589	$self->update;	1791	$self->update;
…		…
1595	return if $self->{text} eq "M$markup";	1797	return if $self->{text} eq "M$markup";
1596	$self->{text} = "M$markup";	1798	$self->{text} = "M$markup";
1597		1799
1598	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1800	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599		1801
1600	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601	$self->{layout}->set_markup ($markup);	1802	$self->{layout}->set_markup ($markup);
1602		1803
1603	delete $self->{size_req};	1804	delete $self->{size_req};
1604	$self->realloc;	1805	$self->realloc;
1605	$self->update;	1806	$self->update;
…		…
1617		1818
1618	my ($w, $h) = $self->{layout}->size;	1819	my ($w, $h) = $self->{layout}->size;
1619		1820
1620	if (exists $self->{template}) {	1821	if (exists $self->{template}) {
1621	$self->{template}->set_font ($self->{font}) if $self->{font};	1822	$self->{template}->set_font ($self->{font}) if $self->{font};
		1823	$self->{template}->set_width ($self->{max_w} || -1);
1622	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1824	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623		1825
1624	my ($w2, $h2) = $self->{template}->size;	1826	my ($w2, $h2) = $self->{template}->size;
1625		1827
1626	$w = List::Util::max $w, $w2;	1828	$w = List::Util::max $w, $w2;
…		…
1631	};	1833	};
1632		1834
1633	@{ $self->{size_req} }	1835	@{ $self->{size_req} }
1634	}	1836	}
1635		1837
		1838	sub baseline_shift {
		1839	$_[0]{layout}->descent
		1840	}
		1841
1636	sub invoke_size_allocate {	1842	sub invoke_size_allocate {
1637	my ($self, $w, $h) = @_;	1843	my ($self, $w, $h) = @_;
1638		1844
1639	delete $self->{ox};	1845	delete $self->{ox};
1640		1846
…		…
1646		1852
1647	sub set_fontsize {	1853	sub set_fontsize {
1648	my ($self, $fontsize) = @_;	1854	my ($self, $fontsize) = @_;
1649		1855
1650	$self->{fontsize} = $fontsize;	1856	$self->{fontsize} = $fontsize;
		1857	delete $self->{size_req};
1651	delete $self->{texture};	1858	delete $self->{texture};
1652		1859
1653	$self->realloc;	1860	$self->realloc;
1654	}	1861	}
1655		1862
1656	sub reconfigure {	1863	sub reconfigure {
1657	my ($self) = @_;	1864	my ($self) = @_;
1658		1865
1659	delete $self->{size_req};	1866	delete $self->{size_req};
		1867	delete $self->{texture};
1660		1868
1661	$self->SUPER::reconfigure;	1869	$self->SUPER::reconfigure;
1662	}	1870	}
1663		1871
1664	sub _draw {	1872	sub _draw {
1665	my ($self) = @_;	1873	my ($self) = @_;
1666		1874
1667	$self->SUPER::_draw; # draw background, if applicable	1875	$self->SUPER::_draw; # draw background, if applicable
1668		1876
1669	my $tex = $self->{texture} ||= do {	1877	my $size = $self->{texture} ||= do {
1670	$self->{layout}->set_foreground (@{$self->{fg}});	1878	$self->{layout}->set_foreground (@{$self->{fg}});
1671	$self->{layout}->set_font ($self->{font}) if $self->{font};	1879	$self->{layout}->set_font ($self->{font}) if $self->{font};
1672	$self->{layout}->set_width ($self->{w});	1880	$self->{layout}->set_width ($self->{w});
1673	$self->{layout}->set_ellipsise ($self->{ellipsise});	1881	$self->{layout}->set_ellipsise ($self->{ellipsise});
1674	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1882	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1883	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676		1884
1677	new_from_layout CFClient::Texture $self->{layout}	1885	[$self->{layout}->size]
1678	};	1886	};
1679		1887
1680	unless (exists $self->{ox}) {	1888	unless (exists $self->{ox}) {
1681	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1889	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1890	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683	: ($self->{w} - $tex->{w}) * 0.5);	1891	: ($self->{w} - $size->[0]) * 0.5);
1684		1892
1685	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1893	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1894	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687	: ($self->{h} - $tex->{h}) * 0.5);	1895	: ($self->{h} - $size->[1]) * 0.5);
1688	};	1896	};
1689		1897
1690	glEnable GL_TEXTURE_2D;
1691
1692	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1898	my $w = List::Util::min $self->{w} + 4, $size->[0];
1693	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1899	my $h = List::Util::min $self->{h} + 2, $size->[1];
1694		1900
1695	if ($tex->{format} == GL_ALPHA) {	1901	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697	glColor @{$self->{fg}};
1698	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699	} else {
1700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702	}
1703
1704	glDisable GL_TEXTURE_2D;
1705	}	1902	}
1706		1903
1707	#############################################################################	1904	#############################################################################
1708		1905
1709	package CFClient::UI::EntryBase;	1906	package CFPlus::UI::EntryBase;
1710		1907
1711	our @ISA = CFClient::UI::Label::;	1908	our @ISA = CFPlus::UI::Label::;
1712		1909
1713	use CFClient::OpenGL;	1910	use CFPlus::OpenGL;
1714		1911
1715	sub new {	1912	sub new {
1716	my $class = shift;	1913	my $class = shift;
1717		1914
1718	$class->SUPER::new (	1915	$class->SUPER::new (
…		…
1722	active_fg => [0, 0, 0],	1919	active_fg => [0, 0, 0],
1723	can_hover => 1,	1920	can_hover => 1,
1724	can_focus => 1,	1921	can_focus => 1,
1725	valign => 0,	1922	valign => 0,
1726	can_events => 1,	1923	can_events => 1,
		1924	ellipsise => 0,
1727	#text => ...	1925	#text => ...
1728	#hidden => "*",	1926	#hidden => "*",
1729	@_	1927	@_
1730	)	1928	)
1731	}	1929	}
…		…
1776	my $sym = $ev->{sym};	1974	my $sym = $ev->{sym};
1777	my $uni = $ev->{unicode};	1975	my $uni = $ev->{unicode};
1778		1976
1779	my $text = $self->get_text;	1977	my $text = $self->get_text;
1780		1978
		1979	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		1980
1781	if ($uni == 8) {	1981	if ($uni == 8) {
1782	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1982	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783	} elsif ($uni == 127) {	1983	} elsif ($uni == 127) {
1784	substr $text, $self->{cursor}, 1, "";	1984	substr $text, $self->{cursor}, 1, "";
1785	} elsif ($sym == CFClient::SDLK_LEFT) {	1985	} elsif ($sym == CFPlus::SDLK_LEFT) {
1786	--$self->{cursor} if $self->{cursor};	1986	--$self->{cursor} if $self->{cursor};
1787	} elsif ($sym == CFClient::SDLK_RIGHT) {	1987	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1788	++$self->{cursor} if $self->{cursor} < length $self->{text};	1988	++$self->{cursor} if $self->{cursor} < length $self->{text};
1789	} elsif ($sym == CFClient::SDLK_HOME) {	1989	} elsif ($sym == CFPlus::SDLK_HOME) {
		1990	# what a hack
		1991	$self->{cursor} =
		1992	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		1993	? length $1
		1994	: 0;
		1995	} elsif ($sym == CFPlus::SDLK_END) {
		1996	# uh, again
		1997	$self->{cursor} =
		1998	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		1999	? $self->{cursor} + length $1
		2000	: length $self->{text};
		2001	} elsif ($uni == 21) { # ctrl-u
		2002	$text = "";
1790	$self->{cursor} = 0;	2003	$self->{cursor} = 0;
1791	} elsif ($sym == CFClient::SDLK_END) {
1792	$self->{cursor} = length $text;
1793	} elsif ($uni == 27) {	2004	} elsif ($uni == 27) {
1794	$self->emit ('escape');	2005	$self->emit ('escape');
1795	} elsif ($uni) {	2006	} elsif ($uni == 0x0d) {
		2007	substr $text, $self->{cursor}++, 0, "\012";
		2008	} elsif ($uni >= 0x20) {
1796	substr $text, $self->{cursor}++, 0, chr $uni;	2009	substr $text, $self->{cursor}++, 0, chr $uni;
1797	} else {	2010	} else {
1798	return 0;	2011	return 0;
1799	}	2012	}
1800		2013
1801	$self->_set_text ($text);	2014	$self->_set_text ($text);
1802		2015
1803	$self->realloc;	2016	$self->realloc;
		2017	$self->update;
1804		2018
1805	1	2019	1
1806	}	2020	}
1807		2021
1808	sub invoke_focus_in {	2022	sub invoke_focus_in {
…		…
1820		2034
1821	my $idx = $self->{layout}->xy_to_index ($x, $y);	2035	my $idx = $self->{layout}->xy_to_index ($x, $y);
1822		2036
1823	# byte-index to char-index	2037	# byte-index to char-index
1824	my $text = $self->{text};	2038	my $text = $self->{text};
1825	utf8::encode $text;	2039	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826	$self->{cursor} = length substr $text, 0, $idx;	2040	$self->{cursor} = length $text;
1827		2041
1828	$self->_set_text ($self->{text});	2042	$self->_set_text ($self->{text});
1829	$self->update;	2043	$self->update;
1830		2044
1831	1	2045	1
…		…
1870	utf8::encode $text;	2084	utf8::encode $text;
1871		2085
1872	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2086	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873	}	2087	}
1874		2088
1875	glColor @{$self->{fg}};
1876	glBegin GL_LINES;	2089	glBegin GL_LINES;
1877	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2090	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1878	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2091	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879	glEnd;	2092	glEnd;
1880	}	2093	}
1881	}	2094	}
1882		2095
		2096	#############################################################################
		2097
1883	package CFClient::UI::Entry;	2098	package CFPlus::UI::Entry;
1884		2099
1885	our @ISA = CFClient::UI::EntryBase::;	2100	our @ISA = CFPlus::UI::EntryBase::;
1886		2101
1887	use CFClient::OpenGL;	2102	use CFPlus::OpenGL;
1888		2103
1889	sub invoke_key_down {	2104	sub invoke_key_down {
1890	my ($self, $ev) = @_;	2105	my ($self, $ev) = @_;
1891		2106
1892	my $sym = $ev->{sym};	2107	my $sym = $ev->{sym};
1893		2108
1894	if ($sym == 13) {	2109	if ($ev->{uni} == 0x0d || $sym == 13) {
1895	unshift @{$self->{history}},	2110	unshift @{$self->{history}},
1896	my $txt = $self->get_text;	2111	my $txt = $self->get_text;
1897		2112
1898	$self->{history_pointer} = -1;	2113	$self->{history_pointer} = -1;
1899	$self->{history_saveback} = '';	2114	$self->{history_saveback} = '';
1900	$self->emit (activate => $txt);	2115	$self->emit (activate => $txt);
1901	$self->update;	2116	$self->update;
1902		2117
1903	} elsif ($sym == CFClient::SDLK_UP) {	2118	} elsif ($sym == CFPlus::SDLK_UP) {
1904	if ($self->{history_pointer} < 0) {	2119	if ($self->{history_pointer} < 0) {
1905	$self->{history_saveback} = $self->get_text;	2120	$self->{history_saveback} = $self->get_text;
1906	}	2121	}
1907	if (@{$self->{history} || []} > 0) {	2122	if (@{$self->{history} || []} > 0) {
1908	$self->{history_pointer}++;	2123	$self->{history_pointer}++;
…		…
1910	$self->{history_pointer} = @{$self->{history} || []} - 1;	2125	$self->{history_pointer} = @{$self->{history} || []} - 1;
1911	}	2126	}
1912	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2127	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1913	}	2128	}
1914		2129
1915	} elsif ($sym == CFClient::SDLK_DOWN) {	2130	} elsif ($sym == CFPlus::SDLK_DOWN) {
1916	$self->{history_pointer}--;	2131	$self->{history_pointer}--;
1917	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2132	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918		2133
1919	if ($self->{history_pointer} >= 0) {	2134	if ($self->{history_pointer} >= 0) {
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2135	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1929	1	2144	1
1930	}	2145	}
1931		2146
1932	#############################################################################	2147	#############################################################################
1933		2148
		2149	package CFPlus::UI::TextEdit;
		2150
		2151	our @ISA = CFPlus::UI::EntryBase::;
		2152
		2153	use CFPlus::OpenGL;
		2154
		2155	sub move_cursor_ver {
		2156	my ($self, $dy) = @_;
		2157
		2158	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2159
		2160	$y += $dy;
		2161
		2162	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2163	$self->{cursor} = $index;
		2164	delete $self->{cur_h};
		2165	$self->update;
		2166	return;
		2167	}
		2168	}
		2169
		2170	sub invoke_key_down {
		2171	my ($self, $ev) = @_;
		2172
		2173	my $sym = $ev->{sym};
		2174
		2175	if ($sym == CFPlus::SDLK_UP) {
		2176	$self->move_cursor_ver (-1);
		2177	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2178	$self->move_cursor_ver (+1);
		2179	} else {
		2180	return $self->SUPER::invoke_key_down ($ev)
		2181	}
		2182
		2183	1
		2184	}
		2185
		2186	#############################################################################
		2187
1934	package CFClient::UI::Button;	2188	package CFPlus::UI::Button;
1935		2189
1936	our @ISA = CFClient::UI::Label::;	2190	our @ISA = CFPlus::UI::Label::;
1937		2191
1938	use CFClient::OpenGL;	2192	use CFPlus::OpenGL;
1939		2193
1940	my @tex =	2194	my @tex =
1941	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2195	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942	qw(b1_button_active.png);	2196	qw(b1_button_active.png);
1943		2197
1944	sub new {	2198	sub new {
1945	my $class = shift;	2199	my $class = shift;
1946		2200
…		…
1983	$self->SUPER::_draw;	2237	$self->SUPER::_draw;
1984	}	2238	}
1985		2239
1986	#############################################################################	2240	#############################################################################
1987		2241
		2242	package CFPlus::UI::CheckBox;
		2243
		2244	our @ISA = CFPlus::UI::DrawBG::;
		2245
		2246	my @tex =
		2247	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2248	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2249
		2250	use CFPlus::OpenGL;
		2251
		2252	sub new {
		2253	my $class = shift;
		2254
		2255	$class->SUPER::new (
		2256	padding_x => 2,
		2257	padding_y => 2,
		2258	fg => [1, 1, 1],
		2259	active_fg => [1, 1, 0],
		2260	bg => [0, 0, 0, 0.2],
		2261	active_bg => [1, 1, 1, 0.5],
		2262	state => 0,
		2263	can_hover => 1,
		2264	@_
		2265	)
		2266	}
		2267
		2268	sub size_request {
		2269	my ($self) = @_;
		2270
		2271	(6) x 2
		2272	}
		2273
		2274	sub toggle {
		2275	my ($self) = @_;
		2276
		2277	$self->{state} = !$self->{state};
		2278	$self->emit (changed => $self->{state});
		2279	$self->update;
		2280	}
		2281
		2282	sub invoke_button_down {
		2283	my ($self, $ev, $x, $y) = @_;
		2284
		2285	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2286	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2287	$self->toggle;
		2288	} else {
		2289	return 0
		2290	}
		2291
		2292	1
		2293	}
		2294
		2295	sub _draw {
		2296	my ($self) = @_;
		2297
		2298	$self->SUPER::_draw;
		2299
		2300	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2301
		2302	my ($w, $h) = @$self{qw(w h)};
		2303
		2304	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2305
		2306	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2307
		2308	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2309
		2310	glEnable GL_TEXTURE_2D;
		2311	$tex->draw_quad_alpha (0, 0, $s, $s);
		2312	glDisable GL_TEXTURE_2D;
		2313	}
		2314
		2315	#############################################################################
		2316
		2317	package CFPlus::UI::Image;
		2318
		2319	our @ISA = CFPlus::UI::Base::;
		2320
		2321	use CFPlus::OpenGL;
		2322
		2323	our %texture_cache;
		2324
		2325	sub new {
		2326	my $class = shift;
		2327
		2328	my $self = $class->SUPER::new (
		2329	can_events => 0,
		2330	@_,
		2331	);
		2332
		2333	$self->{path} || $self->{tex}
		2334	or Carp::croak "'path' or 'tex' attributes required";
		2335
		2336	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2337	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2338
		2339	CFPlus::weaken $texture_cache{$self->{path}};
		2340
		2341	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2342
		2343	$self
		2344	}
		2345
		2346	sub STORABLE_freeze {
		2347	my ($self, $cloning) = @_;
		2348
		2349	$self->{path}
		2350	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2351
		2352	$self->{path}
		2353	}
		2354
		2355	sub STORABLE_attach {
		2356	my ($self, $cloning, $path) = @_;
		2357
		2358	$self->new (path => $path)
		2359	}
		2360
		2361	sub size_request {
		2362	my ($self) = @_;
		2363
		2364	($self->{tex}{w}, $self->{tex}{h})
		2365	}
		2366
		2367	sub _draw {
		2368	my ($self) = @_;
		2369
		2370	my $tex = $self->{tex};
		2371
		2372	my ($w, $h) = ($self->{w}, $self->{h});
		2373
		2374	if ($self->{rot90}) {
		2375	glRotate 90, 0, 0, 1;
		2376	glTranslate 0, -$self->{w}, 0;
		2377
		2378	($w, $h) = ($h, $w);
		2379	}
		2380
		2381	glEnable GL_TEXTURE_2D;
		2382	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2383
		2384	$tex->draw_quad (0, 0, $w, $h);
		2385
		2386	glDisable GL_TEXTURE_2D;
		2387	}
		2388
		2389	#############################################################################
		2390
1988	package CFClient::UI::ImageButton;	2391	package CFPlus::UI::ImageButton;
1989		2392
1990	our @ISA = CFClient::UI::Image::;	2393	our @ISA = CFPlus::UI::Image::;
1991		2394
1992	use CFClient::OpenGL;	2395	use CFPlus::OpenGL;
1993		2396
1994	my %textures;	2397	my %textures;
1995		2398
1996	sub new {	2399	sub new {
1997	my $class = shift;	2400	my $class = shift;
…		…
2019	1	2422	1
2020	}	2423	}
2021		2424
2022	#############################################################################	2425	#############################################################################
2023		2426
2024	package CFClient::UI::CheckBox;
2025
2026	our @ISA = CFClient::UI::DrawBG::;
2027
2028	my @tex =
2029	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2030	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2031
2032	use CFClient::OpenGL;
2033
2034	sub new {
2035	my $class = shift;
2036
2037	$class->SUPER::new (
2038	padding_x => 2,
2039	padding_y => 2,
2040	fg => [1, 1, 1],
2041	active_fg => [1, 1, 0],
2042	bg => [0, 0, 0, 0.2],
2043	active_bg => [1, 1, 1, 0.5],
2044	state => 0,
2045	can_hover => 1,
2046	@_
2047	)
2048	}
2049
2050	sub size_request {
2051	my ($self) = @_;
2052
2053	(6) x 2
2054	}
2055
2056	sub invoke_button_down {
2057	my ($self, $ev, $x, $y) = @_;
2058
2059	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061	$self->{state} = !$self->{state};
2062	$self->emit (changed => $self->{state});
2063	} else {
2064	return 0
2065	}
2066
2067	1
2068	}
2069
2070	sub _draw {
2071	my ($self) = @_;
2072
2073	$self->SUPER::_draw;
2074
2075	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2076
2077	my ($w, $h) = @$self{qw(w h)};
2078
2079	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2080
2081	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2082
2083	my $tex = $self->{state} ? $tex[1] : $tex[0];
2084
2085	glEnable GL_TEXTURE_2D;
2086	$tex->draw_quad_alpha (0, 0, $s, $s);
2087	glDisable GL_TEXTURE_2D;
2088	}
2089
2090	#############################################################################
2091
2092	package CFClient::UI::Image;	2427	package CFPlus::UI::VGauge;
2093		2428
2094	our @ISA = CFClient::UI::Base::;	2429	our @ISA = CFPlus::UI::Base::;
2095
2096	use CFClient::OpenGL;
2097	use Carp qw/confess/;
2098
2099	our %loaded_images;
2100
2101	sub new {
2102	my $class = shift;
2103
2104	my $self = $class->SUPER::new (can_events => 0, @_);
2105
2106	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2107
2108	$loaded_images{$self->{image}} ||=
2109	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2110
2111	my $tex = $self->{tex} = $loaded_images{$self->{image}};
2112
2113	Scalar::Util::weaken $loaded_images{$self->{image}};
2114
2115	$self->{aspect} = $tex->{w} / $tex->{h};
2116
2117	$self
2118	}
2119
2120	sub size_request {
2121	my ($self) = @_;
2122
2123	($self->{tex}->{w}, $self->{tex}->{h})
2124	}
2125
2126	sub _draw {
2127	my ($self) = @_;
2128
2129	my $tex = $self->{tex};
2130
2131	my ($w, $h) = ($self->{w}, $self->{h});
2132
2133	if ($self->{rot90}) {
2134	glRotate 90, 0, 0, 1;
2135	glTranslate 0, -$self->{w}, 0;
2136
2137	($w, $h) = ($h, $w);
2138	}
2139
2140	glEnable GL_TEXTURE_2D;
2141	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2142
2143	$tex->draw_quad_alpha (0, 0, $w, $h);
2144
2145	glDisable GL_TEXTURE_2D;
2146	}
2147
2148	#############################################################################
2149
2150	package CFClient::UI::VGauge;
2151
2152	our @ISA = CFClient::UI::Base::;
2153		2430
2154	use List::Util qw(min max);	2431	use List::Util qw(min max);
2155		2432
2156	use CFClient::OpenGL;	2433	use CFPlus::OpenGL;
2157		2434
2158	my %tex = (	2435	my %tex = (
2159	food => [	2436	food => [
2160	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2437	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2161	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2438	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2162	],	2439	],
2163	grace => [	2440	grace => [
2164	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2441	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2165	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2442	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2166	],	2443	],
2167	hp => [	2444	hp => [
2168	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2445	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2169	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2446	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2170	],	2447	],
2171	mana => [	2448	mana => [
2172	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2449	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2173	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2450	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2174	],	2451	],
2175	);	2452	);
2176		2453
2177	# eg. VGauge->new (gauge => 'food'), default gauge: food	2454	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2237	my $ycut1 = max 0, min 1, $ycut;	2514	my $ycut1 = max 0, min 1, $ycut;
2238	my $ycut2 = max 0, min 1, $ycut - 1;	2515	my $ycut2 = max 0, min 1, $ycut - 1;
2239		2516
2240	my $h1 = $self->{h} * (1 - $ycut1);	2517	my $h1 = $self->{h} * (1 - $ycut1);
2241	my $h2 = $self->{h} * (1 - $ycut2);	2518	my $h2 = $self->{h} * (1 - $ycut2);
		2519	my $h3 = $self->{h};
		2520
		2521	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2242		2522
2243	glEnable GL_BLEND;	2523	glEnable GL_BLEND;
2244	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2524	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2525	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2246	glEnable GL_TEXTURE_2D;	2526	glEnable GL_TEXTURE_2D;
…		…
2265		2545
2266	if ($t3) {	2546	if ($t3) {
2267	glBindTexture GL_TEXTURE_2D, $t3->{name};	2547	glBindTexture GL_TEXTURE_2D, $t3->{name};
2268	glBegin GL_QUADS;	2548	glBegin GL_QUADS;
2269	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2549	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2270	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2550	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2271	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2551	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2272	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2552	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2273	glEnd;	2553	glEnd;
2274	}	2554	}
2275		2555
2276	glDisable GL_BLEND;	2556	glDisable GL_BLEND;
2277	glDisable GL_TEXTURE_2D;	2557	glDisable GL_TEXTURE_2D;
2278	}	2558	}
2279		2559
2280	#############################################################################	2560	#############################################################################
2281		2561
2282	package CFClient::UI::Gauge;	2562	package CFPlus::UI::Gauge;
2283		2563
2284	our @ISA = CFClient::UI::VBox::;	2564	our @ISA = CFPlus::UI::VBox::;
2285		2565
2286	sub new {	2566	sub new {
2287	my ($class, %arg) = @_;	2567	my ($class, %arg) = @_;
2288		2568
2289	my $self = $class->SUPER::new (	2569	my $self = $class->SUPER::new (
…		…
2291	can_hover => 1,	2571	can_hover => 1,
2292	can_events => 1,	2572	can_events => 1,
2293	%arg,	2573	%arg,
2294	);	2574	);
2295		2575
2296	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2576	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2297	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2577	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2298	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2578	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2299		2579
2300	$self	2580	$self
2301	}	2581	}
2302		2582
2303	sub set_fontsize {	2583	sub set_fontsize {
…		…
2324	$self->{value}->set_text ($val);	2604	$self->{value}->set_text ($val);
2325	}	2605	}
2326		2606
2327	#############################################################################	2607	#############################################################################
2328		2608
2329	package CFClient::UI::Slider;	2609	package CFPlus::UI::Slider;
2330		2610
2331	use strict;	2611	use strict;
2332		2612
2333	use CFClient::OpenGL;	2613	use CFPlus::OpenGL;
2334		2614
2335	our @ISA = CFClient::UI::DrawBG::;	2615	our @ISA = CFPlus::UI::DrawBG::;
2336		2616
2337	my @tex =	2617	my @tex =
2338	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2618	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2339	qw(s1_slider.png s1_slider_bg.png);	2619	qw(s1_slider.png s1_slider_bg.png);
2340		2620
2341	sub new {	2621	sub new {
2342	my $class = shift;	2622	my $class = shift;
2343		2623
…		…
2432	}	2712	}
2433		2713
2434	1	2714	1
2435	}	2715	}
2436		2716
		2717	sub invoke_mouse_wheel {
		2718	my ($self, $ev) = @_;
		2719
		2720	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2721
		2722	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2723
		2724	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2725
		2726	! ! $delta
		2727	}
		2728
2437	sub update {	2729	sub update {
2438	my ($self) = @_;	2730	my ($self) = @_;
2439		2731
2440	delete $self->{knob_w};	2732	delete $self->{knob_w};
2441	$self->SUPER::update;	2733	$self->SUPER::update;
…		…
2488	glDisable GL_TEXTURE_2D;	2780	glDisable GL_TEXTURE_2D;
2489	}	2781	}
2490		2782
2491	#############################################################################	2783	#############################################################################
2492		2784
2493	package CFClient::UI::ValSlider;	2785	package CFPlus::UI::ValSlider;
2494		2786
2495	our @ISA = CFClient::UI::HBox::;	2787	our @ISA = CFPlus::UI::HBox::;
2496		2788
2497	sub new {	2789	sub new {
2498	my ($class, %arg) = @_;	2790	my ($class, %arg) = @_;
2499		2791
2500	my $range = delete $arg{range};	2792	my $range = delete $arg{range};
2501		2793
2502	my $self = $class->SUPER::new (	2794	my $self = $class->SUPER::new (
2503	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2795	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2504	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2796	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2505	to_value => sub { shift },	2797	to_value => sub { shift },
2506	from_value => sub { shift },	2798	from_value => sub { shift },
2507	%arg,	2799	%arg,
2508	);	2800	);
2509		2801
…		…
2529	sub set_range { shift->{slider}->set_range (@_) }	2821	sub set_range { shift->{slider}->set_range (@_) }
2530	sub set_value { shift->{slider}->set_value (@_) }	2822	sub set_value { shift->{slider}->set_value (@_) }
2531		2823
2532	#############################################################################	2824	#############################################################################
2533		2825
2534	package CFClient::UI::TextScroller;	2826	package CFPlus::UI::TextScroller;
2535		2827
2536	our @ISA = CFClient::UI::HBox::;	2828	our @ISA = CFPlus::UI::HBox::;
2537		2829
2538	use CFClient::OpenGL;	2830	use CFPlus::OpenGL;
2539		2831
2540	sub new {	2832	sub new {
2541	my $class = shift;	2833	my $class = shift;
2542		2834
2543	my $self = $class->SUPER::new (	2835	my $self = $class->SUPER::new (
2544	fontsize => 1,	2836	fontsize => 1,
2545	can_events => 0,	2837	can_events => 1,
2546	indent => 0,	2838	indent => 0,
2547	#font => default_font	2839	#font => default_font
2548	@_,	2840	@_,
2549		2841
2550	layout => (new CFClient::Layout 1),	2842	layout => (new CFPlus::Layout),
2551	par => [],	2843	par => [],
		2844	max_par => 0,
2552	height => 0,	2845	height => 0,
2553	children => [	2846	children => [
2554	(new CFClient::UI::Empty expand => 1),	2847	(new CFPlus::UI::Empty expand => 1),
2555	(new CFClient::UI::Slider vertical => 1),	2848	(new CFPlus::UI::Slider vertical => 1),
2556	],	2849	],
2557	);	2850	);
2558		2851
2559	$self->{children}[1]->connect (changed => sub { $self->update });	2852	$self->{children}[1]->connect (changed => sub { $self->update });
2560		2853
…		…
2566		2859
2567	$self->{fontsize} = $fontsize;	2860	$self->{fontsize} = $fontsize;
2568	$self->reflow;	2861	$self->reflow;
2569	}	2862	}
2570		2863
		2864	sub size_request {
		2865	my ($self) = @_;
		2866
		2867	my ($empty, $slider) = @{ $self->{children} };
		2868
		2869	local $self->{children} = [$empty, $slider];
		2870	$self->SUPER::size_request
		2871	}
		2872
2571	sub invoke_size_allocate {	2873	sub invoke_size_allocate {
2572	my ($self, $w, $h) = @_;	2874	my ($self, $w, $h) = @_;
2573		2875
		2876	my ($empty, $slider, @other) = @{ $self->{children} };
		2877	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		2878
2574	$self->{layout}->set_font ($self->{font}) if $self->{font};	2879	$self->{layout}->set_font ($self->{font}) if $self->{font};
2575	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2880	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2576	$self->{layout}->set_width ($self->{children}[0]{w});	2881	$self->{layout}->set_width ($empty->{w});
2577	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2882	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2578		2883
2579	$self->reflow;	2884	$self->reflow;
2580		2885
		2886	local $self->{children} = [$empty, $slider];
2581	$self->SUPER::invoke_size_allocate ($w, $h)	2887	$self->SUPER::invoke_size_allocate ($w, $h)
2582	}	2888	}
2583		2889
2584	sub text_size {	2890	sub invoke_mouse_wheel {
2585	my ($self, $text, $indent) = @_;	2891	my ($self, $ev) = @_;
		2892
		2893	return 0 unless $ev->{dy}; # only vertical movements
		2894
		2895	$self->{children}[1]->emit (mouse_wheel => $ev);
		2896
		2897	1
		2898	}
		2899
		2900	sub get_layout {
		2901	my ($self, $para) = @_;
2586		2902
2587	my $layout = $self->{layout};	2903	my $layout = $self->{layout};
2588		2904
		2905	$layout->set_font ($self->{font}) if $self->{font};
		2906	$layout->set_foreground (@{$para->{fg}});
2589	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2907	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2590	$layout->set_width ($self->{children}[0]{w} - $indent);	2908	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2591	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2909	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592	$layout->set_markup ($text);	2910	$layout->set_markup ($para->{markup});
		2911
		2912	$layout->set_shapes (
		2913	map
		2914	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2915	@{$para->{widget}}
2593		2916	);
		2917
2594	$layout->size	2918	$layout
2595	}	2919	}
2596		2920
2597	sub reflow {	2921	sub reflow {
2598	my ($self) = @_;	2922	my ($self) = @_;
2599		2923
…		…
2606		2930
2607	# todo: base offset on lines or so, not on pixels	2931	# todo: base offset on lines or so, not on pixels
2608	$self->{children}[1]->set_value ($offset);	2932	$self->{children}[1]->set_value ($offset);
2609	}	2933	}
2610		2934
		2935	sub current_paragraph {
		2936	my ($self) = @_;
		2937
		2938	$self->{top_paragraph} - 1
		2939	}
		2940
		2941	sub scroll_to {
		2942	my ($self, $para) = @_;
		2943
		2944	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2945
		2946	$self->{scroll_to} = $para;
		2947	$self->update;
		2948	}
		2949
2611	sub clear {	2950	sub clear {
2612	my ($self) = @_;	2951	my ($self) = @_;
		2952
		2953	my (undef, undef, @other) = @{ $self->{children} };
		2954	$self->remove ($_) for @other;
2613		2955
2614	$self->{par} = [];	2956	$self->{par} = [];
2615	$self->{height} = 0;	2957	$self->{height} = 0;
2616	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2958	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2617	}	2959	}
2618		2960
2619	sub add_paragraph {	2961	sub add_paragraph {
2620	my ($self, $color, $text, $indent) = @_;	2962	my $self = shift;
2621		2963
2622	for my $line (split /\n/, $text) {	2964	for my $para (@_) {
2623	my ($w, $h) = $self->text_size ($line);	2965	$para = {
		2966	fg => [1, 1, 1, 1],
		2967	indent => 0,
		2968	markup => "",
		2969	widget => [],
		2970	ref $para ? %$para : (markup => $para),
		2971	w => 1e10,
		2972	wrapped => 1,
		2973	};
		2974
		2975	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2976	push @{$self->{par}}, $para;
		2977	}
		2978
		2979	if (my $max = $self->{max_par}) {
		2980	shift @{$self->{par}} while @{$self->{par}} > $max;
		2981	}
		2982
		2983	$self->{need_reflow}++;
		2984	$self->update;
		2985	}
		2986
		2987	sub scroll_to_bottom {
		2988	my ($self) = @_;
		2989
		2990	$self->{scroll_to} = $#{$self->{par}};
		2991	$self->update;
		2992	}
		2993
		2994	sub force_uptodate {
		2995	my ($self) = @_;
		2996
		2997	if (delete $self->{need_reflow}) {
		2998	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2999
		3000	my $height = 0;
		3001
		3002	for my $para (@{$self->{par}}) {
		3003	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3004	my $layout = $self->get_layout ($para);
		3005	my ($w, $h) = $layout->size;
		3006
		3007	$para->{w} = $w + $para->{indent};
		3008	$para->{h} = $h;
		3009	$para->{wrapped} = $layout->has_wrapped;
		3010	}
		3011
		3012	$para->{y} = $height;
		3013	$height += $para->{h};
		3014	}
		3015
2624	$self->{height} += $h;	3016	$self->{height} = $height;
2625	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3017	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2626	}
2627		3018
2628	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3019	delete $self->{texture};
		3020	}
		3021
		3022	if (my $paridx = delete $self->{scroll_to}) {
		3023	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3024	}
2629	}	3025	}
2630		3026
2631	sub update {	3027	sub update {
2632	my ($self) = @_;	3028	my ($self) = @_;
2633		3029
…		…
2636	return unless $self->{h} > 0;	3032	return unless $self->{h} > 0;
2637		3033
2638	delete $self->{texture};	3034	delete $self->{texture};
2639		3035
2640	$ROOT->on_post_alloc ($self => sub {	3036	$ROOT->on_post_alloc ($self => sub {
		3037	$self->force_uptodate;
		3038
2641	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3039	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2642		3040
2643	if (delete $self->{need_reflow}) {
2644	my $height = 0;
2645
2646	my $layout = $self->{layout};
2647
2648	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2649
2650	for (@{$self->{par}}) {
2651	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2652	$layout->set_width ($W - $_->[3]);
2653	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2654	$layout->set_markup ($_->[4]);
2655	my ($w, $h) = $layout->size;
2656	$_->[0] = $w + $_->[3];
2657	$_->[1] = $h;
2658	}
2659
2660	$height += $_->[1];
2661	}
2662
2663	$self->{height} = $height;
2664
2665	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2666
2667	delete $self->{texture};
2668	}
2669
2670	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3041	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2671	glClearColor 0, 0, 0, 0;	3042	glClearColor 0, 0, 0, 0;
2672	glClear GL_COLOR_BUFFER_BIT;	3043	glClear GL_COLOR_BUFFER_BIT;
2673		3044
		3045	package CFPlus::UI::Base;
		3046	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3047	(0, 0, $self->{w}, $self->{h});
		3048
		3049	my $top = int $self->{children}[1]{range}[0];
		3050
		3051	my $paridx = 0;
		3052	my $top_paragraph;
2674	my $top = int $self->{children}[1]{range}[0];	3053	my $top = int $self->{children}[1]{range}[0];
2675		3054
2676	my $y0 = $top;	3055	my $y0 = $top;
2677	my $y1 = $top + $H;	3056	my $y1 = $top + $H;
2678		3057
2679	my $y = 0;
2680
2681	my $layout = $self->{layout};
2682
2683	$layout->set_font ($self->{font}) if $self->{font};
2684
2685	glEnable GL_BLEND;
2686	#TODO# not correct in windows where rgba is forced off
2687	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2688
2689	for my $par (@{$self->{par}}) {	3058	for my $para (@{$self->{par}}) {
2690	my $h = $par->[1];	3059	my $h = $para->{h};
		3060	my $y = $para->{y};
2691		3061
2692	if ($y0 < $y + $h && $y < $y1) {	3062	if ($y0 < $y + $h && $y < $y1) {
2693	$layout->set_foreground (@{ $par->[2] });	3063	my $layout = $self->get_layout ($para);
2694	$layout->set_width ($W - $par->[3]);
2695	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2696	$layout->set_markup ($par->[4]);
2697		3064
2698	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3065	$layout->render ($para->{indent}, $y - $y0);
2699		3066
2700	glRasterPos $par->[3], $y - $y0;	3067	if (my @w = @{ $para->{widget} }) {
2701	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3068	my @s = $layout->get_shapes;
		3069
		3070	for (@w) {
		3071	my ($dx, $dy) = splice @s, 0, 2, ();
		3072
		3073	$_->{x} = $dx + $para->{indent};
		3074	$_->{y} = $dy + $y - $y0;
		3075
		3076	$_->draw;
		3077	}
		3078	}
2702	}	3079	}
2703		3080
2704	$y += $h;	3081	$paridx++;
		3082	$top_paragraph ||= $paridx if $y >= $top;
2705	}	3083	}
2706		3084
2707	glDisable GL_BLEND;	3085	$self->{top_paragraph} = $top_paragraph;
2708	};	3086	};
2709	});	3087	});
		3088	}
		3089
		3090	sub reconfigure {
		3091	my ($self) = @_;
		3092
		3093	$self->SUPER::reconfigure;
		3094
		3095	$_->{w} = 1e10 for @{ $self->{par} };
		3096	$self->reflow;
2710	}	3097	}
2711		3098
2712	sub _draw {	3099	sub _draw {
2713	my ($self) = @_;	3100	my ($self) = @_;
2714		3101
…		…
2717	glColor 0, 0, 0, 1;	3104	glColor 0, 0, 0, 1;
2718	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3105	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2719	glDisable GL_TEXTURE_2D;	3106	glDisable GL_TEXTURE_2D;
2720		3107
2721	$self->{children}[1]->draw;	3108	$self->{children}[1]->draw;
2722
2723	}	3109	}
2724		3110
2725	#############################################################################	3111	#############################################################################
2726		3112
2727	package CFClient::UI::Animator;	3113	package CFPlus::UI::Animator;
2728		3114
2729	use CFClient::OpenGL;	3115	use CFPlus::OpenGL;
2730		3116
2731	our @ISA = CFClient::UI::Bin::;	3117	our @ISA = CFPlus::UI::Bin::;
2732		3118
2733	sub moveto {	3119	sub moveto {
2734	my ($self, $x, $y) = @_;	3120	my ($self, $x, $y) = @_;
2735		3121
2736	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3122	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2764	glPopMatrix;	3150	glPopMatrix;
2765	}	3151	}
2766		3152
2767	#############################################################################	3153	#############################################################################
2768		3154
2769	package CFClient::UI::Flopper;	3155	package CFPlus::UI::Flopper;
2770		3156
2771	our @ISA = CFClient::UI::Button::;	3157	our @ISA = CFPlus::UI::Button::;
2772		3158
2773	sub new {	3159	sub new {
2774	my $class = shift;	3160	my $class = shift;
2775		3161
2776	my $self = $class->SUPER::new (	3162	my $self = $class->SUPER::new (
…		…
2788	$self->{other}->toggle_visibility;	3174	$self->{other}->toggle_visibility;
2789	}	3175	}
2790		3176
2791	#############################################################################	3177	#############################################################################
2792		3178
2793	package CFClient::UI::Tooltip;	3179	package CFPlus::UI::Tooltip;
2794		3180
2795	our @ISA = CFClient::UI::Bin::;	3181	our @ISA = CFPlus::UI::Bin::;
2796		3182
2797	use CFClient::OpenGL;	3183	use CFPlus::OpenGL;
2798		3184
2799	sub new {	3185	sub new {
2800	my $class = shift;	3186	my $class = shift;
2801		3187
2802	$class->SUPER::new (	3188	$class->SUPER::new (
…		…
2805	)	3191	)
2806	}	3192	}
2807		3193
2808	sub set_tooltip_from {	3194	sub set_tooltip_from {
2809	my ($self, $widget) = @_;	3195	my ($self, $widget) = @_;
		3196
		3197	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3198	if $widget->{tooltip} =~ /^#(.*)$/;
2810		3199
2811	my $tooltip = $widget->{tooltip};	3200	my $tooltip = $widget->{tooltip};
2812		3201
2813	if ($ENV{CFPLUS_DEBUG} & 2) {	3202	if ($ENV{CFPLUS_DEBUG} & 2) {
2814	$tooltip .= "\n\n" . (ref $widget) . "\n"	3203	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2818	}	3207	}
2819		3208
2820	$tooltip =~ s/^\n+//;	3209	$tooltip =~ s/^\n+//;
2821	$tooltip =~ s/\n+$//;	3210	$tooltip =~ s/\n+$//;
2822		3211
2823	$self->add (new CFClient::UI::Label	3212	$self->add (new CFPlus::UI::Label
2824	markup => $tooltip,	3213	markup => $tooltip,
2825	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3214	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2826	fontsize => 0.8,	3215	fontsize => 0.8,
2827	fg => [0, 0, 0, 1],	3216	style => 1, # FLAG_INVERSE
2828	ellipsise => 0,	3217	ellipsise => 0,
2829	font => ($widget->{tooltip_font} || $::FONT_PROP),	3218	font => ($widget->{tooltip_font} || $::FONT_PROP),
2830	);	3219	);
2831	}	3220	}
2832		3221
…		…
2851		3240
2852	$self->{root}->on_post_alloc ("move_$self" => sub {	3241	$self->{root}->on_post_alloc ("move_$self" => sub {
2853	my $widget = $self->{owner}	3242	my $widget = $self->{owner}
2854	or return;	3243	or return;
2855		3244
		3245	if ($widget->{visible}) {
2856	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3246	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2857		3247
2858	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3248	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2859	if $x + $self->{w} > $self->{root}{w};	3249	if $x + $self->{w} > $self->{root}{w};
2860		3250
2861	$self->move_abs ($x, $y);	3251	$self->move_abs ($x, $y);
		3252	} else {
		3253	$self->hide;
		3254	}
2862	});	3255	});
2863	}	3256	}
2864		3257
2865	sub _draw {	3258	sub _draw {
2866	my ($self) = @_;	3259	my ($self) = @_;
…		…
2890	$self->SUPER::_draw;	3283	$self->SUPER::_draw;
2891	}	3284	}
2892		3285
2893	#############################################################################	3286	#############################################################################
2894		3287
2895	package CFClient::UI::Face;	3288	package CFPlus::UI::Face;
2896		3289
2897	our @ISA = CFClient::UI::Base::;	3290	our @ISA = CFPlus::UI::DrawBG::;
2898		3291
2899	use CFClient::OpenGL;	3292	use CFPlus::OpenGL;
2900		3293
2901	sub new {	3294	sub new {
2902	my $class = shift;	3295	my $class = shift;
2903		3296
2904	my $self = $class->SUPER::new (	3297	my $self = $class->SUPER::new (
…		…
2906	can_events => 0,	3299	can_events => 0,
2907	@_,	3300	@_,
2908	);	3301	);
2909		3302
2910	if ($self->{anim} && $self->{animspeed}) {	3303	if ($self->{anim} && $self->{animspeed}) {
2911	Scalar::Util::weaken (my $widget = $self);	3304	CFPlus::weaken (my $widget = $self);
2912		3305
2913	$self->{timer} = Event->timer (	3306	$self->{timer} = Event->timer (
2914	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3307	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2915	hard => 1,	3308	hard => 1,
2916	interval => $self->{animspeed},	3309	interval => $self->{animspeed},
…		…
2939	sub _draw {	3332	sub _draw {
2940	my ($self) = @_;	3333	my ($self) = @_;
2941		3334
2942	return unless $::CONN;	3335	return unless $::CONN;
2943		3336
		3337	$self->SUPER::_draw;
		3338
2944	my $face;	3339	my $face;
2945		3340
2946	if ($self->{frame}) {	3341	if ($self->{frame}) {
2947	my $anim = $::CONN->{anim}[$self->{anim}];	3342	my $anim = $::CONN->{anim}[$self->{anim}];
2948		3343
…		…
2970	$self->SUPER::destroy;	3365	$self->SUPER::destroy;
2971	}	3366	}
2972		3367
2973	#############################################################################	3368	#############################################################################
2974		3369
2975	package CFClient::UI::Buttonbar;	3370	package CFPlus::UI::Buttonbar;
2976		3371
2977	our @ISA = CFClient::UI::HBox::;	3372	our @ISA = CFPlus::UI::HBox::;
2978		3373
2979	# TODO: should actualyl wrap buttons and other goodies.	3374	# TODO: should actually wrap buttons and other goodies.
2980		3375
2981	#############################################################################	3376	#############################################################################
2982		3377
2983	package CFClient::UI::Menu;	3378	package CFPlus::UI::Menu;
2984		3379
2985	our @ISA = CFClient::UI::FancyFrame::;	3380	our @ISA = CFPlus::UI::Toplevel::;
2986		3381
2987	use CFClient::OpenGL;	3382	use CFPlus::OpenGL;
2988		3383
2989	sub new {	3384	sub new {
2990	my $class = shift;	3385	my $class = shift;
2991		3386
2992	my $self = $class->SUPER::new (	3387	my $self = $class->SUPER::new (
2993	items => [],	3388	items => [],
2994	z => 100,	3389	z => 100,
2995	@_,	3390	@_,
2996	);	3391	);
2997		3392
2998	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3393	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2999		3394
3000	for my $item (@{ $self->{items} }) {	3395	for my $item (@{ $self->{items} }) {
3001	my ($widget, $cb, $tooltip) = @$item;	3396	my ($widget, $cb, $tooltip) = @$item;
3002		3397
3003	# handle various types of items, only text for now	3398	# handle various types of items, only text for now
3004	if (!ref $widget) {	3399	if (!ref $widget) {
		3400	if ($widget =~ /\t/) {
		3401	my ($left, $right) = split /\t/, $widget, 2;
		3402
3005	$widget = new CFClient::UI::Label	3403	$widget = new CFPlus::UI::HBox
3006	can_hover => 1,	3404	can_hover => 1,
3007	can_events => 1,	3405	can_events => 1,
		3406	tooltip => $tooltip,
		3407	children => [
		3408	(new CFPlus::UI::Label markup => $left, expand => 1),
		3409	(new CFPlus::UI::Label markup => $right, align => +1),
		3410	],
		3411	;
		3412
		3413	} else {
		3414	$widget = new CFPlus::UI::Label
		3415	can_hover => 1,
		3416	can_events => 1,
3008	markup => $widget,	3417	markup => $widget,
3009	tooltip => $tooltip	3418	tooltip => $tooltip;
		3419	}
3010	}	3420	}
3011		3421
3012	$self->{item}{$widget} = $item;	3422	$self->{item}{$widget} = $item;
3013		3423
3014	$self->{vbox}->add ($widget);	3424	$self->{vbox}->add ($widget);
…		…
3057	1	3467	1
3058	}	3468	}
3059		3469
3060	#############################################################################	3470	#############################################################################
3061		3471
3062	package CFClient::UI::Multiplexer;	3472	package CFPlus::UI::Multiplexer;
3063		3473
3064	our @ISA = CFClient::UI::Container::;	3474	our @ISA = CFPlus::UI::Container::;
3065		3475
3066	sub new {	3476	sub new {
3067	my $class = shift;	3477	my $class = shift;
3068		3478
3069	my $self = $class->SUPER::new (	3479	my $self = $class->SUPER::new (
…		…
3083		3493
3084	$self->{current} = $self->{children}[0]	3494	$self->{current} = $self->{children}[0]
3085	if @{ $self->{children} };	3495	if @{ $self->{children} };
3086	}	3496	}
3087		3497
		3498	sub get_current_page {
		3499	my ($self) = @_;
		3500
		3501	$self->{current}
		3502	}
		3503
3088	sub set_current_page {	3504	sub set_current_page {
3089	my ($self, $page_or_widget) = @_;	3505	my ($self, $page_or_widget) = @_;
3090		3506
3091	my $widget = ref $page_or_widget	3507	my $widget = ref $page_or_widget
3092	? $page_or_widget	3508	? $page_or_widget
…		…
3124	$self->{current}->draw;	3540	$self->{current}->draw;
3125	}	3541	}
3126		3542
3127	#############################################################################	3543	#############################################################################
3128		3544
3129	package CFClient::UI::Notebook;	3545	package CFPlus::UI::Notebook;
3130		3546
3131	our @ISA = CFClient::UI::VBox::;	3547	our @ISA = CFPlus::UI::VBox::;
3132		3548
3133	sub new {	3549	sub new {
3134	my $class = shift;	3550	my $class = shift;
3135		3551
3136	my $self = $class->SUPER::new (	3552	my $self = $class->SUPER::new (
3137	buttonbar => (new CFClient::UI::Buttonbar),	3553	buttonbar => (new CFPlus::UI::Buttonbar),
3138	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3554	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3139	# filter => # will be put between multiplexer and $self	3555	# filter => # will be put between multiplexer and $self
3140	@_,	3556	@_,
3141	);	3557	);
3142		3558
3143	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3559	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3147	}	3563	}
3148		3564
3149	sub add {	3565	sub add {
3150	my ($self, $title, $widget, $tooltip) = @_;	3566	my ($self, $title, $widget, $tooltip) = @_;
3151		3567
3152	Scalar::Util::weaken $self;	3568	CFPlus::weaken $self;
3153		3569
3154	$self->{buttonbar}->add (new CFClient::UI::Button	3570	$self->{buttonbar}->add (new CFPlus::UI::Button
3155	markup => $title,	3571	markup => $title,
3156	tooltip => $tooltip,	3572	tooltip => $tooltip,
3157	on_activate => sub { $self->set_current_page ($widget) },	3573	on_activate => sub { $self->set_current_page ($widget) },
3158	);	3574	);
3159		3575
3160	$self->{multiplexer}->add ($widget);	3576	$self->{multiplexer}->add ($widget);
3161	}	3577	}
3162		3578
		3579	sub get_current_page {
		3580	my ($self) = @_;
		3581
		3582	$self->{multiplexer}->get_current_page
		3583	}
		3584
3163	sub set_current_page {	3585	sub set_current_page {
3164	my ($self, $page) = @_;	3586	my ($self, $page) = @_;
3165		3587
3166	$self->{multiplexer}->set_current_page ($page);	3588	$self->{multiplexer}->set_current_page ($page);
3167	$self->emit (page_changed => $self->{multiplexer}{current});	3589	$self->emit (page_changed => $self->{multiplexer}{current});
3168	}	3590	}
3169		3591
3170	#############################################################################	3592	#############################################################################
3171		3593
3172	package CFClient::UI::Combobox;	3594	package CFPlus::UI::Selector;
3173		3595
3174	use utf8;	3596	use utf8;
3175		3597
3176	our @ISA = CFClient::UI::Button::;	3598	our @ISA = CFPlus::UI::Button::;
3177		3599
3178	sub new {	3600	sub new {
3179	my $class = shift;	3601	my $class = shift;
3180		3602
3181	my $self = $class->SUPER::new (	3603	my $self = $class->SUPER::new (
…		…
3198	my ($value, $title, $tooltip) = @$_;	3620	my ($value, $title, $tooltip) = @$_;
3199		3621
3200	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3622	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3201	}	3623	}
3202		3624
3203	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3625	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3204	}	3626	}
3205		3627
3206	sub _set_value {	3628	sub _set_value {
3207	my ($self, $value) = @_;	3629	my ($self, $value) = @_;
3208		3630
…		…
3223	$self->emit (changed => $value);	3645	$self->emit (changed => $value);
3224	}	3646	}
3225		3647
3226	#############################################################################	3648	#############################################################################
3227		3649
3228	package CFClient::UI::Statusbox;	3650	package CFPlus::UI::Statusbox;
3229		3651
3230	our @ISA = CFClient::UI::VBox::;	3652	our @ISA = CFPlus::UI::VBox::;
3231		3653
3232	sub new {	3654	sub new {
3233	my $class = shift;	3655	my $class = shift;
3234		3656
3235	my $self = $class->SUPER::new (	3657	my $self = $class->SUPER::new (
3236	fontsize => 0.8,	3658	fontsize => 0.8,
3237	@_,	3659	@_,
3238	);	3660	);
3239		3661
3240	Scalar::Util::weaken (my $this = $self);	3662	CFPlus::weaken (my $this = $self);
3241		3663
3242	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3664	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3243		3665
3244	$self	3666	$self
3245	}	3667	}
…		…
3247	sub reorder {	3669	sub reorder {
3248	my ($self) = @_;	3670	my ($self) = @_;
3249	my $NOW = Time::HiRes::time;	3671	my $NOW = Time::HiRes::time;
3250		3672
3251	# freeze display when hovering over any label	3673	# freeze display when hovering over any label
3252	return if $CFClient::UI::TOOLTIP->{owner}	3674	return if $CFPlus::UI::TOOLTIP->{owner}
3253	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3675	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3254	values %{ $self->{item} };	3676	values %{ $self->{item} };
3255		3677
3256	while (my ($k, $v) = each %{ $self->{item} }) {	3678	while (my ($k, $v) = each %{ $self->{item} }) {
3257	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3679	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3258	}	3680	}
…		…
3279	for ($short) {	3701	for ($short) {
3280	s/^\s+//;	3702	s/^\s+//;
3281	s/\s+/ /g;	3703	s/\s+/ /g;
3282	}	3704	}
3283		3705
3284	new CFClient::UI::Label	3706	new CFPlus::UI::Label
3285	markup => $short,	3707	markup => $short,
3286	tooltip => $item->{tooltip},	3708	tooltip => $item->{tooltip},
3287	tooltip_font => $::FONT_PROP,	3709	tooltip_font => $::FONT_PROP,
3288	tooltip_width => 0.67,	3710	tooltip_width => 0.67,
3289	fontsize => $item->{fontsize} || $self->{fontsize},	3711	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3343	count => 1,	3765	count => 1,
3344	%arg,	3766	%arg,
3345	};	3767	};
3346	}	3768	}
3347		3769
		3770	$ROOT->on_refresh (reorder => sub {
3348	$self->reorder;	3771	$self->reorder;
		3772	});
3349	}	3773	}
3350		3774
3351	sub reconfigure {	3775	sub reconfigure {
3352	my ($self) = @_;	3776	my ($self) = @_;
3353		3777
…		…
3366	$self->SUPER::destroy;	3790	$self->SUPER::destroy;
3367	}	3791	}
3368		3792
3369	#############################################################################	3793	#############################################################################
3370		3794
3371	package CFClient::UI::Inventory;
3372
3373	our @ISA = CFClient::UI::ScrolledWindow::;
3374
3375	sub new {
3376	my $class = shift;
3377
3378	my $self = $class->SUPER::new (
3379	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3380	@_,
3381	);
3382
3383	$self
3384	}
3385
3386	sub set_items {
3387	my ($self, $items) = @_;
3388
3389	$self->{child}->clear;
3390	return unless $items;
3391
3392	my @items = sort {
3393	($a->{type} <=> $b->{type})
3394	or ($a->{name} cmp $b->{name})
3395	} @$items;
3396
3397	$self->{real_items} = \@items;
3398
3399	my $row = 0;
3400	for my $item (@items) {
3401	CFClient::Item::update_widgets $item;
3402
3403	$self->{child}->add (0, $row, $item->{face_widget});
3404	$self->{child}->add (1, $row, $item->{desc_widget});
3405	$self->{child}->add (2, $row, $item->{weight_widget});
3406
3407	$row++;
3408	}
3409	}
3410
3411	#############################################################################
3412
3413	package CFClient::UI::BindEditor;
3414
3415	our @ISA = CFClient::UI::FancyFrame::;
3416
3417	sub new {
3418	my $class = shift;
3419
3420	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3421
3422	$self->add (my $vb = new CFClient::UI::VBox);
3423
3424
3425	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3426	text => "start recording",
3427	tooltip => "Start/Stops recording of actions."
3428	."All subsequent actions after the recording started will be captured."
3429	."The actions are displayed after the record was stopped."
3430	."To bind the action you have to click on the 'Bind' button",
3431	on_activate => sub {
3432	unless ($self->{recording}) {
3433	$self->start;
3434	} else {
3435	$self->stop;
3436	}
3437	});
3438
3439	$vb->add (new CFClient::UI::Label text => "Actions:");
3440	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3441
3442	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3443	$vb->add (my $hb = new CFClient::UI::HBox);
3444	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3445	$hb->add (new CFClient::UI::Button
3446	text => "bind",
3447	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3448	on_activate => sub {
3449	$self->ask_for_bind;
3450	});
3451
3452	$vb->add (my $hb = new CFClient::UI::HBox);
3453	$hb->add (new CFClient::UI::Button
3454	text => "ok",
3455	expand => 1,
3456	tooltip => "This closes the binding editor and saves the binding",
3457	on_activate => sub {
3458	$self->hide;
3459	$self->commit;
3460	});
3461
3462	$hb->add (new CFClient::UI::Button
3463	text => "cancel",
3464	expand => 1,
3465	tooltip => "This closes the binding editor without saving",
3466	on_activate => sub {
3467	$self->hide;
3468	$self->{binding_cancel}->()
3469	if $self->{binding_cancel};
3470	});
3471
3472	$self->update_binding_widgets;
3473
3474	$self
3475	}
3476
3477	sub commit {
3478	my ($self) = @_;
3479	my ($mod, $sym, $cmds) = $self->get_binding;
3480	if ($sym != 0 && @$cmds > 0) {
3481	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3482	."'. Don't forget 'Save Config'!");
3483	$self->{binding_change}->($mod, $sym, $cmds)
3484	if $self->{binding_change};
3485	} else {
3486	$::STATUSBOX->add ("No action bound, no key or action specified!");
3487	$self->{binding_cancel}->()
3488	if $self->{binding_cancel};
3489	}
3490	}
3491
3492	sub start {
3493	my ($self) = @_;
3494
3495	$self->{rec_btn}->set_text ("stop recording");
3496	$self->{recording} = 1;
3497	$self->clear_command_list;
3498	$::CONN->start_record if $::CONN;
3499	}
3500
3501	sub stop {
3502	my ($self) = @_;
3503
3504	$self->{rec_btn}->set_text ("start recording");
3505	$self->{recording} = 0;
3506
3507	my $rec;
3508	$rec = $::CONN->stop_record if $::CONN;
3509	return unless ref $rec eq 'ARRAY';
3510	$self->set_command_list ($rec);
3511	}
3512
3513
3514	sub ask_for_bind_and_commit {
3515	my ($self) = @_;
3516	$self->ask_for_bind (1);
3517	}
3518
3519	sub ask_for_bind {
3520	my ($self, $commit, $end_cb) = @_;
3521
3522	CFClient::Binder::open_binding_dialog (sub {
3523	my ($mod, $sym) = @_;
3524	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3525	$self->update_binding_widgets;
3526	$self->commit if $commit;
3527	$end_cb->() if $end_cb;
3528	});
3529	}
3530
3531	# $mod and $sym are the modifiers and key symbol
3532	# $cmds is a array ref of strings (the commands)
3533	# $cb is the callback that is executed on OK
3534	# $ccb is the callback that is executed on CANCEL and
3535	# when the binding was unsuccessful on OK
3536	sub set_binding {
3537	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3538
3539	$self->clear_command_list;
3540	$self->{recording} = 0;
3541	$self->{rec_btn}->set_text ("start recording");
3542
3543	$self->{binding} = [$mod, $sym];
3544	$self->{commands} = $cmds;
3545
3546	$self->{binding_change} = $cb;
3547	$self->{binding_cancel} = $ccb;
3548
3549	$self->update_binding_widgets;
3550	}
3551
3552	# this is a shortcut method that asks for a binding
3553	# and then just binds it.
3554	sub do_quick_binding {
3555	my ($self, $cmds, $end_cb) = @_;
3556	$self->set_binding (undef, undef, $cmds, sub {
3557	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3558	});
3559	$self->ask_for_bind (1, $end_cb);
3560	}
3561
3562	sub update_binding_widgets {
3563	my ($self) = @_;
3564	my ($mod, $sym, $cmds) = $self->get_binding;
3565	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3566	$self->set_command_list ($cmds);
3567	}
3568
3569	sub get_binding {
3570	my ($self) = @_;
3571	return (
3572	$self->{binding}->[0],
3573	$self->{binding}->[1],
3574	[ grep { defined $_ } @{$self->{commands}} ]
3575	);
3576	}
3577
3578	sub clear_command_list {
3579	my ($self) = @_;
3580	$self->{cmdbox}->clear ();
3581	}
3582
3583	sub set_command_list {
3584	my ($self, $cmds) = @_;
3585
3586	$self->{cmdbox}->clear ();
3587	$self->{commands} = $cmds;
3588
3589	my $idx = 0;
3590
3591	for (@$cmds) {
3592	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3593
3594	my $i = $idx;
3595	$hb->add (new CFClient::UI::Label text => $_);
3596	$hb->add (new CFClient::UI::Button
3597	text => "delete",
3598	tooltip => "Deletes the action from the record",
3599	on_activate => sub {
3600	$self->{cmdbox}->remove ($hb);
3601	$cmds->[$i] = undef;
3602	});
3603
3604
3605	$idx++
3606	}
3607	}
3608
3609	#############################################################################
3610
3611	package CFClient::UI::SpellList;
3612
3613	our @ISA = CFClient::UI::Table::;
3614
3615	sub new {
3616	my $class = shift;
3617
3618	my $self = $class->SUPER::new (
3619	binding => [],
3620	commands => [],
3621	@_,
3622	)
3623	}
3624
3625	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3626
3627	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3629	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3630	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3631	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3633	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3635	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3637
3638	sub rebuild_spell_list {
3639	my ($self) = @_;
3640
3641	$CFClient::UI::ROOT->on_refresh ($self => sub {
3642	$self->clear;
3643
3644	return unless $::CONN;
3645
3646	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3647	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3648	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3649	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3650	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3651
3652	my $row = 0;
3653
3654	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3655	my $spell = $self->{spell}{$_};
3656
3657	$row++;
3658
3659	my $spell_cb = sub {
3660	my ($widget, $ev) = @_;
3661
3662	if ($ev->{button} == 1) {
3663	$::CONN->user_send ("cast $spell->{name}");
3664	} elsif ($ev->{button} == 2) {
3665	$::CONN->user_send ("invoke $spell->{name}");
3666	} elsif ($ev->{button} == 3) {
3667	(new CFClient::UI::Menu
3668	items => [
3669	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3670	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3671	],
3672	)->popup ($ev);
3673	} else {
3674	return 0;
3675	}
3676
3677	1
3678	};
3679
3680	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3681
3682	#TODO: add path info to tooltip
3683	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3684
3685	$self->add (0, $row, new CFClient::UI::Face
3686	face => $spell->{face},
3687	can_hover => 1,
3688	can_events => 1,
3689	tooltip => $tooltip,
3690	on_button_down => $spell_cb,
3691	);
3692
3693	$self->add (1, $row, new CFClient::UI::Label
3694	expand => 1,
3695	text => $spell->{name},
3696	can_hover => 1,
3697	can_events => 1,
3698	tooltip => $tooltip,
3699	on_button_down => $spell_cb,
3700	);
3701
3702	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3703	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3704	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3705	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3706	}
3707	});
3708	}
3709
3710	sub add_spell {
3711	my ($self, $spell) = @_;
3712
3713	$self->{spell}->{$spell->{name}} = $spell;
3714	$self->rebuild_spell_list;
3715	}
3716
3717	sub remove_spell {
3718	my ($self, $spell) = @_;
3719
3720	delete $self->{spell}->{$spell->{name}};
3721	$self->rebuild_spell_list;
3722	}
3723
3724	sub clear_spells {
3725	my ($self) = @_;
3726
3727	$self->{spell} = {};
3728	$self->rebuild_spell_list;
3729	}
3730
3731	#############################################################################
3732
3733	package CFClient::UI::Root;	3795	package CFPlus::UI::Root;
3734		3796
3735	our @ISA = CFClient::UI::Container::;	3797	our @ISA = CFPlus::UI::Container::;
3736		3798
3737	use List::Util qw(min max);	3799	use List::Util qw(min max);
3738		3800
3739	use CFClient::OpenGL;	3801	use CFPlus::OpenGL;
3740		3802
3741	sub new {	3803	sub new {
3742	my $class = shift;	3804	my $class = shift;
3743		3805
3744	my $self = $class->SUPER::new (	3806	my $self = $class->SUPER::new (
3745	visible => 1,	3807	visible => 1,
3746	@_,	3808	@_,
3747	);	3809	);
3748		3810
3749	Scalar::Util::weaken ($self->{root} = $self);	3811	CFPlus::weaken ($self->{root} = $self);
3750		3812
3751	$self	3813	$self
3752	}	3814	}
3753		3815
3754	sub size_request {	3816	sub size_request {
…		…
3920	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3982	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3921		3983
3922	$w = 0 if $w < 0;	3984	$w = 0 if $w < 0;
3923	$h = 0 if $h < 0;	3985	$h = 0 if $h < 0;
3924		3986
		3987	$w = max $widget->{min_w}, $w;
		3988	$h = max $widget->{min_h}, $h;
		3989
		3990	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3991	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3992
		3993	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3994	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3995
3925	$w = int $w + 0.5;	3996	$w = int $w + 0.5;
3926	$h = int $h + 0.5;	3997	$h = int $h + 0.5;
3927		3998
3928	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3999	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929	$widget->{old_w} = $widget->{w};	4000	$widget->{old_w} = $widget->{w};
…		…
3952	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4023	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3953	glMatrixMode GL_MODELVIEW;	4024	glMatrixMode GL_MODELVIEW;
3954	glLoadIdentity;	4025	glLoadIdentity;
3955		4026
3956	{	4027	{
3957	package CFClient::UI::Base;	4028	package CFPlus::UI::Base;
3958		4029
3959	($draw_x, $draw_y, $draw_w, $draw_h) =	4030	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3960	(0, 0, $self->{w}, $self->{h});	4031	(0, 0, $self->{w}, $self->{h});
3961	}
3962		4032
3963	$self->_draw;	4033	$self->_draw;
		4034	}
3964	}	4035	}
3965		4036
3966	#############################################################################	4037	#############################################################################
3967		4038
3968	package CFClient::UI;	4039	package CFPlus::UI;
3969		4040
3970	$ROOT = new CFClient::UI::Root;	4041	$ROOT = new CFPlus::UI::Root;
3971	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4042	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3972		4043
3973	1	4044	1
3974		4045

Diff Legend

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