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.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.385 by root, Fri Jul 20 16:32:17 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->focus_out;	316	$self->emit ("focus_out");
287
288	$self->emit (visibility_change => 0);	317	$self->emit (visibility_change => 0);
289	}	318	}
290		319
291	sub set_visibility {	320	sub set_visibility {
292	my ($self, $visible) = @_;	321	my ($self, $visible) = @_;
293		322
294	return if $self->{visible} == $visible;	323	return if $self->{visible} == $visible;
295		324
296	$visible ? $self->hide	325	$visible ? $self->show
297	: $self->show;	326	: $self->hide;
298	}	327	}
299		328
300	sub toggle_visibility {	329	sub toggle_visibility {
301	my ($self) = @_;	330	my ($self) = @_;
302		331
…		…
336	sub size_request {	365	sub size_request {
337	require Carp;	366	require Carp;
338	Carp::confess "size_request is abstract";	367	Carp::confess "size_request is abstract";
339	}	368	}
340		369
		370	sub baseline_shift {
		371	0
		372	}
		373
341	sub configure {	374	sub configure {
342	my ($self, $x, $y, $w, $h) = @_;	375	my ($self, $x, $y, $w, $h) = @_;
343		376
344	if ($self->{aspect}) {	377	if ($self->{aspect}) {
345	my ($ow, $oh) = ($w, $h);	378	my ($ow, $oh) = ($w, $h);
346		379
347	$w = List::Util::min $w, int $h * $self->{aspect};	380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348	$h = List::Util::min $h, int $w / $self->{aspect};	381	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349		382
350	# use alignment to adjust x, y	383	# use alignment to adjust x, y
351		384
352	$x += int 0.5 * ($ow - $w);	385	$x += int 0.5 * ($ow - $w);
353	$y += int 0.5 * ($oh - $h);	386	$y += int 0.5 * ($oh - $h);
…		…
367		400
368	$self->{root}{size_alloc}{$self+0} = $self;	401	$self->{root}{size_alloc}{$self+0} = $self;
369	}	402	}
370	}	403	}
371		404
372	sub size_allocate {
373	# nothing to be done
374	}
375
376	sub children {	405	sub children {
377	# nop	406	# nop
378	}	407	}
379		408
380	sub visible_children {	409	sub visible_children {
…		…
398		427
399	return if $self->{tooltip} eq $tooltip;	428	return if $self->{tooltip} eq $tooltip;
400		429
401	$self->{tooltip} = $tooltip;	430	$self->{tooltip} = $tooltip;
402		431
403	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404	delete $CFClient::UI::TOOLTIP->{owner};	433	delete $CFPlus::UI::TOOLTIP->{owner};
405	$CFClient::UI::TOOLTIP_WATCHER->cb->();	434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
406	}	435	}
407	}	436	}
408		437
409	# translate global coordinates to local coordinate system	438	# translate global coordinates to local coordinate system
410	sub coord2local {	439	sub coord2local {
411	my ($self, $x, $y) = @_;	440	my ($self, $x, $y) = @_;
412		441
		442	Carp::confess unless $self->{parent};#d#
		443
413	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	444	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414	}	445	}
415		446
416	# translate local coordinates to global coordinate system	447	# translate local coordinates to global coordinate system
417	sub coord2global {	448	sub coord2global {
418	my ($self, $x, $y) = @_;	449	my ($self, $x, $y) = @_;
419		450
		451	Carp::confess unless $self->{parent};#d#
		452
420	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421	}	454	}
422		455
423	sub focus_in {	456	sub invoke_focus_in {
424	my ($self) = @_;	457	my ($self) = @_;
425		458
426	return if $FOCUS == $self;	459	return if $FOCUS == $self;
427	return unless $self->{can_focus};	460	return unless $self->{can_focus};
428		461
429	my $focus = $FOCUS; $FOCUS = $self;	462	$FOCUS = $self;
430		463
431	$self->_emit (focus_in => $focus);	464	$self->update;
432		465
433	$focus->update if $focus;	466	0
434	$FOCUS->update;
435	}	467	}
436		468
437	sub focus_out {	469	sub invoke_focus_out {
438	my ($self) = @_;	470	my ($self) = @_;
439		471
440	return unless $FOCUS == $self;	472	return unless $FOCUS == $self;
441		473
442	my $focus = $FOCUS; undef $FOCUS;	474	undef $FOCUS;
443		475
444	$self->_emit (focus_out => $focus);	476	$self->update;
445		477
446	$focus->update if $focus; #?
447
448	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	478	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449	unless $FOCUS;	479	unless $FOCUS;
450	}
451		480
		481	0
		482	}
		483
		484	sub grab_focus {
		485	my ($self) = @_;
		486
		487	$FOCUS->emit ("focus_out") if $FOCUS;
		488	$self->emit ("focus_in");
		489	}
		490
452	sub mouse_motion { 0 }	491	sub invoke_mouse_motion { 0 }
453	sub button_up { 0 }	492	sub invoke_button_up { 0 }
454	sub key_down { 0 }	493	sub invoke_key_down { 0 }
455	sub key_up { 0 }	494	sub invoke_key_up { 0 }
		495	sub invoke_mouse_wheel { 0 }
456		496
457	sub button_down {	497	sub invoke_button_down {
458	my ($self, $ev, $x, $y) = @_;	498	my ($self, $ev, $x, $y) = @_;
459		499
460	$self->focus_in;	500	$self->grab_focus;
461		501
462	0	502	0
		503	}
		504
		505	sub connect {
		506	my ($self, $signal, $cb) = @_;
		507
		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	}
		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	);
		528
		529	sub emit {
		530	my ($self, $signal, @args) = @_;
		531
		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
		543	($self->can ("invoke_$signal") || sub { 1 }), # closure
		544	) {
		545	return $cb->($self, @args, @append) || next;
		546	}
		547
		548	# parent
		549	$self->{parent} && $self->{parent}->emit ($signal, @args)
463	}	550	}
464		551
465	sub find_widget {	552	sub find_widget {
466	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
467		554
…		…
475	}	562	}
476		563
477	sub set_parent {	564	sub set_parent {
478	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
479		566
480	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
481	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
482	}
483
484	sub connect {
485	my ($self, $signal, $cb) = @_;
486
487	push @{ $self->{signal_cb}{$signal} }, $cb;
488	}
489
490	sub _emit {
491	my ($self, $signal, @args) = @_;
492
493	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494	}
495
496	sub emit {
497	my ($self, $signal, @args) = @_;
498
499	$self->_emit ($signal, @args)
500	|| $self->$signal (@args);
501	}
502
503	sub visibility_change {
504	#my ($self, $visible) = @_;
505	}	569	}
506		570
507	sub realloc {	571	sub realloc {
508	my ($self) = @_;	572	my ($self) = @_;
509		573
…		…
542	return unless $self->{h} && $self->{w};	606	return unless $self->{h} && $self->{w};
543		607
544	# update screen rectangle	608	# update screen rectangle
545	local $draw_x = $draw_x + $self->{x};	609	local $draw_x = $draw_x + $self->{x};
546	local $draw_y = $draw_y + $self->{y};	610	local $draw_y = $draw_y + $self->{y};
547	local $draw_w = $draw_x + $self->{w};
548	local $draw_h = $draw_y + $self->{h};
549		611
550	# skip widgets that are entirely outside the drawing area	612	# skip widgets that are entirely outside the drawing area
551	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	613	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	614	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553		615
…		…
576	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
577	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
578	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
579	glEnd;	641	glEnd;
580	glPopMatrix;	642	glPopMatrix;
581	#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;
582	}	644	}
583		645
584	$self->_draw;	646	$self->_draw;
585	glPopMatrix;	647	glPopMatrix;
586	}	648	}
…		…
589	my ($self) = @_;	651	my ($self) = @_;
590		652
591	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
592	}	654	}
593		655
		656	my $cntx;#d#
594	sub DESTROY {	657	sub DESTROY {
595	my ($self) = @_;	658	my ($self) = @_;
596		659
597	delete $WIDGET{$self+0};	660	return if CFPlus::in_destruct;
598		661
599	eval { $self->destroy };	662	eval { $self->destroy };
600	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};
601	}	666	}
602		667
603	#############################################################################	668	#############################################################################
604		669
605	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
606		671
607	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
608		673
609	use strict;	674	use strict;
610	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
611		676
612	sub new {	677	sub new {
613	my $class = shift;	678	my $class = shift;
614		679
615	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
646	}	711	}
647	}	712	}
648		713
649	#############################################################################	714	#############################################################################
650		715
651	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
652		717
653	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
654		719
655	sub new {	720	sub new {
656	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
657	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
658	}	723	}
…		…
665		730
666	sub draw { }	731	sub draw { }
667		732
668	#############################################################################	733	#############################################################################
669		734
670	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
671		736
672	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
673		738
674	sub new {	739	sub new {
675	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
676		741
677	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
686	if $children;	751	if $children;
687		752
688	$self	753	$self
689	}	754	}
690		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
691	sub add {	764	sub add {
692	my ($self, @widgets) = @_;	765	my ($self, @widgets) = @_;
693		766
694	$_->set_parent ($self)	767	$_->set_parent ($self)
695	for @widgets;	768	for @widgets;
…		…
755	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
756	}	829	}
757		830
758	#############################################################################	831	#############################################################################
759		832
760	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
761		834
762	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
763		836
764	sub new {	837	sub new {
765	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
766		839
767	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
768		841
769	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
770	}	843	}
771		844
772	sub add {	845	sub add {
…		…
779	sub remove {	852	sub remove {
780	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
781		854
782	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
783		856
784	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
785	unless @{$self->{children}};	858	unless @{$self->{children}};
786	}	859	}
787		860
788	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
789		862
790	sub size_request {	863	sub size_request {
791	$_[0]{children}[0]->size_request	864	$_[0]{children}[0]->size_request
792	}	865	}
793		866
794	sub size_allocate {	867	sub invoke_size_allocate {
795	my ($self, $w, $h) = @_;	868	my ($self, $w, $h) = @_;
796		869
797	$self->{children}[0]->configure (0, 0, $w, $h);	870	$self->{children}[0]->configure (0, 0, $w, $h);
		871
		872	1
798	}	873	}
799		874
800	#############################################################################	875	#############################################################################
801		876
802	# back-buffered drawing area	877	# back-buffered drawing area
803		878
804	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
805		880
806	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
807		882
808	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
809		884
810	sub new {	885	sub new {
811	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
812		887
813	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
818		893
819	$ROOT->on_post_alloc ($self => sub { $self->render_child });	894	$ROOT->on_post_alloc ($self => sub { $self->render_child });
820	$self->SUPER::update;	895	$self->SUPER::update;
821	}	896	}
822		897
823	sub size_allocate {	898	sub invoke_size_allocate {
824	my ($self, $w, $h) = @_;	899	my ($self, $w, $h) = @_;
825		900
826	$self->SUPER::size_allocate ($w, $h);
827	$self->update;	901	$self->update;
		902
		903	$self->SUPER::invoke_size_allocate ($w, $h)
828	}	904	}
829		905
830	sub _render {	906	sub _render {
831	my ($self) = @_;	907	my ($self) = @_;
832		908
…		…
834	}	910	}
835		911
836	sub render_child {	912	sub render_child {
837	my ($self) = @_;	913	my ($self) = @_;
838		914
839	$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 {
840	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
841	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
842		918
843	{	919	{
844	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
845		921
846	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
847	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
848	}	926	}
849
850	$self->_render;
851	};	927	};
852	}	928	}
853		929
854	sub _draw {	930	sub _draw {
855	my ($self) = @_;	931	my ($self) = @_;
856
857	my ($w, $h) = @$self{qw(w h)};
858		932
859	my $tex = $self->{texture}	933	my $tex = $self->{texture}
860	or return;	934	or return;
861		935
862	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
865		939
866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
867		941
868	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
869	}	943	}
870		944
871	#############################################################################	945	#############################################################################
872		946
873	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
874		948
		949	use List::Util qw(min max);
		950
875	our @ISA = CFClient::UI::Window::;	951	our @ISA = CFPlus::UI::Window::;
876		952
877	sub new {	953	sub new {
878	my $class = shift;	954	my $class = shift;
879		955
880	$class->SUPER::new (	956	$class->SUPER::new (
…		…
893	$h = 10 if $self->{scroll_y};	969	$h = 10 if $self->{scroll_y};
894		970
895	($w, $h)	971	($w, $h)
896	}	972	}
897		973
898	sub size_allocate {	974	sub invoke_size_allocate {
899	my ($self, $w, $h) = @_;	975	my ($self, $w, $h) = @_;
900		976
901	my $child = $self->child;	977	my $child = $self->child;
902		978
903	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	979	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	980	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905		981
906	$self->child->configure (0, 0, $w, $h);	982	$self->child->configure (0, 0, $w, $h);
907	$self->update;	983	$self->update;
		984
		985	1
908	}	986	}
909		987
910	sub set_offset {	988	sub set_offset {
911	my ($self, $x, $y) = @_;	989	my ($self, $x, $y) = @_;
912		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}) {
913	$self->{view_x} = int $x;	995	$self->{view_x} = $x;
914	$self->{view_y} = int $y;	996	$self->{view_y} = $y;
915		997
		998	$self->emit (changed => $x, $y);
916	$self->update;	999	$self->update;
		1000	}
917	}	1001	}
918		1002
919	# 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
920	sub coord2local {	1004	sub coord2local {
921	my ($self, $x, $y) = @_;	1005	my ($self, $x, $y) = @_;
…		…
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1022	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1023	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	1024	) {
941	$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})
942	} else {	1026	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1027	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1028	}
945	}	1029	}
946		1030
947	sub _render {	1031	sub _render {
948	my ($self) = @_;	1032	my ($self) = @_;
949		1033
950	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};
951	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};
952		1036
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1037	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1038
955	$self->SUPER::_render;	1039	$self->SUPER::_render;
956	}	1040	}
957		1041
958	#############################################################################	1042	#############################################################################
959		1043
960	package CFClient::UI::ScrolledWindow;	1044	package CFPlus::UI::ScrolledWindow;
961		1045
962	our @ISA = CFClient::UI::HBox::;	1046	our @ISA = CFPlus::UI::Table::;
963		1047
964	sub new {	1048	sub new {
965	my ($class, %arg) = @_;	1049	my ($class, %arg) = @_;
966		1050
967	my $child = delete $arg{child};	1051	my $child = delete $arg{child};
968		1052
969	my $self;	1053	my $self;
970		1054
971	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
972	vertical => 1,	1065	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1066	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1067	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1068	$self->{vpos} = $_[1];
		1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976	},	1070	},
