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.383 by root, Fri Jul 20 16:32:04 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
98		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	117	# mousewheel
100	if $GRAB;	118	$ev->{dx} = 0;
		119	$ev->{dy} = $ev->{button} * 2 - 9;
		120	$GRAB->emit (mouse_wheel => $ev);
		121	} else {
		122	$GRAB->emit (button_down => $ev)
		123	}
		124	}
101	}	125	}
102		126
103	sub feed_sdl_button_up_event {	127	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	128	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		129
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	130	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		131
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	132	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		133
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	134	$GRAB->emit (button_up => $ev)
112	if $GRAB;	135	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		136
114	if (!$BUTTON_STATE) {	137	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	138	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	139	$grab->update if $grab;
117	$GRAB->update if $GRAB;	140	$GRAB->update if $GRAB;
118		141
		142	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	143	$TOOLTIP_WATCHER->cb->();
120	}	144	}
121	}	145	}
122		146
123	sub feed_sdl_motion_event {	147	sub feed_sdl_motion_event {
124	my ($ev) = @_;	148	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	149	my ($x, $y) = ($ev->{x}, $ev->{y});
126		150
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	151	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		152
129	if ($widget != $HOVER) {	153	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		154
132	$hover->update if $hover && $hover->{can_hover};	155	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	156	if $HOVER;
140	}	157	}
141		158
142	# convert position array to integers	159	# convert position array to integers
143	sub harmonize {	160	sub harmonize {
…		…
193	reconfigure_widgets;	210	reconfigure_widgets;
194	}	211	}
195		212
196	#############################################################################	213	#############################################################################
197		214
		215	package CFPlus::UI::Event;
		216
		217	sub xy {
		218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		219	}
		220
		221	#############################################################################
		222
198	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
199		224
200	use strict;	225	use strict;
201		226
202	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
203		228
204	sub new {	229	sub new {
205	my $class = shift;	230	my $class = shift;
206		231
207	my $self = bless {	232	my $self = bless {
…		…
212	h => undef,	237	h => undef,
213	can_events => 1,	238	can_events => 1,
214	@_	239	@_
215	}, $class;	240	}, $class;
216		241
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		243
219	for (keys %$self) {	244	for (keys %$self) {
220	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
222	}	247	}
223	}	248	}
224		249
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	251	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	252	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	253	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	254	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		255
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		258
234	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
239		264
240	sub destroy {	265	sub destroy {
241	my ($self) = @_;	266	my ($self) = @_;
242		267
243	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
244	%$self = ();	270	%$self = ();
245	}	271	}
246		272
		273	sub TO_JSON {
		274	{ __widget_ref__ => $_[0]{s_id} }
		275	}
		276
247	sub show {	277	sub show {
248	my ($self) = @_;	278	my ($self) = @_;
249		279
250	return if $self->{parent};	280	return if $self->{parent};
251		281
252	$CFClient::UI::ROOT->add ($self);	282	$CFPlus::UI::ROOT->add ($self);
253	}	283	}
254		284
255	sub set_visible {	285	sub set_visible {
256	my ($self) = @_;	286	my ($self) = @_;
257		287
…		…
278	delete $self->{root};	308	delete $self->{root};
279		309
280	undef $GRAB if $GRAB == $self;	310	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	311	undef $HOVER if $HOVER == $self;
282		312
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	313	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	314	if $TOOLTIP->{owner} == $self;
285		315
286	$self->emit ("focus_out");	316	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	317	$self->emit (visibility_change => 0);
288	}	318	}
…		…
290	sub set_visibility {	320	sub set_visibility {
291	my ($self, $visible) = @_;	321	my ($self, $visible) = @_;
292		322
293	return if $self->{visible} == $visible;	323	return if $self->{visible} == $visible;
294		324
295	$visible ? $self->hide	325	$visible ? $self->show
296	: $self->show;	326	: $self->hide;
297	}	327	}
298		328
299	sub toggle_visibility {	329	sub toggle_visibility {
300	my ($self) = @_;	330	my ($self) = @_;
301		331
…		…
335	sub size_request {	365	sub size_request {
336	require Carp;	366	require Carp;
337	Carp::confess "size_request is abstract";	367	Carp::confess "size_request is abstract";
338	}	368	}
339		369
		370	sub baseline_shift {
		371	0
		372	}
		373
340	sub configure {	374	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	375	my ($self, $x, $y, $w, $h) = @_;
342		376
343	if ($self->{aspect}) {	377	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	378	my ($ow, $oh) = ($w, $h);
345		379
346	$w = List::Util::min $w, int $h * $self->{aspect};	380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347	$h = List::Util::min $h, int $w / $self->{aspect};	381	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348		382
349	# use alignment to adjust x, y	383	# use alignment to adjust x, y
350		384
351	$x += int 0.5 * ($ow - $w);	385	$x += int 0.5 * ($ow - $w);
352	$y += int 0.5 * ($oh - $h);	386	$y += int 0.5 * ($oh - $h);
…		…
393		427
394	return if $self->{tooltip} eq $tooltip;	428	return if $self->{tooltip} eq $tooltip;
395		429
396	$self->{tooltip} = $tooltip;	430	$self->{tooltip} = $tooltip;
397		431
398	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399	delete $CFClient::UI::TOOLTIP->{owner};	433	delete $CFPlus::UI::TOOLTIP->{owner};
400	$CFClient::UI::TOOLTIP_WATCHER->cb->();	434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
401	}	435	}
402	}	436	}
403		437
404	# translate global coordinates to local coordinate system	438	# translate global coordinates to local coordinate system
405	sub coord2local {	439	sub coord2local {
406	my ($self, $x, $y) = @_;	440	my ($self, $x, $y) = @_;
407		441
		442	Carp::confess unless $self->{parent};#d#
		443
408	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	444	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409	}	445	}
410		446
411	# translate local coordinates to global coordinate system	447	# translate local coordinates to global coordinate system
412	sub coord2global {	448	sub coord2global {
413	my ($self, $x, $y) = @_;	449	my ($self, $x, $y) = @_;
414		450
		451	Carp::confess unless $self->{parent};#d#
		452
415	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416	}	454	}
417		455
418	sub invoke_focus_in {	456	sub invoke_focus_in {
419	my ($self) = @_;	457	my ($self) = @_;
420		458
421	return if $FOCUS == $self;	459	return if $FOCUS == $self;
422	return unless $self->{can_focus};	460	return unless $self->{can_focus};
423		461
424	my $focus = $FOCUS; $FOCUS = $self;	462	$FOCUS = $self;
425		463
426	$focus->update if $focus;	464	$self->update;
427	$FOCUS->update;
428		465
429	0	466	0
430	}	467	}
431		468
432	sub invoke_focus_out {	469	sub invoke_focus_out {
433	my ($self) = @_;	470	my ($self) = @_;
434		471
435	return unless $FOCUS == $self;	472	return unless $FOCUS == $self;
436		473
437	my $focus = $FOCUS; undef $FOCUS;	474	undef $FOCUS;
438		475
439	$focus->update if $focus; #?	476	$self->update;
440		477
441	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	478	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442	unless $FOCUS;	479	unless $FOCUS;
443		480
444	0	481	0
445	}	482	}
446		483
447	sub grab_focus {	484	sub grab_focus {
448	my ($self) = @_;	485	my ($self) = @_;
449		486
		487	$FOCUS->emit ("focus_out") if $FOCUS;
450	$self->emit ("focus_in");	488	$self->emit ("focus_in");
451	}	489	}
452		490
453	sub invoke_mouse_motion { 1 }	491	sub invoke_mouse_motion { 0 }
454	sub invoke_button_up { 1 }	492	sub invoke_button_up { 0 }
455	sub invoke_key_down { 1 }	493	sub invoke_key_down { 0 }
456	sub invoke_key_up { 1 }	494	sub invoke_key_up { 0 }
		495	sub invoke_mouse_wheel { 0 }
457		496
458	sub invoke_button_down {	497	sub invoke_button_down {
459	my ($self, $ev, $x, $y) = @_;	498	my ($self, $ev, $x, $y) = @_;
460		499
461	$self->grab_focus;	500	$self->grab_focus;
462		501
463	1	502	0
464	}	503	}
465		504
466	sub connect {	505	sub connect {
467	my ($self, $signal, $cb) = @_;	506	my ($self, $signal, $cb) = @_;
468		507
469	push @{ $self->{signal_cb}{$signal} }, $cb;	508	push @{ $self->{signal_cb}{$signal} }, $cb;
		509
		510	defined wantarray and CFPlus::guard {
		511	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		512	@{ $self->{signal_cb}{$signal} };
		513	}
470	}	514	}
		515
		516	sub disconnect_all {
		517	my ($self, $signal) = @_;
		518
		519	delete $self->{signal_cb}{$signal};
		520	}
		521
		522	my %has_coords = (
		523	button_down => 1,
		524	button_up => 1,
		525	mouse_motion => 1,
		526	mouse_wheel => 1,
		527	);
471		528
472	sub emit {	529	sub emit {
473	my ($self, $signal, @args) = @_;	530	my ($self, $signal, @args) = @_;
474		531
475	(List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before	532	# I do not really like this solution, but I do not like duplication
		533	# and needlessly verbose code, either.
		534	my @append
		535	= $has_coords{$signal}
		536	? $args[0]->xy ($self)
		537	: ();
		538
		539	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		540
		541	for my $cb (
		542	@{$self->{signal_cb}{$signal} || []}, # before
476	($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure	543	($self->can ("invoke_$signal") || sub { 1 }), # closure
		544	) {
		545	return $cb->($self, @args, @append) || next;
		546	}
		547
		548	# parent
477	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
478	}	550	}
479		551
480	sub find_widget {	552	sub find_widget {
481	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
482		554
…		…
490	}	562	}
491		563
492	sub set_parent {	564	sub set_parent {
493	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
494		566
495	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
496	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
497	}	569	}
498		570
499	sub realloc {	571	sub realloc {
500	my ($self) = @_;	572	my ($self) = @_;
…		…
534	return unless $self->{h} && $self->{w};	606	return unless $self->{h} && $self->{w};
535		607
536	# update screen rectangle	608	# update screen rectangle
537	local $draw_x = $draw_x + $self->{x};	609	local $draw_x = $draw_x + $self->{x};
538	local $draw_y = $draw_y + $self->{y};	610	local $draw_y = $draw_y + $self->{y};
539	local $draw_w = $draw_x + $self->{w};
540	local $draw_h = $draw_y + $self->{h};
541		611
542	# skip widgets that are entirely outside the drawing area	612	# skip widgets that are entirely outside the drawing area
543	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	613	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	614	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545		615
…		…
568	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
569	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
570	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
571	glEnd;	641	glEnd;
572	glPopMatrix;	642	glPopMatrix;
573	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	643	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
574	}	644	}
575		645
576	$self->_draw;	646	$self->_draw;
577	glPopMatrix;	647	glPopMatrix;
578	}	648	}
…		…
581	my ($self) = @_;	651	my ($self) = @_;
582		652
583	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
584	}	654	}
585		655
		656	my $cntx;#d#
586	sub DESTROY {	657	sub DESTROY {
587	my ($self) = @_;	658	my ($self) = @_;
588		659
589	delete $WIDGET{$self+0};	660	return if CFPlus::in_destruct;
590		661
591	eval { $self->destroy };	662	eval { $self->destroy };
592	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	663	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		664
		665	delete $WIDGET{$self+0};
593	}	666	}
594		667
595	#############################################################################	668	#############################################################################
596		669
597	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
598		671
599	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
600		673
601	use strict;	674	use strict;
602	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
603		676
604	sub new {	677	sub new {
605	my $class = shift;	678	my $class = shift;
606		679
607	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
638	}	711	}
639	}	712	}
640		713
641	#############################################################################	714	#############################################################################
642		715
643	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
644		717
645	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
646		719
647	sub new {	720	sub new {
648	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
649	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
650	}	723	}
…		…
657		730
658	sub draw { }	731	sub draw { }
659		732
660	#############################################################################	733	#############################################################################
661		734
662	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
663		736
664	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
665		738
666	sub new {	739	sub new {
667	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
668		741
669	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
678	if $children;	751	if $children;
679		752
680	$self	753	$self
681	}	754	}
682		755
		756	sub realloc {
		757	my ($self) = @_;
		758
		759	$self->{force_realloc} = 1;
		760	$self->{force_size_alloc} = 1;
		761	$self->SUPER::realloc;
		762	}
		763
