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.329 by root, Sun Jul 23 02:44:06 2006 UTC vs.
Revision 1.440 by root, Sun Sep 16 18:27:48 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};
34
35	$tip = $tip->($widget) if CODE:: eq ref $tip;
36
37	$TOOLTIP->set_tooltip_from ($widget);	35	$TOOLTIP->set_tooltip_from ($widget);
38	$TOOLTIP->show;	36	$TOOLTIP->show;
39	}	37	}
40		38
41	return;	39	return;
42	}	40	}
43	}	41	}
44	}	42	}
45		43
46	$TOOLTIP->hide;	44	$TOOLTIP->hide;
		45	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	46	delete $TOOLTIP->{owner};
48	});	47	});
49		48
50	sub get_layout {	49	sub get_layout {
51	my $layout;	50	my $layout;
…		…
79	sub feed_sdl_key_up_event {	78	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	79	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	80	if $FOCUS;
82	}	81	}
83		82
		83	sub check_hover {
		84	my ($widget) = @_;
		85
		86	if ($widget != $HOVER) {
		87	my $hover = $HOVER; $HOVER = $widget;
		88
		89	$hover->update if $hover && $hover->{can_hover};
		90	$HOVER->update if $HOVER && $HOVER->{can_hover};
		91
		92	$TOOLTIP_WATCHER->start;
		93	}
		94	}
		95
84	sub feed_sdl_button_down_event {	96	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	97	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	98	my ($x, $y) = ($ev->{x}, $ev->{y});
87		99
88	if (!$BUTTON_STATE) {	100	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		101
		102	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	103	my $widget = $ROOT->find_widget ($x, $y);
90		104
91	$GRAB = $widget;	105	$GRAB = $widget;
92	$GRAB->update if $GRAB;	106	$GRAB->update if $GRAB;
93		107
94	$TOOLTIP_WATCHER->cb->();	108	$TOOLTIP_WATCHER->cb->();
95	}	109	}
96		110
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	111	if ($GRAB) {
		112	if ($ev->{button} == 4 || $ev->{button} == 5) {
		113	# mousewheel
		114	my $delta = $ev->{button} * 2 - 9;
		115	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98		116
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	117	$ev->{dx} = $shift ? $delta : 0;
100	if $GRAB;	118	$ev->{dy} = $shift ? 0 : $delta;
		119
		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	{ "\fw" => $_[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	}
…		…
290	sub set_visibility {	320	sub set_visibility {
291	my ($self, $visible) = @_;	321	my ($self, $visible) = @_;
292		322
293	return if $self->{visible} == $visible;	323	return if $self->{visible} == $visible;
294		324
295	$visible ? $self->hide	325	$visible ? $self->show
296	: $self->show;	326	: $self->hide;
297	}	327	}
298		328
299	sub toggle_visibility {	329	sub toggle_visibility {
300	my ($self) = @_;	330	my ($self) = @_;
301		331
…		…
330	$self->{force_h} = $h;	360	$self->{force_h} = $h;
331		361
332	$self->realloc;	362	$self->realloc;
333	}	363	}
334		364
		365	# traverse the widget chain up to find the maximum "physical" size constraints
		366	sub get_max_wh {
		367	my ($self) = @_;
		368
		369	return $self->{parent}->get_max_wh
		370	if $self->{parent};
		371
		372	($::WIDTH, $::HEIGHT)
		373	}
		374
335	sub size_request {	375	sub size_request {
336	require Carp;	376	require Carp;
337	Carp::confess "size_request is abstract";	377	Carp::confess "size_request is abstract";
338	}	378	}
339		379
…		…
345	my ($self, $x, $y, $w, $h) = @_;	385	my ($self, $x, $y, $w, $h) = @_;
346		386
347	if ($self->{aspect}) {	387	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	388	my ($ow, $oh) = ($w, $h);
349		389
350	$w = List::Util::min $w, int $h * $self->{aspect};	390	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	391	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		392
353	# use alignment to adjust x, y	393	# use alignment to adjust x, y
354		394
355	$x += int 0.5 * ($ow - $w);	395	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	396	$y += int 0.5 * ($oh - $h);
…		…
397		437
398	return if $self->{tooltip} eq $tooltip;	438	return if $self->{tooltip} eq $tooltip;
399		439
400	$self->{tooltip} = $tooltip;	440	$self->{tooltip} = $tooltip;
401		441
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	442	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	443	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	444	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	445	}
406	}	446	}
407		447
408	# translate global coordinates to local coordinate system	448	# translate global coordinates to local coordinate system
409	sub coord2local {	449	sub coord2local {
410	my ($self, $x, $y) = @_;	450	my ($self, $x, $y) = @_;
411		451
		452	Carp::confess unless $self->{parent};#d#
		453
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	454	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	455	}
414		456
415	# translate local coordinates to global coordinate system	457	# translate local coordinates to global coordinate system
416	sub coord2global {	458	sub coord2global {
417	my ($self, $x, $y) = @_;	459	my ($self, $x, $y) = @_;
		460
		461	Carp::confess unless $self->{parent};#d#
418		462
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	463	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	464	}
421		465
422	sub invoke_focus_in {	466	sub invoke_focus_in {
…		…
456		500
457	sub invoke_mouse_motion { 0 }	501	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 0 }	502	sub invoke_button_up { 0 }
459	sub invoke_key_down { 0 }	503	sub invoke_key_down { 0 }
460	sub invoke_key_up { 0 }	504	sub invoke_key_up { 0 }
		505	sub invoke_mouse_wheel { 0 }
461		506
462	sub invoke_button_down {	507	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	508	my ($self, $ev, $x, $y) = @_;
464		509
465	$self->grab_focus;	510	$self->grab_focus;
…		…
469		514
470	sub connect {	515	sub connect {
471	my ($self, $signal, $cb) = @_;	516	my ($self, $signal, $cb) = @_;
472		517
473	push @{ $self->{signal_cb}{$signal} }, $cb;	518	push @{ $self->{signal_cb}{$signal} }, $cb;
		519
		520	defined wantarray and CFPlus::guard {
		521	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		522	@{ $self->{signal_cb}{$signal} };
		523	}
474	}	524	}
		525
		526	sub disconnect_all {
		527	my ($self, $signal) = @_;
		528
		529	delete $self->{signal_cb}{$signal};
		530	}
		531
		532	my %has_coords = (
		533	button_down => 1,
		534	button_up => 1,
		535	mouse_motion => 1,
		536	mouse_wheel => 1,
		537	);
475		538
476	sub emit {	539	sub emit {
477	my ($self, $signal, @args) = @_;	540	my ($self, $signal, @args) = @_;
478		541
		542	# I do not really like this solution, but I do not like duplication
		543	# and needlessly verbose code, either.
		544	my @append
		545	= $has_coords{$signal}
		546	? $args[0]->xy ($self)
		547	: ();
		548
479	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	549	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
480		550
481	#d##TODO# stop propagating at first true, do not use sum	551	for my $cb (
482	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	552	@{$self->{signal_cb}{$signal} || []}, # before
483	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	553	($self->can ("invoke_$signal") || sub { 1 }), # closure
		554	) {
		555	return $cb->($self, @args, @append) || next;
		556	}
		557
		558	# parent
484	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	559	$self->{parent} && $self->{parent}->emit ($signal, @args)
485	}	560	}
486		561
487	sub find_widget {	562	#sub find_widget {
488	my ($self, $x, $y) = @_;	563	# in .xs
489
490	return () unless $self->{can_events};
491
492	return $self
493	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
494	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
495
496	()
497	}
498		564
499	sub set_parent {	565	sub set_parent {
500	my ($self, $parent) = @_;	566	my ($self, $parent) = @_;
501		567
502	Scalar::Util::weaken ($self->{parent} = $parent);	568	CFPlus::weaken ($self->{parent} = $parent);
503	$self->set_visible if $parent->{visible};	569	$self->set_visible if $parent->{visible};
504	}	570	}
505		571
506	sub realloc {	572	sub realloc {
507	my ($self) = @_;	573	my ($self) = @_;
…		…
533		599
534	# using global variables seems a bit hacky, but passing through all drawing	600	# using global variables seems a bit hacky, but passing through all drawing
535	# functions seems pointless.	601	# functions seems pointless.
536	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	602	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
537		603
538	sub draw {	604	#sub draw {
539	my ($self) = @_;	605	#CFPlus.xs
540
541	return unless $self->{h} && $self->{w};
542
543	# update screen rectangle
544	local $draw_x = $draw_x + $self->{x};
545	local $draw_y = $draw_y + $self->{y};
546
547	# skip widgets that are entirely outside the drawing area
548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550
551	glPushMatrix;
552	glTranslate $self->{x}, $self->{y}, 0;
553
554	if ($self == $HOVER && $self->{can_hover}) {
555	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
556	glEnable GL_BLEND;
557	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
558	glBegin GL_QUADS;
559	glVertex 0 , 0;
560	glVertex $self->{w}, 0;
561	glVertex $self->{w}, $self->{h};
562	glVertex 0 , $self->{h};
563	glEnd;
564	glDisable GL_BLEND;
565	}
566
567	if ($ENV{CFPLUS_DEBUG} & 1) {
568	glPushMatrix;
569	glColor 1, 1, 0, 1;
570	glTranslate 0.375, 0.375;
571	glBegin GL_LINE_LOOP;
572	glVertex 0 , 0;
573	glVertex $self->{w} - 1, 0;
574	glVertex $self->{w} - 1, $self->{h} - 1;
575	glVertex 0 , $self->{h} - 1;
576	glEnd;
577	glPopMatrix;
578	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
579	}
580
581	$self->_draw;
582	glPopMatrix;
583	}
584		606
585	sub _draw {	607	sub _draw {
586	my ($self) = @_;	608	my ($self) = @_;
587		609
588	warn "no draw defined for $self\n";	610	warn "no draw defined for $self\n";
589	}	611	}
590		612
591	sub DESTROY {	613	sub DESTROY {
592	my ($self) = @_;	614	my ($self) = @_;
593		615
594	return if CFClient::in_destruct;	616	return if CFPlus::in_destruct;
595		617
596	delete $WIDGET{$self+0};	618	local $@;
597
598	eval { $self->destroy };	619	eval { $self->destroy };
599	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	620	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		621
		622	delete $WIDGET{$self+0};
600	}	623	}
601		624
602	#############################################################################	625	#############################################################################
603		626
604	package CFClient::UI::DrawBG;	627	package CFPlus::UI::DrawBG;
605		628
606	our @ISA = CFClient::UI::Base::;	629	our @ISA = CFPlus::UI::Base::;
607		630
608	use strict;	631	use strict;
609	use CFClient::OpenGL;	632	use CFPlus::OpenGL;
610		633
611	sub new {	634	sub new {
612	my $class = shift;	635	my $class = shift;
613
614	# range [value, low, high, page]
615		636
616	$class->SUPER::new (	637	$class->SUPER::new (
617	#bg => [0, 0, 0, 0.2],	638	#bg => [0, 0, 0, 0.2],
618	#active_bg => [1, 1, 1, 0.5],	639	#active_bg => [1, 1, 1, 0.5],
619	@_	640	@_
…		…
631	my ($w, $h) = @$self{qw(w h)};	652	my ($w, $h) = @$self{qw(w h)};
632		653
633	glEnable GL_BLEND;	654	glEnable GL_BLEND;
634	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	655	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
635	glColor_premultiply @$color;	656	glColor_premultiply @$color;
636
637	glBegin GL_QUADS;
638	glVertex 0 , 0;
639	glVertex 0 , $h;
640	glVertex $w, $h;	657	glRect 0, 0, $w, $h;
641	glVertex $w, 0;
642	glEnd;
643
644	glDisable GL_BLEND;	658	glDisable GL_BLEND;
645	}	659	}
646	}	660	}
647		661
648	#############################################################################	662	#############################################################################
649		663
650	package CFClient::UI::Empty;	664	package CFPlus::UI::Empty;
651		665
652	our @ISA = CFClient::UI::Base::;	666	our @ISA = CFPlus::UI::Base::;
653		667
654	sub new {	668	sub new {
655	my ($class, %arg) = @_;	669	my ($class, %arg) = @_;
656	$class->SUPER::new (can_events => 0, %arg);	670	$class->SUPER::new (can_events => 0, %arg);
657	}	671	}
…		…
664		678
665	sub draw { }	679	sub draw { }
666		680
667	#############################################################################	681	#############################################################################
668		682
669	package CFClient::UI::Container;	683	package CFPlus::UI::Container;
670		684
671	our @ISA = CFClient::UI::Base::;	685	our @ISA = CFPlus::UI::Base::;
672		686
673	sub new {	687	sub new {
674	my ($class, %arg) = @_;	688	my ($class, %arg) = @_;
675		689
676	my $children = delete $arg{children};	690	my $children = delete $arg{children};
…		…
680	can_events => 0,	694	can_events => 0,
681	%arg,	695	%arg,
682	);	696	);
683		697
684	$self->add (@$children)	698	$self->add (@$children)
685	if $children;	699	if $children && @$children;
686		700
687	$self	701	$self
		702	}
		703
		704	sub realloc {
		705	my ($self) = @_;
		706
		707	$self->{force_realloc} = 1;
		708	$self->{force_size_alloc} = 1;
		709	$self->SUPER::realloc;
688	}	710	}
689		711
690	sub add {	712	sub add {
691	my ($self, @widgets) = @_;	713	my ($self, @widgets) = @_;
692		714
693	$_->set_parent ($self)	715	$_->set_parent ($self)
694	for @widgets;	716	for @widgets;
695		717
		718	# TODO: only do this in widgets that need it, e.g. root, fixed
696	use sort 'stable';	719	use sort 'stable';
697		720
698	$self->{children} = [	721	$self->{children} = [
699	sort { $a->{z} <=> $b->{z} }	722	sort { $a->{z} <=> $b->{z} }
700	@{$self->{children}}, @widgets	723	@{$self->{children}}, @widgets
701	];	724	];
702		725
703	$self->realloc;	726	$self->realloc;
		727
		728	$self->emit (c_add => \@widgets);
		729
		730	map $_+0, @widgets
704	}	731	}
705		732
706	sub children {	733	sub children {
707	@{ $_[0]{children} }	734	@{ $_[0]{children} }
708	}	735	}
709		736
710	sub remove {	737	sub remove {
711	my ($self, $child) = @_;	738	my ($self, @widgets) = @_;
712		739
		740	$self->emit (c_remove => \@widgets);
		741
		742	for my $child (@widgets) {
713	delete $child->{parent};	743	delete $child->{parent};
714	$child->hide;	744	$child->hide;
715
716	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	745	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		746	}
717		747
718	$self->realloc;	748	$self->realloc;
719	}	749	}
720		750
721	sub clear {	751	sub clear {
722	my ($self) = @_;	752	my ($self) = @_;
723		753
724	my $children = delete $self->{children};	754	my $children = $self->{children};
725	$self->{children} = [];	755	$self->{children} = [];
726		756
727	for (@$children) {	757	for (@$children) {
728	delete $_->{parent};	758	delete $_->{parent};
729	$_->hide;	759	$_->hide;
…		…
749	}	779	}
750		780
751	sub _draw {	781	sub _draw {
752	my ($self) = @_;	782	my ($self) = @_;
753		783
754	$_->draw for @{$self->{children}};	784	$_->draw for $self->visible_children;
755	}	785	}
756		786
757	#############################################################################	787	#############################################################################
758		788
759	package CFClient::UI::Bin;	789	package CFPlus::UI::Bin;
760		790
761	our @ISA = CFClient::UI::Container::;	791	our @ISA = CFPlus::UI::Container::;
762		792
763	sub new {	793	sub new {
764	my ($class, %arg) = @_;	794	my ($class, %arg) = @_;
765		795
766	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	796	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
767		797
768	$class->SUPER::new (children => [$child], %arg)	798	$class->SUPER::new (children => [$child], %arg)
769	}	799	}
770		800
771	sub add {	801	sub add {
772	my ($self, $child) = @_;	802	my ($self, $child) = @_;
773		803
774	$self->SUPER::remove ($_) for @{ $self->{children} };	804	$self->clear;
775	$self->SUPER::add ($child);	805	$self->SUPER::add ($child);
776	}	806	}
777		807
778	sub remove {	808	sub remove {
779	my ($self, $widget) = @_;	809	my ($self, $widget) = @_;
780		810
781	$self->SUPER::remove ($widget);	811	$self->SUPER::remove ($widget);
782		812
783	$self->{children} = [new CFClient::UI::Empty]	813	$self->{children} = [new CFPlus::UI::Empty]
784	unless @{$self->{children}};	814	unless @{$self->{children}};
785	}	815	}
786		816
787	sub child { $_[0]->{children}[0] }	817	sub child { $_[0]->{children}[0] }
788		818
…		…
797		827
798	1	828	1
799	}	829	}
800		830
801	#############################################################################	831	#############################################################################
802
803	# back-buffered drawing area	832	# back-buffered drawing area
804		833
805	package CFClient::UI::Window;	834	package CFPlus::UI::Window;
806		835
807	our @ISA = CFClient::UI::Bin::;	836	our @ISA = CFPlus::UI::Bin::;
808		837
809	use CFClient::OpenGL;	838	use CFPlus::OpenGL;
810		839
811	sub new {	840	sub new {
812	my ($class, %arg) = @_;	841	my ($class, %arg) = @_;
813		842
814	my $self = $class->SUPER::new (%arg);	843	my $self = $class->SUPER::new (%arg);
…		…
836	}	865	}
837		866
838	sub render_child {	867	sub render_child {
839	my ($self) = @_;	868	my ($self) = @_;
840		869
841	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	870	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
842	glClearColor 0, 0, 0, 0;	871	glClearColor 0, 0, 0, 0;
843	glClear GL_COLOR_BUFFER_BIT;	872	glClear GL_COLOR_BUFFER_BIT;
844		873
845	{	874	{
846	package CFClient::UI::Base;	875	package CFPlus::UI::Base;
847		876
848	($draw_x, $draw_y, $draw_w, $draw_h) =	877	local ($draw_x, $draw_y, $draw_w, $draw_h) =
849	(0, 0, $self->{w}, $self->{h});	878	(0, 0, $self->{w}, $self->{h});
		879
		880	$self->_render;
850	}	881	}
851
852	$self->_render;
853	};	882	};
854	}	883	}
855		884
856	sub _draw {	885	sub _draw {
857	my ($self) = @_;	886	my ($self) = @_;
858
859	my ($w, $h) = @$self{qw(w h)};
860		887
861	my $tex = $self->{texture}	888	my $tex = $self->{texture}
862	or return;	889	or return;
863		890
864	glEnable GL_TEXTURE_2D;	891	glEnable GL_TEXTURE_2D;
865	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	892	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
866	glColor 0, 0, 0, 1;	893	glColor 0, 0, 0, 1;
867		894
868	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	895	$tex->draw_quad_alpha_premultiplied (0, 0);
869		896
870	glDisable GL_TEXTURE_2D;	897	glDisable GL_TEXTURE_2D;
871	}	898	}
872		899
873	#############################################################################	900	#############################################################################
874		901
875	package CFClient::UI::ViewPort;	902	package CFPlus::UI::ViewPort;
876		903
		904	use List::Util qw(min max);
		905
877	our @ISA = CFClient::UI::Window::;	906	our @ISA = CFPlus::UI::Window::;
878		907
879	sub new {	908	sub new {
880	my $class = shift;	909	my $class = shift;
881		910
882	$class->SUPER::new (	911	$class->SUPER::new (
…		…
889	sub size_request {	918	sub size_request {
890	my ($self) = @_;	919	my ($self) = @_;
891		920
892	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	921	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
893		922
894	$w = 10 if $self->{scroll_x};	923	$w = 1 if $self->{scroll_x};
895	$h = 10 if $self->{scroll_y};	924	$h = 1 if $self->{scroll_y};
896		925
897	($w, $h)	926	($w, $h)
898	}	927	}
899		928
900	sub invoke_size_allocate {	929	sub invoke_size_allocate {
…		…
912	}	941	}
913		942
914	sub set_offset {	943	sub set_offset {
915	my ($self, $x, $y) = @_;	944	my ($self, $x, $y) = @_;
916		945
		946	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		947	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		948
		949	if ($x != $self->{view_x} or $y != $self->{view_y}) {
917	$self->{view_x} = int $x;	950	$self->{view_x} = $x;
918	$self->{view_y} = int $y;	951	$self->{view_y} = $y;
919		952
		953	$self->emit (changed => $x, $y);
920	$self->update;	954	$self->update;
		955	}
		956	}
		957
		958	sub set_center {
		959	my ($self, $x, $y) = @_;
		960
		961	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		962	}
		963
		964	sub make_visible {
		965	my ($self, $x, $y, $border) = @_;
		966
		967	if ( $x < $self->{view_x} + $self->{w} * $border
		968	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		969	|| $y < $self->{view_y} + $self->{h} * $border
		970	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		971	) {
		972	$self->set_center ($x, $y);
		973	}
921	}	974	}
922		975
923	# hmm, this does not work for topleft of $self... but we should not ask for that	976	# hmm, this does not work for topleft of $self... but we should not ask for that
924	sub coord2local {	977	sub coord2local {
925	my ($self, $x, $y) = @_;	978	my ($self, $x, $y) = @_;
…		…
940	my ($self, $x, $y) = @_;	993	my ($self, $x, $y) = @_;
941		994
942	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
943	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
944	) {	997	) {
945	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	998	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
946	} else {	999	} else {
947	$self->CFClient::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
948	}	1001	}
949	}	1002	}
950		1003
951	sub _render {	1004	sub _render {
952	my ($self) = @_;	1005	my ($self) = @_;
953		1006
954	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1007	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
955	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1008	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
956		1009
957	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1010	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
958		1011
959	$self->SUPER::_render;	1012	$self->SUPER::_render;
960	}	1013	}
961		1014
962	#############################################################################	1015	#############################################################################
963		1016
964	package CFClient::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
965		1018
966	our @ISA = CFClient::UI::HBox::;	1019	our @ISA = CFPlus::UI::Table::;
967		1020
968	sub new {	1021	sub new {
969	my ($class, %arg) = @_;	1022	my ($class, %arg) = @_;
970		1023
971	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
972		1025
973	my $self;	1026	my $self;
974		1027
975	my $slider = new CFClient::UI::Slider	1028	my $hslider = new CFPlus::UI::Slider
		1029	c_col => 0,
		1030	c_row => 1,
		1031	vertical => 0,
		1032	range => [0, 0, 1, 0.01], # HACK fix
		1033	on_changed => sub {
		1034	$self->{hpos} = $_[1];
		1035	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1036	},
		1037	;
		1038
		1039	my $vslider = new CFPlus::UI::Slider
		1040	c_col => 1,
		1041	c_row => 0,
976	vertical => 1,	1042	vertical => 1,
977	range => [0, 0, 1, 0.01], # HACK fix	1043	range => [0, 0, 1, 0.01], # HACK fix
978	on_changed => sub {	1044	on_changed => sub {
979	$self->{vp}->set_offset (0, $_[1]);	1045	$self->{vpos} = $_[1];
		1046	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
980	},	1047	},
981	;	1048	;
982		1049
983	$self = $class->SUPER::new (	1050	$self = $class->SUPER::new (
984	vp => (new CFClient::UI::ViewPort expand => 1),	1051	scroll_x => 0,
		1052	scroll_y => 1,
		1053	can_events => 1,
985	slider => $slider,	1054	hslider => $hslider,
		1055	vslider => $vslider,
		1056	col_expand => [1, 0],
		1057	row_expand => [1, 0],
986	%arg,	1058	%arg,
987	);	1059	);
988		1060
		1061	$self->{vp} = new CFPlus::UI::ViewPort
		1062	c_col => 0,
		1063	c_row => 0,
		1064	expand => 1,
		1065	scroll_x => $self->{scroll_x},
		1066	scroll_y => $self->{scroll_y},
		1067	on_changed => sub {
		1068	my ($vp, $x, $y) = @_;
		1069
		1070	$vp->{parent}{hslider}->set_value ($x);
		1071	$vp->{parent}{vslider}->set_value ($y);
		1072
		1073	0
		1074	},
		1075	on_size_allocate => sub {
		1076	my ($vp, $w, $h) = @_;
		1077	$vp->{parent}->update_slider;
		1078	0
		1079	},
		1080	;
		1081
989	$self->SUPER::add ($self->{vp}, $self->{slider});	1082	$self->SUPER::add ($self->{vp});
		1083
990	$self->add ($child) if $child;	1084	$self->add ($child) if $child;
991		1085
992	$self	1086	$self
993	}	1087	}
994
995	#TODO# update range on size_allocate depending on child
996		1088
997	sub add {	1089	sub add {
998	my ($self, $widget) = @_;	1090	my ($self, $widget) = @_;
999		1091
1000	$self->{vp}->add ($self->{child} = $widget);	1092	$self->{vp}->add ($self->{child} = $widget);
1001	}	1093	}
1002		1094
		1095	sub set_offset { shift->{vp}->set_offset (@_) }
		1096	sub set_center { shift->{vp}->set_center (@_) }
		1097	sub make_visible { shift->{vp}->make_visible (@_) }
		1098
		1099	sub update_slider {
		1100	my ($self) = @_;
		1101
		1102	my $child = ($self->{vp} or return)->child;
		1103
		1104	if ($self->{scroll_x}) {
		1105	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1106	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1107
		1108	my $visible = $w1 > $w2;
		1109	if ($visible != $self->{hslider_visible}) {
		1110	$self->{hslider_visible} = $visible;
		1111	$visible ? $self->SUPER::add ($self->{hslider})
		1112	: $self->SUPER::remove ($self->{hslider});
		1113	}
		1114	}
		1115
		1116	if ($self->{scroll_y}) {
		1117	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1118	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1119
		1120	my $visible = $h1 > $h2;
		1121	if ($visible != $self->{vslider_visible}) {
		1122	$self->{vslider_visible} = $visible;
		1123	$visible ? $self->SUPER::add ($self->{vslider})
		1124	: $self->SUPER::remove ($self->{vslider});
		1125	}
		1126	}
		1127	}
		1128
		1129	sub start_dragging {
		1130	my ($self, $ev) = @_;
		1131
		1132	$self->grab_focus;
		1133
		1134	my $ox = $self->{vp}{view_x};
		1135	my $oy = $self->{vp}{view_y};
		1136
		1137	$self->{motion} = sub {
		1138	my ($ev, $x, $y) = @_;
		1139
		1140	$ox -= $ev->{xrel};
		1141	$oy -= $ev->{yrel};
		1142
		1143	$self->{vp}->set_offset ($ox, $oy);
		1144	};
		1145	}
		1146
		1147	sub invoke_mouse_wheel {
		1148	my ($self, $ev) = @_;
		1149
		1150	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1151	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1152
		1153	1
		1154	}
		1155
		1156	sub invoke_button_down {
		1157	my ($self, $ev, $x, $y) = @_;
		1158
		1159	if ($ev->{button} == 2) {
		1160	$self->start_dragging ($ev);
		1161	return 1;
		1162	}
		1163
		1164	0
		1165	}
		1166
1003	sub invoke_button_up {	1167	sub invoke_button_up {
1004	my ($self, $ev) = @_;	1168	my ($self, $ev, $x, $y) = @_;
1005		1169
1006	warn "button up $ev->{button}\n";#d#	1170	if (delete $self->{motion}) {
		1171	return 1;
1007		1172	}
		1173
1008	0	1174	0
1009	}	1175	}
1010		1176
1011	sub update_slider {	1177	sub invoke_mouse_motion {
1012	my ($self) = @_;	1178	my ($self, $ev, $x, $y) = @_;
1013		1179
1014	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1180	if ($self->{motion}) {
1015	}	1181	$self->{motion}->($ev, $x, $y);
		1182	return 1;
		1183	}
1016		1184
1017	sub update {	1185	0
1018	my ($self) = @_;
1019
1020	$self->SUPER::update;
1021
1022	$self->update_slider;
1023	}	1186	}
1024		1187
1025	sub invoke_size_allocate {	1188	sub invoke_size_allocate {
1026	my ($self, $w, $h) = @_;	1189	my ($self, $w, $h) = @_;
1027		1190
1028	$self->update_slider;	1191	$self->update_slider;
1029
1030	$self->SUPER::invoke_size_allocate ($w, $h)	1192	$self->SUPER::invoke_size_allocate ($w, $h)
1031	}	1193	}
1032		1194
1033	#############################################################################	1195	#############################################################################
1034		1196
1035	package CFClient::UI::Frame;	1197	package CFPlus::UI::Frame;
1036		1198
1037	our @ISA = CFClient::UI::Bin::;	1199	our @ISA = CFPlus::UI::Bin::;
1038		1200
1039	use CFClient::OpenGL;	1201	use CFPlus::OpenGL;
1040		1202
1041	sub new {	1203	sub new {
1042	my $class = shift;	1204	my $class = shift;
1043		1205
1044	$class->SUPER::new (	1206	$class->SUPER::new (
…		…
1054	my ($w, $h) = @$self{qw(w h)};	1216	my ($w, $h) = @$self{qw(w h)};
1055		1217
1056	glEnable GL_BLEND;	1218	glEnable GL_BLEND;
1057	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1219	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1058	glColor_premultiply @{ $self->{bg} };	1220	glColor_premultiply @{ $self->{bg} };
1059
1060	glBegin GL_QUADS;
1061	glVertex 0 , 0;
1062	glVertex 0 , $h;
1063	glVertex $w, $h;	1221	glRect 0, 0, $w, $h;
1064	glVertex $w, 0;
1065	glEnd;
1066
1067	glDisable GL_BLEND;	1222	glDisable GL_BLEND;
1068	}	1223	}
1069		1224
1070	$self->SUPER::_draw;	1225	$self->SUPER::_draw;
1071	}	1226	}
1072		1227
1073	#############################################################################	1228	#############################################################################
1074		1229
1075	package CFClient::UI::FancyFrame;	1230	package CFPlus::UI::FancyFrame;
1076		1231
1077	our @ISA = CFClient::UI::Bin::;	1232	our @ISA = CFPlus::UI::Bin::;
1078		1233
1079	use CFClient::OpenGL;	1234	use CFPlus::OpenGL;
		1235
		1236	sub new {
		1237	my ($class, %arg) = @_;
		1238
		1239	if ((exists $arg{label}) && !ref $arg{label}) {
		1240	$arg{label} = new CFPlus::UI::Label
		1241	align => 1,
		1242	valign => 0,
		1243	text => $arg{label},
		1244	fontsize => ($arg{border} || 0.8) * 0.75;
		1245	}
		1246
		1247	my $self = $class->SUPER::new (
		1248	# label => "",
		1249	fg => [0.6, 0.3, 0.1],
		1250	border => 0.8,
		1251	style => 'single',
		1252	%arg,
		1253	);
		1254
		1255	$self
		1256	}
		1257
		1258	sub add {
		1259	my ($self, @widgets) = @_;
		1260
		1261	$self->SUPER::add (@widgets);
		1262	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1263	}
		1264
		1265	sub border {
		1266	int $_[0]{border} * $::FONTSIZE
		1267	}
		1268
		1269	sub size_request {
		1270	my ($self) = @_;
		1271
		1272	($self->{label_w}, undef) = $self->{label}->size_request
		1273	if $self->{label};
		1274
		1275	my ($w, $h) = $self->SUPER::size_request;
		1276
		1277	(
		1278	$w + $self->border * 2,
		1279	$h + $self->border * 2,
		1280	)
		1281	}
		1282
		1283	sub invoke_size_allocate {
		1284	my ($self, $w, $h) = @_;
		1285
		1286	my $border = $self->border;
		1287
		1288	$w -= List::Util::max 0, $border * 2;
		1289	$h -= List::Util::max 0, $border * 2;
		1290
		1291	if (my $label = $self->{label}) {
		1292	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1293	$label->{h} = List::Util::min $h, $border;
		1294	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1295	}
		1296
		1297	$self->child->configure ($border, $border, $w, $h);
		1298
		1299	1
		1300	}
		1301
		1302	sub _draw {
		1303	my ($self) = @_;
		1304
		1305	my $child = $self->{children}[0];
		1306
		1307	my $border = $self->border;
		1308	my ($w, $h) = ($self->{w}, $self->{h});
		1309
		1310	$child->draw;
		1311
		1312	glColor @{$self->{fg}};
		1313	glBegin GL_LINE_STRIP;
		1314	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1315	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1316	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1317	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1318	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1319	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1320	glEnd;
		1321
		1322	if ($self->{label}) {
		1323	glTranslate $border * 2, 0;
		1324	$self->{label}->_draw;
		1325	}
		1326	}
		1327
		1328	#############################################################################
		1329
		1330	package CFPlus::UI::Toplevel;
		1331
		1332	our @ISA = CFPlus::UI::Bin::;
		1333
		1334	use CFPlus::OpenGL;
1080		1335
1081	my $bg =	1336	my $bg =
1082	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1337	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1083	mipmap => 1, wrap => 1;	1338	mipmap => 1, wrap => 1;
1084		1339
1085	my @border =	1340	my @border =
1086	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1341	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1087	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1342	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1343
		1344	my @icon =
		1345	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1346	qw(x1_move.png x1_resize.png);
1088		1347
1089	sub new {	1348	sub new {
1090	my ($class, %arg) = @_;	1349	my ($class, %arg) = @_;
1091		1350
1092	my $self = $class->SUPER::new (	1351	my $self = $class->SUPER::new (
…		…
1097	min_w => 64,	1356	min_w => 64,
1098	min_h => 32,	1357	min_h => 32,
1099	%arg,	1358	%arg,
1100	);	1359	);
1101		1360
1102	$self->{title_widget} = new CFClient::UI::Label	1361	$self->{title_widget} = new CFPlus::UI::Label
1103	align => 0,	1362	align => 0,
1104	valign => 1,	1363	valign => 1,
1105	text => $self->{title},	1364	text => $self->{title},
1106	fontsize => $self->{border},	1365	fontsize => $self->{border},
1107	if exists $self->{title};	1366	if exists $self->{title};
1108		1367
1109	if ($self->{has_close_button}) {	1368	if ($self->{has_close_button}) {
1110	$self->{close_button} =	1369	$self->{close_button} =
1111	new CFClient::UI::ImageButton	1370	new CFPlus::UI::ImageButton
1112	path => 'x1_close.png',	1371	path => 'x1_close.png',
1113	on_activate => sub { $self->emit ("delete") };	1372	on_activate => sub { $self->emit ("delete") };
1114		1373
1115	$self->CFClient::UI::Container::add ($self->{close_button});	1374	$self->CFPlus::UI::Container::add ($self->{close_button});
1116	}	1375	}
1117		1376
1118	$self	1377	$self
1119	}	1378	}
1120		1379
1121	sub add {	1380	sub add {
1122	my ($self, @widgets) = @_;	1381	my ($self, @widgets) = @_;
1123		1382
1124	$self->SUPER::add (@widgets);	1383	$self->SUPER::add (@widgets);
1125	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1384	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1126	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1385	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1127	}	1386	}
1128		1387
1129	sub border {	1388	sub border {
1130	int $_[0]{border} * $::FONTSIZE	1389	int $_[0]{border} * $::FONTSIZE
		1390	}
		1391
		1392	sub get_max_wh {
		1393	my ($self) = @_;
		1394
		1395	return ($self->{w}, $self->{h})
		1396	if $self->{visible} && $self->{w};
		1397
		1398	$self->SUPER::get_max_wh
1131	}	1399	}
1132		1400
1133	sub size_request {	1401	sub size_request {
1134	my ($self) = @_;	1402	my ($self) = @_;
1135		1403
…		…
1239	$self->{motion}->($ev, $x, $y) if $self->{motion};	1507	$self->{motion}->($ev, $x, $y) if $self->{motion};
1240		1508
1241	! ! $self->{motion}	1509	! ! $self->{motion}
1242	}	1510	}
1243		1511
		1512	sub invoke_visibility_change {
		1513	my ($self, $visible) = @_;
		1514
		1515	delete $self->{motion} unless $visible;
		1516
		1517	0
		1518	}
		1519
1244	sub _draw {	1520	sub _draw {
1245	my ($self) = @_;	1521	my ($self) = @_;
1246		1522
1247	my $child = $self->{children}[0];	1523	my $child = $self->{children}[0];
1248		1524
…		…
1253	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1529	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1254		1530
1255	my $border = $self->border;	1531	my $border = $self->border;
1256		1532
1257	glColor @{ $self->{border_bg} };	1533	glColor @{ $self->{border_bg} };
1258	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1534	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1259	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1535	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1260	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1536	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1261	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1537	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1538
		1539	# move
		1540	my $w2 = ($w - $border) * .5;
		1541	my $h2 = ($h - $border) * .5;
		1542	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1543	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1544	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1545
		1546	# resize
		1547	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1548	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1549	unless $self->{has_close_button};
		1550	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1551	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1262		1552
1263	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1553	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1264	glColor @{ $self->{bg} };	1554	glColor @{ $self->{bg} };
1265		1555
1266	# TODO: repeat texture not scale	1556	# TODO: repeat texture not scale
…		…
1285	if $self->{close_button};	1575	if $self->{close_button};
1286	}	1576	}
1287		1577
1288	#############################################################################	1578	#############################################################################
1289		1579
1290	package CFClient::UI::Table;	1580	package CFPlus::UI::Table;
1291		1581
1292	our @ISA = CFClient::UI::Base::;	1582	our @ISA = CFPlus::UI::Container::;
1293		1583
1294	use List::Util qw(max sum);	1584	use List::Util qw(max sum);
1295		1585
1296	use CFClient::OpenGL;	1586	use CFPlus::OpenGL;
1297		1587
1298	sub new {	1588	sub new {
1299	my $class = shift;	1589	my $class = shift;
1300		1590
1301	$class->SUPER::new (	1591	$class->SUPER::new (
1302	col_expand => [],	1592	col_expand => [],
		1593	row_expand => [],
1303	@_,	1594	@_,
1304	)	1595	)
1305	}	1596	}
1306		1597
1307	sub children {
1308	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1309	}
1310
1311	sub add {	1598	sub add {
1312	my ($self, $x, $y, $child) = @_;	1599	my ($self, @widgets) = @_;
1313		1600
1314	$child->set_parent ($self);	1601	for my $child (@widgets) {
1315	$self->{children}[$y][$x] = $child;	1602	$child->{c_rowspan} ||= 1;
		1603	$child->{c_colspan} ||= 1;
		1604	}
1316		1605
1317	$self->realloc;	1606	$self->SUPER::add (@widgets);
1318	}	1607	}
1319		1608
1320	sub remove {	1609	sub add_at {
		1610	my $self = shift;
		1611
		1612	my @widgets;
		1613
		1614	while (@_) {
		1615	my ($col, $row, $child) = splice @_, 0, 3, ();
		1616
		1617	$child->{c_row} = $row;
		1618	$child->{c_col} = $col;
		1619
		1620	push @widgets, $child;
		1621	}
		1622
		1623	$self->add (@widgets);
		1624	}
		1625
		1626	sub get_wh {
1321	my ($self, $child) = @_;	1627	my ($self) = @_;
1322		1628
1323	# TODO: not yet implemented	1629	my (@w, @h);
1324	}
1325
1326	# TODO: move to container class maybe? send children a signal on removal?
1327	sub clear {
1328	my ($self) = @_;
1329		1630
1330	my @children = $self->children;	1631	my @children = $self->children;
1331	delete $self->{children};	1632
		1633	# first pass, columns
		1634	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1635	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1636
		1637	my $sw = sum @w[$c .. $c + $cs - 1];
		1638
		1639	if ($w > $sw) {
		1640	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1641	}
1332		1642	}
1333	for (@children) {
1334	delete $_->{parent};
1335	$_->hide;
1336	}
1337		1643
1338	$self->realloc;	1644	# second pass, rows
1339	}	1645	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1340
1341	sub get_wh {
1342	my ($self) = @_;
1343
1344	my (@w, @h);
1345
1346	for my $y (0 .. $#{$self->{children}}) {
1347	my $row = $self->{children}[$y]
1348	or next;
1349
1350	for my $x (0 .. $#$row) {
1351	my $widget = $row->[$x]
1352	or next;
1353	my ($w, $h) = @$widget{qw(req_w req_h)};	1646	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1354		1647
1355	$w[$x] = max $w[$x], $w;	1648	my $sh = sum @h[$r .. $r + $rs - 1];
1356	$h[$y] = max $h[$y], $h;	1649
		1650	if ($h > $sh) {
		1651	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1357	}	1652	}
1358	}	1653	}
1359		1654
1360	(\@w, \@h)	1655	(\@w, \@h)
1361	}	1656	}
…		…
1377	my ($ws, $hs) = $self->get_wh;	1672	my ($ws, $hs) = $self->get_wh;
1378		1673
1379	my $req_w = (sum @$ws) || 1;	1674	my $req_w = (sum @$ws) || 1;
1380	my $req_h = (sum @$hs) || 1;	1675	my $req_h = (sum @$hs) || 1;
1381		1676
1382	# TODO: nicer code && do row_expand	1677	# now linearly scale the rows/columns to the allocated size
1383	my @col_expand = @{$self->{col_expand}};	1678	my @col_expand = @{$self->{col_expand}};
1384	@col_expand = (1) x @$ws unless @col_expand;	1679	@col_expand = (1) x @$ws unless @col_expand;
1385	my $col_expand = (sum @col_expand) || 1;	1680	my $col_expand = (sum @col_expand) || 1;
1386		1681
1387	# linearly scale sizes
1388	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1682	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1389	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1390		1683
1391	CFClient::UI::harmonize $ws;	1684	CFPlus::UI::harmonize $ws;
		1685
		1686	my @row_expand = @{$self->{row_expand}};
		1687	@row_expand = (1) x @$ws unless @row_expand;
		1688	my $row_expand = (sum @row_expand) || 1;
		1689
		1690	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1691
1392	CFClient::UI::harmonize $hs;	1692	CFPlus::UI::harmonize $hs;
1393		1693
1394	my $y;	1694	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1695	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1395		1696
1396	for my $r (0 .. $#{$self->{children}}) {	1697	for my $widget ($self->children) {
1397	my $row = $self->{children}[$r]	1698	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1398	or next;
1399		1699
1400	my $x = 0;	1700	$widget->configure (
1401	my $row_h = $hs->[$r];	1701	$x[$c], $y[$r],
		1702	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1402		1703	);
1403	for my $c (0 .. $#$row) {	1704	}
1404	my $col_w = $ws->[$c];
1405		1705
1406	if (my $widget = $row->[$c]) {	1706	1
1407	$widget->configure ($x, $y, $col_w, $row_h);	1707	}
1408	}
1409		1708
1410	$x += $col_w;	1709	#############################################################################
		1710
		1711	package CFPlus::UI::Fixed;
		1712
		1713	use List::Util qw(min max);
		1714
		1715	our @ISA = CFPlus::UI::Container::;
		1716
		1717	sub _scale($$$) {
		1718	my ($rel, $val, $max) = @_;
		1719
		1720	$rel ? $val * $max : $val
		1721	}
		1722
		1723	sub size_request {
		1724	my ($self) = @_;
		1725
		1726	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1727
		1728	# determine overall size by querying abs widgets
		1729	for my $child ($self->visible_children) {
		1730	unless ($child->{c_rel}) {
		1731	my $x = $child->{c_x};
		1732	my $y = $child->{c_y};
		1733
		1734	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1735	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1411	}	1736	}
		1737	}
1412		1738
1413	$y += $row_h;	1739	my $W = $x2 - $x1;
		1740	my $H = $y2 - $y1;
		1741
		1742	# now layout remaining widgets
		1743	for my $child ($self->visible_children) {
		1744	if ($child->{c_rel}) {
		1745	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1746	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1747
		1748	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1749	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1750	}
		1751	}
		1752
		1753	my $W = $x2 - $x1;
		1754	my $H = $y2 - $y1;
		1755
		1756	($W, $H)
		1757	}
		1758
		1759	sub invoke_size_allocate {
		1760	my ($self, $W, $H) = @_;
		1761
		1762	for my $child ($self->visible_children) {
		1763	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1764	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1765
		1766	$x += $child->{c_halign} * $child->{req_w};
		1767	$y += $child->{c_valign} * $child->{req_h};
		1768
		1769	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1414	}	1770	}
1415		1771
1416	1	1772	1
1417	}	1773	}
1418		1774
1419	sub find_widget {
1420	my ($self, $x, $y) = @_;
1421
1422	$x -= $self->{x};
1423	$y -= $self->{y};
1424
1425	my $res;
1426
1427	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1428	$res = $_->find_widget ($x, $y)
1429	and return $res;
1430	}
1431
1432	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1433	}
1434
1435	sub _draw {
1436	my ($self) = @_;
1437
1438	for (grep $_, @{$self->{children}}) {
1439	$_->draw for grep $_, @$_;
1440	}
1441	}
1442
1443	#############################################################################	1775	#############################################################################
1444		1776
1445	package CFClient::UI::Box;	1777	package CFPlus::UI::Box;
1446		1778
1447	our @ISA = CFClient::UI::Container::;	1779	our @ISA = CFPlus::UI::Container::;
1448		1780
1449	sub size_request {	1781	sub size_request {
1450	my ($self) = @_;	1782	my ($self) = @_;
		1783
		1784	my @children = $self->visible_children;
1451		1785
1452	$self->{vertical}	1786	$self->{vertical}
1453	? (	1787	? (
1454	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1788	(List::Util::max map $_->{req_w}, @children),
1455	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1789	(List::Util::sum map $_->{req_h}, @children),
1456	)	1790	)
1457	: (	1791	: (
1458	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1792	(List::Util::sum map $_->{req_w}, @children),
1459	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1793	(List::Util::max map $_->{req_h}, @children),
1460	)	1794	)
1461	}	1795	}
1462		1796
1463	sub invoke_size_allocate {	1797	sub invoke_size_allocate {
1464	my ($self, $w, $h) = @_;	1798	my ($self, $w, $h) = @_;
…		…
1485	$req[$_] += $space * $children[$_]{expand}	1819	$req[$_] += $space * $children[$_]{expand}
1486	for 0 .. $#children;	1820	for 0 .. $#children;
1487	}	1821	}
1488	}	1822	}
1489		1823
1490	CFClient::UI::harmonize \@req;	1824	CFPlus::UI::harmonize \@req;
1491		1825
1492	my $pos = 0;	1826	my $pos = 0;
1493	for (0 .. $#children) {	1827	for (0 .. $#children) {
1494	my $alloc = $req[$_];	1828	my $alloc = $req[$_];
1495	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1829	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1500	1	1834	1
1501	}	1835	}
1502		1836
1503	#############################################################################	1837	#############################################################################
1504		1838
1505	package CFClient::UI::HBox;	1839	package CFPlus::UI::HBox;
1506		1840
1507	our @ISA = CFClient::UI::Box::;	1841	our @ISA = CFPlus::UI::Box::;
1508		1842
1509	sub new {	1843	sub new {
1510	my $class = shift;	1844	my $class = shift;
1511		1845
1512	$class->SUPER::new (	1846	$class->SUPER::new (
…		…
1515	)	1849	)
1516	}	1850	}
1517		1851
1518	#############################################################################	1852	#############################################################################
1519		1853
1520	package CFClient::UI::VBox;	1854	package CFPlus::UI::VBox;
1521		1855
1522	our @ISA = CFClient::UI::Box::;	1856	our @ISA = CFPlus::UI::Box::;
1523		1857
1524	sub new {	1858	sub new {
1525	my $class = shift;	1859	my $class = shift;
1526		1860
1527	$class->SUPER::new (	1861	$class->SUPER::new (
…		…
1530	)	1864	)
1531	}	1865	}
1532		1866
1533	#############################################################################	1867	#############################################################################
1534		1868
1535	package CFClient::UI::Label;	1869	package CFPlus::UI::Label;
1536		1870
1537	our @ISA = CFClient::UI::DrawBG::;	1871	our @ISA = CFPlus::UI::DrawBG::;
1538		1872
1539	use CFClient::OpenGL;	1873	use CFPlus::OpenGL;
1540		1874
1541	sub new {	1875	sub new {
1542	my ($class, %arg) = @_;	1876	my ($class, %arg) = @_;
1543		1877
1544	my $self = $class->SUPER::new (	1878	my $self = $class->SUPER::new (
…		…
1547	#active_bg => none	1881	#active_bg => none
1548	#font => default_font	1882	#font => default_font
1549	#text => initial text	1883	#text => initial text
1550	#markup => initial narkup	1884	#markup => initial narkup
1551	#max_w => maximum pixel width	1885	#max_w => maximum pixel width
		1886	#style => 0, # render flags
1552	ellipsise => 3, # end	1887	ellipsise => 3, # end
1553	layout => (new CFClient::Layout),	1888	layout => (new CFPlus::Layout),
1554	fontsize => 1,	1889	fontsize => 1,
1555	align => -1,	1890	align => -1,
1556	valign => -1,	1891	valign => -1,
1557	padding_x => 2,	1892	padding_x => 2,
1558	padding_y => 2,	1893	padding_y => 2,
1559	can_events => 0,	1894	can_events => 0,
1560	%arg	1895	%arg
1561	);	1896	);
1562		1897
1563	if (exists $self->{template}) {	1898	if (exists $self->{template}) {
1564	my $layout = new CFClient::Layout;	1899	my $layout = new CFPlus::Layout;
1565	$layout->set_text (delete $self->{template});	1900	$layout->set_text (delete $self->{template});
1566	$self->{template} = $layout;	1901	$self->{template} = $layout;
1567	}	1902	}
1568		1903
1569	if (exists $self->{markup}) {	1904	if (exists $self->{markup}) {
…		…
1573	}	1908	}
1574		1909
1575	$self	1910	$self
1576	}	1911	}
1577		1912
1578	sub escape($) {
1579	local $_ = $_[0];
1580
1581	s/&/&amp;/g;
1582	s/>/&gt;/g;
1583	s/</&lt;/g;
1584
1585	$_
1586	}
1587
1588	sub update {	1913	sub update {
1589	my ($self) = @_;	1914	my ($self) = @_;
1590		1915
1591	delete $self->{texture};	1916	delete $self->{texture};
1592	$self->SUPER::update;	1917	$self->SUPER::update;
…		…
1595	sub realloc {	1920	sub realloc {
1596	my ($self) = @_;	1921	my ($self) = @_;
1597		1922
1598	delete $self->{ox};	1923	delete $self->{ox};
1599	$self->SUPER::realloc;	1924	$self->SUPER::realloc;
		1925	}
		1926
		1927	sub clear {
		1928	my ($self) = @_;
		1929
		1930	$self->set_text ("");
1600	}	1931	}
1601		1932
1602	sub set_text {	1933	sub set_text {
1603	my ($self, $text) = @_;	1934	my ($self, $text) = @_;
1604		1935
…		…
1629		1960
1630	sub size_request {	1961	sub size_request {
1631	my ($self) = @_;	1962	my ($self) = @_;
1632		1963
1633	$self->{size_req} ||= do {	1964	$self->{size_req} ||= do {
		1965	my ($max_w, $max_h) = $self->get_max_wh;
		1966
1634	$self->{layout}->set_font ($self->{font}) if $self->{font};	1967	$self->{layout}->set_font ($self->{font}) if $self->{font};
1635	$self->{layout}->set_width ($self->{max_w} || -1);	1968	$self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1636	$self->{layout}->set_ellipsise ($self->{ellipsise});	1969	$self->{layout}->set_ellipsise ($self->{ellipsise});
1637	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1970	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1971	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639		1972
1640	my ($w, $h) = $self->{layout}->size;	1973	my ($w, $h) = $self->{layout}->size;
…		…
1712	: ($self->{w} - $size->[0]) * 0.5);	2045	: ($self->{w} - $size->[0]) * 0.5);
1713		2046
1714	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2047	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1715	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2048	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1716	: ($self->{h} - $size->[1]) * 0.5);	2049	: ($self->{h} - $size->[1]) * 0.5);
		2050
		2051	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1717	};	2052	};
1718		2053
1719	my $w = List::Util::min $self->{w} + 4, $size->[0];	2054	# unless ($self->{list}) {
1720	my $h = List::Util::min $self->{h} + 2, $size->[1];	2055	# $self->{list} = CFPlus::OpenGL::glGenList;
1721		2056	# CFPlus::OpenGL::glNewList $self->{list};
1722	$self->{layout}->render ($self->{ox}, $self->{oy});	2057	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2058	# CFPlus::OpenGL::glEndList;
		2059	# }
		2060	#
		2061	# CFPlus::OpenGL::glCallList $self->{list};
		2062
		2063	$self->{layout}->draw;
1723	}	2064	}
		2065
		2066	#sub destroy {
		2067	# my ($self) = @_;
		2068	#
		2069	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2070	#
		2071	# $self->SUPER::destroy;
		2072	#}