977	;	1071	;
978		1072
979	$self = $class->SUPER::new (	1073	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1074	scroll_x => 0,
		1075	scroll_y => 1,
		1076	can_events => 1,
981	slider => $slider,	1077	hslider => $hslider,
		1078	vslider => $vslider,
		1079	col_expand => [1, 0],
		1080	row_expand => [1, 0],
982	%arg,	1081	%arg,
983	);	1082	);
984		1083
985	$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
986	$self->add ($child) if $child;	1100	$self->add ($child) if $child;
987		1101
988	$self	1102	$self
989	}	1103	}
		1104
		1105	#TODO# update range on size_allocate depending on child
990		1106
991	sub add {	1107	sub add {
992	my ($self, $widget) = @_;	1108	my ($self, $widget) = @_;
993		1109
994	$self->{vp}->add ($self->{child} = $widget);	1110	$self->{vp}->add ($self->{child} = $widget);
995	}	1111	}
996		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
997	sub update {	1137	sub update {
998	my ($self) = @_;	1138	my ($self) = @_;
999		1139
1000	$self->SUPER::update;	1140	$self->SUPER::update;
1001		1141	$self->update_slider;
1002	# todo: overwrite size_allocate of child
1003	my $child = $self->{vp}->child;
1004	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005	}	1142	}
1006		1143
		1144	sub invoke_mouse_wheel {
		1145	my ($self, $ev) = @_;
		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
		1195	}
		1196
1007	sub size_allocate {	1197	sub invoke_size_allocate {
1008	my ($self, $w, $h) = @_;	1198	my ($self, $w, $h) = @_;
1009		1199
		1200	$self->update_slider;
1010	$self->SUPER::size_allocate ($w, $h);	1201	$self->SUPER::invoke_size_allocate ($w, $h)
1011
1012	my $child = $self->{vp}->child;
1013	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014	}	1202	}
1015
1016	#TODO# update range on size_allocate depending on child
1017	# update viewport offset on scroll
1018		1203
1019	#############################################################################	1204	#############################################################################
1020		1205
1021	package CFClient::UI::Frame;	1206	package CFPlus::UI::Frame;
1022		1207
1023	our @ISA = CFClient::UI::Bin::;	1208	our @ISA = CFPlus::UI::Bin::;
1024		1209
1025	use CFClient::OpenGL;	1210	use CFPlus::OpenGL;
1026		1211
1027	sub new {	1212	sub new {
1028	my $class = shift;	1213	my $class = shift;
1029		1214
1030	$class->SUPER::new (	1215	$class->SUPER::new (
…		…
1056	$self->SUPER::_draw;	1241	$self->SUPER::_draw;
1057	}	1242	}
1058		1243
1059	#############################################################################	1244	#############################################################################
1060		1245
1061	package CFClient::UI::FancyFrame;	1246	package CFPlus::UI::FancyFrame;
1062		1247
1063	our @ISA = CFClient::UI::Bin::;	1248	our @ISA = CFPlus::UI::Bin::;
1064		1249
1065	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;
1066		1351
1067	my $bg =	1352	my $bg =
1068	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1353	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069	mipmap => 1, wrap => 1;	1354	mipmap => 1, wrap => 1;
1070		1355
1071	my @border =	1356	my @border =
1072	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1357	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073	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);
1074		1363
1075	sub new {	1364	sub new {
1076	my ($class, %arg) = @_;	1365	my ($class, %arg) = @_;
1077		1366
1078	my $self = $class->SUPER::new (	1367	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1368	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1369	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1370	border => 0.6,
1082	can_events => 1,	1371	can_events => 1,
1083	min_w => 16,	1372	min_w => 64,
1084	min_h => 16,	1373	min_h => 32,
1085	%arg,	1374	%arg,
1086	);	1375	);
1087		1376
1088	$self->{title_widget} = new CFClient::UI::Label	1377	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1378	align => 0,
1090	valign => 1,	1379	valign => 1,
1091	text => $self->{title},	1380	text => $self->{title},
1092	fontsize => $self->{border},	1381	fontsize => $self->{border},
1093	if exists $self->{title};	1382	if exists $self->{title};
1094		1383
		1384	if ($self->{has_close_button}) {
		1385	$self->{close_button} =
		1386	new CFPlus::UI::ImageButton
		1387	path => 'x1_close.png',
		1388	on_activate => sub { $self->emit ("delete") };
		1389
		1390	$self->CFPlus::UI::Container::add ($self->{close_button});
		1391	}
		1392
1095	$self	1393	$self
1096	}	1394	}
1097		1395
1098	sub add {	1396	sub add {
1099	my ($self, @widgets) = @_;	1397	my ($self, @widgets) = @_;
1100		1398
1101	$self->SUPER::add (@widgets);	1399	$self->SUPER::add (@widgets);
		1400	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102	$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};
1103	}	1402	}
1104		1403
1105	sub border {	1404	sub border {
1106	int $_[0]{border} * $::FONTSIZE	1405	int $_[0]{border} * $::FONTSIZE
1107	}	1406	}
…		…
1109	sub size_request {	1408	sub size_request {
1110	my ($self) = @_;	1409	my ($self) = @_;
1111		1410
1112	$self->{title_widget}->size_request	1411	$self->{title_widget}->size_request
1113	if $self->{title_widget};	1412	if $self->{title_widget};
		1413
		1414	$self->{close_button}->size_request
		1415	if $self->{close_button};
1114		1416
1115	my ($w, $h) = $self->SUPER::size_request;	1417	my ($w, $h) = $self->SUPER::size_request;
1116		1418
1117	(	1419	(
1118	$w + $self->border * 2,	1420	$w + $self->border * 2,
1119	$h + $self->border * 2,	1421	$h + $self->border * 2,
1120	)	1422	)
1121	}	1423	}
1122		1424
1123	sub size_allocate {	1425	sub invoke_size_allocate {
1124	my ($self, $w, $h) = @_;	1426	my ($self, $w, $h) = @_;
1125		1427
1126	if ($self->{title_widget}) {	1428	if ($self->{title_widget}) {
1127	$self->{title_widget}{w} = $w;	1429	$self->{title_widget}{w} = $w;
1128	$self->{title_widget}{h} = $h;	1430	$self->{title_widget}{h} = $h;
1129	$self->{title_widget}->size_allocate ($w, $h);	1431	$self->{title_widget}->invoke_size_allocate ($w, $h);
1130	}	1432	}
1131		1433
1132	my $border = $self->border;	1434	my $border = $self->border;
1133		1435
1134	$h -= List::Util::max 0, $border * 2;	1436	$h -= List::Util::max 0, $border * 2;
1135	$w -= List::Util::max 0, $border * 2;	1437	$w -= List::Util::max 0, $border * 2;
		1438
		1439	$self->child->configure ($border, $border, $w, $h);
		1440
		1441	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1442	if $self->{close_button};
		1443
		1444	1
		1445	}
		1446
		1447	sub invoke_delete {
		1448	my ($self) = @_;
		1449
		1450	$self->hide;
1136		1451
1137	$self->child->configure ($border, $border, $w, $h);	1452	1
1138	}	1453	}
1139		1454
1140	sub button_down {	1455	sub invoke_button_down {
1141	my ($self, $ev, $x, $y) = @_;	1456	my ($self, $ev, $x, $y) = @_;
1142		1457
1143	my ($w, $h) = @$self{qw(w h)};	1458	my ($w, $h) = @$self{qw(w h)};
1144	my $border = $self->border;	1459	my $border = $self->border;
1145		1460
…		…
1176		1491
1177	($x, $y) = ($ev->{x}, $ev->{y});	1492	($x, $y) = ($ev->{x}, $ev->{y});
1178		1493
1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1494	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180	# HACK: the next line is required to enforce placement	1495	# HACK: the next line is required to enforce placement
1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1496	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182	};	1497	};
1183	} else {	1498	} else {
1184	return 0;	1499	return 0;
1185	}	1500	}
1186		1501
1187	1	1502	1
1188	}	1503	}
1189		1504
1190	sub button_up {	1505	sub invoke_button_up {
1191	my ($self, $ev, $x, $y) = @_;	1506	my ($self, $ev, $x, $y) = @_;
1192		1507
1193	!!delete $self->{motion}	1508	! ! delete $self->{motion}
1194	}	1509	}
1195		1510
1196	sub mouse_motion {	1511	sub invoke_mouse_motion {
1197	my ($self, $ev, $x, $y) = @_;	1512	my ($self, $ev, $x, $y) = @_;
1198		1513
1199	$self->{motion}->($ev, $x, $y) if $self->{motion};	1514	$self->{motion}->($ev, $x, $y) if $self->{motion};
1200		1515
1201	!!$self->{motion}	1516	! ! $self->{motion}
		1517	}
		1518
		1519	sub invoke_visibility_change {
		1520	my ($self, $visible) = @_;
		1521
		1522	delete $self->{motion} unless $visible;
		1523
		1524	0
1202	}	1525	}
1203		1526
1204	sub _draw {	1527	sub _draw {
1205	my ($self) = @_;	1528	my ($self) = @_;
1206		1529
…		…
1213	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1536	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1214		1537
1215	my $border = $self->border;	1538	my $border = $self->border;
1216		1539
1217	glColor @{ $self->{border_bg} };	1540	glColor @{ $self->{border_bg} };
1218	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1541	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1219	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1542	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1220	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1543	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1221	$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);
1222		1559
1223	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1560	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1224	glColor @{ $self->{bg} };	1561	glColor @{ $self->{bg} };
1225		1562
1226	# TODO: repeat texture not scale	1563	# TODO: repeat texture not scale
…		…
1235	$child->draw;	1572	$child->draw;
1236		1573
1237	if ($self->{title_widget}) {	1574	if ($self->{title_widget}) {
1238	glTranslate 0, $border - $self->{h};	1575	glTranslate 0, $border - $self->{h};
1239	$self->{title_widget}->_draw;	1576	$self->{title_widget}->_draw;
		1577
		1578	glTranslate 0, - ($border - $self->{h});
1240	}	1579	}
		1580
		1581	$self->{close_button}->draw
		1582	if $self->{close_button};
1241	}	1583	}
1242		1584
1243	#############################################################################	1585	#############################################################################
1244		1586
1245	package CFClient::UI::Table;	1587	package CFPlus::UI::Table;
1246		1588
1247	our @ISA = CFClient::UI::Base::;	1589	our @ISA = CFPlus::UI::Base::;
1248		1590
1249	use List::Util qw(max sum);	1591	use List::Util qw(max sum);
1250		1592
1251	use CFClient::OpenGL;	1593	use CFPlus::OpenGL;
1252		1594
1253	sub new {	1595	sub new {
1254	my $class = shift;	1596	my $class = shift;
1255		1597
1256	$class->SUPER::new (	1598	$class->SUPER::new (
		1599	children => [],
1257	col_expand => [],	1600	col_expand => [],
		1601	row_expand => [],
1258	@_,	1602	@_,
1259	)	1603	)
1260	}	1604	}
1261		1605
1262	sub children {	1606	sub children {
1263	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1607	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264	}	1608	}
1265		1609
		1610	# TODO: store row/col info in child widget and use standard add/del
1266	sub add {	1611	sub add {
1267	my ($self, $x, $y, $child) = @_;	1612	my $self = shift;
1268		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
1269	$child->set_parent ($self);	1624	$child->set_parent ($self);
1270	$self->{children}[$y][$x] = $child;	1625	$self->{children}[$row][$col] = $child;
		1626	}
1271		1627
		1628	$self->{force_realloc} = 1;
		1629	$self->{force_size_alloc} = 1;
1272	$self->realloc;	1630	$self->realloc;
1273	}	1631	}
1274		1632
1275	sub remove {	1633	sub remove {
1276	my ($self, $child) = @_;	1634	my ($self, $child) = @_;
1277		1635
1278	# TODO: not yet implemented	1636	for (@{ $self->{children} }) {
		1637	for (@{ $_ || [] }) {
		1638	$_ = undef if $_ == $child;
		1639	}
		1640	}
1279	}	1641	}
1280		1642
1281	# 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?
1282	sub clear {	1644	sub clear {
1283	my ($self) = @_;	1645	my ($self) = @_;
…		…
1324	(sum @$ws),	1686	(sum @$ws),
1325	(sum @$hs),	1687	(sum @$hs),
1326	)	1688	)
1327	}	1689	}
1328		1690
1329	sub size_allocate {	1691	sub invoke_size_allocate {
1330	my ($self, $w, $h) = @_;	1692	my ($self, $w, $h) = @_;
1331		1693
1332	my ($ws, $hs) = $self->get_wh;	1694	my ($ws, $hs) = $self->get_wh;
1333		1695
1334	my $req_w = (sum @$ws) || 1;	1696	my $req_w = (sum @$ws) || 1;
1335	my $req_h = (sum @$hs) || 1;	1697	my $req_h = (sum @$hs) || 1;
1336		1698
1337	# TODO: nicer code && do row_expand	1699	# TODO: nicer code
1338	my @col_expand = @{$self->{col_expand}};	1700	my @col_expand = @{$self->{col_expand}};
1339	@col_expand = (1) x @$ws unless @col_expand;	1701	@col_expand = (1) x @$ws unless @col_expand;
1340	my $col_expand = (sum @col_expand) || 1;	1702	my $col_expand = (sum @col_expand) || 1;
1341		1703
1342	# linearly scale sizes
1343	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1704	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1344	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1345		1705
1346	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
1347	CFClient::UI::harmonize $hs;	1714	CFPlus::UI::harmonize $hs;
1348		1715
1349	my $y;	1716	my $y;
1350		1717
1351	for my $r (0 .. $#{$self->{children}}) {	1718	for my $r (0 .. $#{$self->{children}}) {
1352	my $row = $self->{children}[$r]	1719	my $row = $self->{children}[$r]
…		…
1366	}	1733	}
1367		1734
1368	$y += $row_h;	1735	$y += $row_h;
1369	}	1736	}
1370		1737
		1738	1