683	sub add {	764	sub add {
684	my ($self, @widgets) = @_;	765	my ($self, @widgets) = @_;
685		766
686	$_->set_parent ($self)	767	$_->set_parent ($self)
687	for @widgets;	768	for @widgets;
…		…
747	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
748	}	829	}
749		830
750	#############################################################################	831	#############################################################################
751		832
752	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
753		834
754	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
755		836
756	sub new {	837	sub new {
757	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
758		839
759	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
760		841
761	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
762	}	843	}
763		844
764	sub add {	845	sub add {
…		…
771	sub remove {	852	sub remove {
772	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
773		854
774	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
775		856
776	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
777	unless @{$self->{children}};	858	unless @{$self->{children}};
778	}	859	}
779		860
780	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
781		862
…		…
793		874
794	#############################################################################	875	#############################################################################
795		876
796	# back-buffered drawing area	877	# back-buffered drawing area
797		878
798	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
799		880
800	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
801		882
802	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
803		884
804	sub new {	885	sub new {
805	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
806		887
807	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
829	}	910	}
830		911
831	sub render_child {	912	sub render_child {
832	my ($self) = @_;	913	my ($self) = @_;
833		914
834	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	915	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
835	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
836	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
837		918
838	{	919	{
839	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
840		921
841	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
842	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
843	}	926	}
844
845	$self->_render;
846	};	927	};
847	}	928	}
848		929
849	sub _draw {	930	sub _draw {
850	my ($self) = @_;	931	my ($self) = @_;
851
852	my ($w, $h) = @$self{qw(w h)};
853		932
854	my $tex = $self->{texture}	933	my $tex = $self->{texture}
855	or return;	934	or return;
856		935
857	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
858	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
860		939
861	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
862		941
863	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
864	}	943	}
865		944
866	#############################################################################	945	#############################################################################
867		946
868	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
869		948
		949	use List::Util qw(min max);
		950
870	our @ISA = CFClient::UI::Window::;	951	our @ISA = CFPlus::UI::Window::;
871		952
872	sub new {	953	sub new {
873	my $class = shift;	954	my $class = shift;
874		955
875	$class->SUPER::new (	956	$class->SUPER::new (
…		…
905	}	986	}
906		987
907	sub set_offset {	988	sub set_offset {
908	my ($self, $x, $y) = @_;	989	my ($self, $x, $y) = @_;
909		990
		991	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		992	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		993
		994	if ($x != $self->{view_x} or $y != $self->{view_y}) {
910	$self->{view_x} = int $x;	995	$self->{view_x} = $x;
911	$self->{view_y} = int $y;	996	$self->{view_y} = $y;
912		997
		998	$self->emit (changed => $x, $y);
913	$self->update;	999	$self->update;
		1000	}
914	}	1001	}
915		1002
916	# hmm, this does not work for topleft of $self... but we should not ask for that	1003	# hmm, this does not work for topleft of $self... but we should not ask for that
917	sub coord2local {	1004	sub coord2local {
918	my ($self, $x, $y) = @_;	1005	my ($self, $x, $y) = @_;
…		…
935	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1022	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
936	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1023	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
937	) {	1024	) {
938	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1025	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
939	} else {	1026	} else {
940	$self->CFClient::UI::Base::find_widget ($x, $y)	1027	$self->CFPlus::UI::Base::find_widget ($x, $y)
941	}	1028	}
942	}	1029	}
943		1030
944	sub _render {	1031	sub _render {
945	my ($self) = @_;	1032	my ($self) = @_;
946		1033
947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1034	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};	1035	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
949		1036
950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1037	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
951		1038
952	$self->SUPER::_render;	1039	$self->SUPER::_render;
953	}	1040	}
954		1041
955	#############################################################################	1042	#############################################################################
956		1043
957	package CFClient::UI::ScrolledWindow;	1044	package CFPlus::UI::ScrolledWindow;
958		1045
959	our @ISA = CFClient::UI::HBox::;	1046	our @ISA = CFPlus::UI::Table::;
960		1047
961	sub new {	1048	sub new {
962	my ($class, %arg) = @_;	1049	my ($class, %arg) = @_;
963		1050
964	my $child = delete $arg{child};	1051	my $child = delete $arg{child};
965		1052
966	my $self;	1053	my $self;
967		1054
968	my $slider = new CFClient::UI::Slider	1055	my $hslider = new CFPlus::UI::Slider
		1056	vertical => 0,
		1057	range => [0, 0, 1, 0.01], # HACK fix
		1058	on_changed => sub {
		1059	$self->{hpos} = $_[1];
		1060	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1061	},
		1062	;
		1063
		1064	my $vslider = new CFPlus::UI::Slider
969	vertical => 1,	1065	vertical => 1,
970	range => [0, 0, 1, 0.01], # HACK fix	1066	range => [0, 0, 1, 0.01], # HACK fix
971	on_changed => sub {	1067	on_changed => sub {
972	$self->{vp}->set_offset (0, $_[1]);	1068	$self->{vpos} = $_[1];
		1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
973	},	1070	},
974	;	1071	;
975		1072
976	$self = $class->SUPER::new (	1073	$self = $class->SUPER::new (
977	vp => (new CFClient::UI::ViewPort expand => 1),	1074	scroll_x => 0,
		1075	scroll_y => 1,
		1076	can_events => 1,
978	slider => $slider,	1077	hslider => $hslider,
		1078	vslider => $vslider,
		1079	col_expand => [1, 0],
		1080	row_expand => [1, 0],
979	%arg,	1081	%arg,
980	);	1082	);
981		1083
982	$self->SUPER::add ($self->{vp}, $self->{slider});	1084	$self->{vp} = new CFPlus::UI::ViewPort
		1085	expand => 1,
		1086	scroll_x => $self->{scroll_x},
		1087	scroll_y => $self->{scroll_y},
		1088	on_changed => sub {
		1089	my ($vp, $x, $y) = @_;
		1090
		1091	$vp->{parent}{hslider}->set_value ($x);
		1092	$vp->{parent}{vslider}->set_value ($y);
		1093
		1094	0
		1095	},
		1096	;
		1097
		1098	$self->SUPER::add_at (0, 0, $self->{vp});
		1099
983	$self->add ($child) if $child;	1100	$self->add ($child) if $child;
984		1101
985	$self	1102	$self
986	}	1103	}
		1104
		1105	#TODO# update range on size_allocate depending on child
987		1106
988	sub add {	1107	sub add {
989	my ($self, $widget) = @_;	1108	my ($self, $widget) = @_;
990		1109
991	$self->{vp}->add ($self->{child} = $widget);	1110	$self->{vp}->add ($self->{child} = $widget);
992	}	1111	}
993		1112
		1113	sub update_slider {
		1114	my ($self) = @_;
		1115
		1116	my $child = ($self->{vp} or return)->child;
		1117
		1118	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1119	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1120
		1121	my $visible = $w1 > $w2;
		1122	if ($visible != $self->{hslider}{visible}) {
		1123	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
		1124	: $self->{hslider}->hide;
		1125	}
		1126
		1127	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1128	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1129
		1130	my $visible = $h1 > $h2;
		1131	if ($visible != $self->{vslider}{visible}) {
		1132	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
		1133	: $self->{vslider}->hide;
		1134	}
		1135	}
		1136
994	sub update {	1137	sub update {
995	my ($self) = @_;	1138	my ($self) = @_;
996		1139
997	$self->SUPER::update;	1140	$self->SUPER::update;
		1141	$self->update_slider;
		1142	}
998		1143
999	# todo: overwrite size_allocate of child	1144	sub invoke_mouse_wheel {
1000	my $child = $self->{vp}->child;	1145	my ($self, $ev) = @_;
1001	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1146
		1147	return 0 unless $ev->{dy}; # only vertical movements for now
		1148
		1149	$self->{vslider}->emit (mouse_wheel => $ev);
		1150
		1151	1
		1152	}
		1153
		1154	sub invoke_button_down {
		1155	my ($self, $ev, $x, $y) = @_;
		1156
		1157	if ($ev->{button} == 2) {
		1158	$self->grab_focus;
		1159
		1160	my $ox = $self->{vp}{view_x} + $ev->{x};
		1161	my $oy = $self->{vp}{view_y} + $ev->{y};
		1162
		1163	$self->{motion} = sub {
		1164	my ($ev, $x, $y) = @_;
		1165
		1166	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1167	$self->update;
		1168	};
		1169
		1170	return 1;
		1171	}
		1172
		1173	0
		1174	}
		1175
		1176	sub invoke_button_up {
		1177	my ($self, $ev, $x, $y) = @_;
		1178
		1179	if (delete $self->{motion}) {
		1180	return 1;
		1181	}
		1182
		1183	0
		1184	}
		1185
		1186	sub invoke_mouse_motion {
		1187	my ($self, $ev, $x, $y) = @_;
		1188
		1189	if ($self->{motion}) {
		1190	$self->{motion}->($ev, $x, $y);
		1191	return 1;
		1192	}
		1193
		1194	0
1002	}	1195	}
1003		1196
1004	sub invoke_size_allocate {	1197	sub invoke_size_allocate {
1005	my ($self, $w, $h) = @_;	1198	my ($self, $w, $h) = @_;
1006		1199
1007	my $child = $self->{vp}->child;	1200	$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)	1201	$self->SUPER::invoke_size_allocate ($w, $h)
1011	}	1202	}
1012		1203
1013	#TODO# update range on size_allocate depending on child
1014	# update viewport offset on scroll
1015
1016	#############################################################################	1204	#############################################################################
1017		1205
1018	package CFClient::UI::Frame;	1206	package CFPlus::UI::Frame;
1019		1207
1020	our @ISA = CFClient::UI::Bin::;	1208	our @ISA = CFPlus::UI::Bin::;
1021		1209
1022	use CFClient::OpenGL;	1210	use CFPlus::OpenGL;
1023		1211
1024	sub new {	1212	sub new {
1025	my $class = shift;	1213	my $class = shift;
1026		1214
1027	$class->SUPER::new (	1215	$class->SUPER::new (
…		…
1053	$self->SUPER::_draw;	1241	$self->SUPER::_draw;
1054	}	1242	}
1055		1243
1056	#############################################################################	1244	#############################################################################
1057		1245
1058	package CFClient::UI::FancyFrame;	1246	package CFPlus::UI::FancyFrame;
1059		1247
1060	our @ISA = CFClient::UI::Bin::;	1248	our @ISA = CFPlus::UI::Bin::;
1061		1249
1062	use CFClient::OpenGL;	1250	use CFPlus::OpenGL;
		1251
		1252	sub new {
		1253	my ($class, %arg) = @_;
		1254
		1255	if ((exists $arg{label}) && !ref $arg{label}) {
		1256	$arg{label} = new CFPlus::UI::Label
		1257	align => 1,
		1258	valign => 0,
		1259	text => $arg{label},
		1260	fontsize => ($arg{border} || 0.8) * 0.75;
		1261	}
		1262
		1263	my $self = $class->SUPER::new (
		1264	# label => "",
		1265	fg => [0.6, 0.3, 0.1],
		1266	border => 0.8,
		1267	style => 'single',
		1268	%arg,
		1269	);
		1270
		1271	$self
		1272	}
		1273
		1274	sub add {
		1275	my ($self, @widgets) = @_;
		1276
		1277	$self->SUPER::add (@widgets);
		1278	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1279	}
		1280
		1281	sub border {
		1282	int $_[0]{border} * $::FONTSIZE
		1283	}
		1284
		1285	sub size_request {
		1286	my ($self) = @_;
		1287
		1288	($self->{label_w}, undef) = $self->{label}->size_request
		1289	if $self->{label};
		1290
		1291	my ($w, $h) = $self->SUPER::size_request;
		1292
		1293	(
		1294	$w + $self->border * 2,
		1295	$h + $self->border * 2,
		1296	)
		1297	}
		1298
		1299	sub invoke_size_allocate {
		1300	my ($self, $w, $h) = @_;
		1301
		1302	my $border = $self->border;
		1303
		1304	$w -= List::Util::max 0, $border * 2;
		1305	$h -= List::Util::max 0, $border * 2;
		1306
		1307	if (my $label = $self->{label}) {
		1308	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1309	$label->{h} = List::Util::min $h, $border;
		1310	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1311	}
		1312
		1313	$self->child->configure ($border, $border, $w, $h);
		1314
		1315	1
		1316	}
		1317
		1318	sub _draw {
		1319	my ($self) = @_;
		1320
		1321	my $child = $self->{children}[0];
		1322
		1323	my $border = $self->border;
		1324	my ($w, $h) = ($self->{w}, $self->{h});
		1325
		1326	$child->draw;
		1327
		1328	glColor @{$self->{fg}};
		1329	glBegin GL_LINE_STRIP;
		1330	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1331	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1332	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1333	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1334	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1335	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1336	glEnd;
		1337
		1338	if ($self->{label}) {
		1339	glTranslate $border * 2, 0;
		1340	$self->{label}->_draw;
		1341	}
		1342	}
		1343
		1344	#############################################################################
		1345
		1346	package CFPlus::UI::Toplevel;
		1347
		1348	our @ISA = CFPlus::UI::Bin::;
		1349
		1350	use CFPlus::OpenGL;
1063		1351
1064	my $bg =	1352	my $bg =
1065	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1353	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1066	mipmap => 1, wrap => 1;	1354	mipmap => 1, wrap => 1;
1067		1355
1068	my @border =	1356	my @border =
1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1357	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);	1358	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1359
		1360	my @icon =
		1361	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1362	qw(x1_move.png x1_resize.png);
1071		1363
1072	sub new {	1364	sub new {
1073	my ($class, %arg) = @_;	1365	my ($class, %arg) = @_;
1074		1366
1075	my $self = $class->SUPER::new (	1367	my $self = $class->SUPER::new (
1076	bg => [1, 1, 1, 1],	1368	bg => [1, 1, 1, 1],
1077	border_bg => [1, 1, 1, 1],	1369	border_bg => [1, 1, 1, 1],
1078	border => 0.6,	1370	border => 0.6,
1079	can_events => 1,	1371	can_events => 1,
1080	min_w => 16,	1372	min_w => 64,
1081	min_h => 16,	1373	min_h => 32,
1082	%arg,	1374	%arg,
1083	);	1375	);
1084		1376
1085	$self->{title_widget} = new CFClient::UI::Label	1377	$self->{title_widget} = new CFPlus::UI::Label
1086	align => 0,	1378	align => 0,
1087	valign => 1,	1379	valign => 1,
1088	text => $self->{title},	1380	text => $self->{title},
1089	fontsize => $self->{border},	1381	fontsize => $self->{border},
1090	if exists $self->{title};	1382	if exists $self->{title};
1091		1383
1092	if ($self->{has_close_button}) {	1384	if ($self->{has_close_button}) {
1093	$self->{close_button} =	1385	$self->{close_button} =
1094	new CFClient::UI::ImageButton	1386	new CFPlus::UI::ImageButton
1095	image => 'x1_close.png',	1387	path => 'x1_close.png',
1096	on_activate => sub { $self->hide };	1388	on_activate => sub { $self->emit ("delete") };
1097		1389
1098	$self->CFClient::UI::Container::add ($self->{close_button});	1390	$self->CFPlus::UI::Container::add ($self->{close_button});
1099	}	1391	}
1100		1392
1101	$self	1393	$self
1102	}	1394	}
1103		1395
1104	sub add {	1396	sub add {
1105	my ($self, @widgets) = @_;	1397	my ($self, @widgets) = @_;
1106		1398
1107	$self->SUPER::add (@widgets);	1399	$self->SUPER::add (@widgets);
1108	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1400	$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};	1401	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1110	}	1402	}
1111		1403
1112	sub border {	1404	sub border {
1113	int $_[0]{border} * $::FONTSIZE	1405	int $_[0]{border} * $::FONTSIZE
1114	}	1406	}
…		…
1147	$self->child->configure ($border, $border, $w, $h);	1439	$self->child->configure ($border, $border, $w, $h);
1148		1440
1149	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1441	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150	if $self->{close_button};	1442	if $self->{close_button};
1151		1443
		1444	1
		1445	}
		1446
		1447	sub invoke_delete {
		1448	my ($self) = @_;
		1449
		1450	$self->hide;
		1451
1152	1	1452	1
1153	}	1453	}
1154		1454
1155	sub invoke_button_down {	1455	sub invoke_button_down {
1156	my ($self, $ev, $x, $y) = @_;	1456	my ($self, $ev, $x, $y) = @_;
…		…
1214	$self->{motion}->($ev, $x, $y) if $self->{motion};	1514	$self->{motion}->($ev, $x, $y) if $self->{motion};
1215		1515
1216	! ! $self->{motion}	1516	! ! $self->{motion}
1217	}	1517	}
1218		1518
		1519	sub invoke_visibility_change {
		1520	my ($self, $visible) = @_;
		1521
		1522	delete $self->{motion} unless $visible;
		1523
		1524	0
		1525	}
		1526
