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

Diff Legend

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