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.291 by root, Tue Jun 6 02:55:50 2006 UTC vs.
Revision 1.383 by root, Fri Jul 20 16:32:04 2007 UTC

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

Diff Legend

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