1724		2073
1725	#############################################################################	2074	#############################################################################
1726		2075
1727	package CFClient::UI::EntryBase;	2076	package CFPlus::UI::EntryBase;
1728		2077
1729	our @ISA = CFClient::UI::Label::;	2078	our @ISA = CFPlus::UI::Label::;
1730		2079
1731	use CFClient::OpenGL;	2080	use CFPlus::OpenGL;
1732		2081
1733	sub new {	2082	sub new {
1734	my $class = shift;	2083	my $class = shift;
1735		2084
1736	$class->SUPER::new (	2085	$class->SUPER::new (
1737	fg => [1, 1, 1],	2086	fg => [1, 1, 1],
1738	bg => [0, 0, 0, 0.2],	2087	bg => [0, 0, 0, 0.2],
		2088	outline => [0.6, 0.3, 0.1],
1739	active_bg => [1, 1, 1, 0.5],	2089	active_bg => [0, 0, 1, .2],
1740	active_fg => [0, 0, 0],	2090	active_fg => [1, 1, 1],
		2091	active_outline => [1, 1, 0],
1741	can_hover => 1,	2092	can_hover => 1,
1742	can_focus => 1,	2093	can_focus => 1,
1743	valign => 0,	2094	valign => 0,
1744	can_events => 1,	2095	can_events => 1,
		2096	ellipsise => 0,
1745	#text => ...	2097	#text => ...
1746	#hidden => "*",	2098	#hidden => "*",
1747	@_	2099	@_
1748	)	2100	)
1749	}	2101	}
…		…
1794	my $sym = $ev->{sym};	2146	my $sym = $ev->{sym};
1795	my $uni = $ev->{unicode};	2147	my $uni = $ev->{unicode};
1796		2148
1797	my $text = $self->get_text;	2149	my $text = $self->get_text;
1798		2150
		2151	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2152
