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.406 by root, Sat Jul 21 23:17:35 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
		117	# mousewheel
		118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98		120
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	121	$ev->{dx} = $shift ? $delta : 0;
100	if $GRAB;	122	$ev->{dy} = $shift ? 0 : $delta;
		123
		124	$GRAB->emit (mouse_wheel => $ev);
		125	} else {
		126	$GRAB->emit (button_down => $ev)
		127	}
		128	}
101	}	129	}
102		130
103	sub feed_sdl_button_up_event {	131	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	132	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		133
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	134	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		135
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	136	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		137
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	138	$GRAB->emit (button_up => $ev)
112	if $GRAB;	139	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		140
114	if (!$BUTTON_STATE) {	141	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	142	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	143	$grab->update if $grab;
117	$GRAB->update if $GRAB;	144	$GRAB->update if $GRAB;
118		145
		146	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	147	$TOOLTIP_WATCHER->cb->();
120	}	148	}
121	}	149	}
122		150
123	sub feed_sdl_motion_event {	151	sub feed_sdl_motion_event {
124	my ($ev) = @_;	152	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	153	my ($x, $y) = ($ev->{x}, $ev->{y});
126		154
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	155	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		156
129	if ($widget != $HOVER) {	157	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		158
132	$hover->update if $hover && $hover->{can_hover};	159	$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;	160	if $HOVER;
140	}	161	}
141		162
142	# convert position array to integers	163	# convert position array to integers
143	sub harmonize {	164	sub harmonize {
…		…
193	reconfigure_widgets;	214	reconfigure_widgets;
194	}	215	}
195		216
196	#############################################################################	217	#############################################################################
197		218
		219	package CFPlus::UI::Event;
		220
		221	sub xy {
		222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		223	}
		224
		225	#############################################################################
		226
198	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
199		228
200	use strict;	229	use strict;
201		230
202	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
203		232
204	sub new {	233	sub new {
205	my $class = shift;	234	my $class = shift;
206		235
207	my $self = bless {	236	my $self = bless {
…		…
212	h => undef,	241	h => undef,
213	can_events => 1,	242	can_events => 1,
214	@_	243	@_
215	}, $class;	244	}, $class;
216		245
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		247
219	for (keys %$self) {	248	for (keys %$self) {
220	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
222	}	251	}
223	}	252	}
224		253
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$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};	256	$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};	257	$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};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		259
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		262
234	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
239		268
240	sub destroy {	269	sub destroy {
241	my ($self) = @_;	270	my ($self) = @_;
242		271
243	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
244	%$self = ();	274	%$self = ();
245	}	275	}
246		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
247	sub show {	281	sub show {
248	my ($self) = @_;	282	my ($self) = @_;
249		283
250	return if $self->{parent};	284	return if $self->{parent};
251		285
252	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
253	}	287	}
254		288
255	sub set_visible {	289	sub set_visible {
256	my ($self) = @_;	290	my ($self) = @_;
257		291
…		…
278	delete $self->{root};	312	delete $self->{root};
279		313
280	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
282		316
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
285		319
286	$self->emit ("focus_out");	320	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
288	}	322	}
…		…
290	sub set_visibility {	324	sub set_visibility {
291	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
292		326
293	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
294		328
295	$visible ? $self->hide	329	$visible ? $self->show
296	: $self->show;	330	: $self->hide;
297	}	331	}
298		332
299	sub toggle_visibility {	333	sub toggle_visibility {
300	my ($self) = @_;	334	my ($self) = @_;
301		335
…		…
335	sub size_request {	369	sub size_request {
336	require Carp;	370	require Carp;
337	Carp::confess "size_request is abstract";	371	Carp::confess "size_request is abstract";
338	}	372	}
339		373
		374	sub baseline_shift {
		375	0
		376	}
		377
340	sub configure {	378	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
342		380
343	if ($self->{aspect}) {	381	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
345		383
346	$w = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347	$h = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348		386
349	# use alignment to adjust x, y	387	# use alignment to adjust x, y
350		388
351	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
352	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
393		431
394	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
395		433
396	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
397		435
398	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
400	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
401	}	439	}
402	}	440	}
403		441
404	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
405	sub coord2local {	443	sub coord2local {
406	my ($self, $x, $y) = @_;	444	my ($self, $x, $y) = @_;
407		445
		446	Carp::confess unless $self->{parent};#d#
		447
408	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409	}	449	}
410		450
411	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
412	sub coord2global {	452	sub coord2global {
413	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
414		454
		455	Carp::confess unless $self->{parent};#d#
		456
415	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416	}	458	}
417		459
418	sub invoke_focus_in {	460	sub invoke_focus_in {
419	my ($self) = @_;	461	my ($self) = @_;
420		462
421	return if $FOCUS == $self;	463	return if $FOCUS == $self;
422	return unless $self->{can_focus};	464	return unless $self->{can_focus};
423		465
424	my $focus = $FOCUS; $FOCUS = $self;	466	$FOCUS = $self;
425		467
426	$focus->update if $focus;	468	$self->update;
427	$FOCUS->update;
428		469
429	0	470	0
430	}	471	}
431		472
432	sub invoke_focus_out {	473	sub invoke_focus_out {
433	my ($self) = @_;	474	my ($self) = @_;
434		475
435	return unless $FOCUS == $self;	476	return unless $FOCUS == $self;
436		477
437	my $focus = $FOCUS; undef $FOCUS;	478	undef $FOCUS;
438		479
439	$focus->update if $focus; #?	480	$self->update;
440		481
441	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	482	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442	unless $FOCUS;	483	unless $FOCUS;
443		484
444	0	485	0
445	}	486	}
446		487
447	sub grab_focus {	488	sub grab_focus {
448	my ($self) = @_;	489	my ($self) = @_;
449		490
		491	$FOCUS->emit ("focus_out") if $FOCUS;
450	$self->emit ("focus_in");	492	$self->emit ("focus_in");
451	}	493	}
452		494
453	sub invoke_mouse_motion { 1 }	495	sub invoke_mouse_motion { 0 }
454	sub invoke_button_up { 1 }	496	sub invoke_button_up { 0 }
455	sub invoke_key_down { 1 }	497	sub invoke_key_down { 0 }
456	sub invoke_key_up { 1 }	498	sub invoke_key_up { 0 }
		499	sub invoke_mouse_wheel { 0 }
457		500
458	sub invoke_button_down {	501	sub invoke_button_down {
459	my ($self, $ev, $x, $y) = @_;	502	my ($self, $ev, $x, $y) = @_;
460		503
461	$self->grab_focus;	504	$self->grab_focus;
462		505
463	1	506	0
464	}	507	}
465		508
466	sub connect {	509	sub connect {
467	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
468		511
469	push @{ $self->{signal_cb}{$signal} }, $cb;	512	push @{ $self->{signal_cb}{$signal} }, $cb;
		513
		514	defined wantarray and CFPlus::guard {
		515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		516	@{ $self->{signal_cb}{$signal} };
		517	}
470	}	518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
		524	}
		525
		526	my %has_coords = (
		527	button_down => 1,
		528	button_up => 1,
		529	mouse_motion => 1,
		530	mouse_wheel => 1,
		531	);