1371	}	1739	}
1372		1740
1373	sub find_widget {	1741	sub find_widget {
1374	my ($self, $x, $y) = @_;	1742	my ($self, $x, $y) = @_;
1375		1743
…		…
1394	}	1762	}
1395	}	1763	}
1396		1764
1397	#############################################################################	1765	#############################################################################
1398		1766
1399	package CFClient::UI::Box;	1767	package CFPlus::UI::Fixed;
1400		1768
		1769	use List::Util qw(min max);
		1770
1401	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::;
1402		1852
1403	sub size_request {	1853	sub size_request {
1404	my ($self) = @_;	1854	my ($self) = @_;
1405		1855
1406	$self->{vertical}	1856	$self->{vertical}
…		…
1412	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1862	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1863	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1414	)	1864	)
1415	}	1865	}
1416		1866
1417	sub size_allocate {	1867	sub invoke_size_allocate {
1418	my ($self, $w, $h) = @_;	1868	my ($self, $w, $h) = @_;
1419		1869
1420	my $space = $self->{vertical} ? $h : $w;	1870	my $space = $self->{vertical} ? $h : $w;
1421	my $children = $self->{children};	1871	my @children = $self->visible_children;
1422		1872
1423	my @req;	1873	my @req;
1424		1874
1425	if ($self->{homogeneous}) {	1875	if ($self->{homogeneous}) {
1426	@req = ($space / (@$children || 1)) x @$children;	1876	@req = ($space / (@children || 1)) x @children;
1427	} else {	1877	} else {
1428	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1878	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429	my $req = List::Util::sum @req;	1879	my $req = List::Util::sum @req;
1430		1880
1431	if ($req > $space) {	1881	if ($req > $space) {
1432	# ah well, not enough space	1882	# ah well, not enough space
1433	$_ *= $space / $req for @req;	1883	$_ *= $space / $req for @req;
1434	} else {	1884	} else {
1435	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1885	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436		1886
1437	$space = ($space - $req) / $expand; # remaining space to give away	1887	$space = ($space - $req) / $expand; # remaining space to give away
1438		1888
1439	$req[$_] += $space * $children->[$_]{expand}	1889	$req[$_] += $space * $children[$_]{expand}
1440	for 0 .. $#$children;	1890	for 0 .. $#children;
1441	}	1891	}
1442	}	1892	}
1443		1893
1444	CFClient::UI::harmonize \@req;	1894	CFPlus::UI::harmonize \@req;
1445		1895
1446	my $pos = 0;	1896	my $pos = 0;
1447	for (0 .. $#$children) {	1897	for (0 .. $#children) {
1448	my $alloc = $req[$_];	1898	my $alloc = $req[$_];
1449	$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));
1450		1900
1451	$pos += $alloc;	1901	$pos += $alloc;
1452	}	1902	}
1453		1903
1454	1	1904	1
1455	}	1905	}
1456		1906
1457	#############################################################################	1907	#############################################################################
1458		1908
1459	package CFClient::UI::HBox;	1909	package CFPlus::UI::HBox;
1460		1910
1461	our @ISA = CFClient::UI::Box::;	1911	our @ISA = CFPlus::UI::Box::;
1462		1912
1463	sub new {	1913	sub new {
1464	my $class = shift;	1914	my $class = shift;
1465		1915
1466	$class->SUPER::new (	1916	$class->SUPER::new (
…		…
1469	)	1919	)
1470	}	1920	}
1471		1921
1472	#############################################################################	1922	#############################################################################
1473		1923
1474	package CFClient::UI::VBox;	1924	package CFPlus::UI::VBox;
1475		1925
1476	our @ISA = CFClient::UI::Box::;	1926	our @ISA = CFPlus::UI::Box::;
1477		1927
1478	sub new {	1928	sub new {
1479	my $class = shift;	1929	my $class = shift;
1480		1930
1481	$class->SUPER::new (	1931	$class->SUPER::new (
…		…
1484	)	1934	)
1485	}	1935	}
1486		1936
1487	#############################################################################	1937	#############################################################################
1488		1938
1489	package CFClient::UI::Label;	1939	package CFPlus::UI::Label;
1490		1940
1491	our @ISA = CFClient::UI::DrawBG::;	1941	our @ISA = CFPlus::UI::DrawBG::;
1492		1942
1493	use CFClient::OpenGL;	1943	use CFPlus::OpenGL;
1494		1944
1495	sub new {	1945	sub new {
1496	my ($class, %arg) = @_;	1946	my ($class, %arg) = @_;
1497		1947
1498	my $self = $class->SUPER::new (	1948	my $self = $class->SUPER::new (
…		…
1501	#active_bg => none	1951	#active_bg => none
1502	#font => default_font	1952	#font => default_font
1503	#text => initial text	1953	#text => initial text
1504	#markup => initial narkup	1954	#markup => initial narkup
1505	#max_w => maximum pixel width	1955	#max_w => maximum pixel width
		1956	#style => 0, # render flags
1506	ellipsise => 3, # end	1957	ellipsise => 3, # end
1507	layout => (new CFClient::Layout),	1958	layout => (new CFPlus::Layout),
1508	fontsize => 1,	1959	fontsize => 1,
1509	align => -1,	1960	align => -1,
1510	valign => -1,	1961	valign => -1,
1511	padding_x => 2,	1962	padding_x => 2,
1512	padding_y => 2,	1963	padding_y => 2,
1513	can_events => 0,	1964	can_events => 0,
1514	%arg	1965	%arg
1515	);	1966	);
1516		1967
1517	if (exists $self->{template}) {	1968	if (exists $self->{template}) {
1518	my $layout = new CFClient::Layout;	1969	my $layout = new CFPlus::Layout;
1519	$layout->set_text (delete $self->{template});	1970	$layout->set_text (delete $self->{template});
1520	$self->{template} = $layout;	1971	$self->{template} = $layout;
1521	}	1972	}
1522		1973
1523	if (exists $self->{markup}) {	1974	if (exists $self->{markup}) {
…		…
1527	}	1978	}
1528		1979
1529	$self	1980	$self
1530	}	1981	}
1531		1982
1532	sub escape($) {
1533	local $_ = $_[0];
1534
1535	s/&/&amp;/g;
1536	s/>/&gt;/g;
1537	s/</&lt;/g;
1538
1539	$_
1540	}
1541
1542	sub update {	1983	sub update {
1543	my ($self) = @_;	1984	my ($self) = @_;
1544		1985
1545	delete $self->{texture};	1986	delete $self->{texture};
1546	$self->SUPER::update;	1987	$self->SUPER::update;
…		…
1557	my ($self, $text) = @_;	1998	my ($self, $text) = @_;
1558		1999
1559	return if $self->{text} eq "T$text";	2000	return if $self->{text} eq "T$text";
1560	$self->{text} = "T$text";	2001	$self->{text} = "T$text";
1561		2002
1562	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563	$self->{layout}->set_text ($text);	2003	$self->{layout}->set_text ($text);
1564		2004
1565	delete $self->{size_req};	2005	delete $self->{size_req};
1566	$self->realloc;	2006	$self->realloc;
1567	$self->update;	2007	$self->update;
…		…
1573	return if $self->{text} eq "M$markup";	2013	return if $self->{text} eq "M$markup";
1574	$self->{text} = "M$markup";	2014	$self->{text} = "M$markup";
1575		2015
1576	my $rgba = $markup =~ /span.*(?:foreground|background)/;	2016	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577		2017
1578	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579	$self->{layout}->set_markup ($markup);	2018	$self->{layout}->set_markup ($markup);
1580		2019
1581	delete $self->{size_req};	2020	delete $self->{size_req};
1582	$self->realloc;	2021	$self->realloc;
1583	$self->update;	2022	$self->update;
…		…
1595		2034
1596	my ($w, $h) = $self->{layout}->size;	2035	my ($w, $h) = $self->{layout}->size;
1597		2036
1598	if (exists $self->{template}) {	2037	if (exists $self->{template}) {
1599	$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);
1600	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2040	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601		2041
1602	my ($w2, $h2) = $self->{template}->size;	2042	my ($w2, $h2) = $self->{template}->size;
1603		2043
1604	$w = List::Util::max $w, $w2;	2044	$w = List::Util::max $w, $w2;
…		…
1609	};	2049	};
1610		2050
1611	@{ $self->{size_req} }	2051	@{ $self->{size_req} }
1612	}	2052	}
1613		2053
		2054	sub baseline_shift {
		2055	$_[0]{layout}->descent
		2056	}
		2057