1799	if ($uni == 8) {	2153	if ($uni == 8) {
1800	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2154	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1801	} elsif ($uni == 127) {	2155	} elsif ($uni == 127) {
1802	substr $text, $self->{cursor}, 1, "";	2156	substr $text, $self->{cursor}, 1, "";
1803	} elsif ($sym == CFClient::SDLK_LEFT) {	2157	} elsif ($sym == CFPlus::SDLK_LEFT) {
1804	--$self->{cursor} if $self->{cursor};	2158	--$self->{cursor} if $self->{cursor};
1805	} elsif ($sym == CFClient::SDLK_RIGHT) {	2159	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1806	++$self->{cursor} if $self->{cursor} < length $self->{text};	2160	++$self->{cursor} if $self->{cursor} < length $self->{text};
1807	} elsif ($sym == CFClient::SDLK_HOME) {	2161	} elsif ($sym == CFPlus::SDLK_HOME) {
		2162	# what a hack
		2163	$self->{cursor} =
		2164	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2165	? length $1
		2166	: 0;
		2167	} elsif ($sym == CFPlus::SDLK_END) {
		2168	# uh, again
		2169	$self->{cursor} =
		2170	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2171	? $self->{cursor} + length $1
		2172	: length $self->{text};
		2173	} elsif ($uni == 21) { # ctrl-u
		2174	$text = "";
1808	$self->{cursor} = 0;	2175	$self->{cursor} = 0;
1809	} elsif ($sym == CFClient::SDLK_END) {
1810	$self->{cursor} = length $text;
1811	} elsif ($uni == 27) {	2176	} elsif ($uni == 27) {
1812	$self->emit ('escape');	2177	$self->emit ('escape');
1813	} elsif ($uni) {	2178	} elsif ($uni == 0x0d) {
		2179	substr $text, $self->{cursor}++, 0, "\012";
		2180	} elsif ($uni >= 0x20) {
1814	substr $text, $self->{cursor}++, 0, chr $uni;	2181	substr $text, $self->{cursor}++, 0, chr $uni;
1815	} else {	2182	} else {
1816	return 0;	2183	return 0;
1817	}	2184	}
1818		2185
1819	$self->_set_text ($text);	2186	$self->_set_text ($text);
1820		2187
1821	$self->realloc;	2188	$self->realloc;
		2189	$self->update;