471		532
472	sub emit {	533	sub emit {
473	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
474		535
475	(List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before	536	# I do not really like this solution, but I do not like duplication
		537	# and needlessly verbose code, either.
		538	my @append
		539	= $has_coords{$signal}
		540	? $args[0]->xy ($self)
		541	: ();
		542
		543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		544
		545	for my $cb (
		546	@{$self->{signal_cb}{$signal} || []}, # before
476	($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
477	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
478	}	554	}
479		555
480	sub find_widget {	556	#sub find_widget {
481	my ($self, $x, $y) = @_;	557	# 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		558
492	sub set_parent {	559	sub set_parent {
493	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
494		561
495	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
496	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
497	}	564	}
498		565
499	sub realloc {	566	sub realloc {
500	my ($self) = @_;	567	my ($self) = @_;
…		…
526		593
527	# using global variables seems a bit hacky, but passing through all drawing	594	# using global variables seems a bit hacky, but passing through all drawing
528	# functions seems pointless.	595	# functions seems pointless.
529	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	596	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
530		597
531	sub draw {	598	#sub draw {
532	my ($self) = @_;	599	#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		600
580	sub _draw {	601	sub _draw {
581	my ($self) = @_;	602	my ($self) = @_;
582		603
583	warn "no draw defined for $self\n";	604	warn "no draw defined for $self\n";
584	}	605	}
585		606
586	sub DESTROY {	607	sub DESTROY {
587	my ($self) = @_;	608	my ($self) = @_;
588		609
589	delete $WIDGET{$self+0};	610	return if CFPlus::in_destruct;
590		611
591	eval { $self->destroy };	612	eval { $self->destroy };
592	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	613	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		614
		615	delete $WIDGET{$self+0};
593	}	616	}
594		617
595	#############################################################################	618	#############################################################################
596		619
597	package CFClient::UI::DrawBG;	620	package CFPlus::UI::DrawBG;
598		621
599	our @ISA = CFClient::UI::Base::;	622	our @ISA = CFPlus::UI::Base::;
600		623
601	use strict;	624	use strict;
602	use CFClient::OpenGL;	625	use CFPlus::OpenGL;
603		626
604	sub new {	627	sub new {
605	my $class = shift;	628	my $class = shift;
606		629
607	# range [value, low, high, page]	630	# range [value, low, high, page]
…		…
638	}	661	}
639	}	662	}
640		663
641	#############################################################################	664	#############################################################################
642		665
643	package CFClient::UI::Empty;	666	package CFPlus::UI::Empty;
644		667
645	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFPlus::UI::Base::;
646		669
647	sub new {	670	sub new {
648	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
649	$class->SUPER::new (can_events => 0, %arg);	672	$class->SUPER::new (can_events => 0, %arg);
650	}	673	}
…		…
657		680
658	sub draw { }	681	sub draw { }
659		682
660	#############################################################################	683	#############################################################################
661		684
662	package CFClient::UI::Container;	685	package CFPlus::UI::Container;
663		686
664	our @ISA = CFClient::UI::Base::;	687	our @ISA = CFPlus::UI::Base::;
665		688
666	sub new {	689	sub new {
667	my ($class, %arg) = @_;	690	my ($class, %arg) = @_;
668		691
669	my $children = delete $arg{children};	692	my $children = delete $arg{children};
…		…
673	can_events => 0,	696	can_events => 0,
674	%arg,	697	%arg,
675	);	698	);
676		699
677	$self->add (@$children)	700	$self->add (@$children)
678	if $children;	701	if $children && @$children;
679		702
680	$self	703	$self
		704	}
		705
		706	sub realloc {
		707	my ($self) = @_;
		708
		709	$self->{force_realloc} = 1;
		710	$self->{force_size_alloc} = 1;
		711	$self->SUPER::realloc;
681	}	712	}
682		713
683	sub add {	714	sub add {
684	my ($self, @widgets) = @_;	715	my ($self, @widgets) = @_;
685		716
686	$_->set_parent ($self)	717	$_->set_parent ($self)
687	for @widgets;	718	for @widgets;
688		719
		720	# TODO: only do this in widgets that need it, e.g. root, fixed
689	use sort 'stable';	721	use sort 'stable';
690		722
691	$self->{children} = [	723	$self->{children} = [
692	sort { $a->{z} <=> $b->{z} }	724	sort { $a->{z} <=> $b->{z} }
693	@{$self->{children}}, @widgets	725	@{$self->{children}}, @widgets
694	];	726	];
695		727
696	$self->realloc;	728	$self->realloc;
		729
		730	map $_+0, @widgets
697	}	731	}
698		732
699	sub children {	733	sub children {
700	@{ $_[0]{children} }	734	@{ $_[0]{children} }
701	}	735	}
…		…
712	}	746	}
713		747
714	sub clear {	748	sub clear {
715	my ($self) = @_;	749	my ($self) = @_;
716		750
717	my $children = delete $self->{children};	751	my $children = $self->{children};
718	$self->{children} = [];	752	$self->{children} = [];
719		753
720	for (@$children) {	754	for (@$children) {
721	delete $_->{parent};	755	delete $_->{parent};
722	$_->hide;	756	$_->hide;
…		…
747	$_->draw for @{$self->{children}};	781	$_->draw for @{$self->{children}};
748	}	782	}
749		783
750	#############################################################################	784	#############################################################################
751		785
752	package CFClient::UI::Bin;	786	package CFPlus::UI::Bin;
753		787
754	our @ISA = CFClient::UI::Container::;	788	our @ISA = CFPlus::UI::Container::;
755		789
756	sub new {	790	sub new {
757	my ($class, %arg) = @_;	791	my ($class, %arg) = @_;
758		792
759	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	793	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
760		794
761	$class->SUPER::new (children => [$child], %arg)	795	$class->SUPER::new (children => [$child], %arg)
762	}	796	}
763		797
764	sub add {	798	sub add {
…		…
771	sub remove {	805	sub remove {
772	my ($self, $widget) = @_;	806	my ($self, $widget) = @_;
773		807
774	$self->SUPER::remove ($widget);	808	$self->SUPER::remove ($widget);
775		809
776	$self->{children} = [new CFClient::UI::Empty]	810	$self->{children} = [new CFPlus::UI::Empty]
777	unless @{$self->{children}};	811	unless @{$self->{children}};
778	}	812	}
779		813
780	sub child { $_[0]->{children}[0] }	814	sub child { $_[0]->{children}[0] }
781		815
…		…
793		827
794	#############################################################################	828	#############################################################################
795		829
796	# back-buffered drawing area	830	# back-buffered drawing area
797		831
798	package CFClient::UI::Window;	832	package CFPlus::UI::Window;
799		833
800	our @ISA = CFClient::UI::Bin::;	834	our @ISA = CFPlus::UI::Bin::;
801		835
802	use CFClient::OpenGL;	836	use CFPlus::OpenGL;
803		837
804	sub new {	838	sub new {
805	my ($class, %arg) = @_;	839	my ($class, %arg) = @_;
806		840
807	my $self = $class->SUPER::new (%arg);	841	my $self = $class->SUPER::new (%arg);
…		…
829	}	863	}
830		864
831	sub render_child {	865	sub render_child {
832	my ($self) = @_;	866	my ($self) = @_;
833		867
834	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	868	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
835	glClearColor 0, 0, 0, 0;	869	glClearColor 0, 0, 0, 0;
836	glClear GL_COLOR_BUFFER_BIT;	870	glClear GL_COLOR_BUFFER_BIT;
837		871
838	{	872	{
839	package CFClient::UI::Base;	873	package CFPlus::UI::Base;
840		874
841	($draw_x, $draw_y, $draw_w, $draw_h) =	875	local ($draw_x, $draw_y, $draw_w, $draw_h) =
842	(0, 0, $self->{w}, $self->{h});	876	(0, 0, $self->{w}, $self->{h});
		877
		878	$self->_render;
843	}	879	}
844
845	$self->_render;
846	};	880	};
847	}	881	}
848		882
849	sub _draw {	883	sub _draw {
850	my ($self) = @_;	884	my ($self) = @_;
851
852	my ($w, $h) = @$self{qw(w h)};
853		885
854	my $tex = $self->{texture}	886	my $tex = $self->{texture}
855	or return;	887	or return;
856		888
857	glEnable GL_TEXTURE_2D;	889	glEnable GL_TEXTURE_2D;
858	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	890	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859	glColor 0, 0, 0, 1;	891	glColor 0, 0, 0, 1;
860		892
861	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	893	$tex->draw_quad_alpha_premultiplied (0, 0);
862		894
863	glDisable GL_TEXTURE_2D;	895	glDisable GL_TEXTURE_2D;
864	}	896	}
865		897
866	#############################################################################	898	#############################################################################
867		899
868	package CFClient::UI::ViewPort;	900	package CFPlus::UI::ViewPort;
869		901
		902	use List::Util qw(min max);
		903
870	our @ISA = CFClient::UI::Window::;	904	our @ISA = CFPlus::UI::Window::;
871		905
872	sub new {	906	sub new {
873	my $class = shift;	907	my $class = shift;
874		908
875	$class->SUPER::new (	909	$class->SUPER::new (
…		…
882	sub size_request {	916	sub size_request {
883	my ($self) = @_;	917	my ($self) = @_;
884		918
885	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	919	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
886		920
887	$w = 10 if $self->{scroll_x};	921	$w = 1 if $self->{scroll_x};
888	$h = 10 if $self->{scroll_y};	922	$h = 1 if $self->{scroll_y};
889		923
890	($w, $h)	924	($w, $h)
891	}	925	}
892		926
893	sub invoke_size_allocate {	927	sub invoke_size_allocate {
…		…
905	}	939	}
906		940
907	sub set_offset {	941	sub set_offset {
908	my ($self, $x, $y) = @_;	942	my ($self, $x, $y) = @_;
909		943
		944	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		945	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		946
		947	if ($x != $self->{view_x} or $y != $self->{view_y}) {
910	$self->{view_x} = int $x;	948	$self->{view_x} = $x;
911	$self->{view_y} = int $y;	949	$self->{view_y} = $y;
912		950
		951	$self->emit (changed => $x, $y);
913	$self->update;	952	$self->update;
		953	}
914	}	954	}
915		955
916	# hmm, this does not work for topleft of $self... but we should not ask for that	956	# hmm, this does not work for topleft of $self... but we should not ask for that
917	sub coord2local {	957	sub coord2local {
918	my ($self, $x, $y) = @_;	958	my ($self, $x, $y) = @_;
…		…
933	my ($self, $x, $y) = @_;	973	my ($self, $x, $y) = @_;
934		974
935	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	975	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
936	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	976	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
937	) {	977	) {
938	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	978	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
939	} else {	979	} else {
940	$self->CFClient::UI::Base::find_widget ($x, $y)	980	$self->CFPlus::UI::Base::find_widget ($x, $y)
941	}	981	}
942	}	982	}
943		983
944	sub _render {	984	sub _render {
945	my ($self) = @_;	985	my ($self) = @_;
946		986
947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	987	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};	988	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
949		989
950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	990	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
951		991
952	$self->SUPER::_render;	992	$self->SUPER::_render;
953	}	993	}
954		994
955	#############################################################################	995	#############################################################################
956		996
957	package CFClient::UI::ScrolledWindow;	997	package CFPlus::UI::ScrolledWindow;
958		998
959	our @ISA = CFClient::UI::HBox::;	999	our @ISA = CFPlus::UI::Table::;
960		1000
961	sub new {	1001	sub new {
962	my ($class, %arg) = @_;	1002	my ($class, %arg) = @_;
963		1003
964	my $child = delete $arg{child};	1004	my $child = delete $arg{child};
965		1005
966	my $self;	1006	my $self;
967		1007
968	my $slider = new CFClient::UI::Slider	1008	my $hslider = new CFPlus::UI::Slider
		1009	col => 0,
		1010	row => 1,
		1011	vertical => 0,
		1012	range => [0, 0, 1, 0.01], # HACK fix
		1013	on_changed => sub {
		1014	$self->{hpos} = $_[1];
		1015	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1016	},
		1017	;
		1018
		1019	my $vslider = new CFPlus::UI::Slider
		1020	col => 1,
		1021	row => 0,
969	vertical => 1,	1022	vertical => 1,
970	range => [0, 0, 1, 0.01], # HACK fix	1023	range => [0, 0, 1, 0.01], # HACK fix
971	on_changed => sub {	1024	on_changed => sub {
972	$self->{vp}->set_offset (0, $_[1]);	1025	$self->{vpos} = $_[1];
		1026	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
973	},	1027	},
974	;	1028	;
975		1029
976	$self = $class->SUPER::new (	1030	$self = $class->SUPER::new (
977	vp => (new CFClient::UI::ViewPort expand => 1),	1031	scroll_x => 0,
		1032	scroll_y => 1,
		1033	can_events => 1,
978	slider => $slider,	1034	hslider => $hslider,
		1035	vslider => $vslider,
		1036	col_expand => [1, 0],
		1037	row_expand => [1, 0],
979	%arg,	1038	%arg,
980	);	1039	);
981		1040
		1041	$self->{vp} = new CFPlus::UI::ViewPort
		1042	col => 0,
		1043	row => 0,
		1044	expand => 1,
		1045	scroll_x => $self->{scroll_x},
		1046	scroll_y => $self->{scroll_y},
		1047	on_changed => sub {
		1048	my ($vp, $x, $y) = @_;
		1049
		1050	$vp->{parent}{hslider}->set_value ($x);
		1051	$vp->{parent}{vslider}->set_value ($y);
		1052
		1053	0
		1054	},
		1055	on_size_allocate => sub {
		1056	my ($vp, $w, $h) = @_;
		1057	$vp->{parent}->update_slider;
		1058	0
		1059	},
		1060	;
		1061
982	$self->SUPER::add ($self->{vp}, $self->{slider});	1062	$self->SUPER::add ($self->{vp});
		1063
983	$self->add ($child) if $child;	1064	$self->add ($child) if $child;
984		1065
985	$self	1066	$self
986	}	1067	}
987		1068
…		…
989	my ($self, $widget) = @_;	1070	my ($self, $widget) = @_;
990		1071
991	$self->{vp}->add ($self->{child} = $widget);	1072	$self->{vp}->add ($self->{child} = $widget);
992	}	1073	}
993		1074
994	sub update {	1075	sub update_slider {
		1076	my ($self) = @_;
		1077
		1078	my $child = ($self->{vp} or return)->child;
		1079
		1080	if ($self->{scroll_x}) {
		1081	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1082	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1083
		1084	my $visible = $w1 > $w2;
		1085	if ($visible != $self->{hslider_visible}) {
		1086	$self->{hslider_visible} = $visible;
		1087	$visible ? $self->SUPER::add ($self->{hslider})
		1088	: $self->SUPER::remove ($self->{hslider});
		1089	}
		1090	}
		1091
		1092	if ($self->{scroll_y}) {
		1093	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1094	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1095
		1096	my $visible = $h1 > $h2;
		1097	if ($visible != $self->{vslider_visible}) {
		1098	$self->{vslider_visible} = $visible;
		1099	$visible ? $self->SUPER::add ($self->{vslider})
		1100	: $self->SUPER::remove ($self->{vslider});
		1101	}
		1102	}
		1103	}
		1104
		1105	sub start_dragging {
995	my ($self) = @_;	1106	my ($self, $ev) = @_;
996		1107
997	$self->SUPER::update;	1108	$self->grab_focus;
998		1109
999	# todo: overwrite size_allocate of child	1110	my $ox = $self->{vp}{view_x};
1000	my $child = $self->{vp}->child;	1111	my $oy = $self->{vp}{view_y};
1001	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1112
		1113	$self->{motion} = sub {
		1114	my ($ev, $x, $y) = @_;
		1115
		1116	$ox -= $ev->{xrel};
		1117	$oy -= $ev->{yrel};
		1118
		1119	$self->{vp}->set_offset ($ox, $oy);
		1120	};
		1121	}
		1122
		1123	sub invoke_mouse_wheel {
		1124	my ($self, $ev) = @_;
		1125
		1126	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1127	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1128
		1129	1
		1130	}
		1131
		1132	sub invoke_button_down {
		1133	my ($self, $ev, $x, $y) = @_;
		1134
		1135	if ($ev->{button} == 2) {
		1136	$self->start_dragging ($ev);
		1137	return 1;
		1138	}
		1139
		1140	0
		1141	}
		1142
		1143	sub invoke_button_up {
		1144	my ($self, $ev, $x, $y) = @_;
		1145
		1146	if (delete $self->{motion}) {
		1147	return 1;
		1148	}
		1149
		1150	0
		1151	}
		1152
		1153	sub invoke_mouse_motion {
		1154	my ($self, $ev, $x, $y) = @_;
		1155
		1156	if ($self->{motion}) {
		1157	$self->{motion}->($ev, $x, $y);
		1158	return 1;
		1159	}
		1160
		1161	0
1002	}	1162	}
1003		1163
1004	sub invoke_size_allocate {	1164	sub invoke_size_allocate {
1005	my ($self, $w, $h) = @_;	1165	my ($self, $w, $h) = @_;
1006		1166
1007	my $child = $self->{vp}->child;	1167	$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)	1168	$self->SUPER::invoke_size_allocate ($w, $h)
1011	}	1169	}
1012		1170
1013	#TODO# update range on size_allocate depending on child
1014	# update viewport offset on scroll
1015
1016	#############################################################################	1171	#############################################################################
1017		1172
1018	package CFClient::UI::Frame;	1173	package CFPlus::UI::Frame;
1019		1174
1020	our @ISA = CFClient::UI::Bin::;	1175	our @ISA = CFPlus::UI::Bin::;
1021		1176
1022	use CFClient::OpenGL;	1177	use CFPlus::OpenGL;
1023		1178
1024	sub new {	1179	sub new {
1025	my $class = shift;	1180	my $class = shift;
1026		1181
1027	$class->SUPER::new (	1182	$class->SUPER::new (
…		…
1053	$self->SUPER::_draw;	1208	$self->SUPER::_draw;
1054	}	1209	}
1055		1210
1056	#############################################################################	1211	#############################################################################
1057		1212
1058	package CFClient::UI::FancyFrame;	1213	package CFPlus::UI::FancyFrame;
1059		1214
1060	our @ISA = CFClient::UI::Bin::;	1215	our @ISA = CFPlus::UI::Bin::;
1061		1216
1062	use CFClient::OpenGL;	1217	use CFPlus::OpenGL;
		1218
		1219	sub new {
		1220	my ($class, %arg) = @_;
		1221
		1222	if ((exists $arg{label}) && !ref $arg{label}) {
		1223	$arg{label} = new CFPlus::UI::Label
		1224	align => 1,
		1225	valign => 0,
		1226	text => $arg{label},
		1227	fontsize => ($arg{border} || 0.8) * 0.75;
		1228	}
		1229
		1230	my $self = $class->SUPER::new (
		1231	# label => "",
		1232	fg => [0.6, 0.3, 0.1],
		1233	border => 0.8,
		1234	style => 'single',
		1235	%arg,
		1236	);
		1237
		1238	$self
		1239	}
		1240
		1241	sub add {
		1242	my ($self, @widgets) = @_;
		1243
		1244	$self->SUPER::add (@widgets);
		1245	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1246	}
		1247
		1248	sub border {
		1249	int $_[0]{border} * $::FONTSIZE
		1250	}
		1251
		1252	sub size_request {
		1253	my ($self) = @_;
		1254
		1255	($self->{label_w}, undef) = $self->{label}->size_request
		1256	if $self->{label};
		1257
		1258	my ($w, $h) = $self->SUPER::size_request;
		1259
		1260	(
		1261	$w + $self->border * 2,
		1262	$h + $self->border * 2,
		1263	)
		1264	}
		1265
		1266	sub invoke_size_allocate {
		1267	my ($self, $w, $h) = @_;
		1268
		1269	my $border = $self->border;
		1270
		1271	$w -= List::Util::max 0, $border * 2;
		1272	$h -= List::Util::max 0, $border * 2;
		1273
		1274	if (my $label = $self->{label}) {
		1275	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1276	$label->{h} = List::Util::min $h, $border;
		1277	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1278	}
		1279
		1280	$self->child->configure ($border, $border, $w, $h);
		1281
		1282	1
		1283	}
		1284
		1285	sub _draw {
		1286	my ($self) = @_;
		1287
		1288	my $child = $self->{children}[0];
		1289
		1290	my $border = $self->border;
		1291	my ($w, $h) = ($self->{w}, $self->{h});
		1292
		1293	$child->draw;
		1294
		1295	glColor @{$self->{fg}};
		1296	glBegin GL_LINE_STRIP;
		1297	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1298	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1299	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1300	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1301	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1302	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1303	glEnd;
		1304
		1305	if ($self->{label}) {
		1306	glTranslate $border * 2, 0;
		1307	$self->{label}->_draw;
		1308	}
		1309	}
		1310
		1311	#############################################################################
		1312
		1313	package CFPlus::UI::Toplevel;
		1314
		1315	our @ISA = CFPlus::UI::Bin::;
		1316
		1317	use CFPlus::OpenGL;
1063		1318
1064	my $bg =	1319	my $bg =
1065	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1320	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1066	mipmap => 1, wrap => 1;	1321	mipmap => 1, wrap => 1;
1067		1322
1068	my @border =	1323	my @border =
1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1324	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);	1325	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1326
		1327	my @icon =
		1328	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1329	qw(x1_move.png x1_resize.png);
1071		1330
1072	sub new {	1331	sub new {
1073	my ($class, %arg) = @_;	1332	my ($class, %arg) = @_;
1074		1333
1075	my $self = $class->SUPER::new (	1334	my $self = $class->SUPER::new (
1076	bg => [1, 1, 1, 1],	1335	bg => [1, 1, 1, 1],
1077	border_bg => [1, 1, 1, 1],	1336	border_bg => [1, 1, 1, 1],
1078	border => 0.6,	1337	border => 0.6,
1079	can_events => 1,	1338	can_events => 1,
1080	min_w => 16,	1339	min_w => 64,
1081	min_h => 16,	1340	min_h => 32,
1082	%arg,	1341	%arg,
1083	);	1342	);
1084		1343
1085	$self->{title_widget} = new CFClient::UI::Label	1344	$self->{title_widget} = new CFPlus::UI::Label
1086	align => 0,	1345	align => 0,
1087	valign => 1,	1346	valign => 1,
1088	text => $self->{title},	1347	text => $self->{title},
1089	fontsize => $self->{border},	1348	fontsize => $self->{border},
1090	if exists $self->{title};	1349	if exists $self->{title};
1091		1350
1092	if ($self->{has_close_button}) {	1351	if ($self->{has_close_button}) {
1093	$self->{close_button} =	1352	$self->{close_button} =
1094	new CFClient::UI::ImageButton	1353	new CFPlus::UI::ImageButton
1095	image => 'x1_close.png',	1354	path => 'x1_close.png',
1096	on_activate => sub { $self->hide };	1355	on_activate => sub { $self->emit ("delete") };
1097		1356
1098	$self->CFClient::UI::Container::add ($self->{close_button});	1357	$self->CFPlus::UI::Container::add ($self->{close_button});
1099	}	1358	}
1100		1359
1101	$self	1360	$self
1102	}	1361	}
1103		1362
1104	sub add {	1363	sub add {
1105	my ($self, @widgets) = @_;	1364	my ($self, @widgets) = @_;
1106		1365
1107	$self->SUPER::add (@widgets);	1366	$self->SUPER::add (@widgets);
1108	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1367	$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};	1368	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1110	}	1369	}
1111		1370
1112	sub border {	1371	sub border {
1113	int $_[0]{border} * $::FONTSIZE	1372	int $_[0]{border} * $::FONTSIZE
1114	}	1373	}
…		…
1147	$self->child->configure ($border, $border, $w, $h);	1406	$self->child->configure ($border, $border, $w, $h);
1148		1407
1149	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1408	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150	if $self->{close_button};	1409	if $self->{close_button};
1151		1410
		1411	1
		1412	}
		1413
		1414	sub invoke_delete {
		1415	my ($self) = @_;
		1416
		1417	$self->hide;
		1418
1152	1	1419	1
1153	}	1420	}
1154		1421
1155	sub invoke_button_down {	1422	sub invoke_button_down {
1156	my ($self, $ev, $x, $y) = @_;	1423	my ($self, $ev, $x, $y) = @_;
…		…
1214	$self->{motion}->($ev, $x, $y) if $self->{motion};	1481	$self->{motion}->($ev, $x, $y) if $self->{motion};
1215		1482
1216	! ! $self->{motion}	1483	! ! $self->{motion}
1217	}	1484	}
1218		1485
		1486	sub invoke_visibility_change {
		1487	my ($self, $visible) = @_;
		1488
		1489	delete $self->{motion} unless $visible;
		1490
		1491	0
		1492	}
		1493