1219	sub _draw {	1527	sub _draw {
1220	my ($self) = @_;	1528	my ($self) = @_;
1221		1529
1222	my $child = $self->{children}[0];	1530	my $child = $self->{children}[0];
1223		1531
…		…
1228	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1536	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1229		1537
1230	my $border = $self->border;	1538	my $border = $self->border;
1231		1539
1232	glColor @{ $self->{border_bg} };	1540	glColor @{ $self->{border_bg} };
1233	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1541	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1234	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1542	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1235	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1543	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1236	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1544	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1545
		1546	# move
		1547	my $w2 = ($w - $border) * .5;
		1548	my $h2 = ($h - $border) * .5;
		1549	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1550	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1551	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1552
		1553	# resize
		1554	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1556	unless $self->{has_close_button};
		1557	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1558	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1237		1559
1238	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1560	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1239	glColor @{ $self->{bg} };	1561	glColor @{ $self->{bg} };
1240		1562
1241	# TODO: repeat texture not scale	1563	# TODO: repeat texture not scale
…		…
1260	if $self->{close_button};	1582	if $self->{close_button};
1261	}	1583	}
1262		1584
1263	#############################################################################	1585	#############################################################################
1264		1586
1265	package CFClient::UI::Table;	1587	package CFPlus::UI::Table;
1266		1588
1267	our @ISA = CFClient::UI::Base::;	1589	our @ISA = CFPlus::UI::Base::;
1268		1590
1269	use List::Util qw(max sum);	1591	use List::Util qw(max sum);
1270		1592
1271	use CFClient::OpenGL;	1593	use CFPlus::OpenGL;
1272		1594
1273	sub new {	1595	sub new {
1274	my $class = shift;	1596	my $class = shift;
1275		1597
1276	$class->SUPER::new (	1598	$class->SUPER::new (
		1599	children => [],
1277	col_expand => [],	1600	col_expand => [],
		1601	row_expand => [],
1278	@_,	1602	@_,
1279	)	1603	)
1280	}	1604	}
1281		1605
1282	sub children {	1606	sub children {
1283	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1607	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1284	}	1608	}
1285		1609
		1610	# TODO: store row/col info in child widget and use standard add/del
1286	sub add {	1611	sub add {
1287	my ($self, $x, $y, $child) = @_;	1612	my $self = shift;
1288		1613
		1614	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
		1615	$self->add_at (@_);
		1616	}
		1617
		1618	sub add_at {
		1619	my $self = shift;
		1620
		1621	while (@_) {
		1622	my ($col, $row, $child) = splice @_, 0, 3, ();
		1623
1289	$child->set_parent ($self);	1624	$child->set_parent ($self);
1290	$self->{children}[$y][$x] = $child;	1625	$self->{children}[$row][$col] = $child;
		1626	}
1291		1627
		1628	$self->{force_realloc} = 1;
		1629	$self->{force_size_alloc} = 1;
1292	$self->realloc;	1630	$self->realloc;
1293	}	1631	}
1294		1632
1295	sub remove {	1633	sub remove {
1296	my ($self, $child) = @_;	1634	my ($self, $child) = @_;
1297		1635
1298	# TODO: not yet implemented	1636	for (@{ $self->{children} }) {
		1637	for (@{ $_ || [] }) {
		1638	$_ = undef if $_ == $child;
		1639	}
		1640	}
1299	}	1641	}
1300		1642
1301	# TODO: move to container class maybe? send children a signal on removal?	1643	# TODO: move to container class maybe? send children a signal on removal?
1302	sub clear {	1644	sub clear {
1303	my ($self) = @_;	1645	my ($self) = @_;
…		…
1352	my ($ws, $hs) = $self->get_wh;	1694	my ($ws, $hs) = $self->get_wh;
1353		1695
1354	my $req_w = (sum @$ws) || 1;	1696	my $req_w = (sum @$ws) || 1;
1355	my $req_h = (sum @$hs) || 1;	1697	my $req_h = (sum @$hs) || 1;
1356		1698
1357	# TODO: nicer code && do row_expand	1699	# TODO: nicer code
1358	my @col_expand = @{$self->{col_expand}};	1700	my @col_expand = @{$self->{col_expand}};
1359	@col_expand = (1) x @$ws unless @col_expand;	1701	@col_expand = (1) x @$ws unless @col_expand;
1360	my $col_expand = (sum @col_expand) || 1;	1702	my $col_expand = (sum @col_expand) || 1;
1361		1703
1362	# linearly scale sizes
1363	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1704	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1364	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1365		1705
1366	CFClient::UI::harmonize $ws;	1706	CFPlus::UI::harmonize $ws;
		1707
		1708	my @row_expand = @{$self->{row_expand}};
		1709	@row_expand = (1) x @$ws unless @row_expand;
		1710	my $row_expand = (sum @row_expand) || 1;
		1711
		1712	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1713
1367	CFClient::UI::harmonize $hs;	1714	CFPlus::UI::harmonize $hs;
1368		1715
1369	my $y;	1716	my $y;
1370		1717
1371	for my $r (0 .. $#{$self->{children}}) {	1718	for my $r (0 .. $#{$self->{children}}) {
1372	my $row = $self->{children}[$r]	1719	my $row = $self->{children}[$r]
…		…
1415	}	1762	}
1416	}	1763	}
1417		1764
1418	#############################################################################	1765	#############################################################################
1419		1766
1420	package CFClient::UI::Box;	1767	package CFPlus::UI::Fixed;
1421		1768
		1769	use List::Util qw(min max);
		1770
1422	our @ISA = CFClient::UI::Container::;	1771	our @ISA = CFPlus::UI::Container::;
		1772
		1773	sub add {
		1774	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1775
		1776	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1777	$self->SUPER::add ($child);
		1778	}
		1779
		1780	sub _scale($$$) {
		1781	my ($mode, $val, $max) = @_;
		1782
		1783	$mode eq "abs" ? $val
		1784	: $mode eq "rel" ? $val * $max
		1785	: 0
		1786	}
		1787
		1788	sub size_request {
		1789	my ($self) = @_;
		1790
		1791	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1792
		1793	# determine overall size by querying abs widgets
		1794	for my $child ($self->visible_children) {
		1795	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1796
		1797	if ($pos eq "abs") {
		1798	$w = _scale $size, $w, $child->{req_w};
		1799	$h = _scale $size, $h, $child->{req_h};
		1800
		1801	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1802	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1803	}
		1804	}
		1805
		1806	my $W = $x2 - $x1;
		1807	my $H = $y2 - $y1;
		1808
		1809	# now layout remaining widgets
		1810	for my $child ($self->visible_children) {
		1811	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1812
		1813	if ($pos ne "abs") {
		1814	$x = _scale $pos, $x, $W;
		1815	$y = _scale $pos, $x, $H;
		1816	$w = _scale $size, $w, $child->{req_w};
		1817	$h = _scale $size, $h, $child->{req_h};
		1818
		1819	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1820	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1821	}
		1822	}
		1823
		1824	my $W = $x2 - $x1;
		1825	my $H = $y2 - $y1;
		1826
		1827	($W, $H)
		1828	}
		1829
		1830	sub invoke_size_allocate {
		1831	my ($self, $W, $H) = @_;
		1832
		1833	for my $child ($self->visible_children) {
		1834	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1835
		1836	$x = _scale $pos, $x, $W;
		1837	$y = _scale $pos, $x, $H;
		1838	$w = _scale $size, $w, $child->{req_w};
		1839	$h = _scale $size, $h, $child->{req_h};
		1840
		1841	$child->configure ($x, $y, $w, $h);
		1842	}
		1843
		1844	1
		1845	}
		1846
		1847	#############################################################################
		1848
		1849	package CFPlus::UI::Box;
		1850
		1851	our @ISA = CFPlus::UI::Container::;