1822		2190
1823	1	2191	1
1824	}	2192	}
1825		2193
1826	sub invoke_focus_in {	2194	sub invoke_focus_in {
…		…
1868	glColor_premultiply @{$self->{bg}};	2236	glColor_premultiply @{$self->{bg}};
1869	}	2237	}
1870		2238
1871	glEnable GL_BLEND;	2239	glEnable GL_BLEND;
1872	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2240	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1873	glBegin GL_QUADS;
1874	glVertex 0 , 0;
1875	glVertex 0 , $self->{h};
1876	glVertex $self->{w}, $self->{h};	2241	glRect 0, 0, $self->{w}, $self->{h};
1877	glVertex $self->{w}, 0;
1878	glEnd;
1879	glDisable GL_BLEND;	2242	glDisable GL_BLEND;
1880		2243
1881	$self->SUPER::_draw;	2244	$self->SUPER::_draw;
1882		2245
1883	#TODO: force update every cursor change :(	2246	#TODO: force update every cursor change :(
…		…
1885		2248
1886	unless (exists $self->{cur_h}) {	2249	unless (exists $self->{cur_h}) {
1887	my $text = substr $self->{text}, 0, $self->{cursor};	2250	my $text = substr $self->{text}, 0, $self->{cursor};
1888	utf8::encode $text;	2251	utf8::encode $text;
1889		2252
1890	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2253	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1891	}	2254	}
1892		2255
1893	glColor @{$self->{fg}};	2256	glColor_premultiply @{$self->{active_fg}};
1894	glBegin GL_LINES;	2257	glBegin GL_LINES;
1895	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2258	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1896	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2259	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1897	glEnd;	2260	glEnd;
1898	}
1899	}
1900		2261
		2262	glLineWidth 3;
		2263	glColor @{$self->{active_outline}};
		2264	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2265	glLineWidth 1;
		2266
		2267	} else {
		2268	glColor @{$self->{outline}};
		2269	glBegin GL_LINE_STRIP;
		2270	glVertex .5, $self->{h} * .5;
		2271	glVertex .5, $self->{h} - 2.5;
		2272	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2273	glVertex $self->{w} - .5, $self->{h} * .5;
		2274	glEnd;
		2275	}
		2276	}
		2277
		2278	#############################################################################
		2279