1219	sub _draw {	1494	sub _draw {
1220	my ($self) = @_;	1495	my ($self) = @_;
1221		1496
1222	my $child = $self->{children}[0];	1497	my $child = $self->{children}[0];
1223		1498
…		…
1228	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1503	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1229		1504
1230	my $border = $self->border;	1505	my $border = $self->border;
1231		1506
1232	glColor @{ $self->{border_bg} };	1507	glColor @{ $self->{border_bg} };
1233	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1508	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1234	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1509	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1235	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1510	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1236	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1511	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1512
		1513	# move
		1514	my $w2 = ($w - $border) * .5;
		1515	my $h2 = ($h - $border) * .5;
		1516	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1517	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1518	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1519
		1520	# resize
		1521	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1522	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1523	unless $self->{has_close_button};
		1524	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1525	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1237		1526
1238	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1527	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1239	glColor @{ $self->{bg} };	1528	glColor @{ $self->{bg} };
1240		1529
1241	# TODO: repeat texture not scale	1530	# TODO: repeat texture not scale
…		…
1260	if $self->{close_button};	1549	if $self->{close_button};
1261	}	1550	}
1262		1551
1263	#############################################################################	1552	#############################################################################
1264		1553
1265	package CFClient::UI::Table;	1554	package CFPlus::UI::Table;
1266		1555
1267	our @ISA = CFClient::UI::Base::;	1556	our @ISA = CFPlus::UI::Container::;
1268		1557
1269	use List::Util qw(max sum);	1558	use List::Util qw(max sum);
1270		1559
1271	use CFClient::OpenGL;	1560	use CFPlus::OpenGL;
1272		1561
1273	sub new {	1562	sub new {
1274	my $class = shift;	1563	my $class = shift;
1275		1564
1276	$class->SUPER::new (	1565	$class->SUPER::new (
1277	col_expand => [],	1566	col_expand => [],
		1567	row_expand => [],
1278	@_,	1568	@_,
1279	)	1569	)
1280	}	1570	}
1281		1571
1282	sub children {
1283	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1284	}
1285
1286	sub add {	1572	sub add {
1287	my ($self, $x, $y, $child) = @_;	1573	my ($self, @widgets) = @_;
1288		1574
1289	$child->set_parent ($self);	1575	for my $child (@widgets) {
1290	$self->{children}[$y][$x] = $child;	1576	$child->{rowspan} ||= 1;
		1577	$child->{colspan} ||= 1;
		1578	}
1291		1579
1292	$self->realloc;	1580	$self->SUPER::add (@widgets);
1293	}	1581	}
1294		1582
1295	sub remove {	1583	sub add_at {
		1584	my $self = shift;
		1585
		1586	my @widgets;
		1587
		1588	while (@_) {
		1589	my ($col, $row, $child) = splice @_, 0, 3, ();
		1590
		1591	$child->{row} = $row;
		1592	$child->{col} = $col;
		1593
		1594	push @widgets, $child;
		1595	}
		1596
		1597	$self->add (@widgets);
		1598	}
		1599
		1600	sub get_wh {
1296	my ($self, $child) = @_;	1601	my ($self) = @_;
1297		1602
1298	# TODO: not yet implemented	1603	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		1604
1305	my @children = $self->children;	1605	my @children = $self->children;
1306	delete $self->{children};	1606
		1607	# first pass, columns
		1608	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1609	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1610
		1611	my $sw = sum @w[$c .. $c + $cs - 1];
		1612
		1613	if ($w > $sw) {
		1614	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1615	}
1307		1616	}
1308	for (@children) {
1309	delete $_->{parent};
1310	$_->hide;
1311	}
1312		1617
1313	$self->realloc;	1618	# second pass, rows
1314	}	1619	for my $widget (sort { $a->{rowspan} <=> $b->{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)};	1620	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1329		1621
1330	$w[$x] = max $w[$x], $w;	1622	my $sh = sum @h[$r .. $r + $rs - 1];
1331	$h[$y] = max $h[$y], $h;	1623
		1624	if ($h > $sh) {
		1625	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1332	}	1626	}
1333	}	1627	}
1334		1628
1335	(\@w, \@h)	1629	(\@w, \@h)
1336	}	1630	}
…		…
1352	my ($ws, $hs) = $self->get_wh;	1646	my ($ws, $hs) = $self->get_wh;
1353		1647
1354	my $req_w = (sum @$ws) || 1;	1648	my $req_w = (sum @$ws) || 1;
1355	my $req_h = (sum @$hs) || 1;	1649	my $req_h = (sum @$hs) || 1;
1356		1650
1357	# TODO: nicer code && do row_expand	1651	# now linearly scale the rows/columns to the allocated size
1358	my @col_expand = @{$self->{col_expand}};	1652	my @col_expand = @{$self->{col_expand}};
1359	@col_expand = (1) x @$ws unless @col_expand;	1653	@col_expand = (1) x @$ws unless @col_expand;
1360	my $col_expand = (sum @col_expand) || 1;	1654	my $col_expand = (sum @col_expand) || 1;
1361		1655
1362	# linearly scale sizes
1363	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1656	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1364	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1365		1657
1366	CFClient::UI::harmonize $ws;	1658	CFPlus::UI::harmonize $ws;
		1659
		1660	my @row_expand = @{$self->{row_expand}};
		1661	@row_expand = (1) x @$ws unless @row_expand;
		1662	my $row_expand = (sum @row_expand) || 1;
		1663
		1664	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1665