1423		1852
1424	sub size_request {	1853	sub size_request {
1425	my ($self) = @_;	1854	my ($self) = @_;
1426		1855
1427	$self->{vertical}	1856	$self->{vertical}
…		…
1437		1866
1438	sub invoke_size_allocate {	1867	sub invoke_size_allocate {
1439	my ($self, $w, $h) = @_;	1868	my ($self, $w, $h) = @_;
1440		1869
1441	my $space = $self->{vertical} ? $h : $w;	1870	my $space = $self->{vertical} ? $h : $w;
1442	my $children = $self->{children};	1871	my @children = $self->visible_children;
1443		1872
1444	my @req;	1873	my @req;
1445		1874
1446	if ($self->{homogeneous}) {	1875	if ($self->{homogeneous}) {
1447	@req = ($space / (@$children || 1)) x @$children;	1876	@req = ($space / (@children || 1)) x @children;
1448	} else {	1877	} else {
1449	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1878	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450	my $req = List::Util::sum @req;	1879	my $req = List::Util::sum @req;
1451		1880
1452	if ($req > $space) {	1881	if ($req > $space) {
1453	# ah well, not enough space	1882	# ah well, not enough space
1454	$_ *= $space / $req for @req;	1883	$_ *= $space / $req for @req;
1455	} else {	1884	} else {
1456	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1885	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457		1886
1458	$space = ($space - $req) / $expand; # remaining space to give away	1887	$space = ($space - $req) / $expand; # remaining space to give away
1459		1888
1460	$req[$_] += $space * $children->[$_]{expand}	1889	$req[$_] += $space * $children[$_]{expand}
1461	for 0 .. $#$children;	1890	for 0 .. $#children;
1462	}	1891	}
1463	}	1892	}
1464		1893
1465	CFClient::UI::harmonize \@req;	1894	CFPlus::UI::harmonize \@req;
1466		1895
1467	my $pos = 0;	1896	my $pos = 0;
1468	for (0 .. $#$children) {	1897	for (0 .. $#children) {
1469	my $alloc = $req[$_];	1898	my $alloc = $req[$_];
1470	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1899	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471		1900
1472	$pos += $alloc;	1901	$pos += $alloc;
1473	}	1902	}
1474		1903
1475	1	1904	1
1476	}	1905	}
1477		1906
1478	#############################################################################	1907	#############################################################################
1479		1908
1480	package CFClient::UI::HBox;	1909	package CFPlus::UI::HBox;
1481		1910
1482	our @ISA = CFClient::UI::Box::;	1911	our @ISA = CFPlus::UI::Box::;
1483		1912
1484	sub new {	1913	sub new {
1485	my $class = shift;	1914	my $class = shift;
1486		1915
1487	$class->SUPER::new (	1916	$class->SUPER::new (
…		…
1490	)	1919	)
1491	}	1920	}
1492		1921
1493	#############################################################################	1922	#############################################################################
1494		1923
1495	package CFClient::UI::VBox;	1924	package CFPlus::UI::VBox;
1496		1925
1497	our @ISA = CFClient::UI::Box::;	1926	our @ISA = CFPlus::UI::Box::;
1498		1927
1499	sub new {	1928	sub new {
1500	my $class = shift;	1929	my $class = shift;
1501		1930
1502	$class->SUPER::new (	1931	$class->SUPER::new (
…		…
1505	)	1934	)
1506	}	1935	}
1507		1936
1508	#############################################################################	1937	#############################################################################
1509		1938
1510	package CFClient::UI::Label;	1939	package CFPlus::UI::Label;
1511		1940
1512	our @ISA = CFClient::UI::DrawBG::;	1941	our @ISA = CFPlus::UI::DrawBG::;
1513		1942
1514	use CFClient::OpenGL;	1943	use CFPlus::OpenGL;
1515		1944
1516	sub new {	1945	sub new {
1517	my ($class, %arg) = @_;	1946	my ($class, %arg) = @_;
1518		1947
1519	my $self = $class->SUPER::new (	1948	my $self = $class->SUPER::new (
…		…
1522	#active_bg => none	1951	#active_bg => none
1523	#font => default_font	1952	#font => default_font
1524	#text => initial text	1953	#text => initial text
1525	#markup => initial narkup	1954	#markup => initial narkup
1526	#max_w => maximum pixel width	1955	#max_w => maximum pixel width
		1956	#style => 0, # render flags
1527	ellipsise => 3, # end	1957	ellipsise => 3, # end
1528	layout => (new CFClient::Layout),	1958	layout => (new CFPlus::Layout),
1529	fontsize => 1,	1959	fontsize => 1,
1530	align => -1,	1960	align => -1,
1531	valign => -1,	1961	valign => -1,
1532	padding_x => 2,	1962	padding_x => 2,
1533	padding_y => 2,	1963	padding_y => 2,
1534	can_events => 0,	1964	can_events => 0,
1535	%arg	1965	%arg
1536	);	1966	);
1537		1967
1538	if (exists $self->{template}) {	1968	if (exists $self->{template}) {
1539	my $layout = new CFClient::Layout;	1969	my $layout = new CFPlus::Layout;
1540	$layout->set_text (delete $self->{template});	1970	$layout->set_text (delete $self->{template});
1541	$self->{template} = $layout;	1971	$self->{template} = $layout;
1542	}	1972	}
1543		1973
1544	if (exists $self->{markup}) {	1974	if (exists $self->{markup}) {
…		…
1548	}	1978	}
1549		1979
1550	$self	1980	$self
1551	}	1981	}
1552		1982
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 {	1983	sub update {
1564	my ($self) = @_;	1984	my ($self) = @_;
1565		1985
1566	delete $self->{texture};	1986	delete $self->{texture};
1567	$self->SUPER::update;	1987	$self->SUPER::update;
…		…
1578	my ($self, $text) = @_;	1998	my ($self, $text) = @_;
1579		1999
1580	return if $self->{text} eq "T$text";	2000	return if $self->{text} eq "T$text";
1581	$self->{text} = "T$text";	2001	$self->{text} = "T$text";
1582		2002
1583	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584	$self->{layout}->set_text ($text);	2003	$self->{layout}->set_text ($text);
1585		2004
1586	delete $self->{size_req};	2005	delete $self->{size_req};
1587	$self->realloc;	2006	$self->realloc;
1588	$self->update;	2007	$self->update;
…		…
1594	return if $self->{text} eq "M$markup";	2013	return if $self->{text} eq "M$markup";
1595	$self->{text} = "M$markup";	2014	$self->{text} = "M$markup";
1596		2015
1597	my $rgba = $markup =~ /span.*(?:foreground|background)/;	2016	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598		2017
1599	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600	$self->{layout}->set_markup ($markup);	2018	$self->{layout}->set_markup ($markup);
1601		2019
1602	delete $self->{size_req};	2020	delete $self->{size_req};
1603	$self->realloc;	2021	$self->realloc;
1604	$self->update;	2022	$self->update;
…		…
1616		2034
1617	my ($w, $h) = $self->{layout}->size;	2035	my ($w, $h) = $self->{layout}->size;
1618		2036
1619	if (exists $self->{template}) {	2037	if (exists $self->{template}) {
1620	$self->{template}->set_font ($self->{font}) if $self->{font};	2038	$self->{template}->set_font ($self->{font}) if $self->{font};
		2039	$self->{template}->set_width ($self->{max_w} || -1);
1621	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2040	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622		2041
1623	my ($w2, $h2) = $self->{template}->size;	2042	my ($w2, $h2) = $self->{template}->size;
1624		2043
1625	$w = List::Util::max $w, $w2;	2044	$w = List::Util::max $w, $w2;
…		…
1630	};	2049	};
1631		2050
1632	@{ $self->{size_req} }	2051	@{ $self->{size_req} }
1633	}	2052	}
1634		2053
		2054	sub baseline_shift {
		2055	$_[0]{layout}->descent
		2056	}
		2057
1635	sub invoke_size_allocate {	2058	sub invoke_size_allocate {
1636	my ($self, $w, $h) = @_;	2059	my ($self, $w, $h) = @_;
1637		2060
1638	delete $self->{ox};	2061	delete $self->{ox};
1639		2062
…		…
1645		2068
1646	sub set_fontsize {	2069	sub set_fontsize {
1647	my ($self, $fontsize) = @_;	2070	my ($self, $fontsize) = @_;
1648		2071
1649	$self->{fontsize} = $fontsize;	2072	$self->{fontsize} = $fontsize;
		2073	delete $self->{size_req};
1650	delete $self->{texture};	2074	delete $self->{texture};
1651		2075
1652	$self->realloc;	2076	$self->realloc;
1653	}	2077	}
1654		2078
1655	sub reconfigure {	2079	sub reconfigure {
1656	my ($self) = @_;	2080	my ($self) = @_;
1657		2081
1658	delete $self->{size_req};	2082	delete $self->{size_req};
		2083	delete $self->{texture};
1659		2084
1660	$self->SUPER::reconfigure;	2085	$self->SUPER::reconfigure;
1661	}	2086	}
1662		2087
1663	sub _draw {	2088	sub _draw {
1664	my ($self) = @_;	2089	my ($self) = @_;
1665		2090
1666	$self->SUPER::_draw; # draw background, if applicable	2091	$self->SUPER::_draw; # draw background, if applicable
1667		2092
1668	my $tex = $self->{texture} ||= do {	2093	my $size = $self->{texture} ||= do {
1669	$self->{layout}->set_foreground (@{$self->{fg}});	2094	$self->{layout}->set_foreground (@{$self->{fg}});
1670	$self->{layout}->set_font ($self->{font}) if $self->{font};	2095	$self->{layout}->set_font ($self->{font}) if $self->{font};
1671	$self->{layout}->set_width ($self->{w});	2096	$self->{layout}->set_width ($self->{w});
1672	$self->{layout}->set_ellipsise ($self->{ellipsise});	2097	$self->{layout}->set_ellipsise ($self->{ellipsise});
1673	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2098	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2099	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675		2100
1676	new_from_layout CFClient::Texture $self->{layout}	2101	[$self->{layout}->size]
1677	};	2102	};
1678		2103
1679	unless (exists $self->{ox}) {	2104	unless (exists $self->{ox}) {
1680	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2105	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2106	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682	: ($self->{w} - $tex->{w}) * 0.5);	2107	: ($self->{w} - $size->[0]) * 0.5);
1683		2108
1684	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2109	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2110	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686	: ($self->{h} - $tex->{h}) * 0.5);	2111	: ($self->{h} - $size->[1]) * 0.5);
1687	};	2112	};
1688		2113
1689	glEnable GL_TEXTURE_2D;
1690
1691	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2114	my $w = List::Util::min $self->{w} + 4, $size->[0];
1692	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2115	my $h = List::Util::min $self->{h} + 2, $size->[1];
1693		2116
1694	if ($tex->{format} == GL_ALPHA) {	2117	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
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	}	2118	}
1705		2119
1706	#############################################################################	2120	#############################################################################
1707		2121
1708	package CFClient::UI::EntryBase;	2122	package CFPlus::UI::EntryBase;
1709		2123
1710	our @ISA = CFClient::UI::Label::;	2124	our @ISA = CFPlus::UI::Label::;
1711		2125
1712	use CFClient::OpenGL;	2126	use CFPlus::OpenGL;
1713		2127
1714	sub new {	2128	sub new {
1715	my $class = shift;	2129	my $class = shift;
1716		2130
1717	$class->SUPER::new (	2131	$class->SUPER::new (
…		…
1721	active_fg => [0, 0, 0],	2135	active_fg => [0, 0, 0],
1722	can_hover => 1,	2136	can_hover => 1,
1723	can_focus => 1,	2137	can_focus => 1,
1724	valign => 0,	2138	valign => 0,
1725	can_events => 1,	2139	can_events => 1,
		2140	ellipsise => 0,
1726	#text => ...	2141	#text => ...
1727	#hidden => "*",	2142	#hidden => "*",
1728	@_	2143	@_
1729	)	2144	)
1730	}	2145	}
…		…
1775	my $sym = $ev->{sym};	2190	my $sym = $ev->{sym};
1776	my $uni = $ev->{unicode};	2191	my $uni = $ev->{unicode};
1777		2192
1778	my $text = $self->get_text;	2193	my $text = $self->get_text;
1779		2194
		2195	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2196
1780	if ($uni == 8) {	2197	if ($uni == 8) {
1781	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2198	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1782	} elsif ($uni == 127) {	2199	} elsif ($uni == 127) {
1783	substr $text, $self->{cursor}, 1, "";	2200	substr $text, $self->{cursor}, 1, "";
1784	} elsif ($sym == CFClient::SDLK_LEFT) {	2201	} elsif ($sym == CFPlus::SDLK_LEFT) {
1785	--$self->{cursor} if $self->{cursor};	2202	--$self->{cursor} if $self->{cursor};
1786	} elsif ($sym == CFClient::SDLK_RIGHT) {	2203	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1787	++$self->{cursor} if $self->{cursor} < length $self->{text};	2204	++$self->{cursor} if $self->{cursor} < length $self->{text};
1788	} elsif ($sym == CFClient::SDLK_HOME) {	2205	} elsif ($sym == CFPlus::SDLK_HOME) {
		2206	# what a hack
		2207	$self->{cursor} =
		2208	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2209	? length $1
		2210	: 0;
		2211	} elsif ($sym == CFPlus::SDLK_END) {
		2212	# uh, again
		2213	$self->{cursor} =
		2214	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2215	? $self->{cursor} + length $1
		2216	: length $self->{text};
		2217	} elsif ($uni == 21) { # ctrl-u
		2218	$text = "";
1789	$self->{cursor} = 0;	2219	$self->{cursor} = 0;
1790	} elsif ($sym == CFClient::SDLK_END) {
1791	$self->{cursor} = length $text;
1792	} elsif ($uni == 27) {	2220	} elsif ($uni == 27) {
1793	$self->emit ('escape');	2221	$self->emit ('escape');
1794	} elsif ($uni) {	2222	} elsif ($uni == 0x0d) {
		2223	substr $text, $self->{cursor}++, 0, "\012";
		2224	} elsif ($uni >= 0x20) {
1795	substr $text, $self->{cursor}++, 0, chr $uni;	2225	substr $text, $self->{cursor}++, 0, chr $uni;
1796	} else {	2226	} else {
1797	return 0;	2227	return 0;
1798	}	2228	}
1799		2229
1800	$self->_set_text ($text);	2230	$self->_set_text ($text);
1801		2231
1802	$self->realloc;	2232	$self->realloc;
		2233	$self->update;