1901	package CFClient::UI::Entry;	2280	package CFPlus::UI::Entry;
1902		2281
1903	our @ISA = CFClient::UI::EntryBase::;	2282	our @ISA = CFPlus::UI::EntryBase::;
1904		2283
1905	use CFClient::OpenGL;	2284	use CFPlus::OpenGL;
1906		2285
1907	sub invoke_key_down {	2286	sub invoke_key_down {
1908	my ($self, $ev) = @_;	2287	my ($self, $ev) = @_;
1909		2288
1910	my $sym = $ev->{sym};	2289	my $sym = $ev->{sym};
1911		2290
1912	if ($sym == 13) {	2291	if ($ev->{uni} == 0x0d || $sym == 13) {
1913	unshift @{$self->{history}},	2292	unshift @{$self->{history}},
1914	my $txt = $self->get_text;	2293	my $txt = $self->get_text;
1915		2294
1916	$self->{history_pointer} = -1;	2295	$self->{history_pointer} = -1;
1917	$self->{history_saveback} = '';	2296	$self->{history_saveback} = '';
1918	$self->emit (activate => $txt);	2297	$self->emit (activate => $txt);
1919	$self->update;	2298	$self->update;
1920		2299
1921	} elsif ($sym == CFClient::SDLK_UP) {	2300	} elsif ($sym == CFPlus::SDLK_UP) {
1922	if ($self->{history_pointer} < 0) {	2301	if ($self->{history_pointer} < 0) {
1923	$self->{history_saveback} = $self->get_text;	2302	$self->{history_saveback} = $self->get_text;
1924	}	2303	}
1925	if (@{$self->{history} || []} > 0) {	2304	if (@{$self->{history} || []} > 0) {
1926	$self->{history_pointer}++;	2305	$self->{history_pointer}++;
…		…
1928	$self->{history_pointer} = @{$self->{history} || []} - 1;	2307	$self->{history_pointer} = @{$self->{history} || []} - 1;
1929	}	2308	}
1930	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2309	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1931	}	2310	}
1932		2311
1933	} elsif ($sym == CFClient::SDLK_DOWN) {	2312	} elsif ($sym == CFPlus::SDLK_DOWN) {
1934	$self->{history_pointer}--;	2313	$self->{history_pointer}--;
1935	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2314	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1936		2315
1937	if ($self->{history_pointer} >= 0) {	2316	if ($self->{history_pointer} >= 0) {
1938	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2317	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1947	1	2326	1
1948	}	2327	}
1949		2328
1950	#############################################################################	2329	#############################################################################
1951		2330
		2331	package CFPlus::UI::TextEdit;
		2332
		2333	our @ISA = CFPlus::UI::EntryBase::;
		2334
		2335	use CFPlus::OpenGL;
		2336
		2337	sub move_cursor_ver {
		2338	my ($self, $dy) = @_;
		2339
		2340	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2341
		2342	$y += $dy;
		2343
		2344	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2345	$self->{cursor} = $index;
		2346	delete $self->{cur_h};
		2347	$self->update;
		2348	return;
		2349	}
		2350	}
		2351
		2352	sub invoke_key_down {
		2353	my ($self, $ev) = @_;
		2354
		2355	my $sym = $ev->{sym};
		2356
		2357	if ($sym == CFPlus::SDLK_UP) {
		2358	$self->move_cursor_ver (-1);
		2359	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2360	$self->move_cursor_ver (+1);
		2361	} else {
		2362	return $self->SUPER::invoke_key_down ($ev)
		2363	}
		2364
		2365	1
		2366	}
		2367
		2368	#############################################################################
		2369
1952	package CFClient::UI::Button;	2370	package CFPlus::UI::ButtonBin;
1953		2371
1954	our @ISA = CFClient::UI::Label::;	2372	our @ISA = CFPlus::UI::Bin::;
1955		2373
1956	use CFClient::OpenGL;	2374	use CFPlus::OpenGL;
1957		2375
1958	my @tex =	2376	my @tex =
1959	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2377	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1960	qw(b1_button_active.png);	2378	qw(b1_button_inactive.png b1_button_active.png);
1961		2379
1962	sub new {	2380	sub new {
1963	my $class = shift;	2381	my $class = shift;
1964		2382
1965	$class->SUPER::new (	2383	$class->SUPER::new (
1966	padding_x => 4,
1967	padding_y => 4,
1968	fg => [1, 1, 1],
1969	active_fg => [0, 0, 1],
1970	can_hover => 1,	2384	can_hover => 1,
1971	align => 0,	2385	align => 0,
1972	valign => 0,	2386	valign => 0,
1973	can_events => 1,	2387	can_events => 1,
1974	@_	2388	@_
…		…
1986	}	2400	}
1987		2401
1988	sub _draw {	2402	sub _draw {
1989	my ($self) = @_;	2403	my ($self) = @_;
1990		2404
1991	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1992
1993	glEnable GL_TEXTURE_2D;	2405	glEnable GL_TEXTURE_2D;
1994	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2406	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1995	glColor 0, 0, 0, 1;	2407	glColor 0, 0, 0, 1;
1996		2408
		2409	my $tex = $tex[$GRAB == $self];
1997	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2410	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1998		2411
1999	glDisable GL_TEXTURE_2D;	2412	glDisable GL_TEXTURE_2D;
2000		2413
2001	$self->SUPER::_draw;	2414	$self->SUPER::_draw;
2002	}	2415	}
2003		2416
2004	#############################################################################	2417	#############################################################################
2005		2418
		2419	package CFPlus::UI::Button;
		2420
		2421	our @ISA = CFPlus::UI::Label::;
		2422
		2423	use CFPlus::OpenGL;
		2424
		2425	my @tex =
		2426	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2427	qw(b1_button_inactive.png b1_button_active.png);
		2428
		2429	sub new {
		2430	my $class = shift;
		2431
		2432	$class->SUPER::new (
		2433	padding_x => 4,
		2434	padding_y => 4,
		2435	fg => [1.0, 1.0, 1.0],
		2436	active_fg => [0.8, 0.8, 0.8],
		2437	can_hover => 1,
		2438	align => 0,
		2439	valign => 0,
		2440	can_events => 1,
		2441	@_
		2442	)
		2443	}
		2444
		2445	sub invoke_button_up {
		2446	my ($self, $ev, $x, $y) = @_;
		2447
		2448	$self->emit ("activate")
		2449	if $x >= 0 && $x < $self->{w}
		2450	&& $y >= 0 && $y < $self->{h};
		2451
		2452	1
		2453	}
		2454
		2455	sub _draw {
		2456	my ($self) = @_;
		2457
		2458	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2459
		2460	glEnable GL_TEXTURE_2D;
		2461	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2462	glColor 0, 0, 0, 1;
		2463
		2464	my $tex = $tex[$GRAB == $self];
		2465	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2466
		2467	glDisable GL_TEXTURE_2D;
		2468
		2469	$self->SUPER::_draw;
		2470	}
		2471
		2472	#############################################################################
		2473
		2474	package CFPlus::UI::CheckBox;
		2475
		2476	our @ISA = CFPlus::UI::DrawBG::;
		2477
		2478	my @tex =
		2479	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2480	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2481
		2482	use CFPlus::OpenGL;
		2483
		2484	sub new {
		2485	my $class = shift;
		2486
		2487	$class->SUPER::new (
		2488	padding_x => 2,
		2489	padding_y => 2,
		2490	fg => [1, 1, 1],
		2491	active_fg => [1, 1, 0],
		2492	bg => [0, 0, 0, 0.2],
		2493	active_bg => [1, 1, 1, 0.5],
		2494	state => 0,
		2495	can_hover => 1,
		2496	@_
		2497	)
		2498	}
		2499
		2500	sub size_request {
		2501	my ($self) = @_;
		2502
		2503	(6) x 2
		2504	}
		2505
		2506	sub toggle {
		2507	my ($self) = @_;
		2508
		2509	$self->{state} = !$self->{state};
		2510	$self->emit (changed => $self->{state});
		2511	$self->update;
		2512	}
		2513
		2514	sub invoke_button_down {
		2515	my ($self, $ev, $x, $y) = @_;
		2516
		2517	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2518	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2519	$self->toggle;
		2520	} else {
		2521	return 0
		2522	}
		2523
		2524	1
		2525	}
		2526
		2527	sub _draw {
		2528	my ($self) = @_;
		2529
		2530	$self->SUPER::_draw;
		2531
		2532	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
		2533
		2534	my ($w, $h) = @$self{qw(w h)};
		2535
		2536	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2537
		2538	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2539
		2540	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2541
		2542	glEnable GL_TEXTURE_2D;
		2543	$tex->draw_quad_alpha (0, 0, $s, $s);
		2544	glDisable GL_TEXTURE_2D;
		2545	}
		2546
		2547	#############################################################################
		2548
		2549	package CFPlus::UI::Image;
		2550
		2551	our @ISA = CFPlus::UI::Base::;
		2552
		2553	use CFPlus::OpenGL;
		2554
		2555	our %texture_cache;
		2556
		2557	sub new {
		2558	my $class = shift;
		2559
		2560	my $self = $class->SUPER::new (
		2561	can_events => 0,
		2562	scale => 1,
		2563	@_,
		2564	);
		2565
		2566	$self->{path} || $self->{tex}
		2567	or Carp::croak "'path' or 'tex' attributes required";
		2568
		2569	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2570	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2571
		2572	CFPlus::weaken $texture_cache{$self->{path}};
		2573
		2574	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2575
		2576	$self
		2577	}
		2578
		2579	sub STORABLE_freeze {
		2580	my ($self, $cloning) = @_;
		2581
		2582	$self->{path}
		2583	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2584
		2585	$self->{path}
		2586	}
		2587
		2588	sub STORABLE_attach {
		2589	my ($self, $cloning, $path) = @_;
		2590
		2591	$self->new (path => $path)
		2592	}
		2593
		2594	sub size_request {
		2595	my ($self) = @_;
		2596
		2597	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
		2598	}
		2599
		2600	sub _draw {
		2601	my ($self) = @_;
		2602
		2603	my $tex = $self->{tex};
		2604
		2605	my ($w, $h) = ($self->{w}, $self->{h});
		2606
		2607	if ($self->{rot90}) {
		2608	glRotate 90, 0, 0, 1;
		2609	glTranslate 0, -$self->{w}, 0;
		2610
		2611	($w, $h) = ($h, $w);
		2612	}
		2613
		2614	glEnable GL_TEXTURE_2D;
		2615	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2616
		2617	$tex->draw_quad_alpha (0, 0, $w, $h);
		2618
		2619	glDisable GL_TEXTURE_2D;
		2620	}
		2621
		2622	#############################################################################
		2623
2006	package CFClient::UI::ImageButton;	2624	package CFPlus::UI::ImageButton;
2007		2625
2008	our @ISA = CFClient::UI::Image::;	2626	our @ISA = CFPlus::UI::Image::;
2009		2627
2010	use CFClient::OpenGL;	2628	use CFPlus::OpenGL;
2011		2629
2012	my %textures;	2630	my %textures;
2013		2631
2014	sub new {	2632	sub new {
2015	my $class = shift;	2633	my $class = shift;
…		…
2025	can_events => 1,	2643	can_events => 1,
2026	@_	2644	@_
2027	);	2645	);
2028	}	2646	}
2029		2647
		2648	sub invoke_button_down {
		2649	my ($self, $ev, $x, $y) = @_;
		2650
		2651	1
		2652	}
		2653
2030	sub invoke_button_up {	2654	sub invoke_button_up {
2031	my ($self, $ev, $x, $y) = @_;	2655	my ($self, $ev, $x, $y) = @_;
2032		2656
2033	$self->emit ("activate")	2657	$self->emit ("activate")
2034	if $x >= 0 && $x < $self->{w}	2658	if $x >= 0 && $x < $self->{w}
…		…
2037	1	2661	1
2038	}	2662	}
2039		2663
2040	#############################################################################	2664	#############################################################################
2041		2665
2042	package CFClient::UI::CheckBox;
2043
2044	our @ISA = CFClient::UI::DrawBG::;
2045
2046	my @tex =
2047	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2048	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2049
2050	use CFClient::OpenGL;
2051
2052	sub new {
2053	my $class = shift;
2054
2055	$class->SUPER::new (
2056	padding_x => 2,
2057	padding_y => 2,
2058	fg => [1, 1, 1],
2059	active_fg => [1, 1, 0],
2060	bg => [0, 0, 0, 0.2],
2061	active_bg => [1, 1, 1, 0.5],
2062	state => 0,
2063	can_hover => 1,
2064	@_
2065	)
2066	}
2067
2068	sub size_request {
2069	my ($self) = @_;
2070
2071	(6) x 2
2072	}
2073
2074	sub toggle {
2075	my ($self) = @_;
2076
2077	$self->{state} = !$self->{state};
2078	$self->emit (changed => $self->{state});
2079	$self->update;
2080	}
2081
2082	sub invoke_button_down {
2083	my ($self, $ev, $x, $y) = @_;
2084
2085	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2086	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2087	$self->toggle;
2088	} else {
2089	return 0
2090	}
2091
2092	1
2093	}
2094
2095	sub _draw {
2096	my ($self) = @_;
2097
2098	$self->SUPER::_draw;
2099
2100	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2101
2102	my ($w, $h) = @$self{qw(w h)};
2103
2104	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2105
2106	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2107
2108	my $tex = $self->{state} ? $tex[1] : $tex[0];
2109
2110	glEnable GL_TEXTURE_2D;
2111	$tex->draw_quad_alpha (0, 0, $s, $s);
2112	glDisable GL_TEXTURE_2D;
2113	}
2114
2115	#############################################################################
2116
2117	package CFClient::UI::Image;	2666	package CFPlus::UI::VGauge;
2118		2667
2119	our @ISA = CFClient::UI::Base::;	2668	our @ISA = CFPlus::UI::Base::;
2120
2121	use CFClient::OpenGL;
2122
2123	our %texture_cache;
2124
2125	sub new {
2126	my $class = shift;
2127
2128	my $self = $class->SUPER::new (
2129	can_events => 0,
2130	@_,
2131	);
2132
2133	$self->{path} || $self->{tex}
2134	or Carp::croak "'path' or 'tex' attributes required";
2135
2136	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2137	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2138
2139	Scalar::Util::weaken $texture_cache{$self->{path}};
2140
2141	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2142
2143	$self
2144	}
2145
2146	sub size_request {
2147	my ($self) = @_;
2148
2149	($self->{tex}{w}, $self->{tex}{h})
2150	}
2151
2152	sub _draw {
2153	my ($self) = @_;
2154
2155	my $tex = $self->{tex};
2156
2157	my ($w, $h) = ($self->{w}, $self->{h});
2158
2159	if ($self->{rot90}) {
2160	glRotate 90, 0, 0, 1;
2161	glTranslate 0, -$self->{w}, 0;
2162
2163	($w, $h) = ($h, $w);
2164	}
2165
2166	glEnable GL_TEXTURE_2D;
2167	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2168
2169	$tex->draw_quad_alpha (0, 0, $w, $h);
2170
2171	glDisable GL_TEXTURE_2D;
2172	}
2173
2174	#############################################################################
2175
2176	package CFClient::UI::VGauge;
2177
2178	our @ISA = CFClient::UI::Base::;
2179		2669
2180	use List::Util qw(min max);	2670	use List::Util qw(min max);
2181		2671
2182	use CFClient::OpenGL;	2672	use CFPlus::OpenGL;
2183		2673
2184	my %tex = (	2674	my %tex = (
2185	food => [	2675	food => [
2186	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2676	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2677	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2188	],	2678	],
2189	grace => [	2679	grace => [
2190	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2680	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2191	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2681	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2192	],	2682	],
2193	hp => [	2683	hp => [
2194	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2684	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2195	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2685	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2196	],	2686	],
2197	mana => [	2687	mana => [
2198	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2688	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2199	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2689	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2200	],	2690	],
2201	);	2691	);
2202		2692
2203	# eg. VGauge->new (gauge => 'food'), default gauge: food	2693	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2306	glDisable GL_TEXTURE_2D;	2796	glDisable GL_TEXTURE_2D;
2307	}	2797	}
2308		2798
2309	#############################################################################	2799	#############################################################################
2310		2800
		2801	package CFPlus::UI::Progress;
		2802
		2803	our @ISA = CFPlus::UI::Label::;
		2804
		2805	use CFPlus::OpenGL;
		2806
		2807	sub new {
		2808	my ($class, %arg) = @_;
		2809
		2810	my $self = $class->SUPER::new (
		2811	fg => [1, 1, 1],
		2812	bg => [0, 0, 1, 0.2],
		2813	bar => [0.7, 0.5, 0.1, 0.8],
		2814	outline => [0.4, 0.3, 0],
		2815	fontsize => 0.9,
		2816	valign => 0,
		2817	align => 0,
		2818	can_events => 1,
		2819	ellipsise => 1,
		2820	label => "%d%%",
		2821	%arg,
		2822	);
		2823
		2824	$self->set_value ($arg{value} || -1);
		2825
		2826	$self
		2827	}
		2828
		2829	sub set_label {
		2830	my ($self, $label) = @_;
		2831
		2832	return if $self->{label} eq $label;
		2833	$self->{label} = $label;
		2834
		2835	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2836	}
		2837
		2838	sub set_value {
		2839	my ($self, $value) = @_;
		2840
		2841	if ($self->{value} ne $value) {
		2842	$self->{value} = $value;
		2843
		2844	if ($value < 0) {
		2845	$self->set_text ("-");
		2846	} else {
		2847	$self->set_text (sprintf $self->{label}, $value * 100);
		2848	}
		2849
		2850	$self->update;
		2851	}
		2852	}
		2853
		2854	sub _draw {
		2855	my ($self) = @_;
		2856
		2857	glEnable GL_BLEND;
		2858	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2859
		2860	if ($self->{value} >= 0) {
		2861	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2862
		2863	glColor_premultiply @{$self->{bar}};
		2864	glRect 2, 2, $s, $self->{h} - 2;
		2865	glColor_premultiply @{$self->{bg}};
		2866	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2867	}
		2868
		2869	glColor_premultiply @{$self->{outline}};
		2870	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2871
		2872	glDisable GL_BLEND;
		2873
		2874	{
		2875	local $self->{bg}; # do not draw background
		2876	$self->SUPER::_draw;
		2877	}
		2878	}
		2879
		2880	#############################################################################
		2881
		2882	package CFPlus::UI::ExperienceProgress;
		2883
		2884	our @ISA = CFPlus::UI::Progress::;
		2885
		2886	sub new {
		2887	my ($class, %arg) = @_;
		2888
		2889	my $self = $class->SUPER::new (
		2890	tooltip => sub {
		2891	my ($self) = @_;
		2892
		2893	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2894	$self->{lvl},
		2895	::formsep ($self->{exp}),
		2896	::formsep ($self->{nxt}),
		2897	::formsep ($self->{nxt} - $self->{exp}),
		2898	},
		2899	%arg
		2900	);
		2901
		2902	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2903	if $::CONN;
		2904
		2905	$self
		2906	}
		2907
		2908	sub DESTROY {
		2909	my ($self) = @_;
		2910
		2911	delete $::CONN->{on_exp_update}{$self+0}
		2912	if $::CONN;
		2913
		2914	$self->SUPER::DESTROY;
		2915	}
		2916
		2917	sub set_value {
		2918	my ($self, $lvl, $exp) = @_;
		2919
		2920	$self->{lvl} = $lvl;
		2921	$self->{exp} = $exp;
		2922
		2923	my $v = -1;
		2924
		2925	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2926	my $l0 = $table->[$lvl - 1];
		2927	my $l1 = $table->[$lvl];
		2928
		2929	$self->{nxt} = $l1;
		2930
		2931	$v = ($exp - $l0) / ($l1 - $l0);
		2932	}
		2933
		2934	$self->SUPER::set_value ($v);
		2935	}
		2936
		2937	#############################################################################
		2938