1367	CFClient::UI::harmonize $hs;	1666	CFPlus::UI::harmonize $hs;
1368		1667
1369	my $y;	1668	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1669	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1370		1670
1371	for my $r (0 .. $#{$self->{children}}) {	1671	for my $widget ($self->children) {
1372	my $row = $self->{children}[$r]	1672	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1373	or next;
1374		1673
1375	my $x = 0;	1674	$widget->configure (
1376	my $row_h = $hs->[$r];	1675	$x[$c], $y[$r],
		1676	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1377		1677	);
1378	for my $c (0 .. $#$row) {	1678	}
1379	my $col_w = $ws->[$c];
1380		1679
1381	if (my $widget = $row->[$c]) {	1680	1
1382	$widget->configure ($x, $y, $col_w, $row_h);	1681	}
1383	}
1384		1682
1385	$x += $col_w;	1683	#############################################################################
		1684
		1685	package CFPlus::UI::Fixed;
		1686
		1687	use List::Util qw(min max);
		1688
		1689	our @ISA = CFPlus::UI::Container::;
		1690
		1691	sub add_fixed {
		1692	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1693
		1694	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1695	$self->SUPER::add ($child);
		1696	}
		1697
		1698	sub _scale($$$) {
		1699	my ($mode, $val, $max) = @_;
		1700
		1701	$mode eq "abs" ? $val
		1702	: $mode eq "rel" ? $val * $max
		1703	: 0
		1704	}
		1705
		1706	sub size_request {
		1707	my ($self) = @_;
		1708
		1709	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1710
		1711	# determine overall size by querying abs widgets
		1712	for my $child ($self->visible_children) {
		1713	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1714
		1715	if ($pos eq "abs") {
		1716	$w = _scale $size, $w, $child->{req_w};
		1717	$h = _scale $size, $h, $child->{req_h};
		1718
		1719	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1720	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1386	}	1721	}
		1722	}
1387		1723
1388	$y += $row_h;	1724	my $W = $x2 - $x1;
		1725	my $H = $y2 - $y1;
		1726
		1727	# now layout remaining widgets
		1728	for my $child ($self->visible_children) {
		1729	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1730
		1731	if ($pos ne "abs") {
		1732	$x = _scale $pos, $x, $W;
		1733	$y = _scale $pos, $x, $H;
		1734	$w = _scale $size, $w, $child->{req_w};
		1735	$h = _scale $size, $h, $child->{req_h};
		1736
		1737	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1738	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1739	}
		1740	}
		1741
		1742	my $W = $x2 - $x1;
		1743	my $H = $y2 - $y1;
		1744
		1745	($W, $H)
		1746	}
		1747
		1748	sub invoke_size_allocate {
		1749	my ($self, $W, $H) = @_;
		1750
		1751	for my $child ($self->visible_children) {
		1752	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1753
		1754	$x = _scale $pos, $x, $W;
		1755	$y = _scale $pos, $x, $H;
		1756	$w = _scale $size, $w, $W;
		1757	$h = _scale $size, $h, $H;
		1758
		1759	$child->configure ($x, $y, $w, $h);
1389	}	1760	}
1390		1761
1391	1	1762	1
1392	}	1763	}
1393		1764
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	#############################################################################	1765	#############################################################################
1419		1766
1420	package CFClient::UI::Box;	1767	package CFPlus::UI::Box;
1421		1768
1422	our @ISA = CFClient::UI::Container::;	1769	our @ISA = CFPlus::UI::Container::;
1423		1770
1424	sub size_request {	1771	sub size_request {
1425	my ($self) = @_;	1772	my ($self) = @_;
1426		1773
1427	$self->{vertical}	1774	$self->{vertical}
…		…
1437		1784
1438	sub invoke_size_allocate {	1785	sub invoke_size_allocate {
1439	my ($self, $w, $h) = @_;	1786	my ($self, $w, $h) = @_;
1440		1787
1441	my $space = $self->{vertical} ? $h : $w;	1788	my $space = $self->{vertical} ? $h : $w;
1442	my $children = $self->{children};	1789	my @children = $self->visible_children;
1443		1790
1444	my @req;	1791	my @req;
1445		1792
1446	if ($self->{homogeneous}) {	1793	if ($self->{homogeneous}) {
1447	@req = ($space / (@$children || 1)) x @$children;	1794	@req = ($space / (@children || 1)) x @children;
1448	} else {	1795	} else {
1449	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1796	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450	my $req = List::Util::sum @req;	1797	my $req = List::Util::sum @req;
1451		1798
1452	if ($req > $space) {	1799	if ($req > $space) {
1453	# ah well, not enough space	1800	# ah well, not enough space
1454	$_ *= $space / $req for @req;	1801	$_ *= $space / $req for @req;
1455	} else {	1802	} else {
1456	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1803	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457		1804
1458	$space = ($space - $req) / $expand; # remaining space to give away	1805	$space = ($space - $req) / $expand; # remaining space to give away
1459		1806
1460	$req[$_] += $space * $children->[$_]{expand}	1807	$req[$_] += $space * $children[$_]{expand}
1461	for 0 .. $#$children;	1808	for 0 .. $#children;
1462	}	1809	}
1463	}	1810	}
1464		1811
1465	CFClient::UI::harmonize \@req;	1812	CFPlus::UI::harmonize \@req;
1466		1813
1467	my $pos = 0;	1814	my $pos = 0;
1468	for (0 .. $#$children) {	1815	for (0 .. $#children) {
1469	my $alloc = $req[$_];	1816	my $alloc = $req[$_];
1470	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1817	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471		1818
1472	$pos += $alloc;	1819	$pos += $alloc;
1473	}	1820	}
1474		1821
1475	1	1822	1
1476	}	1823	}
1477		1824
1478	#############################################################################	1825	#############################################################################
1479		1826
1480	package CFClient::UI::HBox;	1827	package CFPlus::UI::HBox;
1481		1828
1482	our @ISA = CFClient::UI::Box::;	1829	our @ISA = CFPlus::UI::Box::;
1483		1830
1484	sub new {	1831	sub new {
1485	my $class = shift;	1832	my $class = shift;
1486		1833
1487	$class->SUPER::new (	1834	$class->SUPER::new (
…		…
1490	)	1837	)
1491	}	1838	}
1492		1839
1493	#############################################################################	1840	#############################################################################
1494		1841
1495	package CFClient::UI::VBox;	1842	package CFPlus::UI::VBox;
1496		1843
1497	our @ISA = CFClient::UI::Box::;	1844	our @ISA = CFPlus::UI::Box::;
1498		1845
1499	sub new {	1846	sub new {
1500	my $class = shift;	1847	my $class = shift;
1501		1848
1502	$class->SUPER::new (	1849	$class->SUPER::new (
…		…
1505	)	1852	)
1506	}	1853	}
1507		1854
1508	#############################################################################	1855	#############################################################################
1509		1856
1510	package CFClient::UI::Label;	1857	package CFPlus::UI::Label;
1511		1858
1512	our @ISA = CFClient::UI::DrawBG::;	1859	our @ISA = CFPlus::UI::DrawBG::;
1513		1860
1514	use CFClient::OpenGL;	1861	use CFPlus::OpenGL;
1515		1862
1516	sub new {	1863	sub new {
1517	my ($class, %arg) = @_;	1864	my ($class, %arg) = @_;
1518		1865
1519	my $self = $class->SUPER::new (	1866	my $self = $class->SUPER::new (
…		…
1522	#active_bg => none	1869	#active_bg => none
1523	#font => default_font	1870	#font => default_font
1524	#text => initial text	1871	#text => initial text
1525	#markup => initial narkup	1872	#markup => initial narkup
1526	#max_w => maximum pixel width	1873	#max_w => maximum pixel width
		1874	#style => 0, # render flags
1527	ellipsise => 3, # end	1875	ellipsise => 3, # end
1528	layout => (new CFClient::Layout),	1876	layout => (new CFPlus::Layout),
1529	fontsize => 1,	1877	fontsize => 1,
1530	align => -1,	1878	align => -1,
1531	valign => -1,	1879	valign => -1,
1532	padding_x => 2,	1880	padding_x => 2,
1533	padding_y => 2,	1881	padding_y => 2,
1534	can_events => 0,	1882	can_events => 0,
1535	%arg	1883	%arg
1536	);	1884	);
1537		1885
1538	if (exists $self->{template}) {	1886	if (exists $self->{template}) {
1539	my $layout = new CFClient::Layout;	1887	my $layout = new CFPlus::Layout;
1540	$layout->set_text (delete $self->{template});	1888	$layout->set_text (delete $self->{template});
1541	$self->{template} = $layout;	1889	$self->{template} = $layout;
1542	}	1890	}
1543		1891
1544	if (exists $self->{markup}) {	1892	if (exists $self->{markup}) {
…		…
1548	}	1896	}
1549		1897
1550	$self	1898	$self
1551	}	1899	}
1552		1900
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 {	1901	sub update {
1564	my ($self) = @_;	1902	my ($self) = @_;
1565		1903
1566	delete $self->{texture};	1904	delete $self->{texture};
1567	$self->SUPER::update;	1905	$self->SUPER::update;
…		…
1578	my ($self, $text) = @_;	1916	my ($self, $text) = @_;
1579		1917
1580	return if $self->{text} eq "T$text";	1918	return if $self->{text} eq "T$text";
1581	$self->{text} = "T$text";	1919	$self->{text} = "T$text";
1582		1920
1583	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584	$self->{layout}->set_text ($text);	1921	$self->{layout}->set_text ($text);
1585		1922
1586	delete $self->{size_req};	1923	delete $self->{size_req};
1587	$self->realloc;	1924	$self->realloc;
1588	$self->update;	1925	$self->update;
…		…
1594	return if $self->{text} eq "M$markup";	1931	return if $self->{text} eq "M$markup";
1595	$self->{text} = "M$markup";	1932	$self->{text} = "M$markup";
1596		1933
1597	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1934	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598		1935
1599	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600	$self->{layout}->set_markup ($markup);	1936	$self->{layout}->set_markup ($markup);
1601		1937
1602	delete $self->{size_req};	1938	delete $self->{size_req};
1603	$self->realloc;	1939	$self->realloc;
1604	$self->update;	1940	$self->update;
…		…
1616		1952
1617	my ($w, $h) = $self->{layout}->size;	1953	my ($w, $h) = $self->{layout}->size;
1618		1954
1619	if (exists $self->{template}) {	1955	if (exists $self->{template}) {
1620	$self->{template}->set_font ($self->{font}) if $self->{font};	1956	$self->{template}->set_font ($self->{font}) if $self->{font};
		1957	$self->{template}->set_width ($self->{max_w} || -1);
1621	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1958	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622		1959
1623	my ($w2, $h2) = $self->{template}->size;	1960	my ($w2, $h2) = $self->{template}->size;
1624		1961
1625	$w = List::Util::max $w, $w2;	1962	$w = List::Util::max $w, $w2;
…		…
1630	};	1967	};
1631		1968
1632	@{ $self->{size_req} }	1969	@{ $self->{size_req} }
1633	}	1970	}
1634		1971
		1972	sub baseline_shift {
		1973	$_[0]{layout}->descent
		1974	}
		1975
1635	sub invoke_size_allocate {	1976	sub invoke_size_allocate {
1636	my ($self, $w, $h) = @_;	1977	my ($self, $w, $h) = @_;
1637		1978
1638	delete $self->{ox};	1979	delete $self->{ox};
1639		1980
…		…
1645		1986
1646	sub set_fontsize {	1987	sub set_fontsize {
1647	my ($self, $fontsize) = @_;	1988	my ($self, $fontsize) = @_;
1648		1989
1649	$self->{fontsize} = $fontsize;	1990	$self->{fontsize} = $fontsize;
		1991	delete $self->{size_req};
1650	delete $self->{texture};	1992	delete $self->{texture};
1651		1993
1652	$self->realloc;	1994	$self->realloc;
1653	}	1995	}
1654		1996
1655	sub reconfigure {	1997	sub reconfigure {
1656	my ($self) = @_;	1998	my ($self) = @_;
1657		1999
1658	delete $self->{size_req};	2000	delete $self->{size_req};
		2001	delete $self->{texture};
1659		2002
1660	$self->SUPER::reconfigure;	2003	$self->SUPER::reconfigure;
1661	}	2004	}
1662		2005
1663	sub _draw {	2006	sub _draw {
1664	my ($self) = @_;	2007	my ($self) = @_;
1665		2008
1666	$self->SUPER::_draw; # draw background, if applicable	2009	$self->SUPER::_draw; # draw background, if applicable
1667		2010
1668	my $tex = $self->{texture} ||= do {	2011	my $size = $self->{texture} ||= do {
1669	$self->{layout}->set_foreground (@{$self->{fg}});	2012	$self->{layout}->set_foreground (@{$self->{fg}});
1670	$self->{layout}->set_font ($self->{font}) if $self->{font};	2013	$self->{layout}->set_font ($self->{font}) if $self->{font};
1671	$self->{layout}->set_width ($self->{w});	2014	$self->{layout}->set_width ($self->{w});
1672	$self->{layout}->set_ellipsise ($self->{ellipsise});	2015	$self->{layout}->set_ellipsise ($self->{ellipsise});
1673	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2016	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2017	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675		2018
1676	new_from_layout CFClient::Texture $self->{layout}	2019	[$self->{layout}->size]
1677	};	2020	};
1678		2021
1679	unless (exists $self->{ox}) {	2022	unless (exists $self->{ox}) {
1680	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2023	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2024	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682	: ($self->{w} - $tex->{w}) * 0.5);	2025	: ($self->{w} - $size->[0]) * 0.5);
1683		2026
1684	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2027	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2028	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686	: ($self->{h} - $tex->{h}) * 0.5);	2029	: ($self->{h} - $size->[1]) * 0.5);
1687	};	2030	};
1688		2031
1689	glEnable GL_TEXTURE_2D;	2032	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1690
1691	my $w = List::Util::min $self->{w} + 4, $tex->{w};
1692	my $h = List::Util::min $self->{h} + 2, $tex->{h};
1693
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	}
1702
1703	glDisable GL_TEXTURE_2D;
1704	}	2033	}
1705		2034
1706	#############################################################################	2035	#############################################################################
1707		2036
1708	package CFClient::UI::EntryBase;	2037	package CFPlus::UI::EntryBase;
1709		2038
1710	our @ISA = CFClient::UI::Label::;	2039	our @ISA = CFPlus::UI::Label::;
1711		2040
1712	use CFClient::OpenGL;	2041	use CFPlus::OpenGL;
1713		2042
1714	sub new {	2043	sub new {
1715	my $class = shift;	2044	my $class = shift;
1716		2045
1717	$class->SUPER::new (	2046	$class->SUPER::new (
…		…
1721	active_fg => [0, 0, 0],	2050	active_fg => [0, 0, 0],
1722	can_hover => 1,	2051	can_hover => 1,
1723	can_focus => 1,	2052	can_focus => 1,
1724	valign => 0,	2053	valign => 0,
1725	can_events => 1,	2054	can_events => 1,
		2055	ellipsise => 0,
1726	#text => ...	2056	#text => ...
1727	#hidden => "*",	2057	#hidden => "*",
1728	@_	2058	@_
1729	)	2059	)
1730	}	2060	}
…		…
1775	my $sym = $ev->{sym};	2105	my $sym = $ev->{sym};
1776	my $uni = $ev->{unicode};	2106	my $uni = $ev->{unicode};
1777		2107
1778	my $text = $self->get_text;	2108	my $text = $self->get_text;
1779		2109
		2110	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2111