1614	sub size_allocate {	2058	sub invoke_size_allocate {
1615	my ($self, $w, $h) = @_;	2059	my ($self, $w, $h) = @_;
1616		2060
1617	delete $self->{ox};	2061	delete $self->{ox};
1618		2062
1619	delete $self->{texture}	2063	delete $self->{texture}
1620	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	2064	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		2065
		2066	1
1621	}	2067	}
1622		2068
1623	sub set_fontsize {	2069	sub set_fontsize {
1624	my ($self, $fontsize) = @_;	2070	my ($self, $fontsize) = @_;
1625		2071
1626	$self->{fontsize} = $fontsize;	2072	$self->{fontsize} = $fontsize;
		2073	delete $self->{size_req};
1627	delete $self->{texture};	2074	delete $self->{texture};
1628		2075
1629	$self->realloc;	2076	$self->realloc;
1630	}	2077	}
1631		2078
1632	sub reconfigure {	2079	sub reconfigure {
1633	my ($self) = @_;	2080	my ($self) = @_;
1634		2081
1635	delete $self->{size_req};	2082	delete $self->{size_req};
		2083	delete $self->{texture};
1636		2084
1637	$self->SUPER::reconfigure;	2085	$self->SUPER::reconfigure;
1638	}	2086	}
1639		2087
1640	sub _draw {	2088	sub _draw {
1641	my ($self) = @_;	2089	my ($self) = @_;
1642		2090
1643	$self->SUPER::_draw; # draw background, if applicable	2091	$self->SUPER::_draw; # draw background, if applicable
1644		2092
1645	my $tex = $self->{texture} ||= do {	2093	my $size = $self->{texture} ||= do {
1646	$self->{layout}->set_foreground (@{$self->{fg}});	2094	$self->{layout}->set_foreground (@{$self->{fg}});
1647	$self->{layout}->set_font ($self->{font}) if $self->{font};	2095	$self->{layout}->set_font ($self->{font}) if $self->{font};
1648	$self->{layout}->set_width ($self->{w});	2096	$self->{layout}->set_width ($self->{w});
1649	$self->{layout}->set_ellipsise ($self->{ellipsise});	2097	$self->{layout}->set_ellipsise ($self->{ellipsise});
1650	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2098	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2099	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652		2100
1653	new_from_layout CFClient::Texture $self->{layout}	2101	[$self->{layout}->size]
1654	};	2102	};
1655		2103
1656	unless (exists $self->{ox}) {	2104	unless (exists $self->{ox}) {
1657	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2105	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2106	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659	: ($self->{w} - $tex->{w}) * 0.5);	2107	: ($self->{w} - $size->[0]) * 0.5);
1660		2108
1661	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2109	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2110	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663	: ($self->{h} - $tex->{h}) * 0.5);	2111	: ($self->{h} - $size->[1]) * 0.5);
1664	};	2112	};
1665		2113
1666	glEnable GL_TEXTURE_2D;
1667
1668	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2114	my $w = List::Util::min $self->{w} + 4, $size->[0];
1669	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2115	my $h = List::Util::min $self->{h} + 2, $size->[1];
1670		2116
1671	if ($tex->{format} == GL_ALPHA) {	2117	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1672	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1673	glColor @{$self->{fg}};
1674	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1675	} else {
1676	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1677	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1678	}
1679
1680	glDisable GL_TEXTURE_2D;
1681	}	2118	}
1682		2119
1683	#############################################################################	2120	#############################################################################
1684		2121
1685	package CFClient::UI::EntryBase;	2122	package CFPlus::UI::EntryBase;
1686		2123
1687	our @ISA = CFClient::UI::Label::;	2124	our @ISA = CFPlus::UI::Label::;
1688		2125
1689	use CFClient::OpenGL;	2126	use CFPlus::OpenGL;
1690		2127
1691	sub new {	2128	sub new {
1692	my $class = shift;	2129	my $class = shift;
1693		2130
1694	$class->SUPER::new (	2131	$class->SUPER::new (
…		…
1698	active_fg => [0, 0, 0],	2135	active_fg => [0, 0, 0],
1699	can_hover => 1,	2136	can_hover => 1,
1700	can_focus => 1,	2137	can_focus => 1,
1701	valign => 0,	2138	valign => 0,
1702	can_events => 1,	2139	can_events => 1,
		2140	ellipsise => 0,
1703	#text => ...	2141	#text => ...
1704	#hidden => "*",	2142	#hidden => "*",
1705	@_	2143	@_
1706	)	2144	)
1707	}	2145	}
…		…
1718		2156
1719	$text =~ s/./*/g if $self->{hidden};	2157	$text =~ s/./*/g if $self->{hidden};
1720	$self->{layout}->set_text ("$text ");	2158	$self->{layout}->set_text ("$text ");
1721	delete $self->{size_req};	2159	delete $self->{size_req};
1722		2160
1723	$self->_emit (changed => $self->{text});	2161	$self->emit (changed => $self->{text});
1724		2162
1725	$self->realloc;	2163	$self->realloc;
1726	$self->update;	2164	$self->update;
1727	}	2165	}
1728		2166
…		…
1743	my ($w, $h) = $self->SUPER::size_request;	2181	my ($w, $h) = $self->SUPER::size_request;
1744		2182
1745	($w + 1, $h) # add 1 for cursor	2183	($w + 1, $h) # add 1 for cursor
1746	}	2184	}
1747		2185
1748	sub key_down {	2186	sub invoke_key_down {
1749	my ($self, $ev) = @_;	2187	my ($self, $ev) = @_;
1750		2188
1751	my $mod = $ev->{mod};	2189	my $mod = $ev->{mod};
1752	my $sym = $ev->{sym};	2190	my $sym = $ev->{sym};
1753	my $uni = $ev->{unicode};	2191	my $uni = $ev->{unicode};
1754		2192
1755	my $text = $self->get_text;	2193	my $text = $self->get_text;
		2194
		2195	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1756		2196
1757	if ($uni == 8) {	2197	if ($uni == 8) {
1758	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2198	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1759	} elsif ($uni == 127) {	2199	} elsif ($uni == 127) {
1760	substr $text, $self->{cursor}, 1, "";	2200	substr $text, $self->{cursor}, 1, "";
1761	} elsif ($sym == CFClient::SDLK_LEFT) {	2201	} elsif ($sym == CFPlus::SDLK_LEFT) {
1762	--$self->{cursor} if $self->{cursor};	2202	--$self->{cursor} if $self->{cursor};
1763	} elsif ($sym == CFClient::SDLK_RIGHT) {	2203	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1764	++$self->{cursor} if $self->{cursor} < length $self->{text};	2204	++$self->{cursor} if $self->{cursor} < length $self->{text};
1765	} 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 = "";
1766	$self->{cursor} = 0;	2219	$self->{cursor} = 0;
1767	} elsif ($sym == CFClient::SDLK_END) {
1768	$self->{cursor} = length $text;
1769	} elsif ($uni == 27) {	2220	} elsif ($uni == 27) {
1770	$self->_emit ('escape');	2221	$self->emit ('escape');
1771	} elsif ($uni) {	2222	} elsif ($uni == 0x0d) {
		2223	substr $text, $self->{cursor}++, 0, "\012";
		2224	} elsif ($uni >= 0x20) {
1772	substr $text, $self->{cursor}++, 0, chr $uni;	2225	substr $text, $self->{cursor}++, 0, chr $uni;
1773	} else {	2226	} else {
1774	return 0;	2227	return 0;
1775	}	2228	}
1776		2229
1777	$self->_set_text ($text);	2230	$self->_set_text ($text);
1778		2231
1779	$self->realloc;	2232	$self->realloc;
		2233	$self->update;
1780		2234
1781	1	2235	1
1782	}	2236	}
1783		2237
1784	sub focus_in {	2238	sub invoke_focus_in {
1785	my ($self) = @_;	2239	my ($self) = @_;
1786		2240
1787	$self->{last_activity} = $::NOW;	2241	$self->{last_activity} = $::NOW;
1788		2242
1789	$self->SUPER::focus_in;	2243	$self->SUPER::invoke_focus_in
1790	}	2244	}
1791		2245
1792	sub button_down {	2246	sub invoke_button_down {
1793	my ($self, $ev, $x, $y) = @_;	2247	my ($self, $ev, $x, $y) = @_;
1794		2248
1795	$self->SUPER::button_down ($ev, $x, $y);	2249	$self->SUPER::invoke_button_down ($ev, $x, $y);
1796		2250
1797	my $idx = $self->{layout}->xy_to_index ($x, $y);	2251	my $idx = $self->{layout}->xy_to_index ($x, $y);
1798		2252
1799	# byte-index to char-index	2253	# byte-index to char-index
1800	my $text = $self->{text};	2254	my $text = $self->{text};
1801	utf8::encode $text;	2255	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1802	$self->{cursor} = length substr $text, 0, $idx;	2256	$self->{cursor} = length $text;
1803		2257
1804	$self->_set_text ($self->{text});	2258	$self->_set_text ($self->{text});
1805	$self->update;	2259	$self->update;
1806		2260
1807	1	2261	1
1808	}	2262	}
1809		2263
1810	sub mouse_motion {	2264	sub invoke_mouse_motion {
1811	my ($self, $ev, $x, $y) = @_;	2265	my ($self, $ev, $x, $y) = @_;
1812	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2266	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813		2267
1814	0	2268	1
1815	}	2269	}
1816		2270
1817	sub _draw {	2271	sub _draw {
1818	my ($self) = @_;	2272	my ($self) = @_;
1819		2273
…		…
1846	utf8::encode $text;	2300	utf8::encode $text;
1847		2301
1848	@$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)
1849	}	2303	}
1850		2304
1851	glColor @{$self->{fg}};
1852	glBegin GL_LINES;	2305	glBegin GL_LINES;
1853	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};
1854	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};
1855	glEnd;	2308	glEnd;
1856	}	2309	}
1857	}	2310	}
1858		2311
		2312	#############################################################################
		2313
1859	package CFClient::UI::Entry;	2314	package CFPlus::UI::Entry;
1860		2315
1861	our @ISA = CFClient::UI::EntryBase::;	2316	our @ISA = CFPlus::UI::EntryBase::;
1862		2317
1863	use CFClient::OpenGL;	2318	use CFPlus::OpenGL;
1864		2319
1865	sub key_down {	2320	sub invoke_key_down {
1866	my ($self, $ev) = @_;	2321	my ($self, $ev) = @_;
1867		2322
1868	my $sym = $ev->{sym};	2323	my $sym = $ev->{sym};
1869		2324
1870	if ($sym == 13) {	2325	if ($ev->{uni} == 0x0d || $sym == 13) {
1871	unshift @{$self->{history}},	2326	unshift @{$self->{history}},
1872	my $txt = $self->get_text;	2327	my $txt = $self->get_text;
		2328
1873	$self->{history_pointer} = -1;	2329	$self->{history_pointer} = -1;
1874	$self->{history_saveback} = '';	2330	$self->{history_saveback} = '';
1875	$self->_emit (activate => $txt);	2331	$self->emit (activate => $txt);
1876	$self->update;	2332	$self->update;
1877		2333
1878	} elsif ($sym == CFClient::SDLK_UP) {	2334	} elsif ($sym == CFPlus::SDLK_UP) {
1879	if ($self->{history_pointer} < 0) {	2335	if ($self->{history_pointer} < 0) {
1880	$self->{history_saveback} = $self->get_text;	2336	$self->{history_saveback} = $self->get_text;
1881	}	2337	}
1882	if (@{$self->{history} || []} > 0) {	2338	if (@{$self->{history} || []} > 0) {
1883	$self->{history_pointer}++;	2339	$self->{history_pointer}++;
…		…
1885	$self->{history_pointer} = @{$self->{history} || []} - 1;	2341	$self->{history_pointer} = @{$self->{history} || []} - 1;
1886	}	2342	}
1887	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2343	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1888	}	2344	}
1889		2345
1890	} elsif ($sym == CFClient::SDLK_DOWN) {	2346	} elsif ($sym == CFPlus::SDLK_DOWN) {
1891	$self->{history_pointer}--;	2347	$self->{history_pointer}--;
1892	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2348	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1893		2349
1894	if ($self->{history_pointer} >= 0) {	2350	if ($self->{history_pointer} >= 0) {
1895	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2351	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1896	} else {	2352	} else {
1897	$self->set_text ($self->{history_saveback});	2353	$self->set_text ($self->{history_saveback});
1898	}	2354	}
1899		2355
1900	} else {	2356	} else {
1901	return $self->SUPER::key_down ($ev)	2357	return $self->SUPER::invoke_key_down ($ev)
1902	}	2358	}
1903		2359
1904	1	2360	1
1905	}	2361	}
1906		2362
1907	#############################################################################	2363	#############################################################################
1908		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
1909	package CFClient::UI::Button;	2404	package CFPlus::UI::Button;
1910		2405
1911	our @ISA = CFClient::UI::Label::;	2406	our @ISA = CFPlus::UI::Label::;
1912		2407
1913	use CFClient::OpenGL;	2408	use CFPlus::OpenGL;
1914		2409
1915	my @tex =	2410	my @tex =
1916	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2411	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1917	qw(b1_button_active.png);	2412	qw(b1_button_inactive.png b1_button_active.png);
1918		2413
1919	sub new {	2414	sub new {
1920	my $class = shift;	2415	my $class = shift;
1921		2416
1922	$class->SUPER::new (	2417	$class->SUPER::new (
1923	padding_x => 4,	2418	padding_x => 4,
1924	padding_y => 4,	2419	padding_y => 4,
1925	fg => [1, 1, 1],	2420	fg => [1.0, 1.0, 1.0],
1926	active_fg => [0, 0, 1],	2421	active_fg => [0.8, 0.8, 0.8],
1927	can_hover => 1,	2422	can_hover => 1,
1928	align => 0,	2423	align => 0,
1929	valign => 0,	2424	valign => 0,
1930	can_events => 1,	2425	can_events => 1,
1931	@_	2426	@_
1932	)	2427	)
1933	}	2428	}
1934		2429
1935	sub activate { }
1936
1937	sub button_up {	2430	sub invoke_button_up {
1938	my ($self, $ev, $x, $y) = @_;	2431	my ($self, $ev, $x, $y) = @_;
1939		2432
1940	$self->emit ("activate")	2433	$self->emit ("activate")
1941	if $x >= 0 && $x < $self->{w}	2434	if $x >= 0 && $x < $self->{w}
1942	&& $y >= 0 && $y < $self->{h};	2435	&& $y >= 0 && $y < $self->{h};
…		…
1951		2444
1952	glEnable GL_TEXTURE_2D;	2445	glEnable GL_TEXTURE_2D;
1953	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2446	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1954	glColor 0, 0, 0, 1;	2447	glColor 0, 0, 0, 1;
1955		2448
		2449	my $tex = $tex[$GRAB == $self];
1956	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2450	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1957		2451
1958	glDisable GL_TEXTURE_2D;	2452	glDisable GL_TEXTURE_2D;
1959		2453
1960	$self->SUPER::_draw;	2454	$self->SUPER::_draw;
1961	}	2455	}
1962		2456
1963	#############################################################################	2457	#############################################################################
1964		2458
1965	package CFClient::UI::CheckBox;	2459	package CFPlus::UI::CheckBox;
1966		2460
1967	our @ISA = CFClient::UI::DrawBG::;	2461	our @ISA = CFPlus::UI::DrawBG::;
1968		2462
1969	my @tex =	2463	my @tex =
1970	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2464	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1971	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2465	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1972		2466
1973	use CFClient::OpenGL;	2467	use CFPlus::OpenGL;
1974		2468
1975	sub new {	2469	sub new {
1976	my $class = shift;	2470	my $class = shift;
1977		2471
1978	$class->SUPER::new (	2472	$class->SUPER::new (
…		…
1992	my ($self) = @_;	2486	my ($self) = @_;
1993		2487
1994	(6) x 2	2488	(6) x 2
1995	}	2489	}
1996		2490
		2491	sub toggle {
		2492	my ($self) = @_;
		2493
		2494	$self->{state} = !$self->{state};
		2495	$self->emit (changed => $self->{state});
		2496	$self->update;
		2497	}
		2498
1997	sub button_down {	2499	sub invoke_button_down {
1998	my ($self, $ev, $x, $y) = @_;	2500	my ($self, $ev, $x, $y) = @_;
1999		2501
2000	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2502	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2503	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002	$self->{state} = !$self->{state};	2504	$self->toggle;
2003	$self->_emit (changed => $self->{state});
2004	} else {	2505	} else {
2005	return 0	2506	return 0
2006	}	2507	}
2007		2508
2008	1	2509	1
…		…
2028	glDisable GL_TEXTURE_2D;	2529	glDisable GL_TEXTURE_2D;
2029	}	2530	}
2030		2531
2031	#############################################################################	2532	#############################################################################
2032		2533
2033	package CFClient::UI::Image;	2534	package CFPlus::UI::Image;
2034		2535
2035	our @ISA = CFClient::UI::Base::;	2536	our @ISA = CFPlus::UI::Base::;
2036		2537
2037	use CFClient::OpenGL;	2538	use CFPlus::OpenGL;
2038	use Carp qw/confess/;
2039		2539
2040	our %loaded_images;	2540	our %texture_cache;
2041		2541
2042	sub new {	2542	sub new {
2043	my $class = shift;	2543	my $class = shift;
2044		2544
2045	my $self = $class->SUPER::new (can_events => 0, @_);	2545	my $self = $class->SUPER::new (
		2546	can_events => 0,
		2547	@_,
		2548	);
2046		2549
2047	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2550	$self->{path} || $self->{tex}
		2551	or Carp::croak "'path' or 'tex' attributes required";
2048		2552
2049	$loaded_images{$self->{image}} ||=	2553	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2050	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2554	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2051		2555
2052	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2556	CFPlus::weaken $texture_cache{$self->{path}};
2053		2557
2054	Scalar::Util::weaken $loaded_images{$self->{image}};	2558	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056	$self->{aspect} = $tex->{w} / $tex->{h};
2057		2559
2058	$self	2560	$self
2059	}	2561	}
2060		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
2061	sub size_request {	2578	sub size_request {
2062	my ($self) = @_;	2579	my ($self) = @_;
2063		2580
2064	($self->{tex}->{w}, $self->{tex}->{h})	2581	($self->{tex}{w}, $self->{tex}{h})
2065	}	2582	}
2066		2583
2067	sub _draw {	2584	sub _draw {
2068	my ($self) = @_;	2585	my ($self) = @_;
2069		2586
…		…
2079	}	2596	}
2080		2597
2081	glEnable GL_TEXTURE_2D;	2598	glEnable GL_TEXTURE_2D;
2082	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2599	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2083		2600
2084	$tex->draw_quad_alpha (0, 0, $w, $h);	2601	$tex->draw_quad (0, 0, $w, $h);
2085		2602
2086	glDisable GL_TEXTURE_2D;	2603	glDisable GL_TEXTURE_2D;
2087	}	2604	}
2088		2605
2089	#############################################################################	2606	#############################################################################
2090		2607
		2608	package CFPlus::UI::ImageButton;
		2609
		2610	our @ISA = CFPlus::UI::Image::;
		2611
		2612	use CFPlus::OpenGL;
		2613
		2614	my %textures;
		2615
		2616	sub new {
		2617	my $class = shift;
		2618
		2619	my $self = $class->SUPER::new (
		2620	padding_x => 4,
		2621	padding_y => 4,
		2622	fg => [1, 1, 1],
		2623	active_fg => [0, 0, 1],
		2624	can_hover => 1,
		2625	align => 0,
		2626	valign => 0,
		2627	can_events => 1,
		2628	@_
		2629	);
		2630	}
		2631
		2632	sub invoke_button_up {
		2633	my ($self, $ev, $x, $y) = @_;
		2634
		2635	$self->emit ("activate")
		2636	if $x >= 0 && $x < $self->{w}
		2637	&& $y >= 0 && $y < $self->{h};
		2638
		2639	1
		2640	}
		2641
		2642	#############################################################################
		2643