2311	package CFClient::UI::Gauge;	2939	package CFPlus::UI::Gauge;
2312		2940
2313	our @ISA = CFClient::UI::VBox::;	2941	our @ISA = CFPlus::UI::VBox::;
2314		2942
2315	sub new {	2943	sub new {
2316	my ($class, %arg) = @_;	2944	my ($class, %arg) = @_;
2317		2945
2318	my $self = $class->SUPER::new (	2946	my $self = $class->SUPER::new (
…		…
2320	can_hover => 1,	2948	can_hover => 1,
2321	can_events => 1,	2949	can_events => 1,
2322	%arg,	2950	%arg,
2323	);	2951	);
2324		2952
2325	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2953	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2326	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2954	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2327	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2955	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2328		2956
2329	$self	2957	$self
2330	}	2958	}
2331		2959
2332	sub set_fontsize {	2960	sub set_fontsize {
…		…
2353	$self->{value}->set_text ($val);	2981	$self->{value}->set_text ($val);
2354	}	2982	}
2355		2983
2356	#############################################################################	2984	#############################################################################
2357		2985
2358	package CFClient::UI::Slider;	2986	package CFPlus::UI::Slider;
2359		2987
2360	use strict;	2988	use strict;
2361		2989
2362	use CFClient::OpenGL;	2990	use CFPlus::OpenGL;
2363		2991
2364	our @ISA = CFClient::UI::DrawBG::;	2992	our @ISA = CFPlus::UI::DrawBG::;
2365		2993
2366	my @tex =	2994	my @tex =
2367	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2995	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2368	qw(s1_slider.png s1_slider_bg.png);	2996	qw(s1_slider.png s1_slider_bg.png);
2369		2997
2370	sub new {	2998	sub new {
2371	my $class = shift;	2999	my $class = shift;
2372		3000
…		…
2440		3068
2441	$self->SUPER::invoke_button_down ($ev, $x, $y);	3069	$self->SUPER::invoke_button_down ($ev, $x, $y);
2442		3070
2443	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3071	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2444		3072
2445	$self->invoke_mouse_motion ($ev, $x, $y)	3073	$self->invoke_mouse_motion ($ev, $x, $y);
		3074
		3075	1
2446	}	3076	}
2447		3077
2448	sub invoke_mouse_motion {	3078	sub invoke_mouse_motion {
2449	my ($self, $ev, $x, $y) = @_;	3079	my ($self, $ev, $x, $y) = @_;
2450		3080
…		…
2457		3087
2458	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	3088	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2459	} else {	3089	} else {
2460	return 0;	3090	return 0;
2461	}	3091	}
		3092
		3093	1
		3094	}
		3095
		3096	sub invoke_mouse_wheel {
		3097	my ($self, $ev) = @_;
		3098
		3099	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		3100
		3101	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3102
		3103	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2462		3104
2463	1	3105	1
2464	}	3106	}
2465		3107
2466	sub update {	3108	sub update {
…		…
2517	glDisable GL_TEXTURE_2D;	3159	glDisable GL_TEXTURE_2D;
2518	}	3160	}
2519		3161
2520	#############################################################################	3162	#############################################################################
2521		3163
2522	package CFClient::UI::ValSlider;	3164	package CFPlus::UI::ValSlider;
2523		3165
2524	our @ISA = CFClient::UI::HBox::;	3166	our @ISA = CFPlus::UI::HBox::;
2525		3167
2526	sub new {	3168	sub new {
2527	my ($class, %arg) = @_;	3169	my ($class, %arg) = @_;
2528		3170
2529	my $range = delete $arg{range};	3171	my $range = delete $arg{range};
2530		3172
2531	my $self = $class->SUPER::new (	3173	my $self = $class->SUPER::new (
2532	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3174	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2533	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3175	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2534	to_value => sub { shift },	3176	to_value => sub { shift },
2535	from_value => sub { shift },	3177	from_value => sub { shift },
2536	%arg,	3178	%arg,
2537	);	3179	);
2538		3180
…		…
2558	sub set_range { shift->{slider}->set_range (@_) }	3200	sub set_range { shift->{slider}->set_range (@_) }
2559	sub set_value { shift->{slider}->set_value (@_) }	3201	sub set_value { shift->{slider}->set_value (@_) }
2560		3202
2561	#############################################################################	3203	#############################################################################
2562		3204
2563	package CFClient::UI::TextScroller;	3205	package CFPlus::UI::TextScroller;
2564		3206
2565	our @ISA = CFClient::UI::HBox::;	3207	our @ISA = CFPlus::UI::HBox::;
2566		3208
2567	use CFClient::OpenGL;	3209	use CFPlus::OpenGL;
2568		3210
2569	sub new {	3211	sub new {
2570	my $class = shift;	3212	my $class = shift;
2571		3213
2572	my $self = $class->SUPER::new (	3214	my $self = $class->SUPER::new (
2573	fontsize => 1,	3215	fontsize => 1,
2574	can_events => 0,	3216	can_events => 1,
2575	indent => 0,	3217	indent => 0,
2576	#font => default_font	3218	#font => default_font
2577	@_,	3219	@_,
2578		3220
2579	layout => (new CFClient::Layout),	3221	layout => (new CFPlus::Layout),
2580	par => [],	3222	par => [],
		3223	max_par => 0,
2581	height => 0,	3224	height => 0,
2582	children => [	3225	children => [
2583	(new CFClient::UI::Empty expand => 1),	3226	(new CFPlus::UI::Empty expand => 1),
2584	(new CFClient::UI::Slider vertical => 1),	3227	(new CFPlus::UI::Slider vertical => 1),
2585	],	3228	],
2586	);	3229	);
2587		3230
2588	$self->{children}[1]->connect (changed => sub { $self->update });	3231	$self->{children}[1]->connect (changed => sub { $self->update });
2589		3232
…		…
2598	}	3241	}
2599		3242
2600	sub size_request {	3243	sub size_request {
2601	my ($self) = @_;	3244	my ($self) = @_;
2602		3245
2603	my ($empty, $slider) = @{ $self->{children} };	3246	my ($empty, $slider) = $self->visible_children;
2604		3247
2605	local $self->{children} = [$empty, $slider];	3248	local $self->{children} = [$empty, $slider];
2606	$self->SUPER::size_request	3249	$self->SUPER::size_request
2607	}	3250	}
2608		3251
…		…
2619		3262
2620	$self->reflow;	3263	$self->reflow;
2621		3264
2622	local $self->{children} = [$empty, $slider];	3265	local $self->{children} = [$empty, $slider];
2623	$self->SUPER::invoke_size_allocate ($w, $h)	3266	$self->SUPER::invoke_size_allocate ($w, $h)
		3267	}
		3268
		3269	sub invoke_mouse_wheel {
		3270	my ($self, $ev) = @_;
		3271
		3272	return 0 unless $ev->{dy}; # only vertical movements
		3273
		3274	$self->{children}[1]->emit (mouse_wheel => $ev);
		3275
		3276	1
2624	}	3277	}
2625		3278
2626	sub get_layout {	3279	sub get_layout {
2627	my ($self, $para) = @_;	3280	my ($self, $para) = @_;
2628		3281
…		…
2656		3309
2657	# todo: base offset on lines or so, not on pixels	3310	# todo: base offset on lines or so, not on pixels
2658	$self->{children}[1]->set_value ($offset);	3311	$self->{children}[1]->set_value ($offset);
2659	}	3312	}
2660		3313
		3314	sub current_paragraph {
		3315	my ($self) = @_;
		3316
		3317	$self->{top_paragraph} - 1
		3318	}
		3319
		3320	sub scroll_to {
		3321	my ($self, $para) = @_;
		3322
		3323	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3324
		3325	$self->{scroll_to} = $para;
		3326	$self->update;
		3327	}
		3328
2661	sub clear {	3329	sub clear {
2662	my ($self) = @_;	3330	my ($self) = @_;
2663		3331
2664	my (undef, undef, @other) = @{ $self->{children} };	3332	my (undef, undef, @other) = @{ $self->{children} };
2665	$self->remove ($_) for @other;	3333	$self->remove ($_) for @other;
…		…
2668	$self->{height} = 0;	3336	$self->{height} = 0;
2669	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3337	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2670	}	3338	}
2671		3339
2672	sub add_paragraph {	3340	sub add_paragraph {
2673	my ($self, $color, $para, $indent) = @_;	3341	my $self = shift;
2674		3342
2675	my ($text, @w) = ref $para ? @$para : $para;	3343	for my $para (@_) {
2676
2677	$para = {	3344	$para = {
		3345	fg => [1, 1, 1, 1],
		3346	indent => 0,
		3347	markup => "",
		3348	widget => [],
		3349	ref $para ? %$para : (markup => $para),
2678	w => 1e10,	3350	w => 1e10,
2679	wrapped => 1,	3351	wrapped => 1,
2680	fg => $color,
2681	indent => $indent,
2682	markup => $text,
2683	widget => \@w,
2684	};	3352	};
2685		3353
2686	$self->add (@w) if @w;	3354	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2687	push @{$self->{par}}, $para;	3355	push @{$self->{par}}, $para;
		3356	}
		3357
		3358	if (my $max = $self->{max_par}) {
		3359	shift @{$self->{par}} while @{$self->{par}} > $max;
		3360	}
2688		3361
2689	$self->{need_reflow}++;	3362	$self->{need_reflow}++;
2690	$self->update;	3363	$self->update;
2691	}	3364	}
2692		3365
2693	sub scroll_to_bottom {	3366	sub scroll_to_bottom {
2694	my ($self) = @_;	3367	my ($self) = @_;
2695		3368
2696	$self->{scroll_to_bottom} = 1;	3369	$self->{scroll_to} = $#{$self->{par}};
2697	$self->update;	3370	$self->update;
2698	}	3371	}
2699		3372
		3373	sub force_uptodate {
		3374	my ($self) = @_;
		3375
		3376	if (delete $self->{need_reflow}) {
		3377	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3378
		3379	my $height = 0;
		3380
		3381	for my $para (@{$self->{par}}) {
		3382	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3383	my $layout = $self->get_layout ($para);
		3384	my ($w, $h) = $layout->size;
		3385
		3386	$para->{w} = $w + $para->{indent};
		3387	$para->{h} = $h;
		3388	$para->{wrapped} = $layout->has_wrapped;
		3389	}
		3390
		3391	$para->{y} = $height;
		3392	$height += $para->{h};
		3393	}
		3394
		3395	$self->{height} = $height;
		3396	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3397
		3398	delete $self->{texture};
		3399	}
		3400
		3401	if (my $paridx = delete $self->{scroll_to}) {
		3402	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3403	}
		3404	}
		3405