1803		2234
1804	1	2235	1
1805	}	2236	}
1806		2237
1807	sub invoke_focus_in {	2238	sub invoke_focus_in {
…		…
1819		2250
1820	my $idx = $self->{layout}->xy_to_index ($x, $y);	2251	my $idx = $self->{layout}->xy_to_index ($x, $y);
1821		2252
1822	# byte-index to char-index	2253	# byte-index to char-index
1823	my $text = $self->{text};	2254	my $text = $self->{text};
1824	utf8::encode $text;	2255	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825	$self->{cursor} = length substr $text, 0, $idx;	2256	$self->{cursor} = length $text;
1826		2257
1827	$self->_set_text ($self->{text});	2258	$self->_set_text ($self->{text});
1828	$self->update;	2259	$self->update;
1829		2260
1830	1	2261	1
…		…
1869	utf8::encode $text;	2300	utf8::encode $text;
1870		2301
1871	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2302	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1872	}	2303	}
1873		2304
1874	glColor @{$self->{fg}};
1875	glBegin GL_LINES;	2305	glBegin GL_LINES;
1876	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2306	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};	2307	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1878	glEnd;	2308	glEnd;
1879	}	2309	}
1880	}	2310	}
1881		2311
		2312	#############################################################################
		2313
1882	package CFClient::UI::Entry;	2314	package CFPlus::UI::Entry;
1883		2315
1884	our @ISA = CFClient::UI::EntryBase::;	2316	our @ISA = CFPlus::UI::EntryBase::;
1885		2317
1886	use CFClient::OpenGL;	2318	use CFPlus::OpenGL;
1887		2319
1888	sub invoke_key_down {	2320	sub invoke_key_down {
1889	my ($self, $ev) = @_;	2321	my ($self, $ev) = @_;
1890		2322
1891	my $sym = $ev->{sym};	2323	my $sym = $ev->{sym};
1892		2324
1893	if ($sym == 13) {	2325	if ($ev->{uni} == 0x0d || $sym == 13) {
1894	unshift @{$self->{history}},	2326	unshift @{$self->{history}},
1895	my $txt = $self->get_text;	2327	my $txt = $self->get_text;
		2328
1896	$self->{history_pointer} = -1;	2329	$self->{history_pointer} = -1;
1897	$self->{history_saveback} = '';	2330	$self->{history_saveback} = '';
1898	$self->emit (activate => $txt);	2331	$self->emit (activate => $txt);
1899	$self->update;	2332	$self->update;
1900		2333
1901	} elsif ($sym == CFClient::SDLK_UP) {	2334	} elsif ($sym == CFPlus::SDLK_UP) {
1902	if ($self->{history_pointer} < 0) {	2335	if ($self->{history_pointer} < 0) {
1903	$self->{history_saveback} = $self->get_text;	2336	$self->{history_saveback} = $self->get_text;
1904	}	2337	}
1905	if (@{$self->{history} || []} > 0) {	2338	if (@{$self->{history} || []} > 0) {
1906	$self->{history_pointer}++;	2339	$self->{history_pointer}++;
…		…
1908	$self->{history_pointer} = @{$self->{history} || []} - 1;	2341	$self->{history_pointer} = @{$self->{history} || []} - 1;
1909	}	2342	}
1910	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2343	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1911	}	2344	}
1912		2345
1913	} elsif ($sym == CFClient::SDLK_DOWN) {	2346	} elsif ($sym == CFPlus::SDLK_DOWN) {
1914	$self->{history_pointer}--;	2347	$self->{history_pointer}--;
1915	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2348	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1916		2349
1917	if ($self->{history_pointer} >= 0) {	2350	if ($self->{history_pointer} >= 0) {
1918	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2351	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1927	1	2360	1
1928	}	2361	}
1929		2362
1930	#############################################################################	2363	#############################################################################
1931		2364
		2365	package CFPlus::UI::TextEdit;
		2366
		2367	our @ISA = CFPlus::UI::EntryBase::;
		2368
		2369	use CFPlus::OpenGL;
		2370
		2371	sub move_cursor_ver {
		2372	my ($self, $dy) = @_;
		2373
		2374	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2375
		2376	$y += $dy;
		2377
		2378	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2379	$self->{cursor} = $index;
		2380	delete $self->{cur_h};
		2381	$self->update;
		2382	return;
		2383	}
		2384	}
		2385
		2386	sub invoke_key_down {
		2387	my ($self, $ev) = @_;
		2388
		2389	my $sym = $ev->{sym};
		2390
		2391	if ($sym == CFPlus::SDLK_UP) {
		2392	$self->move_cursor_ver (-1);
		2393	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2394	$self->move_cursor_ver (+1);
		2395	} else {
		2396	return $self->SUPER::invoke_key_down ($ev)
		2397	}
		2398
		2399	1
		2400	}
		2401
		2402	#############################################################################
		2403
1932	package CFClient::UI::Button;	2404	package CFPlus::UI::Button;
1933		2405
1934	our @ISA = CFClient::UI::Label::;	2406	our @ISA = CFPlus::UI::Label::;
1935		2407
1936	use CFClient::OpenGL;	2408	use CFPlus::OpenGL;
1937		2409
1938	my @tex =	2410	my @tex =
1939	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2411	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1940	qw(b1_button_active.png);	2412	qw(b1_button_inactive.png b1_button_active.png);
1941		2413
1942	sub new {	2414	sub new {
1943	my $class = shift;	2415	my $class = shift;
1944		2416
1945	$class->SUPER::new (	2417	$class->SUPER::new (
1946	padding_x => 4,	2418	padding_x => 4,
1947	padding_y => 4,	2419	padding_y => 4,
1948	fg => [1, 1, 1],	2420	fg => [1.0, 1.0, 1.0],
1949	active_fg => [0, 0, 1],	2421	active_fg => [0.8, 0.8, 0.8],
1950	can_hover => 1,	2422	can_hover => 1,
1951	align => 0,	2423	align => 0,
1952	valign => 0,	2424	valign => 0,
1953	can_events => 1,	2425	can_events => 1,
1954	@_	2426	@_
…		…
1972		2444
1973	glEnable GL_TEXTURE_2D;	2445	glEnable GL_TEXTURE_2D;
1974	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2446	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1975	glColor 0, 0, 0, 1;	2447	glColor 0, 0, 0, 1;
1976		2448
		2449	my $tex = $tex[$GRAB == $self];
1977	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2450	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1978		2451
1979	glDisable GL_TEXTURE_2D;	2452	glDisable GL_TEXTURE_2D;
1980		2453
1981	$self->SUPER::_draw;	2454	$self->SUPER::_draw;
1982	}	2455	}
1983		2456
1984	#############################################################################	2457	#############################################################################
1985		2458
		2459	package CFPlus::UI::CheckBox;
		2460
		2461	our @ISA = CFPlus::UI::DrawBG::;
		2462
		2463	my @tex =
		2464	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2465	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2466
		2467	use CFPlus::OpenGL;
		2468
		2469	sub new {
		2470	my $class = shift;
		2471
		2472	$class->SUPER::new (
		2473	padding_x => 2,
		2474	padding_y => 2,
		2475	fg => [1, 1, 1],
		2476	active_fg => [1, 1, 0],
		2477	bg => [0, 0, 0, 0.2],
		2478	active_bg => [1, 1, 1, 0.5],
		2479	state => 0,
		2480	can_hover => 1,
		2481	@_
		2482	)
		2483	}
		2484
		2485	sub size_request {
		2486	my ($self) = @_;
		2487
		2488	(6) x 2
		2489	}
		2490
		2491	sub toggle {
		2492	my ($self) = @_;
		2493
		2494	$self->{state} = !$self->{state};
		2495	$self->emit (changed => $self->{state});
		2496	$self->update;
		2497	}
		2498
		2499	sub invoke_button_down {
		2500	my ($self, $ev, $x, $y) = @_;
		2501
		2502	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2503	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2504	$self->toggle;
		2505	} else {
		2506	return 0
		2507	}
		2508
		2509	1
		2510	}
		2511
		2512	sub _draw {
		2513	my ($self) = @_;
		2514
		2515	$self->SUPER::_draw;
		2516
		2517	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2518
		2519	my ($w, $h) = @$self{qw(w h)};
		2520
		2521	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2522
		2523	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2524
		2525	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2526
		2527	glEnable GL_TEXTURE_2D;
		2528	$tex->draw_quad_alpha (0, 0, $s, $s);
		2529	glDisable GL_TEXTURE_2D;
		2530	}
		2531
		2532	#############################################################################
		2533
		2534	package CFPlus::UI::Image;
		2535
		2536	our @ISA = CFPlus::UI::Base::;
		2537
		2538	use CFPlus::OpenGL;
		2539
		2540	our %texture_cache;
		2541
		2542	sub new {
		2543	my $class = shift;
		2544
		2545	my $self = $class->SUPER::new (
		2546	can_events => 0,
		2547	@_,
		2548	);
		2549
		2550	$self->{path} || $self->{tex}
		2551	or Carp::croak "'path' or 'tex' attributes required";
		2552
		2553	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2554	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2555
		2556	CFPlus::weaken $texture_cache{$self->{path}};
		2557
		2558	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2559
		2560	$self
		2561	}
		2562
		2563	sub STORABLE_freeze {
		2564	my ($self, $cloning) = @_;
		2565
		2566	$self->{path}
		2567	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2568
		2569	$self->{path}
		2570	}
		2571
		2572	sub STORABLE_attach {
		2573	my ($self, $cloning, $path) = @_;
		2574
		2575	$self->new (path => $path)
		2576	}
		2577
		2578	sub size_request {
		2579	my ($self) = @_;
		2580
		2581	($self->{tex}{w}, $self->{tex}{h})
		2582	}
		2583
		2584	sub _draw {
		2585	my ($self) = @_;
		2586
		2587	my $tex = $self->{tex};
		2588
		2589	my ($w, $h) = ($self->{w}, $self->{h});
		2590
		2591	if ($self->{rot90}) {
		2592	glRotate 90, 0, 0, 1;
		2593	glTranslate 0, -$self->{w}, 0;
		2594
		2595	($w, $h) = ($h, $w);
		2596	}
		2597
		2598	glEnable GL_TEXTURE_2D;
		2599	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2600
		2601	$tex->draw_quad (0, 0, $w, $h);
		2602
		2603	glDisable GL_TEXTURE_2D;
		2604	}
		2605
		2606	#############################################################################
		2607
1986	package CFClient::UI::ImageButton;	2608	package CFPlus::UI::ImageButton;
1987		2609
1988	our @ISA = CFClient::UI::Image::;	2610	our @ISA = CFPlus::UI::Image::;
1989		2611
1990	use CFClient::OpenGL;	2612	use CFPlus::OpenGL;
1991		2613
1992	my %textures;	2614	my %textures;
1993		2615
1994	sub new {	2616	sub new {
1995	my $class = shift;	2617	my $class = shift;
…		…
2017	1	2639	1
2018	}	2640	}
2019		2641
2020	#############################################################################	2642	#############################################################################
2021		2643
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;	2644	package CFPlus::UI::VGauge;
2091		2645
2092	our @ISA = CFClient::UI::Base::;	2646	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		2647
2152	use List::Util qw(min max);	2648	use List::Util qw(min max);
2153		2649
2154	use CFClient::OpenGL;	2650	use CFPlus::OpenGL;
2155		2651
2156	my %tex = (	2652	my %tex = (
2157	food => [	2653	food => [
2158	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2654	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2159	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2655	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2160	],	2656	],
2161	grace => [	2657	grace => [
2162	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2658	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/	2659	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2164	],	2660	],
2165	hp => [	2661	hp => [
2166	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2662	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2167	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2663	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2168	],	2664	],
2169	mana => [	2665	mana => [
2170	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2666	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/	2667	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2172	],	2668	],
2173	);	2669	);
2174		2670
2175	# eg. VGauge->new (gauge => 'food'), default gauge: food	2671	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2235	my $ycut1 = max 0, min 1, $ycut;	2731	my $ycut1 = max 0, min 1, $ycut;
2236	my $ycut2 = max 0, min 1, $ycut - 1;	2732	my $ycut2 = max 0, min 1, $ycut - 1;
2237		2733
2238	my $h1 = $self->{h} * (1 - $ycut1);	2734	my $h1 = $self->{h} * (1 - $ycut1);
2239	my $h2 = $self->{h} * (1 - $ycut2);	2735	my $h2 = $self->{h} * (1 - $ycut2);
		2736	my $h3 = $self->{h};
		2737
		2738	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2240		2739
2241	glEnable GL_BLEND;	2740	glEnable GL_BLEND;
2242	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2741	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2243	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2742	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2244	glEnable GL_TEXTURE_2D;	2743	glEnable GL_TEXTURE_2D;
…		…
2263		2762
2264	if ($t3) {	2763	if ($t3) {
2265	glBindTexture GL_TEXTURE_2D, $t3->{name};	2764	glBindTexture GL_TEXTURE_2D, $t3->{name};
2266	glBegin GL_QUADS;	2765	glBegin GL_QUADS;
2267	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2766	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2268	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2767	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2269	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2768	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2270	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2769	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2271	glEnd;	2770	glEnd;
2272	}	2771	}
2273		2772
2274	glDisable GL_BLEND;	2773	glDisable GL_BLEND;
2275	glDisable GL_TEXTURE_2D;	2774	glDisable GL_TEXTURE_2D;
2276	}	2775	}
2277		2776
2278	#############################################################################	2777	#############################################################################
2279		2778
2280	package CFClient::UI::Gauge;	2779	package CFPlus::UI::Gauge;
2281		2780
2282	our @ISA = CFClient::UI::VBox::;	2781	our @ISA = CFPlus::UI::VBox::;
2283		2782
2284	sub new {	2783	sub new {
2285	my ($class, %arg) = @_;	2784	my ($class, %arg) = @_;
2286		2785
2287	my $self = $class->SUPER::new (	2786	my $self = $class->SUPER::new (
…		…
2289	can_hover => 1,	2788	can_hover => 1,
2290	can_events => 1,	2789	can_events => 1,
2291	%arg,	2790	%arg,
2292	);	2791	);
2293		2792
2294	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2793	$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);	2794	$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");	2795	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2297		2796
2298	$self	2797	$self
2299	}	2798	}
2300		2799
2301	sub set_fontsize {	2800	sub set_fontsize {
…		…
2322	$self->{value}->set_text ($val);	2821	$self->{value}->set_text ($val);
2323	}	2822	}
2324		2823
2325	#############################################################################	2824	#############################################################################
2326		2825
2327	package CFClient::UI::Slider;	2826	package CFPlus::UI::Slider;
2328		2827
2329	use strict;	2828	use strict;
2330		2829
2331	use CFClient::OpenGL;	2830	use CFPlus::OpenGL;
2332		2831
2333	our @ISA = CFClient::UI::DrawBG::;	2832	our @ISA = CFPlus::UI::DrawBG::;
2334		2833
2335	my @tex =	2834	my @tex =
2336	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2835	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2337	qw(s1_slider.png s1_slider_bg.png);	2836	qw(s1_slider.png s1_slider_bg.png);
2338		2837
2339	sub new {	2838	sub new {
2340	my $class = shift;	2839	my $class = shift;
2341		2840
…		…
2409		2908
2410	$self->SUPER::invoke_button_down ($ev, $x, $y);	2909	$self->SUPER::invoke_button_down ($ev, $x, $y);
2411		2910
2412	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2911	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2413		2912
2414	$self->mouse_motion ($ev, $x, $y)	2913	$self->invoke_mouse_motion ($ev, $x, $y)
2415	}	2914	}
2416		2915
2417	sub invoke_mouse_motion {	2916	sub invoke_mouse_motion {
2418	my ($self, $ev, $x, $y) = @_;	2917	my ($self, $ev, $x, $y) = @_;
2419		2918
…		…
2428	} else {	2927	} else {
2429	return 0;	2928	return 0;
2430	}	2929	}
2431		2930
2432	1	2931	1
		2932	}
		2933
		2934	sub invoke_mouse_wheel {
		2935	my ($self, $ev) = @_;
		2936
		2937	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2938
		2939	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2940
		2941	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2942
		2943	! ! $delta
2433	}	2944	}
2434		2945
2435	sub update {	2946	sub update {
2436	my ($self) = @_;	2947	my ($self) = @_;
2437		2948
…		…
2486	glDisable GL_TEXTURE_2D;	2997	glDisable GL_TEXTURE_2D;
2487	}	2998	}
2488		2999
2489	#############################################################################	3000	#############################################################################
2490		3001
2491	package CFClient::UI::ValSlider;	3002	package CFPlus::UI::ValSlider;
2492		3003
2493	our @ISA = CFClient::UI::HBox::;	3004	our @ISA = CFPlus::UI::HBox::;
2494		3005
2495	sub new {	3006	sub new {
2496	my ($class, %arg) = @_;	3007	my ($class, %arg) = @_;
2497		3008
2498	my $range = delete $arg{range};	3009	my $range = delete $arg{range};
2499		3010
2500	my $self = $class->SUPER::new (	3011	my $self = $class->SUPER::new (
2501	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3012	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2502	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3013	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2503	to_value => sub { shift },	3014	to_value => sub { shift },
2504	from_value => sub { shift },	3015	from_value => sub { shift },
2505	%arg,	3016	%arg,
2506	);	3017	);
2507		3018
…		…
2527	sub set_range { shift->{slider}->set_range (@_) }	3038	sub set_range { shift->{slider}->set_range (@_) }
2528	sub set_value { shift->{slider}->set_value (@_) }	3039	sub set_value { shift->{slider}->set_value (@_) }
2529		3040
2530	#############################################################################	3041	#############################################################################
2531		3042
2532	package CFClient::UI::TextScroller;	3043	package CFPlus::UI::TextScroller;
2533		3044
2534	our @ISA = CFClient::UI::HBox::;	3045	our @ISA = CFPlus::UI::HBox::;
2535		3046
2536	use CFClient::OpenGL;	3047	use CFPlus::OpenGL;
2537		3048
2538	sub new {	3049	sub new {
2539	my $class = shift;	3050	my $class = shift;
2540		3051
2541	my $self = $class->SUPER::new (	3052	my $self = $class->SUPER::new (
2542	fontsize => 1,	3053	fontsize => 1,
2543	can_events => 0,	3054	can_events => 1,
2544	indent => 0,	3055	indent => 0,
2545	#font => default_font	3056	#font => default_font
2546	@_,	3057	@_,
2547		3058
2548	layout => (new CFClient::Layout 1),	3059	layout => (new CFPlus::Layout),
2549	par => [],	3060	par => [],
		3061	max_par => 0,
2550	height => 0,	3062	height => 0,
2551	children => [	3063	children => [
2552	(new CFClient::UI::Empty expand => 1),	3064	(new CFPlus::UI::Empty expand => 1),
2553	(new CFClient::UI::Slider vertical => 1),	3065	(new CFPlus::UI::Slider vertical => 1),
2554	],	3066	],
2555	);	3067	);
2556		3068
2557	$self->{children}[1]->connect (changed => sub { $self->update });	3069	$self->{children}[1]->connect (changed => sub { $self->update });
2558		3070
…		…
2564		3076
2565	$self->{fontsize} = $fontsize;	3077	$self->{fontsize} = $fontsize;
2566	$self->reflow;	3078	$self->reflow;
2567	}	3079	}
2568		3080
		3081	sub size_request {
		3082	my ($self) = @_;
		3083
		3084	my ($empty, $slider) = @{ $self->{children} };
		3085
		3086	local $self->{children} = [$empty, $slider];
		3087	$self->SUPER::size_request
		3088	}
		3089
2569	sub invoke_size_allocate {	3090	sub invoke_size_allocate {
2570	my ($self, $w, $h) = @_;	3091	my ($self, $w, $h) = @_;
2571		3092
		3093	my ($empty, $slider, @other) = @{ $self->{children} };
		3094	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		3095
2572	$self->{layout}->set_font ($self->{font}) if $self->{font};	3096	$self->{layout}->set_font ($self->{font}) if $self->{font};
2573	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3097	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2574	$self->{layout}->set_width ($self->{children}[0]{w});	3098	$self->{layout}->set_width ($empty->{w});
2575	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3099	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2576		3100
2577	$self->reflow;	3101	$self->reflow;
2578		3102
		3103	local $self->{children} = [$empty, $slider];
2579	$self->SUPER::invoke_size_allocate ($w, $h)	3104	$self->SUPER::invoke_size_allocate ($w, $h)
2580	}	3105	}
2581		3106
2582	sub text_size {	3107	sub invoke_mouse_wheel {
2583	my ($self, $text, $indent) = @_;	3108	my ($self, $ev) = @_;
		3109
		3110	return 0 unless $ev->{dy}; # only vertical movements
		3111
		3112	$self->{children}[1]->emit (mouse_wheel => $ev);
		3113
		3114	1
		3115	}
		3116
		3117	sub get_layout {
		3118	my ($self, $para) = @_;
2584		3119
2585	my $layout = $self->{layout};	3120	my $layout = $self->{layout};
2586		3121
		3122	$layout->set_font ($self->{font}) if $self->{font};
		3123	$layout->set_foreground (@{$para->{fg}});
2587	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3124	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2588	$layout->set_width ($self->{children}[0]{w} - $indent);	3125	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2589	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3126	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590	$layout->set_markup ($text);	3127	$layout->set_markup ($para->{markup});
		3128
		3129	$layout->set_shapes (
		3130	map
		3131	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3132	@{$para->{widget}}
2591		3133	);
		3134
2592	$layout->size	3135	$layout
2593	}	3136	}
2594		3137
2595	sub reflow {	3138	sub reflow {
2596	my ($self) = @_;	3139	my ($self) = @_;
2597		3140
…		…
2604		3147
2605	# todo: base offset on lines or so, not on pixels	3148	# todo: base offset on lines or so, not on pixels
2606	$self->{children}[1]->set_value ($offset);	3149	$self->{children}[1]->set_value ($offset);
2607	}	3150	}
2608		3151
		3152	sub current_paragraph {
		3153	my ($self) = @_;
		3154
		3155	$self->{top_paragraph} - 1
		3156	}
		3157
		3158	sub scroll_to {
		3159	my ($self, $para) = @_;
		3160
		3161	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3162
		3163	$self->{scroll_to} = $para;
		3164	$self->update;
		3165	}
		3166
2609	sub clear {	3167	sub clear {
2610	my ($self) = @_;	3168	my ($self) = @_;
		3169
		3170	my (undef, undef, @other) = @{ $self->{children} };
		3171	$self->remove ($_) for @other;
2611		3172
2612	$self->{par} = [];	3173	$self->{par} = [];
2613	$self->{height} = 0;	3174	$self->{height} = 0;
2614	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3175	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2615	}	3176	}
2616		3177
2617	sub add_paragraph {	3178	sub add_paragraph {
2618	my ($self, $color, $text, $indent) = @_;	3179	my $self = shift;
2619		3180
2620	for my $line (split /\n/, $text) {	3181	for my $para (@_) {
2621	my ($w, $h) = $self->text_size ($line);	3182	$para = {
		3183	fg => [1, 1, 1, 1],
		3184	indent => 0,
		3185	markup => "",
		3186	widget => [],
		3187	ref $para ? %$para : (markup => $para),
		3188	w => 1e10,
		3189	wrapped => 1,
		3190	};
		3191
		3192	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3193	push @{$self->{par}}, $para;
		3194	}
		3195
		3196	if (my $max = $self->{max_par}) {
		3197	shift @{$self->{par}} while @{$self->{par}} > $max;
		3198	}
		3199
		3200	$self->{need_reflow}++;
		3201	$self->update;
		3202	}
		3203
		3204	sub scroll_to_bottom {
		3205	my ($self) = @_;
		3206
		3207	$self->{scroll_to} = $#{$self->{par}};
		3208	$self->update;
		3209	}
		3210
		3211	sub force_uptodate {
		3212	my ($self) = @_;
		3213
		3214	if (delete $self->{need_reflow}) {
		3215	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3216
		3217	my $height = 0;
		3218
		3219	for my $para (@{$self->{par}}) {
		3220	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3221	my $layout = $self->get_layout ($para);
		3222	my ($w, $h) = $layout->size;
		3223
		3224	$para->{w} = $w + $para->{indent};
		3225	$para->{h} = $h;
		3226	$para->{wrapped} = $layout->has_wrapped;
		3227	}
		3228
		3229	$para->{y} = $height;
		3230	$height += $para->{h};
		3231	}
		3232
2622	$self->{height} += $h;	3233	$self->{height} = $height;
2623	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3234	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2624	}
2625		3235
2626	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3236	delete $self->{texture};
		3237	}
		3238
		3239	if (my $paridx = delete $self->{scroll_to}) {
		3240	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3241	}
2627	}	3242	}
2628		3243
2629	sub update {	3244	sub update {
2630	my ($self) = @_;	3245	my ($self) = @_;
2631		3246
…		…
2634	return unless $self->{h} > 0;	3249	return unless $self->{h} > 0;
2635		3250
2636	delete $self->{texture};	3251	delete $self->{texture};
2637		3252
2638	$ROOT->on_post_alloc ($self => sub {	3253	$ROOT->on_post_alloc ($self => sub {
		3254	$self->force_uptodate;
		3255
2639	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3256	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2640		3257
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 {	3258	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2669	glClearColor 0, 0, 0, 0;	3259	glClearColor 0, 0, 0, 0;
2670	glClear GL_COLOR_BUFFER_BIT;	3260	glClear GL_COLOR_BUFFER_BIT;
2671		3261
		3262	package CFPlus::UI::Base;
		3263	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3264	(0, 0, $self->{w}, $self->{h});
		3265
		3266	my $top = int $self->{children}[1]{range}[0];
		3267
		3268	my $paridx = 0;
		3269	my $top_paragraph;
2672	my $top = int $self->{children}[1]{range}[0];	3270	my $top = int $self->{children}[1]{range}[0];
2673		3271
2674	my $y0 = $top;	3272	my $y0 = $top;
2675	my $y1 = $top + $H;	3273	my $y1 = $top + $H;
2676		3274
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}}) {	3275	for my $para (@{$self->{par}}) {
2688	my $h = $par->[1];	3276	my $h = $para->{h};
		3277	my $y = $para->{y};
2689		3278
2690	if ($y0 < $y + $h && $y < $y1) {	3279	if ($y0 < $y + $h && $y < $y1) {
2691	$layout->set_foreground (@{ $par->[2] });	3280	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		3281
2696	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3282	$layout->render ($para->{indent}, $y - $y0);
2697		3283
2698	glRasterPos $par->[3], $y - $y0;	3284	if (my @w = @{ $para->{widget} }) {
2699	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3285	my @s = $layout->get_shapes;
		3286
		3287	for (@w) {
		3288	my ($dx, $dy) = splice @s, 0, 2, ();
		3289
		3290	$_->{x} = $dx + $para->{indent};
		3291	$_->{y} = $dy + $y - $y0;
		3292
		3293	$_->draw;
		3294	}
		3295	}
2700	}	3296	}
2701		3297
2702	$y += $h;	3298	$paridx++;
		3299	$top_paragraph ||= $paridx if $y >= $top;
2703	}	3300	}
2704		3301
2705	glDisable GL_BLEND;	3302	$self->{top_paragraph} = $top_paragraph;
2706	};	3303	};
2707	});	3304	});
		3305	}
		3306
		3307	sub reconfigure {
		3308	my ($self) = @_;
		3309
		3310	$self->SUPER::reconfigure;
		3311
		3312	$_->{w} = 1e10 for @{ $self->{par} };
		3313	$self->reflow;
2708	}	3314	}
2709		3315
2710	sub _draw {	3316	sub _draw {
2711	my ($self) = @_;	3317	my ($self) = @_;
2712		3318
…		…
2715	glColor 0, 0, 0, 1;	3321	glColor 0, 0, 0, 1;
2716	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3322	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2717	glDisable GL_TEXTURE_2D;	3323	glDisable GL_TEXTURE_2D;
2718		3324
2719	$self->{children}[1]->draw;	3325	$self->{children}[1]->draw;
2720
2721	}	3326	}
2722		3327
2723	#############################################################################	3328	#############################################################################
2724		3329
2725	package CFClient::UI::Animator;	3330	package CFPlus::UI::Animator;
2726		3331
2727	use CFClient::OpenGL;	3332	use CFPlus::OpenGL;
2728		3333
2729	our @ISA = CFClient::UI::Bin::;	3334	our @ISA = CFPlus::UI::Bin::;
2730		3335
2731	sub moveto {	3336	sub moveto {
2732	my ($self, $x, $y) = @_;	3337	my ($self, $x, $y) = @_;
2733		3338
2734	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3339	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2762	glPopMatrix;	3367	glPopMatrix;
2763	}	3368	}
2764		3369
2765	#############################################################################	3370	#############################################################################
2766		3371
2767	package CFClient::UI::Flopper;	3372	package CFPlus::UI::Flopper;
2768		3373
2769	our @ISA = CFClient::UI::Button::;	3374	our @ISA = CFPlus::UI::Button::;
2770		3375
2771	sub new {	3376	sub new {
2772	my $class = shift;	3377	my $class = shift;
2773		3378
2774	my $self = $class->SUPER::new (	3379	my $self = $class->SUPER::new (
…		…
2786	$self->{other}->toggle_visibility;	3391	$self->{other}->toggle_visibility;
2787	}	3392	}
2788		3393
2789	#############################################################################	3394	#############################################################################
2790		3395
2791	package CFClient::UI::Tooltip;	3396	package CFPlus::UI::Tooltip;
2792		3397
2793	our @ISA = CFClient::UI::Bin::;	3398	our @ISA = CFPlus::UI::Bin::;
2794		3399
2795	use CFClient::OpenGL;	3400	use CFPlus::OpenGL;
2796		3401
2797	sub new {	3402	sub new {
2798	my $class = shift;	3403	my $class = shift;
2799		3404
2800	$class->SUPER::new (	3405	$class->SUPER::new (
…		…
2803	)	3408	)
2804	}	3409	}
2805		3410
2806	sub set_tooltip_from {	3411	sub set_tooltip_from {
2807	my ($self, $widget) = @_;	3412	my ($self, $widget) = @_;
		3413
		3414	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3415	if $widget->{tooltip} =~ /^#(.*)$/;
2808		3416
2809	my $tooltip = $widget->{tooltip};	3417	my $tooltip = $widget->{tooltip};
2810		3418
2811	if ($ENV{CFPLUS_DEBUG} & 2) {	3419	if ($ENV{CFPLUS_DEBUG} & 2) {
2812	$tooltip .= "\n\n" . (ref $widget) . "\n"	3420	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2816	}	3424	}
2817		3425
2818	$tooltip =~ s/^\n+//;	3426	$tooltip =~ s/^\n+//;
2819	$tooltip =~ s/\n+$//;	3427	$tooltip =~ s/\n+$//;
2820		3428
2821	$self->add (new CFClient::UI::Label	3429	$self->add (new CFPlus::UI::Label
2822	markup => $tooltip,	3430	markup => $tooltip,
2823	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3431	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2824	fontsize => 0.8,	3432	fontsize => 0.8,
2825	fg => [0, 0, 0, 1],	3433	style => 1, # FLAG_INVERSE
2826	ellipsise => 0,	3434	ellipsise => 0,
2827	font => ($widget->{tooltip_font} || $::FONT_PROP),	3435	font => ($widget->{tooltip_font} || $::FONT_PROP),
2828	);	3436	);
2829	}	3437	}
2830		3438
…		…
2849		3457
2850	$self->{root}->on_post_alloc ("move_$self" => sub {	3458	$self->{root}->on_post_alloc ("move_$self" => sub {
2851	my $widget = $self->{owner}	3459	my $widget = $self->{owner}
2852	or return;	3460	or return;
2853		3461
		3462	if ($widget->{visible}) {
2854	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3463	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2855		3464
2856	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3465	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2857	if $x + $self->{w} > $self->{root}{w};	3466	if $x + $self->{w} > $self->{root}{w};
2858		3467
2859	$self->move_abs ($x, $y);	3468	$self->move_abs ($x, $y);
		3469	} else {
		3470	$self->hide;
		3471	}
2860	});	3472	});
2861	}	3473	}
2862		3474
2863	sub _draw {	3475	sub _draw {
2864	my ($self) = @_;	3476	my ($self) = @_;
…		…
2888	$self->SUPER::_draw;	3500	$self->SUPER::_draw;
2889	}	3501	}
2890		3502
2891	#############################################################################	3503	#############################################################################
2892		3504
2893	package CFClient::UI::Face;	3505	package CFPlus::UI::Face;
2894		3506
2895	our @ISA = CFClient::UI::Base::;	3507	our @ISA = CFPlus::UI::DrawBG::;
2896		3508
2897	use CFClient::OpenGL;	3509	use CFPlus::OpenGL;
2898		3510
2899	sub new {	3511	sub new {
2900	my $class = shift;	3512	my $class = shift;
2901		3513
2902	my $self = $class->SUPER::new (	3514	my $self = $class->SUPER::new (
		3515	size_w => 32,
		3516	size_h => 8,
2903	aspect => 1,	3517	aspect => 1,
2904	can_events => 0,	3518	can_events => 0,
2905	@_,	3519	@_,
2906	);	3520	);
2907		3521
2908	if ($self->{anim} && $self->{animspeed}) {	3522	if ($self->{anim} && $self->{animspeed}) {
2909	Scalar::Util::weaken (my $widget = $self);	3523	CFPlus::weaken (my $widget = $self);
2910		3524
		3525	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3526	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2911	$self->{timer} = Event->timer (	3527	$self->{timer} = Event->timer (
2912	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2913	hard => 1,	3528	parked => 1,
2914	interval => $self->{animspeed},
2915	cb => sub {	3529	cb => sub {
		3530	return unless $::CONN && $widget;
		3531
2916	++$widget->{frame};	3532	++$widget->{frame};
		3533	$widget->update_face;
2917	$widget->update;	3534	$widget->update;
		3535
		3536	$widget->update_timer;
2918	},	3537	},
2919	);	3538	);
		3539
		3540	$self->update_face;
		3541	$self->update_timer;
2920	}	3542	}
2921		3543
2922	$self	3544	$self
2923	}	3545	}
2924		3546
		3547	sub update_timer {
		3548	my ($self) = @_;
		3549
		3550	return unless $self->{timer};
		3551
		3552	if ($self->{visible}) {
		3553	$self->{timer}->at (
		3554	$self->{anim_start}
		3555	+ $self->{animspeed}
		3556	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3557	);
		3558	$self->{timer}->start;
		3559	} else {
		3560	$self->{timer}->stop;
		3561	}
		3562	}
		3563
		3564	sub update_face {
		3565	my ($self) = @_;
		3566
		3567	return unless $::CONN;
		3568
		3569	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3570	if ($anim && @$anim) {
		3571	delete $self->{wait_face};
		3572	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3573	}
		3574	}
		3575	}
		3576