2091	package CFClient::UI::VGauge;	2644	package CFPlus::UI::VGauge;
2092		2645
2093	our @ISA = CFClient::UI::Base::;	2646	our @ISA = CFPlus::UI::Base::;
2094		2647
2095	use List::Util qw(min max);	2648	use List::Util qw(min max);
2096		2649
2097	use CFClient::OpenGL;	2650	use CFPlus::OpenGL;
2098		2651
2099	my %tex = (	2652	my %tex = (
2100	food => [	2653	food => [
2101	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2654	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2655	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2103	],	2656	],
2104	grace => [	2657	grace => [
2105	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2658	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106	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/
2107	],	2660	],
2108	hp => [	2661	hp => [
2109	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2662	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2110	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2663	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2111	],	2664	],
2112	mana => [	2665	mana => [
2113	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2666	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2114	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/
2115	],	2668	],
2116	);	2669	);
2117		2670
2118	# eg. VGauge->new (gauge => 'food'), default gauge: food	2671	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2178	my $ycut1 = max 0, min 1, $ycut;	2731	my $ycut1 = max 0, min 1, $ycut;
2179	my $ycut2 = max 0, min 1, $ycut - 1;	2732	my $ycut2 = max 0, min 1, $ycut - 1;
2180		2733
2181	my $h1 = $self->{h} * (1 - $ycut1);	2734	my $h1 = $self->{h} * (1 - $ycut1);
2182	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);
2183		2739
2184	glEnable GL_BLEND;	2740	glEnable GL_BLEND;
2185	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2741	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2742	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187	glEnable GL_TEXTURE_2D;	2743	glEnable GL_TEXTURE_2D;
…		…
2206		2762
2207	if ($t3) {	2763	if ($t3) {
2208	glBindTexture GL_TEXTURE_2D, $t3->{name};	2764	glBindTexture GL_TEXTURE_2D, $t3->{name};
2209	glBegin GL_QUADS;	2765	glBegin GL_QUADS;
2210	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2766	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2767	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2768	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2769	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214	glEnd;	2770	glEnd;
2215	}	2771	}
2216		2772
2217	glDisable GL_BLEND;	2773	glDisable GL_BLEND;
2218	glDisable GL_TEXTURE_2D;	2774	glDisable GL_TEXTURE_2D;
2219	}	2775	}
2220		2776
2221	#############################################################################	2777	#############################################################################
2222		2778
2223	package CFClient::UI::Gauge;	2779	package CFPlus::UI::Gauge;
2224		2780
2225	our @ISA = CFClient::UI::VBox::;	2781	our @ISA = CFPlus::UI::VBox::;
2226		2782
2227	sub new {	2783	sub new {
2228	my ($class, %arg) = @_;	2784	my ($class, %arg) = @_;
2229		2785
2230	my $self = $class->SUPER::new (	2786	my $self = $class->SUPER::new (
…		…
2232	can_hover => 1,	2788	can_hover => 1,
2233	can_events => 1,	2789	can_events => 1,
2234	%arg,	2790	%arg,
2235	);	2791	);
2236		2792
2237	$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");
2238	$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);
2239	$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");
2240		2796
2241	$self	2797	$self
2242	}	2798	}
2243		2799
2244	sub set_fontsize {	2800	sub set_fontsize {
…		…
2265	$self->{value}->set_text ($val);	2821	$self->{value}->set_text ($val);
2266	}	2822	}
2267		2823
2268	#############################################################################	2824	#############################################################################
2269		2825
2270	package CFClient::UI::Slider;	2826	package CFPlus::UI::Slider;
2271		2827
2272	use strict;	2828	use strict;
2273		2829
2274	use CFClient::OpenGL;	2830	use CFPlus::OpenGL;
2275		2831
2276	our @ISA = CFClient::UI::DrawBG::;	2832	our @ISA = CFPlus::UI::DrawBG::;
2277		2833
2278	my @tex =	2834	my @tex =
2279	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2835	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2280	qw(s1_slider.png s1_slider_bg.png);	2836	qw(s1_slider.png s1_slider_bg.png);
2281		2837
2282	sub new {	2838	sub new {
2283	my $class = shift;	2839	my $class = shift;
2284		2840
…		…
2305	$self->update;	2861	$self->update;
2306		2862
2307	$self	2863	$self
2308	}	2864	}
2309		2865
2310	sub changed { }
2311
2312	sub set_range {	2866	sub set_range {
2313	my ($self, $range) = @_;	2867	my ($self, $range) = @_;
2314		2868
2315	($range, $self->{range}) = ($self->{range}, $range);	2869	($range, $self->{range}) = ($self->{range}, $range);
2316		2870
…		…
2336	if $unit;	2890	if $unit;
2337		2891
2338	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2892	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339		2893
2340	if ($value != $old_value) {	2894	if ($value != $old_value) {
2341	$self->_emit (changed => $value);	2895	$self->emit (changed => $value);
2342	$self->update;	2896	$self->update;
2343	}	2897	}
2344	}	2898	}
2345		2899
2346	sub size_request {	2900	sub size_request {
2347	my ($self) = @_;	2901	my ($self) = @_;
2348		2902
2349	($self->{req_w}, $self->{req_h})	2903	($self->{req_w}, $self->{req_h})
2350	}	2904	}
2351		2905
2352	sub button_down {	2906	sub invoke_button_down {
2353	my ($self, $ev, $x, $y) = @_;	2907	my ($self, $ev, $x, $y) = @_;
2354		2908
2355	$self->SUPER::button_down ($ev, $x, $y);	2909	$self->SUPER::invoke_button_down ($ev, $x, $y);
2356		2910
2357	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2911	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358		2912
2359	$self->mouse_motion ($ev, $x, $y)	2913	$self->invoke_mouse_motion ($ev, $x, $y)
2360	}	2914	}
2361		2915
2362	sub mouse_motion {	2916	sub invoke_mouse_motion {
2363	my ($self, $ev, $x, $y) = @_;	2917	my ($self, $ev, $x, $y) = @_;
2364		2918
2365	if ($GRAB == $self) {	2919	if ($GRAB == $self) {
2366	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2920	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367		2921
…		…
2373	} else {	2927	} else {
2374	return 0;	2928	return 0;
2375	}	2929	}
2376		2930
2377	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
2378	}	2944	}
2379		2945
2380	sub update {	2946	sub update {
2381	my ($self) = @_;	2947	my ($self) = @_;
2382		2948
…		…
2431	glDisable GL_TEXTURE_2D;	2997	glDisable GL_TEXTURE_2D;
2432	}	2998	}
2433		2999
2434	#############################################################################	3000	#############################################################################
2435		3001
2436	package CFClient::UI::ValSlider;	3002	package CFPlus::UI::ValSlider;
2437		3003
2438	our @ISA = CFClient::UI::HBox::;	3004	our @ISA = CFPlus::UI::HBox::;
2439		3005
2440	sub new {	3006	sub new {
2441	my ($class, %arg) = @_;	3007	my ($class, %arg) = @_;
2442		3008
2443	my $range = delete $arg{range};	3009	my $range = delete $arg{range};
2444		3010
2445	my $self = $class->SUPER::new (	3011	my $self = $class->SUPER::new (
2446	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3012	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2447	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3013	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2448	to_value => sub { shift },	3014	to_value => sub { shift },
2449	from_value => sub { shift },	3015	from_value => sub { shift },
2450	%arg,	3016	%arg,
2451	);	3017	);
2452		3018
…		…
2472	sub set_range { shift->{slider}->set_range (@_) }	3038	sub set_range { shift->{slider}->set_range (@_) }
2473	sub set_value { shift->{slider}->set_value (@_) }	3039	sub set_value { shift->{slider}->set_value (@_) }
2474		3040
2475	#############################################################################	3041	#############################################################################
2476		3042
2477	package CFClient::UI::TextScroller;	3043	package CFPlus::UI::TextScroller;
2478		3044
2479	our @ISA = CFClient::UI::HBox::;	3045	our @ISA = CFPlus::UI::HBox::;
2480		3046
2481	use CFClient::OpenGL;	3047	use CFPlus::OpenGL;
2482		3048
2483	sub new {	3049	sub new {
2484	my $class = shift;	3050	my $class = shift;
2485		3051
2486	my $self = $class->SUPER::new (	3052	my $self = $class->SUPER::new (
2487	fontsize => 1,	3053	fontsize => 1,
2488	can_events => 0,	3054	can_events => 1,
2489	indent => 0,	3055	indent => 0,
2490	#font => default_font	3056	#font => default_font
2491	@_,	3057	@_,
2492		3058
2493	layout => (new CFClient::Layout 1),	3059	layout => (new CFPlus::Layout),
2494	par => [],	3060	par => [],
		3061	max_par => 0,
2495	height => 0,	3062	height => 0,
2496	children => [	3063	children => [
2497	(new CFClient::UI::Empty expand => 1),	3064	(new CFPlus::UI::Empty expand => 1),
2498	(new CFClient::UI::Slider vertical => 1),	3065	(new CFPlus::UI::Slider vertical => 1),
2499	],	3066	],
2500	);	3067	);
2501		3068
2502	$self->{children}[1]->connect (changed => sub { $self->update });	3069	$self->{children}[1]->connect (changed => sub { $self->update });
2503		3070
…		…
2509		3076
2510	$self->{fontsize} = $fontsize;	3077	$self->{fontsize} = $fontsize;
2511	$self->reflow;	3078	$self->reflow;
2512	}	3079	}
2513		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
2514	sub size_allocate {	3090	sub invoke_size_allocate {
2515	my ($self, $w, $h) = @_;	3091	my ($self, $w, $h) = @_;
2516		3092
2517	$self->SUPER::size_allocate ($w, $h);	3093	my ($empty, $slider, @other) = @{ $self->{children} };
		3094	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518		3095
2519	$self->{layout}->set_font ($self->{font}) if $self->{font};	3096	$self->{layout}->set_font ($self->{font}) if $self->{font};
2520	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3097	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521	$self->{layout}->set_width ($self->{children}[0]{w});	3098	$self->{layout}->set_width ($empty->{w});
2522	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3099	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523		3100
2524	$self->reflow;	3101	$self->reflow;
2525	}
2526		3102
2527	sub text_size {	3103	local $self->{children} = [$empty, $slider];
		3104	$self->SUPER::invoke_size_allocate ($w, $h)
		3105	}
		3106
		3107	sub invoke_mouse_wheel {
2528	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) = @_;
2529		3119
2530	my $layout = $self->{layout};	3120	my $layout = $self->{layout};
2531		3121
		3122	$layout->set_font ($self->{font}) if $self->{font};
		3123	$layout->set_foreground (@{$para->{fg}});
2532	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3124	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533	$layout->set_width ($self->{children}[0]{w} - $indent);	3125	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3126	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535	$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}}
2536		3133	);
		3134