1780	if ($uni == 8) {	2112	if ($uni == 8) {
1781	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2113	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1782	} elsif ($uni == 127) {	2114	} elsif ($uni == 127) {
1783	substr $text, $self->{cursor}, 1, "";	2115	substr $text, $self->{cursor}, 1, "";
1784	} elsif ($sym == CFClient::SDLK_LEFT) {	2116	} elsif ($sym == CFPlus::SDLK_LEFT) {
1785	--$self->{cursor} if $self->{cursor};	2117	--$self->{cursor} if $self->{cursor};
1786	} elsif ($sym == CFClient::SDLK_RIGHT) {	2118	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1787	++$self->{cursor} if $self->{cursor} < length $self->{text};	2119	++$self->{cursor} if $self->{cursor} < length $self->{text};
1788	} elsif ($sym == CFClient::SDLK_HOME) {	2120	} elsif ($sym == CFPlus::SDLK_HOME) {
		2121	# what a hack
		2122	$self->{cursor} =
		2123	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2124	? length $1
		2125	: 0;
		2126	} elsif ($sym == CFPlus::SDLK_END) {
		2127	# uh, again
		2128	$self->{cursor} =
		2129	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2130	? $self->{cursor} + length $1
		2131	: length $self->{text};
		2132	} elsif ($uni == 21) { # ctrl-u
		2133	$text = "";
1789	$self->{cursor} = 0;	2134	$self->{cursor} = 0;
1790	} elsif ($sym == CFClient::SDLK_END) {
1791	$self->{cursor} = length $text;
1792	} elsif ($uni == 27) {	2135	} elsif ($uni == 27) {
1793	$self->emit ('escape');	2136	$self->emit ('escape');
1794	} elsif ($uni) {	2137	} elsif ($uni == 0x0d) {
		2138	substr $text, $self->{cursor}++, 0, "\012";
		2139	} elsif ($uni >= 0x20) {
1795	substr $text, $self->{cursor}++, 0, chr $uni;	2140	substr $text, $self->{cursor}++, 0, chr $uni;
1796	} else {	2141	} else {
1797	return 0;	2142	return 0;
1798	}	2143	}
1799		2144
1800	$self->_set_text ($text);	2145	$self->_set_text ($text);
1801		2146
1802	$self->realloc;	2147	$self->realloc;
		2148	$self->update;
1803		2149
1804	1	2150	1
1805	}	2151	}
1806		2152
1807	sub invoke_focus_in {	2153	sub invoke_focus_in {
…		…
1819		2165
1820	my $idx = $self->{layout}->xy_to_index ($x, $y);	2166	my $idx = $self->{layout}->xy_to_index ($x, $y);
1821		2167
1822	# byte-index to char-index	2168	# byte-index to char-index
1823	my $text = $self->{text};	2169	my $text = $self->{text};
1824	utf8::encode $text;	2170	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825	$self->{cursor} = length substr $text, 0, $idx;	2171	$self->{cursor} = length $text;
1826		2172
1827	$self->_set_text ($self->{text});	2173	$self->_set_text ($self->{text});
1828	$self->update;	2174	$self->update;
1829		2175
1830	1	2176	1
…		…
1869	utf8::encode $text;	2215	utf8::encode $text;
1870		2216
1871	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2217	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1872	}	2218	}
1873		2219
1874	glColor @{$self->{fg}};
1875	glBegin GL_LINES;	2220	glBegin GL_LINES;
1876	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2221	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1877	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2222	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1878	glEnd;	2223	glEnd;
1879	}	2224	}
1880	}	2225	}
1881		2226
		2227	#############################################################################
		2228