2925	sub size_request {	3577	sub size_request {
2926	(32, 8)	3578	my ($self) = @_;
		3579
		3580	if ($::CONN) {
		3581	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3582	if (my $tex = $::CONN->{texture}[$faceid]) {
		3583	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3584	} else {
		3585	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3586	$self->realloc;
		3587	});
		3588	}
		3589	}
		3590	}
		3591
		3592	($self->{size_w} || 8, $self->{size_h} || 8)
2927	}	3593	}
2928		3594
2929	sub update {	3595	sub update {
2930	my ($self) = @_;	3596	my ($self) = @_;
2931		3597
2932	return unless $self->{visible};	3598	return unless $self->{visible};
2933		3599
2934	$self->SUPER::update;	3600	$self->SUPER::update;
2935	}	3601	}
2936		3602
		3603	sub invoke_visibility_change {
		3604	my ($self) = @_;
		3605
		3606	$self->update_timer;
		3607
		3608	0
		3609	}
		3610
2937	sub _draw {	3611	sub _draw {
2938	my ($self) = @_;	3612	my ($self) = @_;
2939		3613
2940	return unless $::CONN;	3614	return unless $::CONN;
2941		3615
2942	my $face;	3616	$self->SUPER::_draw;
2943		3617
2944	if ($self->{frame}) {
2945	my $anim = $::CONN->{anim}[$self->{anim}];	3618	my $faceid = $::CONN->{faceid}[$self->{face}]
2946		3619	or return;
2947	$face = $anim->[ $self->{frame} % @$anim ]
2948	if $anim && @$anim;
2949	}
2950		3620
2951	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3621	my $tex = $::CONN->{texture}[$faceid];
2952		3622
2953	if ($tex) {	3623	if ($tex) {
2954	glEnable GL_TEXTURE_2D;	3624	glEnable GL_TEXTURE_2D;
2955	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3625	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2956	glColor 0, 0, 0, 1;	3626	glColor 0, 0, 0, 1;
…		…
2960	}	3630	}
2961		3631
2962	sub destroy {	3632	sub destroy {
2963	my ($self) = @_;	3633	my ($self) = @_;
2964		3634
2965	$self->{timer}->cancel	3635	(delete $self->{timer})->cancel
2966	if $self->{timer};	3636	if $self->{timer};
2967		3637
2968	$self->SUPER::destroy;	3638	$self->SUPER::destroy;
2969	}	3639	}
2970		3640
2971	#############################################################################	3641	#############################################################################
2972		3642
2973	package CFClient::UI::Buttonbar;	3643	package CFPlus::UI::Buttonbar;
2974		3644
2975	our @ISA = CFClient::UI::HBox::;	3645	our @ISA = CFPlus::UI::HBox::;
2976		3646
2977	# TODO: should actualyl wrap buttons and other goodies.	3647	# TODO: should actually wrap buttons and other goodies.
2978		3648
2979	#############################################################################	3649	#############################################################################
2980		3650
2981	package CFClient::UI::Menu;	3651	package CFPlus::UI::Menu;
2982		3652
2983	our @ISA = CFClient::UI::FancyFrame::;	3653	our @ISA = CFPlus::UI::Toplevel::;
2984		3654
2985	use CFClient::OpenGL;	3655	use CFPlus::OpenGL;
2986		3656
2987	sub new {	3657	sub new {
2988	my $class = shift;	3658	my $class = shift;
2989		3659
2990	my $self = $class->SUPER::new (	3660	my $self = $class->SUPER::new (
2991	items => [],	3661	items => [],
2992	z => 100,	3662	z => 100,
2993	@_,	3663	@_,
2994	);	3664	);
2995		3665
2996	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3666	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2997		3667
2998	for my $item (@{ $self->{items} }) {	3668	for my $item (@{ $self->{items} }) {
2999	my ($widget, $cb, $tooltip) = @$item;	3669	my ($widget, $cb, $tooltip) = @$item;
3000		3670
3001	# handle various types of items, only text for now	3671	# handle various types of items, only text for now
3002	if (!ref $widget) {	3672	if (!ref $widget) {
		3673	if ($widget =~ /\t/) {
		3674	my ($left, $right) = split /\t/, $widget, 2;
		3675
3003	$widget = new CFClient::UI::Label	3676	$widget = new CFPlus::UI::HBox
3004	can_hover => 1,	3677	can_hover => 1,
3005	can_events => 1,	3678	can_events => 1,
		3679	tooltip => $tooltip,
		3680	children => [
		3681	(new CFPlus::UI::Label markup => $left, expand => 1),
		3682	(new CFPlus::UI::Label markup => $right, align => +1),
		3683	],
		3684	;
		3685
		3686	} else {
		3687	$widget = new CFPlus::UI::Label
		3688	can_hover => 1,
		3689	can_events => 1,
3006	markup => $widget,	3690	markup => $widget,
3007	tooltip => $tooltip	3691	tooltip => $tooltip;
		3692	}
3008	}	3693	}
3009		3694
3010	$self->{item}{$widget} = $item;	3695	$self->{item}{$widget} = $item;
3011		3696
3012	$self->{vbox}->add ($widget);	3697	$self->{vbox}->add ($widget);
…		…
3055	1	3740	1
3056	}	3741	}
3057		3742
3058	#############################################################################	3743	#############################################################################
3059		3744
3060	package CFClient::UI::Multiplexer;	3745	package CFPlus::UI::Multiplexer;
3061		3746
3062	our @ISA = CFClient::UI::Container::;	3747	our @ISA = CFPlus::UI::Container::;
3063		3748
3064	sub new {	3749	sub new {
3065	my $class = shift;	3750	my $class = shift;
3066		3751
3067	my $self = $class->SUPER::new (	3752	my $self = $class->SUPER::new (
…		…
3081		3766
3082	$self->{current} = $self->{children}[0]	3767	$self->{current} = $self->{children}[0]
3083	if @{ $self->{children} };	3768	if @{ $self->{children} };
3084	}	3769	}
3085		3770
		3771	sub get_current_page {
		3772	my ($self) = @_;
		3773
		3774	$self->{current}
		3775	}
		3776
3086	sub set_current_page {	3777	sub set_current_page {
3087	my ($self, $page_or_widget) = @_;	3778	my ($self, $page_or_widget) = @_;
3088		3779
3089	my $widget = ref $page_or_widget	3780	my $widget = ref $page_or_widget
3090	? $page_or_widget	3781	? $page_or_widget
…		…
3122	$self->{current}->draw;	3813	$self->{current}->draw;
3123	}	3814	}
3124		3815
3125	#############################################################################	3816	#############################################################################
3126		3817
3127	package CFClient::UI::Notebook;	3818	package CFPlus::UI::Notebook;
3128		3819
3129	our @ISA = CFClient::UI::VBox::;	3820	our @ISA = CFPlus::UI::VBox::;
3130		3821
3131	sub new {	3822	sub new {
3132	my $class = shift;	3823	my $class = shift;
3133		3824
3134	my $self = $class->SUPER::new (	3825	my $self = $class->SUPER::new (
3135	buttonbar => (new CFClient::UI::Buttonbar),	3826	buttonbar => (new CFPlus::UI::Buttonbar),
3136	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3827	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3137	# filter => # will be put between multiplexer and $self	3828	# filter => # will be put between multiplexer and $self
3138	@_,	3829	@_,
3139	);	3830	);
3140		3831
3141	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3832	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3145	}	3836	}
3146		3837
3147	sub add {	3838	sub add {
3148	my ($self, $title, $widget, $tooltip) = @_;	3839	my ($self, $title, $widget, $tooltip) = @_;
3149		3840
3150	Scalar::Util::weaken $self;	3841	CFPlus::weaken $self;
3151		3842
3152	$self->{buttonbar}->add (new CFClient::UI::Button	3843	$self->{buttonbar}->add (new CFPlus::UI::Button
3153	markup => $title,	3844	markup => $title,
3154	tooltip => $tooltip,	3845	tooltip => $tooltip,
3155	on_activate => sub { $self->set_current_page ($widget) },	3846	on_activate => sub { $self->set_current_page ($widget) },
3156	);	3847	);
3157		3848
3158	$self->{multiplexer}->add ($widget);	3849	$self->{multiplexer}->add ($widget);
3159	}	3850	}
3160		3851
		3852	sub get_current_page {
		3853	my ($self) = @_;
		3854
		3855	$self->{multiplexer}->get_current_page
		3856	}
		3857
3161	sub set_current_page {	3858	sub set_current_page {
3162	my ($self, $page) = @_;	3859	my ($self, $page) = @_;
3163		3860
3164	$self->{multiplexer}->set_current_page ($page);	3861	$self->{multiplexer}->set_current_page ($page);
3165	$self->emit (page_changed => $self->{multiplexer}{current});	3862	$self->emit (page_changed => $self->{multiplexer}{current});
3166	}	3863	}
3167		3864
3168	#############################################################################	3865	#############################################################################
3169		3866
3170	package CFClient::UI::Combobox;	3867	package CFPlus::UI::Selector;
3171		3868
3172	use utf8;	3869	use utf8;
3173		3870
3174	our @ISA = CFClient::UI::Button::;	3871	our @ISA = CFPlus::UI::Button::;
3175		3872
3176	sub new {	3873	sub new {
3177	my $class = shift;	3874	my $class = shift;
3178		3875
3179	my $self = $class->SUPER::new (	3876	my $self = $class->SUPER::new (
…		…
3196	my ($value, $title, $tooltip) = @$_;	3893	my ($value, $title, $tooltip) = @$_;
3197		3894
3198	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3895	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3199	}	3896	}
3200		3897
3201	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3898	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3202	}	3899	}
3203		3900
3204	sub _set_value {	3901	sub _set_value {
3205	my ($self, $value) = @_;	3902	my ($self, $value) = @_;
3206		3903
…		…
3221	$self->emit (changed => $value);	3918	$self->emit (changed => $value);
3222	}	3919	}
3223		3920
3224	#############################################################################	3921	#############################################################################
3225		3922
3226	package CFClient::UI::Statusbox;	3923	package CFPlus::UI::Statusbox;
3227		3924
3228	our @ISA = CFClient::UI::VBox::;	3925	our @ISA = CFPlus::UI::VBox::;
3229		3926
3230	sub new {	3927	sub new {
3231	my $class = shift;	3928	my $class = shift;
3232		3929
3233	my $self = $class->SUPER::new (	3930	my $self = $class->SUPER::new (
3234	fontsize => 0.8,	3931	fontsize => 0.8,
3235	@_,	3932	@_,
3236	);	3933	);
3237		3934
3238	Scalar::Util::weaken (my $this = $self);	3935	CFPlus::weaken (my $this = $self);
3239		3936
3240	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3937	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3241		3938
3242	$self	3939	$self
3243	}	3940	}
…		…
3245	sub reorder {	3942	sub reorder {
3246	my ($self) = @_;	3943	my ($self) = @_;
3247	my $NOW = Time::HiRes::time;	3944	my $NOW = Time::HiRes::time;
3248		3945
3249	# freeze display when hovering over any label	3946	# freeze display when hovering over any label
3250	return if $CFClient::UI::TOOLTIP->{owner}	3947	return if $CFPlus::UI::TOOLTIP->{owner}
3251	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3948	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3252	values %{ $self->{item} };	3949	values %{ $self->{item} };
3253		3950
3254	while (my ($k, $v) = each %{ $self->{item} }) {	3951	while (my ($k, $v) = each %{ $self->{item} }) {
3255	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3952	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3256	}	3953	}
…		…
3277	for ($short) {	3974	for ($short) {
3278	s/^\s+//;	3975	s/^\s+//;
3279	s/\s+/ /g;	3976	s/\s+/ /g;
3280	}	3977	}
3281		3978
3282	new CFClient::UI::Label	3979	new CFPlus::UI::Label
3283	markup => $short,	3980	markup => $short,
3284	tooltip => $item->{tooltip},	3981	tooltip => $item->{tooltip},
3285	tooltip_font => $::FONT_PROP,	3982	tooltip_font => $::FONT_PROP,
3286	tooltip_width => 0.67,	3983	tooltip_width => 0.67,
3287	fontsize => $item->{fontsize} || $self->{fontsize},	3984	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3341	count => 1,	4038	count => 1,
3342	%arg,	4039	%arg,
3343	};	4040	};
3344	}	4041	}
3345		4042
		4043	$ROOT->on_refresh (reorder => sub {
3346	$self->reorder;	4044	$self->reorder;
		4045	});
3347	}	4046	}
3348		4047
3349	sub reconfigure {	4048	sub reconfigure {
3350	my ($self) = @_;	4049	my ($self) = @_;
3351		4050
…		…
3364	$self->SUPER::destroy;	4063	$self->SUPER::destroy;
3365	}	4064	}
3366		4065
3367	#############################################################################	4066	#############################################################################
3368		4067
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;	4068	package CFPlus::UI::Root;
3732		4069
3733	our @ISA = CFClient::UI::Container::;	4070	our @ISA = CFPlus::UI::Container::;
3734		4071
3735	use List::Util qw(min max);	4072	use List::Util qw(min max);
3736		4073
3737	use CFClient::OpenGL;	4074	use CFPlus::OpenGL;
3738		4075
3739	sub new {	4076	sub new {
3740	my $class = shift;	4077	my $class = shift;
3741		4078
3742	my $self = $class->SUPER::new (	4079	my $self = $class->SUPER::new (
3743	visible => 1,	4080	visible => 1,
3744	@_,	4081	@_,
3745	);	4082	);
3746		4083
3747	Scalar::Util::weaken ($self->{root} = $self);	4084	CFPlus::weaken ($self->{root} = $self);
3748		4085
3749	$self	4086	$self
3750	}	4087	}
3751		4088
3752	sub size_request {	4089	sub size_request {
…		…
3918	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4255	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3919		4256
3920	$w = 0 if $w < 0;	4257	$w = 0 if $w < 0;
3921	$h = 0 if $h < 0;	4258	$h = 0 if $h < 0;
3922		4259
		4260	$w = max $widget->{min_w}, $w;
		4261	$h = max $widget->{min_h}, $h;
		4262
		4263	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4264	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4265
		4266	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4267	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4268
3923	$w = int $w + 0.5;	4269	$w = int $w + 0.5;
3924	$h = int $h + 0.5;	4270	$h = int $h + 0.5;
3925		4271
3926	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4272	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3927	$widget->{old_w} = $widget->{w};	4273	$widget->{old_w} = $widget->{w};
…		…
3937		4283
3938	while ($self->{post_alloc_hook}) {	4284	while ($self->{post_alloc_hook}) {
3939	$_->()	4285	$_->()
3940	for values %{delete $self->{post_alloc_hook}};	4286	for values %{delete $self->{post_alloc_hook}};
3941	}	4287	}
3942
3943		4288
3944	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4289	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3945	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4290	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3946	glClear GL_COLOR_BUFFER_BIT;	4291	glClear GL_COLOR_BUFFER_BIT;
3947		4292
…		…
3950	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4295	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3951	glMatrixMode GL_MODELVIEW;	4296	glMatrixMode GL_MODELVIEW;
3952	glLoadIdentity;	4297	glLoadIdentity;
3953		4298
3954	{	4299	{
3955	package CFClient::UI::Base;	4300	package CFPlus::UI::Base;
3956		4301
3957	($draw_x, $draw_y, $draw_w, $draw_h) =	4302	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3958	(0, 0, $self->{w}, $self->{h});	4303	(0, 0, $self->{w}, $self->{h});
3959	}
3960		4304
3961	$self->_draw;	4305	$self->_draw;
		4306	}
3962	}	4307	}
3963		4308
3964	#############################################################################	4309	#############################################################################
3965		4310
3966	package CFClient::UI;	4311	package CFPlus::UI;
3967		4312
3968	$ROOT = new CFClient::UI::Root;	4313	$ROOT = new CFPlus::UI::Root;
3969	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4314	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3970		4315
3971	1	4316	1
3972		4317

Diff Legend

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