2700	sub update {	3406	sub update {
2701	my ($self) = @_;	3407	my ($self) = @_;
2702		3408
2703	$self->SUPER::update;	3409	$self->SUPER::update;
2704		3410
2705	return unless $self->{h} > 0;	3411	return unless $self->{h} > 0;
2706		3412
2707	delete $self->{texture};	3413	delete $self->{texture};
2708		3414
2709	$ROOT->on_post_alloc ($self => sub {	3415	$ROOT->on_post_alloc ($self => sub {
		3416	$self->force_uptodate;
		3417
2710	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3418	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2711		3419
2712	if (delete $self->{need_reflow}) {
2713	my $height = 0;
2714
2715	for my $para (@{$self->{par}}) {
2716	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2717	my $layout = $self->get_layout ($para);
2718	my ($w, $h) = $layout->size;
2719
2720	$para->{w} = $w + $para->{indent};
2721	$para->{h} = $h;
2722	$para->{wrapped} = $layout->has_wrapped;
2723	}
2724
2725	$height += $para->{h};
2726	}
2727
2728	$self->{height} = $height;
2729
2730	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2731
2732	delete $self->{texture};
2733	}
2734
2735	if (delete $self->{scroll_to_bottom}) {
2736	$self->{children}[1]->set_value (1e10);
2737	}
2738
2739	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3420	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2740	glClearColor 0, 0, 0, 0;	3421	glClearColor 0, 0, 0, 0;
2741	glClear GL_COLOR_BUFFER_BIT;	3422	glClear GL_COLOR_BUFFER_BIT;
2742		3423
		3424	package CFPlus::UI::Base;
		3425	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3426	(0, 0, $self->{w}, $self->{h});
		3427
		3428	my $top = int $self->{children}[1]{range}[0];
		3429
		3430	my $paridx = 0;
		3431	my $top_paragraph;
2743	my $top = int $self->{children}[1]{range}[0];	3432	my $top = int $self->{children}[1]{range}[0];
2744		3433
2745	my $y0 = $top;	3434	my $y0 = $top;
2746	my $y1 = $top + $H;	3435	my $y1 = $top + $H;
2747		3436
2748	my $y = 0;
2749
2750	for my $para (@{$self->{par}}) {	3437	for my $para (@{$self->{par}}) {
2751	my $h = $para->{h};	3438	my $h = $para->{h};
		3439	my $y = $para->{y};
2752		3440
2753	if ($y0 < $y + $h && $y < $y1) {	3441	if ($y0 < $y + $h && $y < $y1) {
2754
2755	my $layout = $self->get_layout ($para);	3442	my $layout = $self->get_layout ($para);
2756		3443
2757	$layout->render ($para->{indent}, $y - $y0);	3444	$layout->render ($para->{indent}, $y - $y0);
		3445	$layout->draw;
2758		3446
2759	if (my @w = @{ $para->{widget} }) {	3447	if (my @w = @{ $para->{widget} }) {
2760	my @s = $layout->get_shapes;	3448	my @s = $layout->get_shapes;
2761		3449
2762	for (@w) {	3450	for (@w) {
…		…
2768	$_->draw;	3456	$_->draw;
2769	}	3457	}
2770	}	3458	}
2771	}	3459	}
2772		3460
2773	$y += $h;	3461	$paridx++;
		3462	$top_paragraph ||= $paridx if $y >= $top;
2774	}	3463	}
		3464
		3465	$self->{top_paragraph} = $top_paragraph;
2775	};	3466	};
2776	});	3467	});
2777	}	3468	}
2778		3469
2779	sub reconfigure {	3470	sub reconfigure {
…		…
2797	$self->{children}[1]->draw;	3488	$self->{children}[1]->draw;
2798	}	3489	}
2799		3490
2800	#############################################################################	3491	#############################################################################
2801		3492
2802	package CFClient::UI::Animator;	3493	package CFPlus::UI::Animator;
2803		3494
2804	use CFClient::OpenGL;	3495	use CFPlus::OpenGL;
2805		3496
2806	our @ISA = CFClient::UI::Bin::;	3497	our @ISA = CFPlus::UI::Bin::;
2807		3498
2808	sub moveto {	3499	sub moveto {
2809	my ($self, $x, $y) = @_;	3500	my ($self, $x, $y) = @_;
2810		3501
2811	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3502	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2839	glPopMatrix;	3530	glPopMatrix;
2840	}	3531	}
2841		3532
2842	#############################################################################	3533	#############################################################################
2843		3534
2844	package CFClient::UI::Flopper;	3535	package CFPlus::UI::Flopper;
2845		3536
2846	our @ISA = CFClient::UI::Button::;	3537	our @ISA = CFPlus::UI::Button::;
2847		3538
2848	sub new {	3539	sub new {
2849	my $class = shift;	3540	my $class = shift;
2850		3541
2851	my $self = $class->SUPER::new (	3542	my $self = $class->SUPER::new (
…		…
2863	$self->{other}->toggle_visibility;	3554	$self->{other}->toggle_visibility;
2864	}	3555	}
2865		3556
2866	#############################################################################	3557	#############################################################################
2867		3558
2868	package CFClient::UI::Tooltip;	3559	package CFPlus::UI::Tooltip;
2869		3560
2870	our @ISA = CFClient::UI::Bin::;	3561	our @ISA = CFPlus::UI::Bin::;
2871		3562
2872	use CFClient::OpenGL;	3563	use CFPlus::OpenGL;
2873		3564
2874	sub new {	3565	sub new {
2875	my $class = shift;	3566	my $class = shift;
2876		3567
2877	$class->SUPER::new (	3568	$class->SUPER::new (
…		…
2881	}	3572	}
2882		3573
2883	sub set_tooltip_from {	3574	sub set_tooltip_from {
2884	my ($self, $widget) = @_;	3575	my ($self, $widget) = @_;
2885		3576
2886	my $tooltip = $widget->{tooltip};	3577	my $tip = $widget->{tooltip};
		3578	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3579
		3580	$tip = CFPlus::Pod::section_label tooltip => $1
		3581	if $tip =~ /^#(.*)$/;
2887		3582
2888	if ($ENV{CFPLUS_DEBUG} & 2) {	3583	if ($ENV{CFPLUS_DEBUG} & 2) {
2889	$tooltip .= "\n\n" . (ref $widget) . "\n"	3584	$tip .= "\n\n" . (ref $widget) . "\n"
2890	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3585	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2891	. "req $widget->{req_w} $widget->{req_h}\n"	3586	. "req $widget->{req_w} $widget->{req_h}\n"
2892	. "visible $widget->{visible}";	3587	. "visible $widget->{visible}";
2893	}	3588	}
2894		3589
2895	$tooltip =~ s/^\n+//;	3590	$tip =~ s/^\n+//;
2896	$tooltip =~ s/\n+$//;	3591	$tip =~ s/\n+$//;
2897		3592
2898	$self->add (new CFClient::UI::Label	3593	$self->add (new CFPlus::UI::Label
2899	markup => $tooltip,	3594	markup => $tip,
2900	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3595	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2901	fontsize => 0.8,	3596	fontsize => 0.8,
2902	fg => [0, 0, 0, 1],	3597	style => 1, # FLAG_INVERSE
2903	ellipsise => 0,	3598	ellipsise => 0,
2904	font => ($widget->{tooltip_font} || $::FONT_PROP),	3599	font => ($widget->{tooltip_font} || $::FONT_PROP),
2905	);	3600	);
2906	}	3601	}
2907		3602
…		…
2926		3621
2927	$self->{root}->on_post_alloc ("move_$self" => sub {	3622	$self->{root}->on_post_alloc ("move_$self" => sub {
2928	my $widget = $self->{owner}	3623	my $widget = $self->{owner}
2929	or return;	3624	or return;
2930		3625
		3626	if ($widget->{visible}) {
2931	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3627	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2932		3628
2933	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3629	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2934	if $x + $self->{w} > $self->{root}{w};	3630	if $x + $self->{w} > $self->{root}{w};
2935		3631
2936	$self->move_abs ($x, $y);	3632	$self->move_abs ($x, $y);
		3633	} else {
		3634	$self->hide;
		3635	}
2937	});	3636	});
2938	}	3637	}
2939		3638
2940	sub _draw {	3639	sub _draw {
2941	my ($self) = @_;	3640	my ($self) = @_;
2942		3641
2943	glTranslate 0.375, 0.375;
2944
2945	my ($w, $h) = @$self{qw(w h)};	3642	my ($w, $h) = @$self{qw(w h)};
2946		3643
2947	glColor 1, 0.8, 0.4;	3644	glColor 1, 0.8, 0.4;
2948	glBegin GL_QUADS;	3645	glRect 0, 0, $w, $h;
2949	glVertex 0 , 0;
2950	glVertex 0 , $h;
2951	glVertex $w, $h;
2952	glVertex $w, 0;
2953	glEnd;
2954		3646
2955	glColor 0, 0, 0;	3647	glColor 0, 0, 0;
2956	glBegin GL_LINE_LOOP;	3648	glRect_lineloop .5, .5, $w + .5, $h + .5;
2957	glVertex 0 , 0;
2958	glVertex 0 , $h;
2959	glVertex $w, $h;
2960	glVertex $w, 0;
2961	glEnd;
2962		3649
2963	glTranslate 2 - 0.375, 2 - 0.375;	3650	glTranslate 2, 2;
2964		3651
2965	$self->SUPER::_draw;	3652	$self->SUPER::_draw;
2966	}	3653	}
2967		3654
2968	#############################################################################	3655	#############################################################################
2969		3656
2970	package CFClient::UI::Face;	3657	package CFPlus::UI::Face;
2971		3658
2972	our @ISA = CFClient::UI::Base::;	3659	our @ISA = CFPlus::UI::DrawBG::;
2973		3660
2974	use CFClient::OpenGL;	3661	use CFPlus::OpenGL;
2975		3662
2976	sub new {	3663	sub new {
2977	my $class = shift;	3664	my $class = shift;
2978		3665
2979	my $self = $class->SUPER::new (	3666	my $self = $class->SUPER::new (
		3667	size_w => 32,
		3668	size_h => 8,
2980	aspect => 1,	3669	aspect => 1,
2981	can_events => 0,	3670	can_events => 0,
2982	@_,	3671	@_,
2983	);	3672	);
2984		3673
2985	if ($self->{anim} && $self->{animspeed}) {	3674	if ($self->{anim} && $self->{animspeed}) {
2986	Scalar::Util::weaken (my $widget = $self);	3675	CFPlus::weaken (my $widget = $self);
2987		3676
		3677	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3678	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2988	$self->{timer} = Event->timer (	3679	$self->{timer} = Event->timer (
2989	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2990	hard => 1,	3680	parked => 1,
2991	interval => $self->{animspeed},
2992	cb => sub {	3681	cb => sub {
		3682	return unless $::CONN;
		3683
		3684	my $w = $widget
		3685	or return;
		3686
2993	++$widget->{frame};	3687	++$w->{frame};
		3688	$w->update_face;
		3689
		3690	# somehow, $widget can go away
2994	$widget->update;	3691	$w->update;
		3692	$w->update_timer;
2995	},	3693	},
2996	);	3694	);
		3695
		3696	$self->update_face;
		3697	$self->update_timer;
2997	}	3698	}
2998		3699
2999	$self	3700	$self
3000	}	3701	}
3001		3702
		3703	sub update_timer {
		3704	my ($self) = @_;
		3705
		3706	return unless $self->{timer};
		3707
		3708	if ($self->{visible}) {
		3709	$self->{timer}->at (
		3710	$self->{anim_start}
		3711	+ $self->{animspeed}
		3712	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3713	);
		3714	$self->{timer}->start;
		3715	} else {
		3716	$self->{timer}->stop;
		3717	}
		3718	}
		3719
		3720	sub update_face {
		3721	my ($self) = @_;
		3722
		3723	if ($::CONN) {
		3724	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3725	if ($anim && @$anim) {
		3726	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3727	delete $self->{face_change_cb};
		3728
		3729	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3730	unless ($tex->{name} || $tex->{loading}) {
		3731	$tex->upload (sub { $self->reconfigure });
		3732	}
		3733	}
		3734	}
		3735	}
		3736	}
		3737	}
		3738
3002	sub size_request {	3739	sub size_request {
3003	(32, 8)	3740	my ($self) = @_;
		3741
		3742	if ($::CONN) {
		3743	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3744	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3745	if ($tex->{name}) {
		3746	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3747	} elsif (!$tex->{loading}) {
		3748	$tex->upload (sub { $self->reconfigure });
		3749	}
		3750	}
		3751
		3752	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3753	}
		3754	}
		3755
		3756	($self->{size_w} || 8, $self->{size_h} || 8)
3004	}	3757	}
3005		3758
3006	sub update {	3759	sub update {
3007	my ($self) = @_;	3760	my ($self) = @_;
3008		3761
3009	return unless $self->{visible};	3762	return unless $self->{visible};
3010		3763
3011	$self->SUPER::update;	3764	$self->SUPER::update;
3012	}	3765	}
3013		3766
		3767	sub invoke_visibility_change {
		3768	my ($self) = @_;
		3769
		3770	$self->update_timer;
		3771
		3772	0
		3773	}
		3774