2537	$layout->size	3135	$layout
2538	}	3136	}
2539		3137
2540	sub reflow {	3138	sub reflow {
2541	my ($self) = @_;	3139	my ($self) = @_;
2542		3140
…		…
2549		3147
2550	# todo: base offset on lines or so, not on pixels	3148	# todo: base offset on lines or so, not on pixels
2551	$self->{children}[1]->set_value ($offset);	3149	$self->{children}[1]->set_value ($offset);
2552	}	3150	}
2553		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
2554	sub clear {	3167	sub clear {
2555	my ($self) = @_;	3168	my ($self) = @_;
		3169
		3170	my (undef, undef, @other) = @{ $self->{children} };
		3171	$self->remove ($_) for @other;
2556		3172
2557	$self->{par} = [];	3173	$self->{par} = [];
2558	$self->{height} = 0;	3174	$self->{height} = 0;
2559	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3175	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560	}	3176	}
2561		3177
2562	sub add_paragraph {	3178	sub add_paragraph {
2563	my ($self, $color, $text, $indent) = @_;	3179	my $self = shift;
2564		3180
2565	for my $line (split /\n/, $text) {	3181	for my $para (@_) {
2566	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
2567	$self->{height} += $h;	3233	$self->{height} = $height;
2568	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3234	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2569	}
2570		3235
2571	$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	}
2572	}	3242	}
2573		3243
2574	sub update {	3244	sub update {
2575	my ($self) = @_;	3245	my ($self) = @_;
2576		3246
…		…
2579	return unless $self->{h} > 0;	3249	return unless $self->{h} > 0;
2580		3250
2581	delete $self->{texture};	3251	delete $self->{texture};
2582		3252
2583	$ROOT->on_post_alloc ($self => sub {	3253	$ROOT->on_post_alloc ($self => sub {
		3254	$self->force_uptodate;
		3255
2584	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3256	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585		3257
2586	if (delete $self->{need_reflow}) {
2587	my $height = 0;
2588
2589	my $layout = $self->{layout};
2590
2591	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593	for (@{$self->{par}}) {
2594	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2595	$layout->set_width ($W - $_->[3]);
2596	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597	$layout->set_markup ($_->[4]);
2598	my ($w, $h) = $layout->size;
2599	$_->[0] = $w + $_->[3];
2600	$_->[1] = $h;
2601	}
2602
2603	$height += $_->[1];
2604	}
2605
2606	$self->{height} = $height;
2607
2608	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2609
2610	delete $self->{texture};
2611	}
2612
2613	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3258	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2614	glClearColor 0, 0, 0, 0;	3259	glClearColor 0, 0, 0, 0;
2615	glClear GL_COLOR_BUFFER_BIT;	3260	glClear GL_COLOR_BUFFER_BIT;
2616		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;
2617	my $top = int $self->{children}[1]{range}[0];	3270	my $top = int $self->{children}[1]{range}[0];
2618		3271
2619	my $y0 = $top;	3272	my $y0 = $top;
2620	my $y1 = $top + $H;	3273	my $y1 = $top + $H;
2621		3274
2622	my $y = 0;
2623
2624	my $layout = $self->{layout};
2625
2626	$layout->set_font ($self->{font}) if $self->{font};
2627
2628	glEnable GL_BLEND;
2629	#TODO# not correct in windows where rgba is forced off
2630	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631
2632	for my $par (@{$self->{par}}) {	3275	for my $para (@{$self->{par}}) {
2633	my $h = $par->[1];	3276	my $h = $para->{h};
		3277	my $y = $para->{y};
2634		3278
2635	if ($y0 < $y + $h && $y < $y1) {	3279	if ($y0 < $y + $h && $y < $y1) {
2636	$layout->set_foreground (@{ $par->[2] });	3280	my $layout = $self->get_layout ($para);
2637	$layout->set_width ($W - $par->[3]);
2638	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639	$layout->set_markup ($par->[4]);
2640		3281
2641	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3282	$layout->render ($para->{indent}, $y - $y0);
2642		3283
2643	glRasterPos $par->[3], $y - $y0;	3284	if (my @w = @{ $para->{widget} }) {
2644	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	}
2645	}	3296	}
2646		3297
2647	$y += $h;	3298	$paridx++;
		3299	$top_paragraph ||= $paridx if $y >= $top;
2648	}	3300	}
2649		3301
2650	glDisable GL_BLEND;	3302	$self->{top_paragraph} = $top_paragraph;
2651	};	3303	};
2652	});	3304	});
		3305	}
		3306
		3307	sub reconfigure {
		3308	my ($self) = @_;
		3309
		3310	$self->SUPER::reconfigure;
		3311
		3312	$_->{w} = 1e10 for @{ $self->{par} };
		3313	$self->reflow;
2653	}	3314	}
2654		3315
2655	sub _draw {	3316	sub _draw {
2656	my ($self) = @_;	3317	my ($self) = @_;
2657		3318
…		…
2660	glColor 0, 0, 0, 1;	3321	glColor 0, 0, 0, 1;
2661	$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});
2662	glDisable GL_TEXTURE_2D;	3323	glDisable GL_TEXTURE_2D;
2663		3324
2664	$self->{children}[1]->draw;	3325	$self->{children}[1]->draw;
2665
2666	}	3326	}
2667		3327
2668	#############################################################################	3328	#############################################################################
2669		3329
2670	package CFClient::UI::Animator;	3330	package CFPlus::UI::Animator;
2671		3331
2672	use CFClient::OpenGL;	3332	use CFPlus::OpenGL;
2673		3333
2674	our @ISA = CFClient::UI::Bin::;	3334	our @ISA = CFPlus::UI::Bin::;
2675		3335
2676	sub moveto {	3336	sub moveto {
2677	my ($self, $x, $y) = @_;	3337	my ($self, $x, $y) = @_;
2678		3338
2679	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3339	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2707	glPopMatrix;	3367	glPopMatrix;
2708	}	3368	}
2709		3369
2710	#############################################################################	3370	#############################################################################
2711		3371
2712	package CFClient::UI::Flopper;	3372	package CFPlus::UI::Flopper;
2713		3373
2714	our @ISA = CFClient::UI::Button::;	3374	our @ISA = CFPlus::UI::Button::;
2715		3375
2716	sub new {	3376	sub new {
2717	my $class = shift;	3377	my $class = shift;
2718		3378
2719	my $self = $class->SUPER::new (	3379	my $self = $class->SUPER::new (
…		…
2731	$self->{other}->toggle_visibility;	3391	$self->{other}->toggle_visibility;
2732	}	3392	}
2733		3393
2734	#############################################################################	3394	#############################################################################
2735		3395
2736	package CFClient::UI::Tooltip;	3396	package CFPlus::UI::Tooltip;
2737		3397
2738	our @ISA = CFClient::UI::Bin::;	3398	our @ISA = CFPlus::UI::Bin::;
2739		3399
2740	use CFClient::OpenGL;	3400	use CFPlus::OpenGL;
2741		3401
2742	sub new {	3402	sub new {
2743	my $class = shift;	3403	my $class = shift;
2744		3404
2745	$class->SUPER::new (	3405	$class->SUPER::new (
…		…
2748	)	3408	)
2749	}	3409	}
2750		3410
2751	sub set_tooltip_from {	3411	sub set_tooltip_from {
2752	my ($self, $widget) = @_;	3412	my ($self, $widget) = @_;
		3413
		3414	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3415	if $widget->{tooltip} =~ /^#(.*)$/;
2753		3416
2754	my $tooltip = $widget->{tooltip};	3417	my $tooltip = $widget->{tooltip};
2755		3418
2756	if ($ENV{CFPLUS_DEBUG} & 2) {	3419	if ($ENV{CFPLUS_DEBUG} & 2) {
2757	$tooltip .= "\n\n" . (ref $widget) . "\n"	3420	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2761	}	3424	}
2762		3425
2763	$tooltip =~ s/^\n+//;	3426	$tooltip =~ s/^\n+//;
2764	$tooltip =~ s/\n+$//;	3427	$tooltip =~ s/\n+$//;
2765		3428
2766	$self->add (new CFClient::UI::Label	3429	$self->add (new CFPlus::UI::Label
2767	markup => $tooltip,	3430	markup => $tooltip,
2768	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3431	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2769	fontsize => 0.8,	3432	fontsize => 0.8,
2770	fg => [0, 0, 0, 1],	3433	style => 1, # FLAG_INVERSE
2771	ellipsise => 0,	3434	ellipsise => 0,
2772	font => ($widget->{tooltip_font} || $::FONT_PROP),	3435	font => ($widget->{tooltip_font} || $::FONT_PROP),
2773	);	3436	);
2774	}	3437	}
2775		3438
…		…
2779	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3442	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780		3443
2781	($w + 4, $h + 4)	3444	($w + 4, $h + 4)
2782	}	3445	}
2783		3446
2784	sub size_allocate {	3447	sub invoke_size_allocate {
2785	my ($self, $w, $h) = @_;	3448	my ($self, $w, $h) = @_;
2786		3449
2787	$self->SUPER::size_allocate ($w - 4, $h - 4);	3450	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788	}	3451	}
2789		3452
2790	sub visibility_change {	3453	sub invoke_visibility_change {
2791	my ($self, $visible) = @_;	3454	my ($self, $visible) = @_;
2792		3455
2793	return unless $visible;	3456	return unless $visible;
2794		3457
2795	$self->{root}->on_post_alloc ("move_$self" => sub {	3458	$self->{root}->on_post_alloc ("move_$self" => sub {
2796	my $widget = $self->{owner}	3459	my $widget = $self->{owner}
2797	or return;	3460	or return;
2798		3461
		3462	if ($widget->{visible}) {
2799	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3463	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800		3464
2801	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3465	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802	if $x + $self->{w} > $self->{root}{w};	3466	if $x + $self->{w} > $self->{root}{w};
2803		3467
2804	$self->move_abs ($x, $y);	3468	$self->move_abs ($x, $y);
		3469	} else {
		3470	$self->hide;
		3471	}
2805	});	3472	});
2806	}	3473	}
2807		3474
2808	sub _draw {	3475	sub _draw {
2809	my ($self) = @_;	3476	my ($self) = @_;
…		…
2833	$self->SUPER::_draw;	3500	$self->SUPER::_draw;
2834	}	3501	}
2835		3502
2836	#############################################################################	3503	#############################################################################
2837		3504
2838	package CFClient::UI::Face;	3505	package CFPlus::UI::Face;
2839		3506
2840	our @ISA = CFClient::UI::Base::;	3507	our @ISA = CFPlus::UI::DrawBG::;
2841		3508
2842	use CFClient::OpenGL;	3509	use CFPlus::OpenGL;
2843		3510
2844	sub new {	3511	sub new {
2845	my $class = shift;	3512	my $class = shift;
2846		3513
2847	my $self = $class->SUPER::new (	3514	my $self = $class->SUPER::new (
		3515	size_w => 32,
		3516	size_h => 8,
2848	aspect => 1,	3517	aspect => 1,
2849	can_events => 0,	3518	can_events => 0,
2850	@_,	3519	@_,
2851	);	3520	);
2852		3521
2853	if ($self->{anim} && $self->{animspeed}) {	3522	if ($self->{anim} && $self->{animspeed}) {
2854	Scalar::Util::weaken (my $widget = $self);	3523	CFPlus::weaken (my $widget = $self);
2855		3524
		3525	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3526	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2856	$self->{timer} = Event->timer (	3527	$self->{timer} = Event->timer (
2857	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2858	hard => 1,	3528	parked => 1,
2859	interval => $self->{animspeed},
2860	cb => sub {	3529	cb => sub {
		3530	return unless $::CONN && $widget;
		3531
2861	++$widget->{frame};	3532	++$widget->{frame};
		3533	$widget->update_face;
2862	$widget->update;	3534	$widget->update;
		3535
		3536	$widget->update_timer;
2863	},	3537	},
2864	);	3538	);
		3539
		3540	$self->update_face;
		3541	$self->update_timer;
2865	}	3542	}
2866		3543
2867	$self	3544	$self
2868	}	3545	}
2869		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
2870	sub size_request {	3577	sub size_request {
2871	(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)
2872	}	3593	}
2873		3594
2874	sub update {	3595	sub update {
2875	my ($self) = @_;	3596	my ($self) = @_;
2876		3597
2877	return unless $self->{visible};	3598	return unless $self->{visible};
2878		3599
2879	$self->SUPER::update;	3600	$self->SUPER::update;
2880	}	3601	}
2881		3602
		3603	sub invoke_visibility_change {
		3604	my ($self) = @_;
		3605
		3606	$self->update_timer;
		3607
		3608	0
		3609	}
		3610