1882	package CFClient::UI::Entry;	2229	package CFPlus::UI::Entry;
1883		2230
1884	our @ISA = CFClient::UI::EntryBase::;	2231	our @ISA = CFPlus::UI::EntryBase::;
1885		2232
1886	use CFClient::OpenGL;	2233	use CFPlus::OpenGL;
1887		2234
1888	sub invoke_key_down {	2235	sub invoke_key_down {
1889	my ($self, $ev) = @_;	2236	my ($self, $ev) = @_;
1890		2237
1891	my $sym = $ev->{sym};	2238	my $sym = $ev->{sym};
1892		2239
1893	if ($sym == 13) {	2240	if ($ev->{uni} == 0x0d || $sym == 13) {
1894	unshift @{$self->{history}},	2241	unshift @{$self->{history}},
1895	my $txt = $self->get_text;	2242	my $txt = $self->get_text;
		2243
1896	$self->{history_pointer} = -1;	2244	$self->{history_pointer} = -1;
1897	$self->{history_saveback} = '';	2245	$self->{history_saveback} = '';
1898	$self->emit (activate => $txt);	2246	$self->emit (activate => $txt);
1899	$self->update;	2247	$self->update;
1900		2248
1901	} elsif ($sym == CFClient::SDLK_UP) {	2249	} elsif ($sym == CFPlus::SDLK_UP) {
1902	if ($self->{history_pointer} < 0) {	2250	if ($self->{history_pointer} < 0) {
1903	$self->{history_saveback} = $self->get_text;	2251	$self->{history_saveback} = $self->get_text;
1904	}	2252	}
1905	if (@{$self->{history} || []} > 0) {	2253	if (@{$self->{history} || []} > 0) {
1906	$self->{history_pointer}++;	2254	$self->{history_pointer}++;
…		…
1908	$self->{history_pointer} = @{$self->{history} || []} - 1;	2256	$self->{history_pointer} = @{$self->{history} || []} - 1;
1909	}	2257	}
1910	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2258	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1911	}	2259	}
1912		2260
1913	} elsif ($sym == CFClient::SDLK_DOWN) {	2261	} elsif ($sym == CFPlus::SDLK_DOWN) {
1914	$self->{history_pointer}--;	2262	$self->{history_pointer}--;
1915	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2263	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1916		2264
1917	if ($self->{history_pointer} >= 0) {	2265	if ($self->{history_pointer} >= 0) {
1918	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2266	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1927	1	2275	1
1928	}	2276	}
1929		2277
1930	#############################################################################	2278	#############################################################################
1931		2279
		2280	package CFPlus::UI::TextEdit;
		2281
		2282	our @ISA = CFPlus::UI::EntryBase::;
		2283
		2284	use CFPlus::OpenGL;
		2285
		2286	sub move_cursor_ver {
		2287	my ($self, $dy) = @_;
		2288
		2289	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2290
		2291	$y += $dy;
		2292
		2293	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2294	$self->{cursor} = $index;
		2295	delete $self->{cur_h};
		2296	$self->update;
		2297	return;
		2298	}
		2299	}
		2300
		2301	sub invoke_key_down {
		2302	my ($self, $ev) = @_;
		2303
		2304	my $sym = $ev->{sym};
		2305
		2306	if ($sym == CFPlus::SDLK_UP) {
		2307	$self->move_cursor_ver (-1);
		2308	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2309	$self->move_cursor_ver (+1);
		2310	} else {
		2311	return $self->SUPER::invoke_key_down ($ev)
		2312	}
		2313
		2314	1
		2315	}
		2316
		2317	#############################################################################
		2318
1932	package CFClient::UI::Button;	2319	package CFPlus::UI::Button;
1933		2320
1934	our @ISA = CFClient::UI::Label::;	2321	our @ISA = CFPlus::UI::Label::;
1935		2322
1936	use CFClient::OpenGL;	2323	use CFPlus::OpenGL;
1937		2324
1938	my @tex =	2325	my @tex =
1939	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2326	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1940	qw(b1_button_active.png);	2327	qw(b1_button_inactive.png b1_button_active.png);
1941		2328
1942	sub new {	2329	sub new {
1943	my $class = shift;	2330	my $class = shift;
1944		2331
1945	$class->SUPER::new (	2332	$class->SUPER::new (
1946	padding_x => 4,	2333	padding_x => 4,
1947	padding_y => 4,	2334	padding_y => 4,
1948	fg => [1, 1, 1],	2335	fg => [1.0, 1.0, 1.0],
1949	active_fg => [0, 0, 1],	2336	active_fg => [0.8, 0.8, 0.8],
1950	can_hover => 1,	2337	can_hover => 1,
1951	align => 0,	2338	align => 0,
1952	valign => 0,	2339	valign => 0,
1953	can_events => 1,	2340	can_events => 1,
1954	@_	2341	@_
…		…
1972		2359
1973	glEnable GL_TEXTURE_2D;	2360	glEnable GL_TEXTURE_2D;
1974	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2361	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1975	glColor 0, 0, 0, 1;	2362	glColor 0, 0, 0, 1;
1976		2363
		2364	my $tex = $tex[$GRAB == $self];
1977	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2365	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1978		2366
1979	glDisable GL_TEXTURE_2D;	2367	glDisable GL_TEXTURE_2D;
1980		2368
1981	$self->SUPER::_draw;	2369	$self->SUPER::_draw;
1982	}	2370	}
1983		2371
1984	#############################################################################	2372	#############################################################################
1985		2373
		2374	package CFPlus::UI::CheckBox;
		2375
		2376	our @ISA = CFPlus::UI::DrawBG::;
		2377
		2378	my @tex =
		2379	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2380	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2381
		2382	use CFPlus::OpenGL;
		2383
		2384	sub new {
		2385	my $class = shift;
		2386
		2387	$class->SUPER::new (
		2388	padding_x => 2,
		2389	padding_y => 2,
		2390	fg => [1, 1, 1],
		2391	active_fg => [1, 1, 0],
		2392	bg => [0, 0, 0, 0.2],
		2393	active_bg => [1, 1, 1, 0.5],
		2394	state => 0,
		2395	can_hover => 1,
		2396	@_
		2397	)
		2398	}
		2399
		2400	sub size_request {
		2401	my ($self) = @_;
		2402
		2403	(6) x 2
		2404	}
		2405
		2406	sub toggle {
		2407	my ($self) = @_;
		2408
		2409	$self->{state} = !$self->{state};
		2410	$self->emit (changed => $self->{state});
		2411	$self->update;
		2412	}
		2413
		2414	sub invoke_button_down {
		2415	my ($self, $ev, $x, $y) = @_;
		2416
		2417	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2418	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2419	$self->toggle;
		2420	} else {
		2421	return 0
		2422	}
		2423
		2424	1
		2425	}
		2426
		2427	sub _draw {
		2428	my ($self) = @_;
		2429
		2430	$self->SUPER::_draw;
		2431
		2432	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2433
		2434	my ($w, $h) = @$self{qw(w h)};
		2435
		2436	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2437
		2438	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2439
		2440	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2441
		2442	glEnable GL_TEXTURE_2D;
		2443	$tex->draw_quad_alpha (0, 0, $s, $s);
		2444	glDisable GL_TEXTURE_2D;
		2445	}
		2446
		2447	#############################################################################
		2448
		2449	package CFPlus::UI::Image;
		2450
		2451	our @ISA = CFPlus::UI::Base::;
		2452
		2453	use CFPlus::OpenGL;
		2454
		2455	our %texture_cache;
		2456
		2457	sub new {
		2458	my $class = shift;
		2459
		2460	my $self = $class->SUPER::new (
		2461	can_events => 0,
		2462	@_,
		2463	);
		2464
		2465	$self->{path} || $self->{tex}
		2466	or Carp::croak "'path' or 'tex' attributes required";
		2467
		2468	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2469	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2470
		2471	CFPlus::weaken $texture_cache{$self->{path}};
		2472
		2473	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2474
		2475	$self
		2476	}
		2477
		2478	sub STORABLE_freeze {
		2479	my ($self, $cloning) = @_;
		2480
		2481	$self->{path}
		2482	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2483
		2484	$self->{path}
		2485	}
		2486
		2487	sub STORABLE_attach {
		2488	my ($self, $cloning, $path) = @_;
		2489
		2490	$self->new (path => $path)
		2491	}
		2492
		2493	sub size_request {
		2494	my ($self) = @_;
		2495
		2496	($self->{tex}{w}, $self->{tex}{h})
		2497	}
		2498
		2499	sub _draw {
		2500	my ($self) = @_;
		2501
		2502	my $tex = $self->{tex};
		2503
		2504	my ($w, $h) = ($self->{w}, $self->{h});
		2505
		2506	if ($self->{rot90}) {
		2507	glRotate 90, 0, 0, 1;
		2508	glTranslate 0, -$self->{w}, 0;
		2509
		2510	($w, $h) = ($h, $w);
		2511	}
		2512
		2513	glEnable GL_TEXTURE_2D;
		2514	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2515
		2516	$tex->draw_quad (0, 0, $w, $h);
		2517
		2518	glDisable GL_TEXTURE_2D;
		2519	}
		2520
		2521	#############################################################################
		2522
1986	package CFClient::UI::ImageButton;	2523	package CFPlus::UI::ImageButton;
1987		2524
1988	our @ISA = CFClient::UI::Image::;	2525	our @ISA = CFPlus::UI::Image::;
1989		2526
1990	use CFClient::OpenGL;	2527	use CFPlus::OpenGL;
1991		2528
1992	my %textures;	2529	my %textures;
1993		2530
1994	sub new {	2531	sub new {
1995	my $class = shift;	2532	my $class = shift;
…		…
2017	1	2554	1
2018	}	2555	}
2019		2556
2020	#############################################################################	2557	#############################################################################
2021		2558
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;	2559	package CFPlus::UI::VGauge;
2091		2560
2092	our @ISA = CFClient::UI::Base::;	2561	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		2562
2152	use List::Util qw(min max);	2563	use List::Util qw(min max);
2153		2564
2154	use CFClient::OpenGL;	2565	use CFPlus::OpenGL;
2155		2566
2156	my %tex = (	2567	my %tex = (
2157	food => [	2568	food => [
2158	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2569	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2159	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2570	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2160	],	2571	],
2161	grace => [	2572	grace => [
2162	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2573	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/	2574	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2164	],	2575	],
2165	hp => [	2576	hp => [
2166	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2577	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2167	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2578	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2168	],	2579	],
2169	mana => [	2580	mana => [
2170	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2581	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/	2582	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2172	],	2583	],
2173	);	2584	);
2174		2585
2175	# eg. VGauge->new (gauge => 'food'), default gauge: food	2586	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2235	my $ycut1 = max 0, min 1, $ycut;	2646	my $ycut1 = max 0, min 1, $ycut;
2236	my $ycut2 = max 0, min 1, $ycut - 1;	2647	my $ycut2 = max 0, min 1, $ycut - 1;
2237		2648
2238	my $h1 = $self->{h} * (1 - $ycut1);	2649	my $h1 = $self->{h} * (1 - $ycut1);
2239	my $h2 = $self->{h} * (1 - $ycut2);	2650	my $h2 = $self->{h} * (1 - $ycut2);
		2651	my $h3 = $self->{h};
		2652
		2653	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2240		2654
2241	glEnable GL_BLEND;	2655	glEnable GL_BLEND;
2242	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2656	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2243	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2657	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2244	glEnable GL_TEXTURE_2D;	2658	glEnable GL_TEXTURE_2D;
…		…
2263		2677
2264	if ($t3) {	2678	if ($t3) {
2265	glBindTexture GL_TEXTURE_2D, $t3->{name};	2679	glBindTexture GL_TEXTURE_2D, $t3->{name};
2266	glBegin GL_QUADS;	2680	glBegin GL_QUADS;
2267	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2681	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2268	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2682	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2269	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2683	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2270	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2684	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2271	glEnd;	2685	glEnd;
2272	}	2686	}
2273		2687
2274	glDisable GL_BLEND;	2688	glDisable GL_BLEND;
2275	glDisable GL_TEXTURE_2D;	2689	glDisable GL_TEXTURE_2D;
2276	}	2690	}
2277		2691
2278	#############################################################################	2692	#############################################################################
2279		2693
2280	package CFClient::UI::Gauge;	2694	package CFPlus::UI::Gauge;
2281		2695
2282	our @ISA = CFClient::UI::VBox::;	2696	our @ISA = CFPlus::UI::VBox::;
2283		2697
2284	sub new {	2698	sub new {
2285	my ($class, %arg) = @_;	2699	my ($class, %arg) = @_;
2286		2700
2287	my $self = $class->SUPER::new (	2701	my $self = $class->SUPER::new (
…		…
2289	can_hover => 1,	2703	can_hover => 1,
2290	can_events => 1,	2704	can_events => 1,
2291	%arg,	2705	%arg,
2292	);	2706	);
2293		2707
2294	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2708	$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);	2709	$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");	2710	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2297		2711
2298	$self	2712	$self
2299	}	2713	}
2300		2714
2301	sub set_fontsize {	2715	sub set_fontsize {
…		…
2322	$self->{value}->set_text ($val);	2736	$self->{value}->set_text ($val);
2323	}	2737	}
2324		2738
2325	#############################################################################	2739	#############################################################################
2326		2740
2327	package CFClient::UI::Slider;	2741	package CFPlus::UI::Slider;
2328		2742
2329	use strict;	2743	use strict;
2330		2744
2331	use CFClient::OpenGL;	2745	use CFPlus::OpenGL;
2332		2746
2333	our @ISA = CFClient::UI::DrawBG::;	2747	our @ISA = CFPlus::UI::DrawBG::;
2334		2748
2335	my @tex =	2749	my @tex =
2336	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2750	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2337	qw(s1_slider.png s1_slider_bg.png);	2751	qw(s1_slider.png s1_slider_bg.png);
2338		2752
2339	sub new {	2753	sub new {
2340	my $class = shift;	2754	my $class = shift;
2341		2755
…		…
2409		2823
2410	$self->SUPER::invoke_button_down ($ev, $x, $y);	2824	$self->SUPER::invoke_button_down ($ev, $x, $y);
2411		2825
2412	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2826	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2413		2827
2414	$self->mouse_motion ($ev, $x, $y)	2828	$self->invoke_mouse_motion ($ev, $x, $y)
2415	}	2829	}
2416		2830
2417	sub invoke_mouse_motion {	2831	sub invoke_mouse_motion {
2418	my ($self, $ev, $x, $y) = @_;	2832	my ($self, $ev, $x, $y) = @_;
2419		2833
…		…
2428	} else {	2842	} else {
2429	return 0;	2843	return 0;
2430	}	2844	}
2431		2845
2432	1	2846	1
		2847	}
		2848
		2849	sub invoke_mouse_wheel {
		2850	my ($self, $ev) = @_;
		2851
		2852	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2853
		2854	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2855
		2856	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2857
		2858	! ! $delta
2433	}	2859	}
2434		2860
2435	sub update {	2861	sub update {
2436	my ($self) = @_;	2862	my ($self) = @_;
2437		2863
…		…
2486	glDisable GL_TEXTURE_2D;	2912	glDisable GL_TEXTURE_2D;
2487	}	2913	}
2488		2914
2489	#############################################################################	2915	#############################################################################
2490		2916
2491	package CFClient::UI::ValSlider;	2917	package CFPlus::UI::ValSlider;
2492		2918
2493	our @ISA = CFClient::UI::HBox::;	2919	our @ISA = CFPlus::UI::HBox::;
2494		2920
2495	sub new {	2921	sub new {
2496	my ($class, %arg) = @_;	2922	my ($class, %arg) = @_;
2497		2923
2498	my $range = delete $arg{range};	2924	my $range = delete $arg{range};
2499		2925
2500	my $self = $class->SUPER::new (	2926	my $self = $class->SUPER::new (
2501	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2927	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2502	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2928	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2503	to_value => sub { shift },	2929	to_value => sub { shift },
2504	from_value => sub { shift },	2930	from_value => sub { shift },
2505	%arg,	2931	%arg,
2506	);	2932	);
2507		2933
…		…
2527	sub set_range { shift->{slider}->set_range (@_) }	2953	sub set_range { shift->{slider}->set_range (@_) }
2528	sub set_value { shift->{slider}->set_value (@_) }	2954	sub set_value { shift->{slider}->set_value (@_) }
2529		2955
2530	#############################################################################	2956	#############################################################################
2531		2957
2532	package CFClient::UI::TextScroller;	2958	package CFPlus::UI::TextScroller;
2533		2959
2534	our @ISA = CFClient::UI::HBox::;	2960	our @ISA = CFPlus::UI::HBox::;
2535		2961
2536	use CFClient::OpenGL;	2962	use CFPlus::OpenGL;
2537		2963
2538	sub new {	2964	sub new {
2539	my $class = shift;	2965	my $class = shift;
2540		2966
2541	my $self = $class->SUPER::new (	2967	my $self = $class->SUPER::new (
2542	fontsize => 1,	2968	fontsize => 1,
2543	can_events => 0,	2969	can_events => 1,
2544	indent => 0,	2970	indent => 0,
2545	#font => default_font	2971	#font => default_font
2546	@_,	2972	@_,
2547		2973
2548	layout => (new CFClient::Layout 1),	2974	layout => (new CFPlus::Layout),
2549	par => [],	2975	par => [],
		2976	max_par => 0,
2550	height => 0,	2977	height => 0,
2551	children => [	2978	children => [
2552	(new CFClient::UI::Empty expand => 1),	2979	(new CFPlus::UI::Empty expand => 1),
2553	(new CFClient::UI::Slider vertical => 1),	2980	(new CFPlus::UI::Slider vertical => 1),
2554	],	2981	],
2555	);	2982	);
2556		2983
2557	$self->{children}[1]->connect (changed => sub { $self->update });	2984	$self->{children}[1]->connect (changed => sub { $self->update });
2558		2985
…		…
2564		2991
2565	$self->{fontsize} = $fontsize;	2992	$self->{fontsize} = $fontsize;
2566	$self->reflow;	2993	$self->reflow;
2567	}	2994	}
2568		2995
		2996	sub size_request {
		2997	my ($self) = @_;
		2998
		2999	my ($empty, $slider) = @{ $self->{children} };
		3000
		3001	local $self->{children} = [$empty, $slider];
		3002	$self->SUPER::size_request
		3003	}
		3004
2569	sub invoke_size_allocate {	3005	sub invoke_size_allocate {
2570	my ($self, $w, $h) = @_;	3006	my ($self, $w, $h) = @_;
2571		3007
		3008	my ($empty, $slider, @other) = @{ $self->{children} };
		3009	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		3010
2572	$self->{layout}->set_font ($self->{font}) if $self->{font};	3011	$self->{layout}->set_font ($self->{font}) if $self->{font};
2573	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3012	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2574	$self->{layout}->set_width ($self->{children}[0]{w});	3013	$self->{layout}->set_width ($empty->{w});
2575	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3014	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2576		3015
2577	$self->reflow;	3016	$self->reflow;
2578		3017
		3018	local $self->{children} = [$empty, $slider];
2579	$self->SUPER::invoke_size_allocate ($w, $h)	3019	$self->SUPER::invoke_size_allocate ($w, $h)
2580	}	3020	}
2581		3021
2582	sub text_size {	3022	sub invoke_mouse_wheel {
2583	my ($self, $text, $indent) = @_;	3023	my ($self, $ev) = @_;
		3024
		3025	return 0 unless $ev->{dy}; # only vertical movements
		3026
		3027	$self->{children}[1]->emit (mouse_wheel => $ev);
		3028
		3029	1
		3030	}
		3031
		3032	sub get_layout {
		3033	my ($self, $para) = @_;
2584		3034
2585	my $layout = $self->{layout};	3035	my $layout = $self->{layout};
2586		3036
		3037	$layout->set_font ($self->{font}) if $self->{font};
		3038	$layout->set_foreground (@{$para->{fg}});
2587	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3039	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2588	$layout->set_width ($self->{children}[0]{w} - $indent);	3040	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2589	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3041	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590	$layout->set_markup ($text);	3042	$layout->set_markup ($para->{markup});
		3043
		3044	$layout->set_shapes (
		3045	map
		3046	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3047	@{$para->{widget}}
2591		3048	);
		3049
2592	$layout->size	3050	$layout
2593	}	3051	}
2594		3052
2595	sub reflow {	3053	sub reflow {
2596	my ($self) = @_;	3054	my ($self) = @_;
2597		3055
…		…
2604		3062
2605	# todo: base offset on lines or so, not on pixels	3063	# todo: base offset on lines or so, not on pixels
2606	$self->{children}[1]->set_value ($offset);	3064	$self->{children}[1]->set_value ($offset);
2607	}	3065	}
2608		3066
		3067	sub current_paragraph {
		3068	my ($self) = @_;
		3069
		3070	$self->{top_paragraph} - 1
		3071	}
		3072
		3073	sub scroll_to {
		3074	my ($self, $para) = @_;
		3075
		3076	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3077
		3078	$self->{scroll_to} = $para;
		3079	$self->update;
		3080	}
		3081
2609	sub clear {	3082	sub clear {
2610	my ($self) = @_;	3083	my ($self) = @_;
		3084
		3085	my (undef, undef, @other) = @{ $self->{children} };
		3086	$self->remove ($_) for @other;
2611		3087
2612	$self->{par} = [];	3088	$self->{par} = [];
2613	$self->{height} = 0;	3089	$self->{height} = 0;
2614	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3090	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2615	}	3091	}
2616		3092
2617	sub add_paragraph {	3093	sub add_paragraph {
2618	my ($self, $color, $text, $indent) = @_;	3094	my $self = shift;
2619		3095
2620	for my $line (split /\n/, $text) {	3096	for my $para (@_) {
2621	my ($w, $h) = $self->text_size ($line);	3097	$para = {
		3098	fg => [1, 1, 1, 1],
		3099	indent => 0,
		3100	markup => "",
		3101	widget => [],
		3102	ref $para ? %$para : (markup => $para),
		3103	w => 1e10,
		3104	wrapped => 1,
		3105	};
		3106
		3107	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3108	push @{$self->{par}}, $para;
		3109	}
		3110
		3111	if (my $max = $self->{max_par}) {
		3112	shift @{$self->{par}} while @{$self->{par}} > $max;
		3113	}
		3114
		3115	$self->{need_reflow}++;
		3116	$self->update;
		3117	}
		3118
		3119	sub scroll_to_bottom {
		3120	my ($self) = @_;
		3121
		3122	$self->{scroll_to} = $#{$self->{par}};
		3123	$self->update;
		3124	}
		3125
		3126	sub force_uptodate {
		3127	my ($self) = @_;
		3128
		3129	if (delete $self->{need_reflow}) {
		3130	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3131
		3132	my $height = 0;
		3133
		3134	for my $para (@{$self->{par}}) {
		3135	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3136	my $layout = $self->get_layout ($para);
		3137	my ($w, $h) = $layout->size;
		3138
		3139	$para->{w} = $w + $para->{indent};
		3140	$para->{h} = $h;
		3141	$para->{wrapped} = $layout->has_wrapped;
		3142	}
		3143
		3144	$para->{y} = $height;
		3145	$height += $para->{h};
		3146	}
		3147
2622	$self->{height} += $h;	3148	$self->{height} = $height;
2623	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3149	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2624	}
2625		3150
2626	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3151	delete $self->{texture};
		3152	}
		3153
		3154	if (my $paridx = delete $self->{scroll_to}) {
		3155	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3156	}
2627	}	3157	}
2628		3158
2629	sub update {	3159	sub update {
2630	my ($self) = @_;	3160	my ($self) = @_;
2631		3161
…		…
2634	return unless $self->{h} > 0;	3164	return unless $self->{h} > 0;
2635		3165
2636	delete $self->{texture};	3166	delete $self->{texture};
2637		3167
2638	$ROOT->on_post_alloc ($self => sub {	3168	$ROOT->on_post_alloc ($self => sub {
		3169	$self->force_uptodate;
		3170
2639	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3171	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2640		3172
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 {	3173	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2669	glClearColor 0, 0, 0, 0;	3174	glClearColor 0, 0, 0, 0;
2670	glClear GL_COLOR_BUFFER_BIT;	3175	glClear GL_COLOR_BUFFER_BIT;
2671		3176
		3177	package CFPlus::UI::Base;
		3178	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3179	(0, 0, $self->{w}, $self->{h});
		3180
		3181	my $top = int $self->{children}[1]{range}[0];
		3182
		3183	my $paridx = 0;
		3184	my $top_paragraph;
2672	my $top = int $self->{children}[1]{range}[0];	3185	my $top = int $self->{children}[1]{range}[0];
2673		3186
2674	my $y0 = $top;	3187	my $y0 = $top;
2675	my $y1 = $top + $H;	3188	my $y1 = $top + $H;
2676		3189
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}}) {	3190	for my $para (@{$self->{par}}) {
2688	my $h = $par->[1];	3191	my $h = $para->{h};
		3192	my $y = $para->{y};
2689		3193
2690	if ($y0 < $y + $h && $y < $y1) {	3194	if ($y0 < $y + $h && $y < $y1) {
2691	$layout->set_foreground (@{ $par->[2] });	3195	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		3196
2696	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3197	$layout->render ($para->{indent}, $y - $y0);
2697		3198
2698	glRasterPos $par->[3], $y - $y0;	3199	if (my @w = @{ $para->{widget} }) {
2699	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3200	my @s = $layout->get_shapes;
		3201
		3202	for (@w) {
		3203	my ($dx, $dy) = splice @s, 0, 2, ();
		3204
		3205	$_->{x} = $dx + $para->{indent};
		3206	$_->{y} = $dy + $y - $y0;
		3207
		3208	$_->draw;
		3209	}
		3210	}
2700	}	3211	}
2701		3212
2702	$y += $h;	3213	$paridx++;
		3214	$top_paragraph ||= $paridx if $y >= $top;
2703	}	3215	}
2704		3216
2705	glDisable GL_BLEND;	3217	$self->{top_paragraph} = $top_paragraph;
2706	};	3218	};
2707	});	3219	});
		3220	}
		3221
		3222	sub reconfigure {
		3223	my ($self) = @_;
		3224
		3225	$self->SUPER::reconfigure;
		3226
		3227	$_->{w} = 1e10 for @{ $self->{par} };
		3228	$self->reflow;
2708	}	3229	}
2709		3230
2710	sub _draw {	3231	sub _draw {
2711	my ($self) = @_;	3232	my ($self) = @_;
2712		3233
…		…
2715	glColor 0, 0, 0, 1;	3236	glColor 0, 0, 0, 1;
2716	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3237	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2717	glDisable GL_TEXTURE_2D;	3238	glDisable GL_TEXTURE_2D;
2718		3239
2719	$self->{children}[1]->draw;	3240	$self->{children}[1]->draw;
2720
2721	}	3241	}
2722		3242
2723	#############################################################################	3243	#############################################################################
2724		3244
2725	package CFClient::UI::Animator;	3245	package CFPlus::UI::Animator;
2726		3246
2727	use CFClient::OpenGL;	3247	use CFPlus::OpenGL;
2728		3248
2729	our @ISA = CFClient::UI::Bin::;	3249	our @ISA = CFPlus::UI::Bin::;
2730		3250
2731	sub moveto {	3251	sub moveto {
2732	my ($self, $x, $y) = @_;	3252	my ($self, $x, $y) = @_;
2733		3253
2734	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3254	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2762	glPopMatrix;	3282	glPopMatrix;
2763	}	3283	}
2764		3284
2765	#############################################################################	3285	#############################################################################
2766		3286
2767	package CFClient::UI::Flopper;	3287	package CFPlus::UI::Flopper;
2768		3288
2769	our @ISA = CFClient::UI::Button::;	3289	our @ISA = CFPlus::UI::Button::;
2770		3290
2771	sub new {	3291	sub new {
2772	my $class = shift;	3292	my $class = shift;
2773		3293
2774	my $self = $class->SUPER::new (	3294	my $self = $class->SUPER::new (
…		…
2786	$self->{other}->toggle_visibility;	3306	$self->{other}->toggle_visibility;
2787	}	3307	}
2788		3308
2789	#############################################################################	3309	#############################################################################
2790		3310
2791	package CFClient::UI::Tooltip;	3311	package CFPlus::UI::Tooltip;
2792		3312
2793	our @ISA = CFClient::UI::Bin::;	3313	our @ISA = CFPlus::UI::Bin::;
2794		3314
2795	use CFClient::OpenGL;	3315	use CFPlus::OpenGL;
2796		3316
2797	sub new {	3317	sub new {
2798	my $class = shift;	3318	my $class = shift;
2799		3319
2800	$class->SUPER::new (	3320	$class->SUPER::new (
…		…
2803	)	3323	)
2804	}	3324	}
2805		3325
2806	sub set_tooltip_from {	3326	sub set_tooltip_from {
2807	my ($self, $widget) = @_;	3327	my ($self, $widget) = @_;
		3328
		3329	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3330	if $widget->{tooltip} =~ /^#(.*)$/;
2808		3331
2809	my $tooltip = $widget->{tooltip};	3332	my $tooltip = $widget->{tooltip};
2810		3333
2811	if ($ENV{CFPLUS_DEBUG} & 2) {	3334	if ($ENV{CFPLUS_DEBUG} & 2) {
2812	$tooltip .= "\n\n" . (ref $widget) . "\n"	3335	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2816	}	3339	}
2817		3340
2818	$tooltip =~ s/^\n+//;	3341	$tooltip =~ s/^\n+//;
2819	$tooltip =~ s/\n+$//;	3342	$tooltip =~ s/\n+$//;
2820		3343
2821	$self->add (new CFClient::UI::Label	3344	$self->add (new CFPlus::UI::Label
2822	markup => $tooltip,	3345	markup => $tooltip,
2823	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3346	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2824	fontsize => 0.8,	3347	fontsize => 0.8,
2825	fg => [0, 0, 0, 1],	3348	style => 1, # FLAG_INVERSE
2826	ellipsise => 0,	3349	ellipsise => 0,
2827	font => ($widget->{tooltip_font} || $::FONT_PROP),	3350	font => ($widget->{tooltip_font} || $::FONT_PROP),
2828	);	3351	);
2829	}	3352	}
2830		3353
…		…
2849		3372
2850	$self->{root}->on_post_alloc ("move_$self" => sub {	3373	$self->{root}->on_post_alloc ("move_$self" => sub {
2851	my $widget = $self->{owner}	3374	my $widget = $self->{owner}
2852	or return;	3375	or return;
2853		3376
		3377	if ($widget->{visible}) {
2854	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3378	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2855		3379
2856	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3380	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2857	if $x + $self->{w} > $self->{root}{w};	3381	if $x + $self->{w} > $self->{root}{w};
2858		3382
2859	$self->move_abs ($x, $y);	3383	$self->move_abs ($x, $y);
		3384	} else {
		3385	$self->hide;
		3386	}
2860	});	3387	});
2861	}	3388	}
2862		3389
2863	sub _draw {	3390	sub _draw {
2864	my ($self) = @_;	3391	my ($self) = @_;
…		…
2888	$self->SUPER::_draw;	3415	$self->SUPER::_draw;
2889	}	3416	}
2890		3417
2891	#############################################################################	3418	#############################################################################
2892		3419
2893	package CFClient::UI::Face;	3420	package CFPlus::UI::Face;
2894		3421
2895	our @ISA = CFClient::UI::Base::;	3422	our @ISA = CFPlus::UI::DrawBG::;
2896		3423
2897	use CFClient::OpenGL;	3424	use CFPlus::OpenGL;
2898		3425
2899	sub new {	3426	sub new {
2900	my $class = shift;	3427	my $class = shift;
2901		3428
2902	my $self = $class->SUPER::new (	3429	my $self = $class->SUPER::new (
		3430	size_w => 32,
		3431	size_h => 8,
2903	aspect => 1,	3432	aspect => 1,
2904	can_events => 0,	3433	can_events => 0,
2905	@_,	3434	@_,
2906	);	3435	);
2907		3436
2908	if ($self->{anim} && $self->{animspeed}) {	3437	if ($self->{anim} && $self->{animspeed}) {
2909	Scalar::Util::weaken (my $widget = $self);	3438	CFPlus::weaken (my $widget = $self);
2910		3439
		3440	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3441	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2911	$self->{timer} = Event->timer (	3442	$self->{timer} = Event->timer (
2912	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2913	hard => 1,	3443	parked => 1,
2914	interval => $self->{animspeed},
2915	cb => sub {	3444	cb => sub {
		3445	return unless $::CONN && $widget;
		3446
2916	++$widget->{frame};	3447	++$widget->{frame};
		3448	$widget->update_face;
2917	$widget->update;	3449	$widget->update;
		3450
		3451	$widget->update_timer;
2918	},	3452	},
2919	);	3453	);
		3454
		3455	$self->update_face;
		3456	$self->update_timer;
2920	}	3457	}
2921		3458
2922	$self	3459	$self
2923	}	3460	}
2924		3461
		3462	sub update_timer {
		3463	my ($self) = @_;
		3464
		3465	return unless $self->{timer};
		3466
		3467	if ($self->{visible}) {
		3468	$self->{timer}->at (
		3469	$self->{anim_start}
		3470	+ $self->{animspeed}
		3471	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3472	);
		3473	$self->{timer}->start;
		3474	} else {
		3475	$self->{timer}->stop;
		3476	}
		3477	}
		3478
		3479	sub update_face {
		3480	my ($self) = @_;
		3481
		3482	return unless $::CONN;
		3483
		3484	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3485	if ($anim && @$anim) {
		3486	delete $self->{wait_face};
		3487	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3488	$self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
		3489	}
		3490	}
		3491	}
		3492