3014	sub _draw {	3775	sub _draw {
3015	my ($self) = @_;	3776	my ($self) = @_;
3016		3777
3017	return unless $::CONN;	3778	$self->SUPER::_draw;
3018		3779
3019	my $face;	3780	if (my $tex = $self->{tex}) {
3020
3021	if ($self->{frame}) {
3022	my $anim = $::CONN->{anim}[$self->{anim}];
3023
3024	$face = $anim->[ $self->{frame} % @$anim ]
3025	if $anim && @$anim;
3026	}
3027
3028	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3029
3030	if ($tex) {
3031	glEnable GL_TEXTURE_2D;	3781	glEnable GL_TEXTURE_2D;
3032	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3782	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3033	glColor 0, 0, 0, 1;	3783	glColor 0, 0, 0, 1;
3034	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3784	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3035	glDisable GL_TEXTURE_2D;	3785	glDisable GL_TEXTURE_2D;
…		…
3037	}	3787	}
3038		3788
3039	sub destroy {	3789	sub destroy {
3040	my ($self) = @_;	3790	my ($self) = @_;
3041		3791
3042	$self->{timer}->cancel	3792	(delete $self->{timer})->cancel
3043	if $self->{timer};	3793	if $self->{timer};
3044		3794
3045	$self->SUPER::destroy;	3795	$self->SUPER::destroy;
3046	}	3796	}
3047		3797
3048	#############################################################################	3798	#############################################################################
3049		3799
3050	package CFClient::UI::Buttonbar;	3800	package CFPlus::UI::Buttonbar;
3051		3801
3052	our @ISA = CFClient::UI::HBox::;	3802	our @ISA = CFPlus::UI::HBox::;
3053		3803
3054	# TODO: should actualyl wrap buttons and other goodies.	3804	# TODO: should actually wrap buttons and other goodies.
3055		3805
3056	#############################################################################	3806	#############################################################################
3057		3807
3058	package CFClient::UI::Menu;	3808	package CFPlus::UI::Menu;
3059		3809
3060	our @ISA = CFClient::UI::FancyFrame::;	3810	our @ISA = CFPlus::UI::Toplevel::;
3061		3811
3062	use CFClient::OpenGL;	3812	use CFPlus::OpenGL;
3063		3813
3064	sub new {	3814	sub new {
3065	my $class = shift;	3815	my $class = shift;
3066		3816
3067	my $self = $class->SUPER::new (	3817	my $self = $class->SUPER::new (
3068	items => [],	3818	items => [],
3069	z => 100,	3819	z => 100,
3070	@_,	3820	@_,
3071	);	3821	);
3072		3822
3073	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3823	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3074		3824
3075	for my $item (@{ $self->{items} }) {	3825	for my $item (@{ $self->{items} }) {
3076	my ($widget, $cb, $tooltip) = @$item;	3826	my ($widget, $cb, $tooltip) = @$item;
3077		3827
3078	# handle various types of items, only text for now	3828	# handle various types of items, only text for now
3079	if (!ref $widget) {	3829	if (!ref $widget) {
3080	if ($widget =~ /\t/) {	3830	if ($widget =~ /\t/) {
3081	my ($left, $right) = split /\t/, $widget, 2;	3831	my ($left, $right) = split /\t/, $widget, 2;
3082		3832
3083	$widget = new CFClient::UI::HBox	3833	$widget = new CFPlus::UI::HBox
3084	can_hover => 1,	3834	can_hover => 1,
3085	can_events => 1,	3835	can_events => 1,
3086	tooltip => $tooltip,	3836	tooltip => $tooltip,
3087	children => [	3837	children => [
3088	(new CFClient::UI::Label markup => $left, expand => 1),	3838	(new CFPlus::UI::Label markup => $left, expand => 1),
3089	(new CFClient::UI::Label markup => $right, align => +1),	3839	(new CFPlus::UI::Label markup => $right, align => +1),
3090	],	3840	],
3091	;	3841	;
3092		3842
3093	} else {	3843	} else {
3094	$widget = new CFClient::UI::Label	3844	$widget = new CFPlus::UI::Label
3095	can_hover => 1,	3845	can_hover => 1,
3096	can_events => 1,	3846	can_events => 1,
3097	markup => $widget,	3847	markup => $widget,
3098	tooltip => $tooltip;	3848	tooltip => $tooltip;
3099	}	3849	}
…		…
3147	1	3897	1
3148	}	3898	}
3149		3899
3150	#############################################################################	3900	#############################################################################
3151		3901
3152	package CFClient::UI::Multiplexer;	3902	package CFPlus::UI::Multiplexer;
3153		3903
3154	our @ISA = CFClient::UI::Container::;	3904	our @ISA = CFPlus::UI::Container::;
3155		3905
3156	sub new {	3906	sub new {
3157	my $class = shift;	3907	my $class = shift;
3158		3908
3159	my $self = $class->SUPER::new (	3909	my $self = $class->SUPER::new (
…		…
3220	$self->{current}->draw;	3970	$self->{current}->draw;
3221	}	3971	}
3222		3972
3223	#############################################################################	3973	#############################################################################
3224		3974
3225	package CFClient::UI::Notebook;	3975	package CFPlus::UI::Notebook;
3226		3976
		3977	use CFPlus::OpenGL;
		3978
3227	our @ISA = CFClient::UI::VBox::;	3979	our @ISA = CFPlus::UI::VBox::;
3228		3980
3229	sub new {	3981	sub new {
3230	my $class = shift;	3982	my $class = shift;
3231		3983
3232	my $self = $class->SUPER::new (	3984	my $self = $class->SUPER::new (
3233	buttonbar => (new CFClient::UI::Buttonbar),	3985	buttonbar => (new CFPlus::UI::Buttonbar),
3234	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3986	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3987	active_outline => [.7, .7, 0.2],
3235	# filter => # will be put between multiplexer and $self	3988	# filter => # will be put between multiplexer and $self
3236	@_,	3989	@_,
3237	);	3990	);
3238		3991
3239	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3992	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3240	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3993	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3241		3994
		3995	{
		3996	Scalar::Util::weaken (my $wself = $self);
		3997
		3998	$self->{multiplexer}->connect (c_add => sub {
		3999	my ($mplex, $widgets) = @_;
		4000
		4001	for my $child (@$widgets) {
		4002	Scalar::Util::weaken $child;
		4003	$child->{c_tab_} ||= do {
		4004	my $tab =
		4005	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		4006	? $child->{c_tab}
		4007	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4008
		4009	$tab->connect (activate => sub {
		4010	$wself->set_current_page ($child);
		4011	});
		4012
		4013	$tab
		4014	};
		4015
		4016	$self->{buttonbar}->add ($child->{c_tab_});
		4017	}
		4018	});
		4019
		4020	$self->{multiplexer}->connect (c_remove => sub {
		4021	my ($mplex, $widgets) = @_;
		4022
		4023	for my $child (@$widgets) {
		4024	$wself->{buttonbar}->remove ($child->{c_tab_});
		4025	}
		4026	});
		4027	}
		4028
3242	$self	4029	$self
3243	}	4030	}
3244		4031
3245	sub add {	4032	sub add {
		4033	my ($self, @widgets) = @_;
		4034
		4035	$self->{multiplexer}->add (@widgets)
		4036	}
		4037
		4038	sub remove {
		4039	my ($self, @widgets) = @_;
		4040
		4041	$self->{multiplexer}->remove (@widgets)
		4042	}
		4043
		4044	sub pages {
		4045	my ($self) = @_;
		4046	$self->{multiplexer}->children
		4047	}
		4048
		4049	sub add_tab {
3246	my ($self, $title, $widget, $tooltip) = @_;	4050	my ($self, $title, $widget, $tooltip) = @_;
3247		4051
3248	Scalar::Util::weaken $self;	4052	$title = [$title, $tooltip] unless ref $title;
		4053	$widget->{c_tab} = $title;
3249		4054
3250	$self->{buttonbar}->add (new CFClient::UI::Button
3251	markup => $title,
3252	tooltip => $tooltip,
3253	on_activate => sub { $self->set_current_page ($widget) },
3254	);
3255
3256	$self->{multiplexer}->add ($widget);	4055	$self->add ($widget);
3257	}	4056	}
3258		4057
3259	sub get_current_page {	4058	sub get_current_page {
3260	my ($self) = @_;	4059	my ($self) = @_;
3261		4060
…		…
3267		4066
3268	$self->{multiplexer}->set_current_page ($page);	4067	$self->{multiplexer}->set_current_page ($page);
3269	$self->emit (page_changed => $self->{multiplexer}{current});	4068	$self->emit (page_changed => $self->{multiplexer}{current});
3270	}	4069	}
3271		4070
		4071	sub _draw {
		4072	my ($self) = @_;
		4073
		4074	$self->SUPER::_draw ();
		4075
		4076	if (my $cur = $self->{multiplexer}{current}) {
		4077	if ($cur = $cur->{c_tab_}) {
		4078	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4079	$self->{buttonbar}{y} + $cur->{y};
		4080	glLineWidth 3;
		4081	#glEnable GL_BLEND;
		4082	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4083	glColor @{$self->{active_outline}};
		4084	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4085	glLineWidth 1;
		4086	#glDisable GL_BLEND;
		4087	}
		4088	}
		4089	}
		4090
3272	#############################################################################	4091	#############################################################################
3273		4092
3274	package CFClient::UI::Combobox;	4093	package CFPlus::UI::Selector;
3275		4094
3276	use utf8;	4095	use utf8;
3277		4096
3278	our @ISA = CFClient::UI::Button::;	4097	our @ISA = CFPlus::UI::Button::;
3279		4098
3280	sub new {	4099	sub new {
3281	my $class = shift;	4100	my $class = shift;
3282		4101
3283	my $self = $class->SUPER::new (	4102	my $self = $class->SUPER::new (
…		…
3300	my ($value, $title, $tooltip) = @$_;	4119	my ($value, $title, $tooltip) = @$_;
3301		4120
3302	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4121	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3303	}	4122	}
3304		4123
3305	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	4124	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3306	}	4125	}
3307		4126
3308	sub _set_value {	4127	sub _set_value {
3309	my ($self, $value) = @_;	4128	my ($self, $value) = @_;
3310		4129
…		…
3325	$self->emit (changed => $value);	4144	$self->emit (changed => $value);
3326	}	4145	}
3327		4146
3328	#############################################################################	4147	#############################################################################
3329		4148
3330	package CFClient::UI::Statusbox;	4149	package CFPlus::UI::Statusbox;
3331		4150
3332	our @ISA = CFClient::UI::VBox::;	4151	our @ISA = CFPlus::UI::VBox::;
3333		4152
3334	sub new {	4153	sub new {
3335	my $class = shift;	4154	my $class = shift;
3336		4155
3337	my $self = $class->SUPER::new (	4156	my $self = $class->SUPER::new (
3338	fontsize => 0.8,	4157	fontsize => 0.8,
3339	@_,	4158	@_,
3340	);	4159	);
3341		4160
3342	Scalar::Util::weaken (my $this = $self);	4161	CFPlus::weaken (my $this = $self);
3343		4162
3344	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4163	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3345		4164
3346	$self	4165	$self
3347	}	4166	}
…		…
3349	sub reorder {	4168	sub reorder {
3350	my ($self) = @_;	4169	my ($self) = @_;
3351	my $NOW = Time::HiRes::time;	4170	my $NOW = Time::HiRes::time;
3352		4171
3353	# freeze display when hovering over any label	4172	# freeze display when hovering over any label
3354	return if $CFClient::UI::TOOLTIP->{owner}	4173	return if $CFPlus::UI::TOOLTIP->{owner}
3355	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4174	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3356	values %{ $self->{item} };	4175	values %{ $self->{item} };
3357		4176
3358	while (my ($k, $v) = each %{ $self->{item} }) {	4177	while (my ($k, $v) = each %{ $self->{item} }) {
3359	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4178	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3360	}	4179	}
…		…
3381	for ($short) {	4200	for ($short) {
3382	s/^\s+//;	4201	s/^\s+//;
3383	s/\s+/ /g;	4202	s/\s+/ /g;
3384	}	4203	}
3385		4204
3386	new CFClient::UI::Label	4205	new CFPlus::UI::Label
3387	markup => $short,	4206	markup => $short,
3388	tooltip => $item->{tooltip},	4207	tooltip => $item->{tooltip},
3389	tooltip_font => $::FONT_PROP,	4208	tooltip_font => $::FONT_PROP,
3390	tooltip_width => 0.67,	4209	tooltip_width => 0.67,
3391	fontsize => $item->{fontsize} || $self->{fontsize},	4210	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3470	$self->SUPER::destroy;	4289	$self->SUPER::destroy;
3471	}	4290	}
3472		4291
3473	#############################################################################	4292	#############################################################################
3474		4293
3475	package CFClient::UI::Inventory;
3476
3477	our @ISA = CFClient::UI::Table::;
3478
3479	sub new {
3480	my $class = shift;
3481
3482	my $self = $class->SUPER::new (
3483	col_expand => [0, 1, 0],
3484	@_,
3485	);
3486
3487	$self
3488	}
3489
3490	sub set_items {
3491	my ($self, $items) = @_;
3492
3493	$self->clear;
3494	return unless $items;
3495
3496	my @items = sort {
3497	($a->{type} <=> $b->{type})
3498	or ($a->{name} cmp $b->{name})
3499	} values %$items;
3500
3501	$self->{real_items} = \@items;
3502
3503	my $row = 0;
3504	for my $item (@items) {
3505	CFClient::Item::update_widgets $item;
3506
3507	$self->add (0, $row, $item->{face_widget});
3508	$self->add (1, $row, $item->{desc_widget});
3509	$self->add (2, $row, $item->{weight_widget});
3510
3511	$row++;
3512	}
3513	}
3514
3515	#############################################################################
3516
3517	package CFClient::UI::SpellList;
3518
3519	our @ISA = CFClient::UI::Table::;
3520
3521	sub new {
3522	my $class = shift;
3523
3524	my $self = $class->SUPER::new (
3525	binding => [],
3526	commands => [],
3527	@_,
3528	)
3529	}
3530
3531	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3532
3533	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3534	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3535	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3537	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3539	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3541	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3543
3544	sub rebuild_spell_list {
3545	my ($self) = @_;
3546
3547	$CFClient::UI::ROOT->on_refresh ($self => sub {
3548	$self->clear;
3549
3550	return unless $::CONN;
3551
3552	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3553	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3554	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3555	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3556	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3557
3558	my $row = 0;
3559
3560	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3561	my $spell = $self->{spell}{$_};
3562
3563	$row++;
3564
3565	my $spell_cb = sub {
3566	my ($widget, $ev) = @_;
3567
3568	if ($ev->{button} == 1) {
3569	$::CONN->user_send ("cast $spell->{name}");
3570	} elsif ($ev->{button} == 2) {
3571	$::CONN->user_send ("invoke $spell->{name}");
3572	} elsif ($ev->{button} == 3) {
3573	(new CFClient::UI::Menu
3574	items => [
3575	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3576	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3577	],
3578	)->popup ($ev);
3579	} else {
3580	return 0;
3581	}
3582
3583	1
3584	};
3585
3586	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3587
3588	#TODO: add path info to tooltip
3589	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3590
3591	$self->add (0, $row, new CFClient::UI::Face
3592	face => $spell->{face},
3593	can_hover => 1,
3594	can_events => 1,
3595	tooltip => $tooltip,
3596	on_button_down => $spell_cb,
3597	);
3598
3599	$self->add (1, $row, new CFClient::UI::Label
3600	expand => 1,
3601	text => $spell->{name},
3602	can_hover => 1,
3603	can_events => 1,
3604	tooltip => $tooltip,
3605	on_button_down => $spell_cb,
3606	);
3607
3608	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3609	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3610	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3611	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3612	}
3613	});
3614	}
3615
3616	sub add_spell {
3617	my ($self, $spell) = @_;
3618
3619	$self->{spell}->{$spell->{name}} = $spell;
3620	$self->rebuild_spell_list;
3621	}
3622
3623	sub remove_spell {
3624	my ($self, $spell) = @_;
3625
3626	delete $self->{spell}->{$spell->{name}};
3627	$self->rebuild_spell_list;
3628	}
3629
3630	sub clear_spells {
3631	my ($self) = @_;
3632
3633	$self->{spell} = {};
3634	$self->rebuild_spell_list;
3635	}
3636
3637	#############################################################################
3638
3639	package CFClient::UI::Root;	4294	package CFPlus::UI::Root;
3640		4295
3641	our @ISA = CFClient::UI::Container::;	4296	our @ISA = CFPlus::UI::Container::;
3642		4297
3643	use List::Util qw(min max);	4298	use List::Util qw(min max);
3644		4299
3645	use CFClient::OpenGL;	4300	use CFPlus::OpenGL;
3646		4301
3647	sub new {	4302	sub new {
3648	my $class = shift;	4303	my $class = shift;
3649		4304
3650	my $self = $class->SUPER::new (	4305	my $self = $class->SUPER::new (
3651	visible => 1,	4306	visible => 1,
3652	@_,	4307	@_,
3653	);	4308	);
3654		4309
3655	Scalar::Util::weaken ($self->{root} = $self);	4310	CFPlus::weaken ($self->{root} = $self);
3656		4311
3657	$self	4312	$self
3658	}	4313	}
3659		4314
3660	sub size_request {	4315	sub size_request {
…		…
3708	}	4363	}
3709		4364
3710	sub update {	4365	sub update {
3711	my ($self) = @_;	4366	my ($self) = @_;
3712		4367
3713	$::WANT_REFRESH++;	4368	$::WANT_REFRESH->start;
3714	}	4369	}
3715		4370
3716	sub add {	4371	sub add {
3717	my ($self, @children) = @_;	4372	my ($self, @children) = @_;
3718		4373
…		…
3755	while ($self->{refresh_hook}) {	4410	while ($self->{refresh_hook}) {
3756	$_->()	4411	$_->()
3757	for values %{delete $self->{refresh_hook}};	4412	for values %{delete $self->{refresh_hook}};
3758	}	4413	}
3759		4414
3760	if ($self->{realloc}) {	4415	while ($self->{realloc}) {
3761	my %queue;	4416	my %queue;
3762	my @queue;	4417	my @queue;
3763	my $widget;	4418	my $widget;
3764		4419
3765	outer:	4420	outer:
…		…
3812	}	4467	}
3813	}	4468	}
3814		4469
3815	delete $self->{realloc}{$widget+0};	4470	delete $self->{realloc}{$widget+0};
3816	}	4471	}
3817	}
3818		4472
3819	while (my $size_alloc = delete $self->{size_alloc}) {	4473	while (my $size_alloc = delete $self->{size_alloc}) {
3820	my @queue = sort { $b->{visible} <=> $a->{visible} }	4474	my @queue = sort { $a->{visible} <=> $b->{visible} }
3821	values %$size_alloc;	4475	values %$size_alloc;
3822		4476
3823	while () {	4477	while () {
3824	my $widget = pop @queue || last;	4478	my $widget = pop @queue || last;
3825		4479
3826	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4480	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3827		4481
3828	$w = 0 if $w < 0;
3829	$h = 0 if $h < 0;
3830
3831	$w = max $widget->{min_w}, $w;	4482	$w = max $widget->{min_w}, $w;
3832	$h = max $widget->{min_h}, $h;	4483	$h = max $widget->{min_h}, $h;
3833		4484
		4485	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4486	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4487
3834	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4488	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4489	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3836		4490
3837	$w = int $w + 0.5;	4491	$w = int $w + 0.5;
3838	$h = int $h + 0.5;	4492	$h = int $h + 0.5;
3839		4493
3840	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4494	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3841	$widget->{old_w} = $widget->{w};	4495	$widget->{old_w} = $widget->{w};
3842	$widget->{old_h} = $widget->{h};	4496	$widget->{old_h} = $widget->{h};
3843		4497
3844	$widget->{w} = $w;	4498	$widget->{w} = $w;
3845	$widget->{h} = $h;	4499	$widget->{h} = $h;
3846		4500
3847	$widget->emit (size_allocate => $w, $h);	4501	$widget->emit (size_allocate => $w, $h);
		4502	}
3848	}	4503	}
3849	}	4504	}
3850	}	4505	}
3851		4506
3852	while ($self->{post_alloc_hook}) {	4507	while ($self->{post_alloc_hook}) {
3853	$_->()	4508	$_->()
3854	for values %{delete $self->{post_alloc_hook}};	4509	for values %{delete $self->{post_alloc_hook}};
3855	}	4510	}
3856
3857		4511
3858	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4512	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3859	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4513	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3860	glClear GL_COLOR_BUFFER_BIT;	4514	glClear GL_COLOR_BUFFER_BIT;
3861		4515
…		…
3864	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4518	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3865	glMatrixMode GL_MODELVIEW;	4519	glMatrixMode GL_MODELVIEW;
3866	glLoadIdentity;	4520	glLoadIdentity;
3867		4521
3868	{	4522	{
3869	package CFClient::UI::Base;	4523	package CFPlus::UI::Base;
3870		4524
3871	($draw_x, $draw_y, $draw_w, $draw_h) =	4525	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3872	(0, 0, $self->{w}, $self->{h});	4526	(0, 0, $self->{w}, $self->{h});
3873	}
3874		4527
3875	$self->_draw;	4528	$self->_draw;
		4529	}
3876	}	4530	}
3877		4531
3878	#############################################################################	4532	#############################################################################
3879		4533
3880	package CFClient::UI;	4534	package CFPlus::UI;
3881		4535
3882	$ROOT = new CFClient::UI::Root;	4536	$ROOT = new CFPlus::UI::Root;
3883	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4537	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3884		4538
3885	1	4539	1
3886		4540

Diff Legend

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