2882	sub _draw {	3611	sub _draw {
2883	my ($self) = @_;	3612	my ($self) = @_;
2884		3613
2885	return unless $::CONN;	3614	return unless $::CONN;
2886		3615
2887	my $face;	3616	$self->SUPER::_draw;
2888		3617
2889	if ($self->{frame}) {
2890	my $anim = $::CONN->{anim}[$self->{anim}];	3618	my $faceid = $::CONN->{faceid}[$self->{face}]
2891		3619	or return;
2892	$face = $anim->[ $self->{frame} % @$anim ]
2893	if $anim && @$anim;
2894	}
2895		3620
2896	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3621	my $tex = $::CONN->{texture}[$faceid];
2897		3622
2898	if ($tex) {	3623	if ($tex) {
2899	glEnable GL_TEXTURE_2D;	3624	glEnable GL_TEXTURE_2D;
2900	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3625	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2901	glColor 0, 0, 0, 1;	3626	glColor 0, 0, 0, 1;
…		…
2905	}	3630	}
2906		3631
2907	sub destroy {	3632	sub destroy {
2908	my ($self) = @_;	3633	my ($self) = @_;
2909		3634
2910	$self->{timer}->cancel	3635	(delete $self->{timer})->cancel
2911	if $self->{timer};	3636	if $self->{timer};
2912		3637
2913	$self->SUPER::destroy;	3638	$self->SUPER::destroy;
2914	}	3639	}
2915		3640
2916	#############################################################################	3641	#############################################################################
2917		3642
2918	package CFClient::UI::Buttonbar;	3643	package CFPlus::UI::Buttonbar;
2919		3644
2920	our @ISA = CFClient::UI::HBox::;	3645	our @ISA = CFPlus::UI::HBox::;
2921		3646
2922	# TODO: should actualyl wrap buttons and other goodies.	3647	# TODO: should actually wrap buttons and other goodies.
2923		3648
2924	#############################################################################	3649	#############################################################################
2925		3650
2926	package CFClient::UI::Menu;	3651	package CFPlus::UI::Menu;
2927		3652
2928	our @ISA = CFClient::UI::FancyFrame::;	3653	our @ISA = CFPlus::UI::Toplevel::;
2929		3654
2930	use CFClient::OpenGL;	3655	use CFPlus::OpenGL;
2931		3656
2932	sub new {	3657	sub new {
2933	my $class = shift;	3658	my $class = shift;
2934		3659
2935	my $self = $class->SUPER::new (	3660	my $self = $class->SUPER::new (
2936	items => [],	3661	items => [],
2937	z => 100,	3662	z => 100,
2938	@_,	3663	@_,
2939	);	3664	);
2940		3665
2941	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3666	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2942		3667
2943	for my $item (@{ $self->{items} }) {	3668	for my $item (@{ $self->{items} }) {
2944	my ($widget, $cb, $tooltip) = @$item;	3669	my ($widget, $cb, $tooltip) = @$item;
2945		3670
2946	# handle various types of items, only text for now	3671	# handle various types of items, only text for now
2947	if (!ref $widget) {	3672	if (!ref $widget) {
		3673	if ($widget =~ /\t/) {
		3674	my ($left, $right) = split /\t/, $widget, 2;
		3675
2948	$widget = new CFClient::UI::Label	3676	$widget = new CFPlus::UI::HBox
2949	can_hover => 1,	3677	can_hover => 1,
2950	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,
2951	markup => $widget,	3690	markup => $widget,
2952	tooltip => $tooltip	3691	tooltip => $tooltip;
		3692	}
2953	}	3693	}
2954		3694
2955	$self->{item}{$widget} = $item;	3695	$self->{item}{$widget} = $item;
2956		3696
2957	$self->{vbox}->add ($widget);	3697	$self->{vbox}->add ($widget);
…		…
2962		3702
2963	# popup given the event (must be a mouse button down event currently)	3703	# popup given the event (must be a mouse button down event currently)
2964	sub popup {	3704	sub popup {
2965	my ($self, $ev) = @_;	3705	my ($self, $ev) = @_;
2966		3706
2967	$self->_emit ("popdown");	3707	$self->emit ("popdown");
2968		3708
2969	# maybe save $GRAB? must be careful about events...	3709	# maybe save $GRAB? must be careful about events...
2970	$GRAB = $self;	3710	$GRAB = $self;
2971	$self->{button} = $ev->{button};	3711	$self->{button} = $ev->{button};
2972		3712
2973	$self->show;	3713	$self->show;
2974	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3714	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975	}	3715	}
2976		3716
2977	sub mouse_motion {	3717	sub invoke_mouse_motion {
2978	my ($self, $ev, $x, $y) = @_;	3718	my ($self, $ev, $x, $y) = @_;
2979		3719
2980	# TODO: should use vbox->find_widget or so	3720	# TODO: should use vbox->find_widget or so
2981	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3721	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982	$self->{hover} = $self->{item}{$HOVER};	3722	$self->{hover} = $self->{item}{$HOVER};
2983		3723
2984	0	3724	0
2985	}	3725	}
2986		3726
2987	sub button_up {	3727	sub invoke_button_up {
2988	my ($self, $ev, $x, $y) = @_;	3728	my ($self, $ev, $x, $y) = @_;
2989		3729
2990	if ($ev->{button} == $self->{button}) {	3730	if ($ev->{button} == $self->{button}) {
2991	undef $GRAB;	3731	undef $GRAB;
2992	$self->hide;	3732	$self->hide;
2993		3733
2994	$self->_emit ("popdown");	3734	$self->emit ("popdown");
2995	$self->{hover}[1]->() if $self->{hover};	3735	$self->{hover}[1]->() if $self->{hover};
2996	} else {	3736	} else {
2997	return 0	3737	return 0
2998	}	3738	}
2999		3739
3000	1	3740	1
3001	}	3741	}
3002		3742
3003	#############################################################################	3743	#############################################################################
3004		3744
3005	package CFClient::UI::Multiplexer;	3745	package CFPlus::UI::Multiplexer;
3006		3746
3007	our @ISA = CFClient::UI::Container::;	3747	our @ISA = CFPlus::UI::Container::;
3008		3748
3009	sub new {	3749	sub new {
3010	my $class = shift;	3750	my $class = shift;
3011		3751
3012	my $self = $class->SUPER::new (	3752	my $self = $class->SUPER::new (
…		…
3026		3766
3027	$self->{current} = $self->{children}[0]	3767	$self->{current} = $self->{children}[0]
3028	if @{ $self->{children} };	3768	if @{ $self->{children} };
3029	}	3769	}
3030		3770
		3771	sub get_current_page {
		3772	my ($self) = @_;
		3773
		3774	$self->{current}
		3775	}
		3776
3031	sub set_current_page {	3777	sub set_current_page {
3032	my ($self, $page_or_widget) = @_;	3778	my ($self, $page_or_widget) = @_;
3033		3779
3034	my $widget = ref $page_or_widget	3780	my $widget = ref $page_or_widget
3035	? $page_or_widget	3781	? $page_or_widget
3036	: $self->{children}[$page_or_widget];	3782	: $self->{children}[$page_or_widget];
3037		3783
3038	$self->{current} = $widget;	3784	$self->{current} = $widget;
3039	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3785	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040		3786
3041	$self->_emit (page_changed => $self->{current});	3787	$self->emit (page_changed => $self->{current});
3042		3788
3043	$self->realloc;	3789	$self->realloc;
3044	}	3790	}
3045		3791
3046	sub visible_children {	3792	sub visible_children {
…		…
3051	my ($self) = @_;	3797	my ($self) = @_;
3052		3798
3053	$self->{current}->size_request	3799	$self->{current}->size_request
3054	}	3800	}
3055		3801
3056	sub size_allocate {	3802	sub invoke_size_allocate {
3057	my ($self, $w, $h) = @_;	3803	my ($self, $w, $h) = @_;
3058		3804
3059	$self->{current}->configure (0, 0, $w, $h);	3805	$self->{current}->configure (0, 0, $w, $h);
		3806
		3807	1
3060	}	3808	}
3061		3809
3062	sub _draw {	3810	sub _draw {
3063	my ($self) = @_;	3811	my ($self) = @_;
3064		3812
3065	$self->{current}->draw;	3813	$self->{current}->draw;
3066	}	3814	}
3067		3815
3068	#############################################################################	3816	#############################################################################
3069		3817
3070	package CFClient::UI::Notebook;	3818	package CFPlus::UI::Notebook;
3071		3819
3072	our @ISA = CFClient::UI::VBox::;	3820	our @ISA = CFPlus::UI::VBox::;
3073		3821
3074	sub new {	3822	sub new {
3075	my $class = shift;	3823	my $class = shift;
3076		3824
3077	my $self = $class->SUPER::new (	3825	my $self = $class->SUPER::new (
3078	buttonbar => (new CFClient::UI::Buttonbar),	3826	buttonbar => (new CFPlus::UI::Buttonbar),
3079	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3827	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3080	# filter => # will be put between multiplexer and $self	3828	# filter => # will be put between multiplexer and $self
3081	@_,	3829	@_,
3082	);	3830	);
3083		3831
3084	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3832	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3088	}	3836	}
3089		3837
3090	sub add {	3838	sub add {
3091	my ($self, $title, $widget, $tooltip) = @_;	3839	my ($self, $title, $widget, $tooltip) = @_;
3092		3840
3093	Scalar::Util::weaken $self;	3841	CFPlus::weaken $self;
3094		3842
3095	$self->{buttonbar}->add (new CFClient::UI::Button	3843	$self->{buttonbar}->add (new CFPlus::UI::Button
3096	markup => $title,	3844	markup => $title,
3097	tooltip => $tooltip,	3845	tooltip => $tooltip,
3098	on_activate => sub { $self->set_current_page ($widget) },	3846	on_activate => sub { $self->set_current_page ($widget) },
3099	);	3847	);
3100		3848
3101	$self->{multiplexer}->add ($widget);	3849	$self->{multiplexer}->add ($widget);
3102	}	3850	}
3103		3851
		3852	sub get_current_page {
		3853	my ($self) = @_;
		3854
		3855	$self->{multiplexer}->get_current_page
		3856	}
		3857
3104	sub set_current_page {	3858	sub set_current_page {
3105	my ($self, $page) = @_;	3859	my ($self, $page) = @_;
3106		3860
3107	$self->{multiplexer}->set_current_page ($page);	3861	$self->{multiplexer}->set_current_page ($page);
3108	$self->_emit (page_changed => $self->{multiplexer}{current});	3862	$self->emit (page_changed => $self->{multiplexer}{current});
3109	}	3863	}
3110		3864
3111	#############################################################################	3865	#############################################################################
3112		3866
3113	package CFClient::UI::Combobox;	3867	package CFPlus::UI::Selector;
3114		3868
3115	use utf8;	3869	use utf8;
3116		3870
3117	our @ISA = CFClient::UI::Button::;	3871	our @ISA = CFPlus::UI::Button::;
3118		3872
3119	sub new {	3873	sub new {
3120	my $class = shift;	3874	my $class = shift;
3121		3875
3122	my $self = $class->SUPER::new (	3876	my $self = $class->SUPER::new (
…		…
3128	$self->_set_value ($self->{value});	3882	$self->_set_value ($self->{value});
3129		3883
3130	$self	3884	$self
3131	}	3885	}
3132		3886
3133	sub button_down {	3887	sub invoke_button_down {
3134	my ($self, $ev) = @_;	3888	my ($self, $ev) = @_;
3135		3889
3136	my @menu_items;	3890	my @menu_items;
3137		3891
3138	for (@{ $self->{options} }) {	3892	for (@{ $self->{options} }) {
3139	my ($value, $title, $tooltip) = @$_;	3893	my ($value, $title, $tooltip) = @$_;
3140		3894
3141	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3895	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142	}	3896	}
3143		3897
3144	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3898	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145	}	3899	}
3146		3900
3147	sub _set_value {	3901	sub _set_value {
3148	my ($self, $value) = @_;	3902	my ($self, $value) = @_;
3149		3903
…		…
3159	my ($self, $value) = @_;	3913	my ($self, $value) = @_;
3160		3914
3161	return unless $self->{value} ne $value;	3915	return unless $self->{value} ne $value;
3162		3916
3163	$self->_set_value ($value);	3917	$self->_set_value ($value);
3164	$self->_emit (changed => $value);	3918	$self->emit (changed => $value);
3165	}	3919	}
3166		3920
3167	#############################################################################	3921	#############################################################################
3168		3922
3169	package CFClient::UI::Statusbox;	3923	package CFPlus::UI::Statusbox;
3170		3924
3171	our @ISA = CFClient::UI::VBox::;	3925	our @ISA = CFPlus::UI::VBox::;
3172		3926
3173	sub new {	3927	sub new {
3174	my $class = shift;	3928	my $class = shift;
3175		3929
3176	my $self = $class->SUPER::new (	3930	my $self = $class->SUPER::new (
3177	fontsize => 0.8,	3931	fontsize => 0.8,
3178	@_,	3932	@_,
3179	);	3933	);
3180		3934
3181	Scalar::Util::weaken (my $this = $self);	3935	CFPlus::weaken (my $this = $self);
3182		3936
3183	$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 });
3184		3938
3185	$self	3939	$self
3186	}	3940	}
…		…
3188	sub reorder {	3942	sub reorder {
3189	my ($self) = @_;	3943	my ($self) = @_;
3190	my $NOW = Time::HiRes::time;	3944	my $NOW = Time::HiRes::time;
3191		3945
3192	# freeze display when hovering over any label	3946	# freeze display when hovering over any label
3193	return if $CFClient::UI::TOOLTIP->{owner}	3947	return if $CFPlus::UI::TOOLTIP->{owner}
3194	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3948	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3195	values %{ $self->{item} };	3949	values %{ $self->{item} };
3196		3950
3197	while (my ($k, $v) = each %{ $self->{item} }) {	3951	while (my ($k, $v) = each %{ $self->{item} }) {
3198	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3952	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3199	}	3953	}
…		…
3220	for ($short) {	3974	for ($short) {
3221	s/^\s+//;	3975	s/^\s+//;
3222	s/\s+/ /g;	3976	s/\s+/ /g;
3223	}	3977	}
3224		3978
3225	new CFClient::UI::Label	3979	new CFPlus::UI::Label
3226	markup => $short,	3980	markup => $short,
3227	tooltip => $item->{tooltip},	3981	tooltip => $item->{tooltip},
3228	tooltip_font => $::FONT_PROP,	3982	tooltip_font => $::FONT_PROP,
3229	tooltip_width => 0.67,	3983	tooltip_width => 0.67,
3230	fontsize => $item->{fontsize} || $self->{fontsize},	3984	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3284	count => 1,	4038	count => 1,
3285	%arg,	4039	%arg,
3286	};	4040	};
3287	}	4041	}
3288		4042
		4043	$ROOT->on_refresh (reorder => sub {
3289	$self->reorder;	4044	$self->reorder;
		4045	});
3290	}	4046	}
3291		4047
3292	sub reconfigure {	4048	sub reconfigure {
3293	my ($self) = @_;	4049	my ($self) = @_;
3294		4050
…		…
3307	$self->SUPER::destroy;	4063	$self->SUPER::destroy;
3308	}	4064	}
3309		4065
3310	#############################################################################	4066	#############################################################################
3311		4067
3312	package CFClient::UI::Inventory;
3313
3314	our @ISA = CFClient::UI::ScrolledWindow::;
3315
3316	sub new {
3317	my $class = shift;
3318
3319	my $self = $class->SUPER::new (
3320	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321	@_,
3322	);
3323
3324	$self
3325	}
3326
3327	sub set_items {
3328	my ($self, $items) = @_;
3329
3330	$self->{child}->clear;
3331	return unless $items;
3332
3333	my @items = sort {
3334	($a->{type} <=> $b->{type})
3335	or ($a->{name} cmp $b->{name})
3336	} @$items;
3337
3338	$self->{real_items} = \@items;
3339
3340	my $row = 0;
3341	for my $item (@items) {
3342	CFClient::Item::update_widgets $item;
3343
3344	$self->{child}->add (0, $row, $item->{face_widget});
3345	$self->{child}->add (1, $row, $item->{desc_widget});
3346	$self->{child}->add (2, $row, $item->{weight_widget});
3347
3348	$row++;
3349	}
3350	}
3351
3352	#############################################################################
3353
3354	package CFClient::UI::BindEditor;
3355
3356	our @ISA = CFClient::UI::FancyFrame::;
3357
3358	sub new {
3359	my $class = shift;
3360
3361	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363	$self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367	text => "start recording",
3368	tooltip => "Start/Stops recording of actions."
3369	."All subsequent actions after the recording started will be captured."
3370	."The actions are displayed after the record was stopped."
3371	."To bind the action you have to click on the 'Bind' button",
3372	on_activate => sub {
3373	unless ($self->{recording}) {
3374	$self->start;
3375	} else {
3376	$self->stop;
3377	}
3378	});
3379
3380	$vb->add (new CFClient::UI::Label text => "Actions:");
3381	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3384	$vb->add (my $hb = new CFClient::UI::HBox);
3385	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386	$hb->add (new CFClient::UI::Button
3387	text => "bind",
3388	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389	on_activate => sub {
3390	$self->ask_for_bind;
3391	});
3392
3393	$vb->add (my $hb = new CFClient::UI::HBox);
3394	$hb->add (new CFClient::UI::Button
3395	text => "ok",
3396	expand => 1,
3397	tooltip => "This closes the binding editor and saves the binding",
3398	on_activate => sub {
3399	$self->hide;
3400	$self->commit;
3401	});
3402
3403	$hb->add (new CFClient::UI::Button
3404	text => "cancel",
3405	expand => 1,
3406	tooltip => "This closes the binding editor without saving",
3407	on_activate => sub {
3408	$self->hide;
3409	$self->{binding_cancel}->()
3410	if $self->{binding_cancel};
3411	});
3412
3413	$self->update_binding_widgets;
3414
3415	$self
3416	}
3417
3418	sub commit {
3419	my ($self) = @_;
3420	my ($mod, $sym, $cmds) = $self->get_binding;
3421	if ($sym != 0 && @$cmds > 0) {
3422	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423	."'. Don't forget 'Save Config'!");
3424	$self->{binding_change}->($mod, $sym, $cmds)
3425	if $self->{binding_change};
3426	} else {
3427	$::STATUSBOX->add ("No action bound, no key or action specified!");
3428	$self->{binding_cancel}->()
3429	if $self->{binding_cancel};
3430	}
3431	}
3432
3433	sub start {
3434	my ($self) = @_;
3435
3436	$self->{rec_btn}->set_text ("stop recording");
3437	$self->{recording} = 1;
3438	$self->clear_command_list;
3439	$::CONN->start_record if $::CONN;
3440	}
3441
3442	sub stop {
3443	my ($self) = @_;
3444
3445	$self->{rec_btn}->set_text ("start recording");
3446	$self->{recording} = 0;
3447
3448	my $rec;
3449	$rec = $::CONN->stop_record if $::CONN;
3450	return unless ref $rec eq 'ARRAY';
3451	$self->set_command_list ($rec);
3452	}
3453
3454
3455	sub ask_for_bind_and_commit {
3456	my ($self) = @_;
3457	$self->ask_for_bind (1);
3458	}
3459
3460	sub ask_for_bind {
3461	my ($self, $commit) = @_;
3462
3463	CFClient::Binder::open_binding_dialog (sub {
3464	my ($mod, $sym) = @_;
3465	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466	$self->update_binding_widgets;
3467	$self->commit if $commit;
3468	});
3469	}
3470
3471	# $mod and $sym are the modifiers and key symbol
3472	# $cmds is a array ref of strings (the commands)
3473	# $cb is the callback that is executed on OK
3474	# $ccb is the callback that is executed on CANCEL and
3475	# when the binding was unsuccessful on OK
3476	sub set_binding {
3477	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479	$self->clear_command_list;
3480	$self->{recording} = 0;
3481	$self->{rec_btn}->set_text ("start recording");
3482
3483	$self->{binding} = [$mod, $sym];
3484	$self->{commands} = $cmds;
3485
3486	$self->{binding_change} = $cb;
3487	$self->{binding_cancel} = $ccb;
3488
3489	$self->update_binding_widgets;
3490	}
3491
3492	# this is a shortcut method that asks for a binding
3493	# and then just binds it.
3494	sub do_quick_binding {
3495	my ($self, $cmds) = @_;
3496	$self->set_binding (undef, undef, $cmds, sub {
3497	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498	});
3499	$self->ask_for_bind (1);
3500	}
3501
3502	sub update_binding_widgets {
3503	my ($self) = @_;
3504	my ($mod, $sym, $cmds) = $self->get_binding;
3505	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506	$self->set_command_list ($cmds);
3507	}
3508
3509	sub get_binding {
3510	my ($self) = @_;
3511	return (
3512	$self->{binding}->[0],
3513	$self->{binding}->[1],
3514	[ grep { defined $_ } @{$self->{commands}} ]
3515	);
3516	}
3517
3518	sub clear_command_list {
3519	my ($self) = @_;
3520	$self->{cmdbox}->clear ();
3521	}
3522
3523	sub set_command_list {
3524	my ($self, $cmds) = @_;
3525
3526	$self->{cmdbox}->clear ();
3527	$self->{commands} = $cmds;
3528
3529	my $idx = 0;
3530
3531	for (@$cmds) {
3532	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534	my $i = $idx;
3535	$hb->add (new CFClient::UI::Label text => $_);
3536	$hb->add (new CFClient::UI::Button
3537	text => "delete",
3538	tooltip => "Deletes the action from the record",
3539	on_activate => sub {
3540	$self->{cmdbox}->remove ($hb);
3541	$cmds->[$i] = undef;
3542	});
3543
3544
3545	$idx++
3546	}
3547	}
3548
3549	#############################################################################
3550
3551	package CFClient::UI::SpellList;
3552
3553	our @ISA = CFClient::UI::Table::;
3554
3555	sub new {
3556	my $class = shift;
3557
3558	my $self = $class->SUPER::new (
3559	binding => [],
3560	commands => [],
3561	@_,
3562	)
3563	}
3564
3565	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578	sub rebuild_spell_list {
3579	my ($self) = @_;
3580
3581	$CFClient::UI::ROOT->on_refresh ($self => sub {
3582	$self->clear;
3583
3584	return unless $::CONN;
3585
3586	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592	my $row = 0;
3593
3594	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595	my $spell = $self->{spell}{$_};
3596
3597	$row++;
3598
3599	my $spell_cb = sub {
3600	my ($widget, $ev) = @_;
3601
3602	if ($ev->{button} == 1) {
3603	$::CONN->user_send ("cast $spell->{name}");
3604	} elsif ($ev->{button} == 2) {
3605	$::CONN->user_send ("invoke $spell->{name}");
3606	} elsif ($ev->{button} == 3) {
3607	(new CFClient::UI::Menu
3608	items => [
3609	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611	],
3612	)->popup ($ev);
3613	} else {
3614	return 0;
3615	}
3616
3617	1
3618	};
3619
3620	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622	#TODO: add path info to tooltip
3623	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625	$self->add (0, $row, new CFClient::UI::Face
3626	face => $spell->{face},
3627	can_hover => 1,
3628	can_events => 1,
3629	tooltip => $tooltip,
3630	on_button_down => $spell_cb,
3631	);
3632
3633	$self->add (1, $row, new CFClient::UI::Label
3634	expand => 1,
3635	text => $spell->{name},
3636	can_hover => 1,
3637	can_events => 1,
3638	tooltip => $tooltip,
3639	on_button_down => $spell_cb,
3640	);
3641
3642	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646	}
3647	});
3648	}
3649
3650	sub add_spell {
3651	my ($self, $spell) = @_;
3652
3653	$self->{spell}->{$spell->{name}} = $spell;
3654	$self->rebuild_spell_list;
3655	}
3656
3657	sub remove_spell {
3658	my ($self, $spell) = @_;
3659
3660	delete $self->{spell}->{$spell->{name}};
3661	$self->rebuild_spell_list;
3662	}
3663
3664	sub clear_spells {
3665	my ($self) = @_;
3666
3667	$self->{spell} = {};
3668	$self->rebuild_spell_list;
3669	}
3670
3671	#############################################################################
3672
3673	package CFClient::UI::Root;	4068	package CFPlus::UI::Root;
3674		4069
3675	our @ISA = CFClient::UI::Container::;	4070	our @ISA = CFPlus::UI::Container::;
3676		4071
3677	use List::Util qw(min max);	4072	use List::Util qw(min max);
3678		4073
3679	use CFClient::OpenGL;	4074	use CFPlus::OpenGL;
3680		4075
3681	sub new {	4076	sub new {
3682	my $class = shift;	4077	my $class = shift;
3683		4078
3684	my $self = $class->SUPER::new (	4079	my $self = $class->SUPER::new (
3685	visible => 1,	4080	visible => 1,
3686	@_,	4081	@_,
3687	);	4082	);
3688		4083
3689	Scalar::Util::weaken ($self->{root} = $self);	4084	CFPlus::weaken ($self->{root} = $self);
3690		4085
3691	$self	4086	$self
3692	}	4087	}
3693		4088
3694	sub size_request {	4089	sub size_request {
…		…
3709	$coord = $max - $size if $coord > $max - $size;	4104	$coord = $max - $size if $coord > $max - $size;
3710		4105
3711	int $coord + 0.5	4106	int $coord + 0.5
3712	}	4107	}
3713		4108
3714	sub size_allocate {	4109	sub invoke_size_allocate {
3715	my ($self, $w, $h) = @_;	4110	my ($self, $w, $h) = @_;
3716		4111
3717	for my $child ($self->children) {	4112	for my $child ($self->children) {
3718	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	4113	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719		4114
…		…
3723	$X = _to_pixel $X, $W, $self->{w};	4118	$X = _to_pixel $X, $W, $self->{w};
3724	$Y = _to_pixel $Y, $H, $self->{h};	4119	$Y = _to_pixel $Y, $H, $self->{h};
3725		4120
3726	$child->configure ($X, $Y, $W, $H);	4121	$child->configure ($X, $Y, $W, $H);
3727	}	4122	}
		4123
		4124	1
3728	}	4125	}
3729		4126
3730	sub coord2local {	4127	sub coord2local {
3731	my ($self, $x, $y) = @_;	4128	my ($self, $x, $y) = @_;
3732		4129
…		…
3858	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4255	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3859		4256
3860	$w = 0 if $w < 0;	4257	$w = 0 if $w < 0;
3861	$h = 0 if $h < 0;	4258	$h = 0 if $h < 0;
3862		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
3863	$w = int $w + 0.5;	4269	$w = int $w + 0.5;
3864	$h = int $h + 0.5;	4270	$h = int $h + 0.5;
3865		4271
3866	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}) {
3867	$widget->{old_w} = $widget->{w};	4273	$widget->{old_w} = $widget->{w};
…		…
3877		4283
3878	while ($self->{post_alloc_hook}) {	4284	while ($self->{post_alloc_hook}) {
3879	$_->()	4285	$_->()
3880	for values %{delete $self->{post_alloc_hook}};	4286	for values %{delete $self->{post_alloc_hook}};
3881	}	4287	}
3882
3883		4288
3884	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4289	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3885	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4290	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3886	glClear GL_COLOR_BUFFER_BIT;	4291	glClear GL_COLOR_BUFFER_BIT;
3887		4292
…		…
3890	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4295	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3891	glMatrixMode GL_MODELVIEW;	4296	glMatrixMode GL_MODELVIEW;
3892	glLoadIdentity;	4297	glLoadIdentity;
3893		4298
3894	{	4299	{
3895	package CFClient::UI::Base;	4300	package CFPlus::UI::Base;
3896		4301
3897	($draw_x, $draw_y, $draw_w, $draw_h) =	4302	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3898	(0, 0, $self->{w}, $self->{h});	4303	(0, 0, $self->{w}, $self->{h});
3899	}
3900		4304
3901	$self->_draw;	4305	$self->_draw;
		4306	}
3902	}	4307	}
3903		4308
3904	#############################################################################	4309	#############################################################################
3905		4310
3906	package CFClient::UI;	4311	package CFPlus::UI;
3907		4312
3908	$ROOT = new CFClient::UI::Root;	4313	$ROOT = new CFPlus::UI::Root;
3909	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4314	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3910		4315
3911	1	4316	1
3912		4317

Diff Legend

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