2925	sub size_request {	3493	sub size_request {
2926	(32, 8)	3494	my ($self) = @_;
		3495
		3496	if ($::CONN) {
		3497	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3498	if (my $tex = $::CONN->{texture}[$faceid]) {
		3499	$self->{tex} = $tex;
		3500	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3501	} else {
		3502	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3503	$self->realloc;
		3504	});
		3505	}
		3506	}
		3507	}
		3508
		3509	($self->{size_w} || 8, $self->{size_h} || 8)
2927	}	3510	}
2928		3511
2929	sub update {	3512	sub update {
2930	my ($self) = @_;	3513	my ($self) = @_;
2931		3514
2932	return unless $self->{visible};	3515	return unless $self->{visible};
2933		3516
2934	$self->SUPER::update;	3517	$self->SUPER::update;
2935	}	3518	}
2936		3519
		3520	sub invoke_visibility_change {
		3521	my ($self) = @_;
		3522
		3523	$self->update_timer;
		3524
		3525	0
		3526	}
		3527
2937	sub _draw {	3528	sub _draw {
2938	my ($self) = @_;	3529	my ($self) = @_;
2939		3530
2940	return unless $::CONN;	3531	$self->SUPER::_draw;
2941		3532
2942	my $face;	3533	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;	3534	glEnable GL_TEXTURE_2D;
2955	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3535	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2956	glColor 0, 0, 0, 1;	3536	glColor 0, 0, 0, 1;
2957	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3537	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2958	glDisable GL_TEXTURE_2D;	3538	glDisable GL_TEXTURE_2D;
…		…
2960	}	3540	}
2961		3541
2962	sub destroy {	3542	sub destroy {
2963	my ($self) = @_;	3543	my ($self) = @_;
2964		3544
2965	$self->{timer}->cancel	3545	(delete $self->{timer})->cancel
2966	if $self->{timer};	3546	if $self->{timer};
2967		3547
2968	$self->SUPER::destroy;	3548	$self->SUPER::destroy;
2969	}	3549	}
2970		3550
2971	#############################################################################	3551	#############################################################################
2972		3552
2973	package CFClient::UI::Buttonbar;	3553	package CFPlus::UI::Buttonbar;
2974		3554
2975	our @ISA = CFClient::UI::HBox::;	3555	our @ISA = CFPlus::UI::HBox::;
2976		3556
2977	# TODO: should actualyl wrap buttons and other goodies.	3557	# TODO: should actually wrap buttons and other goodies.
2978		3558
2979	#############################################################################	3559	#############################################################################
2980		3560
2981	package CFClient::UI::Menu;	3561	package CFPlus::UI::Menu;
2982		3562
2983	our @ISA = CFClient::UI::FancyFrame::;	3563	our @ISA = CFPlus::UI::Toplevel::;
2984		3564
2985	use CFClient::OpenGL;	3565	use CFPlus::OpenGL;
2986		3566
2987	sub new {	3567	sub new {
2988	my $class = shift;	3568	my $class = shift;
2989		3569
2990	my $self = $class->SUPER::new (	3570	my $self = $class->SUPER::new (
2991	items => [],	3571	items => [],
2992	z => 100,	3572	z => 100,
2993	@_,	3573	@_,
2994	);	3574	);
2995		3575
2996	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3576	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2997		3577
2998	for my $item (@{ $self->{items} }) {	3578	for my $item (@{ $self->{items} }) {
2999	my ($widget, $cb, $tooltip) = @$item;	3579	my ($widget, $cb, $tooltip) = @$item;
3000		3580
3001	# handle various types of items, only text for now	3581	# handle various types of items, only text for now
3002	if (!ref $widget) {	3582	if (!ref $widget) {
		3583	if ($widget =~ /\t/) {
		3584	my ($left, $right) = split /\t/, $widget, 2;
		3585
3003	$widget = new CFClient::UI::Label	3586	$widget = new CFPlus::UI::HBox
3004	can_hover => 1,	3587	can_hover => 1,
3005	can_events => 1,	3588	can_events => 1,
		3589	tooltip => $tooltip,
		3590	children => [
		3591	(new CFPlus::UI::Label markup => $left, expand => 1),
		3592	(new CFPlus::UI::Label markup => $right, align => +1),
		3593	],
		3594	;
		3595
		3596	} else {
		3597	$widget = new CFPlus::UI::Label
		3598	can_hover => 1,
		3599	can_events => 1,
3006	markup => $widget,	3600	markup => $widget,
3007	tooltip => $tooltip	3601	tooltip => $tooltip;
		3602	}
3008	}	3603	}
3009		3604
3010	$self->{item}{$widget} = $item;	3605	$self->{item}{$widget} = $item;
3011		3606
3012	$self->{vbox}->add ($widget);	3607	$self->{vbox}->add ($widget);
…		…
3055	1	3650	1
3056	}	3651	}
3057		3652
3058	#############################################################################	3653	#############################################################################
3059		3654
3060	package CFClient::UI::Multiplexer;	3655	package CFPlus::UI::Multiplexer;
3061		3656
3062	our @ISA = CFClient::UI::Container::;	3657	our @ISA = CFPlus::UI::Container::;
3063		3658
3064	sub new {	3659	sub new {
3065	my $class = shift;	3660	my $class = shift;
3066		3661
3067	my $self = $class->SUPER::new (	3662	my $self = $class->SUPER::new (
…		…
3081		3676
3082	$self->{current} = $self->{children}[0]	3677	$self->{current} = $self->{children}[0]
3083	if @{ $self->{children} };	3678	if @{ $self->{children} };
3084	}	3679	}
3085		3680
		3681	sub get_current_page {
		3682	my ($self) = @_;
		3683
		3684	$self->{current}
		3685	}
		3686
3086	sub set_current_page {	3687	sub set_current_page {
3087	my ($self, $page_or_widget) = @_;	3688	my ($self, $page_or_widget) = @_;
3088		3689
3089	my $widget = ref $page_or_widget	3690	my $widget = ref $page_or_widget
3090	? $page_or_widget	3691	? $page_or_widget
…		…
3122	$self->{current}->draw;	3723	$self->{current}->draw;
3123	}	3724	}
3124		3725
3125	#############################################################################	3726	#############################################################################
3126		3727
3127	package CFClient::UI::Notebook;	3728	package CFPlus::UI::Notebook;
3128		3729
3129	our @ISA = CFClient::UI::VBox::;	3730	our @ISA = CFPlus::UI::VBox::;
3130		3731
3131	sub new {	3732	sub new {
3132	my $class = shift;	3733	my $class = shift;
3133		3734
3134	my $self = $class->SUPER::new (	3735	my $self = $class->SUPER::new (
3135	buttonbar => (new CFClient::UI::Buttonbar),	3736	buttonbar => (new CFPlus::UI::Buttonbar),
3136	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3737	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3137	# filter => # will be put between multiplexer and $self	3738	# filter => # will be put between multiplexer and $self
3138	@_,	3739	@_,
3139	);	3740	);
3140		3741
3141	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3742	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3145	}	3746	}
3146		3747
3147	sub add {	3748	sub add {
3148	my ($self, $title, $widget, $tooltip) = @_;	3749	my ($self, $title, $widget, $tooltip) = @_;
3149		3750
3150	Scalar::Util::weaken $self;	3751	CFPlus::weaken $self;
3151		3752
3152	$self->{buttonbar}->add (new CFClient::UI::Button	3753	$self->{buttonbar}->add (new CFPlus::UI::Button
3153	markup => $title,	3754	markup => $title,
3154	tooltip => $tooltip,	3755	tooltip => $tooltip,
3155	on_activate => sub { $self->set_current_page ($widget) },	3756	on_activate => sub { $self->set_current_page ($widget) },
3156	);	3757	);
3157		3758
3158	$self->{multiplexer}->add ($widget);	3759	$self->{multiplexer}->add ($widget);
3159	}	3760	}
3160		3761
		3762	sub get_current_page {
		3763	my ($self) = @_;
		3764
		3765	$self->{multiplexer}->get_current_page
		3766	}
		3767
3161	sub set_current_page {	3768	sub set_current_page {
3162	my ($self, $page) = @_;	3769	my ($self, $page) = @_;
3163		3770
3164	$self->{multiplexer}->set_current_page ($page);	3771	$self->{multiplexer}->set_current_page ($page);
3165	$self->emit (page_changed => $self->{multiplexer}{current});	3772	$self->emit (page_changed => $self->{multiplexer}{current});
3166	}	3773	}
3167		3774
3168	#############################################################################	3775	#############################################################################
3169		3776
3170	package CFClient::UI::Combobox;	3777	package CFPlus::UI::Selector;
3171		3778
3172	use utf8;	3779	use utf8;
3173		3780
3174	our @ISA = CFClient::UI::Button::;	3781	our @ISA = CFPlus::UI::Button::;
3175		3782
3176	sub new {	3783	sub new {
3177	my $class = shift;	3784	my $class = shift;
3178		3785
3179	my $self = $class->SUPER::new (	3786	my $self = $class->SUPER::new (
…		…
3196	my ($value, $title, $tooltip) = @$_;	3803	my ($value, $title, $tooltip) = @$_;
3197		3804
3198	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3805	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3199	}	3806	}
3200		3807
3201	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3808	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3202	}	3809	}
3203		3810
3204	sub _set_value {	3811	sub _set_value {
3205	my ($self, $value) = @_;	3812	my ($self, $value) = @_;
3206		3813
…		…
3221	$self->emit (changed => $value);	3828	$self->emit (changed => $value);
3222	}	3829	}
3223		3830
3224	#############################################################################	3831	#############################################################################
3225		3832
3226	package CFClient::UI::Statusbox;	3833	package CFPlus::UI::Statusbox;
3227		3834
3228	our @ISA = CFClient::UI::VBox::;	3835	our @ISA = CFPlus::UI::VBox::;
3229		3836
3230	sub new {	3837	sub new {
3231	my $class = shift;	3838	my $class = shift;
3232		3839
3233	my $self = $class->SUPER::new (	3840	my $self = $class->SUPER::new (
3234	fontsize => 0.8,	3841	fontsize => 0.8,
3235	@_,	3842	@_,
3236	);	3843	);
3237		3844
3238	Scalar::Util::weaken (my $this = $self);	3845	CFPlus::weaken (my $this = $self);
3239		3846
3240	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3847	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3241		3848
3242	$self	3849	$self
3243	}	3850	}
…		…
3245	sub reorder {	3852	sub reorder {
3246	my ($self) = @_;	3853	my ($self) = @_;
3247	my $NOW = Time::HiRes::time;	3854	my $NOW = Time::HiRes::time;
3248		3855
3249	# freeze display when hovering over any label	3856	# freeze display when hovering over any label
3250	return if $CFClient::UI::TOOLTIP->{owner}	3857	return if $CFPlus::UI::TOOLTIP->{owner}
3251	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3858	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3252	values %{ $self->{item} };	3859	values %{ $self->{item} };
3253		3860
3254	while (my ($k, $v) = each %{ $self->{item} }) {	3861	while (my ($k, $v) = each %{ $self->{item} }) {
3255	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3862	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3256	}	3863	}
…		…
3277	for ($short) {	3884	for ($short) {
3278	s/^\s+//;	3885	s/^\s+//;
3279	s/\s+/ /g;	3886	s/\s+/ /g;
3280	}	3887	}
3281		3888
3282	new CFClient::UI::Label	3889	new CFPlus::UI::Label
3283	markup => $short,	3890	markup => $short,
3284	tooltip => $item->{tooltip},	3891	tooltip => $item->{tooltip},
3285	tooltip_font => $::FONT_PROP,	3892	tooltip_font => $::FONT_PROP,
3286	tooltip_width => 0.67,	3893	tooltip_width => 0.67,
3287	fontsize => $item->{fontsize} || $self->{fontsize},	3894	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3341	count => 1,	3948	count => 1,
3342	%arg,	3949	%arg,
3343	};	3950	};
3344	}	3951	}
3345		3952
		3953	$ROOT->on_refresh (reorder => sub {
3346	$self->reorder;	3954	$self->reorder;
		3955	});
3347	}	3956	}
3348		3957
3349	sub reconfigure {	3958	sub reconfigure {
3350	my ($self) = @_;	3959	my ($self) = @_;
3351		3960
…		…
3364	$self->SUPER::destroy;	3973	$self->SUPER::destroy;
3365	}	3974	}
3366		3975
3367	#############################################################################	3976	#############################################################################
3368		3977
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;	3978	package CFPlus::UI::Root;
3732		3979
3733	our @ISA = CFClient::UI::Container::;	3980	our @ISA = CFPlus::UI::Container::;
3734		3981
3735	use List::Util qw(min max);	3982	use List::Util qw(min max);
3736		3983
3737	use CFClient::OpenGL;	3984	use CFPlus::OpenGL;
3738		3985
3739	sub new {	3986	sub new {
3740	my $class = shift;	3987	my $class = shift;
3741		3988
3742	my $self = $class->SUPER::new (	3989	my $self = $class->SUPER::new (
3743	visible => 1,	3990	visible => 1,
3744	@_,	3991	@_,
3745	);	3992	);
3746		3993
3747	Scalar::Util::weaken ($self->{root} = $self);	3994	CFPlus::weaken ($self->{root} = $self);
3748		3995
3749	$self	3996	$self
3750	}	3997	}
3751		3998
3752	sub size_request {	3999	sub size_request {
…		…
3847	while ($self->{refresh_hook}) {	4094	while ($self->{refresh_hook}) {
3848	$_->()	4095	$_->()
3849	for values %{delete $self->{refresh_hook}};	4096	for values %{delete $self->{refresh_hook}};
3850	}	4097	}
3851		4098
3852	if ($self->{realloc}) {	4099	while ($self->{realloc}) {
3853	my %queue;	4100	my %queue;
3854	my @queue;	4101	my @queue;
3855	my $widget;	4102	my $widget;
3856		4103
3857	outer:	4104	outer:
…		…
3904	}	4151	}
3905	}	4152	}
3906		4153
3907	delete $self->{realloc}{$widget+0};	4154	delete $self->{realloc}{$widget+0};
3908	}	4155	}
3909	}
3910		4156
3911	while (my $size_alloc = delete $self->{size_alloc}) {	4157	while (my $size_alloc = delete $self->{size_alloc}) {
3912	my @queue = sort { $b->{visible} <=> $a->{visible} }	4158	my @queue = sort { $a->{visible} <=> $b->{visible} }
3913	values %$size_alloc;	4159	values %$size_alloc;
3914		4160
3915	while () {	4161	while () {
3916	my $widget = pop @queue || last;	4162	my $widget = pop @queue || last;
3917		4163
3918	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4164	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3919		4165
3920	$w = 0 if $w < 0;	4166	$w = max $widget->{min_w}, $w;
3921	$h = 0 if $h < 0;	4167	$h = max $widget->{min_h}, $h;
3922		4168
		4169	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4170	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4171
		4172	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4173	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4174
3923	$w = int $w + 0.5;	4175	$w = int $w + 0.5;
3924	$h = int $h + 0.5;	4176	$h = int $h + 0.5;
3925		4177
3926	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4178	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3927	$widget->{old_w} = $widget->{w};	4179	$widget->{old_w} = $widget->{w};
3928	$widget->{old_h} = $widget->{h};	4180	$widget->{old_h} = $widget->{h};
3929		4181
3930	$widget->{w} = $w;	4182	$widget->{w} = $w;
3931	$widget->{h} = $h;	4183	$widget->{h} = $h;
3932		4184
3933	$widget->emit (size_allocate => $w, $h);	4185	$widget->emit (size_allocate => $w, $h);
		4186	}
3934	}	4187	}
3935	}	4188	}
3936	}	4189	}
3937		4190
3938	while ($self->{post_alloc_hook}) {	4191	while ($self->{post_alloc_hook}) {
3939	$_->()	4192	$_->()
3940	for values %{delete $self->{post_alloc_hook}};	4193	for values %{delete $self->{post_alloc_hook}};
3941	}	4194	}
3942
3943		4195
3944	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4196	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3945	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4197	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3946	glClear GL_COLOR_BUFFER_BIT;	4198	glClear GL_COLOR_BUFFER_BIT;
3947		4199
…		…
3950	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4202	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3951	glMatrixMode GL_MODELVIEW;	4203	glMatrixMode GL_MODELVIEW;
3952	glLoadIdentity;	4204	glLoadIdentity;
3953		4205
3954	{	4206	{
3955	package CFClient::UI::Base;	4207	package CFPlus::UI::Base;
3956		4208
3957	($draw_x, $draw_y, $draw_w, $draw_h) =	4209	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3958	(0, 0, $self->{w}, $self->{h});	4210	(0, 0, $self->{w}, $self->{h});
3959	}
3960		4211
3961	$self->_draw;	4212	$self->_draw;
		4213	}
3962	}	4214	}
3963		4215
3964	#############################################################################	4216	#############################################################################
3965		4217
3966	package CFClient::UI;	4218	package CFPlus::UI;
3967		4219
3968	$ROOT = new CFClient::UI::Root;	4220	$ROOT = new CFPlus::UI::Root;
3969	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4221	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3970		4222
3971	1	4223	1
3972		4224

Diff Legend

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