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.278 by root, Sun Jun 4 23:05:06 2006 UTC vs.
Revision 1.375 by root, Mon Jul 16 20:12:19 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 ();
		7	use Event;
8		8
9	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
10	use CFClient::Texture;	11	use CFPlus::Texture;
11		12
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
13		14
14	our $LAYOUT;	15	our $LAYOUT;
15	our $ROOT;	16	our $ROOT;
16	our $TOOLTIP;	17	our $TOOLTIP;
17	our $BUTTON_STATE;	18	our $BUTTON_STATE;
18		19
19	our %WIDGET; # all widgets, weak-referenced	20	our %WIDGET; # all widgets, weak-referenced
		21
		22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
		23	if (!$GRAB) {
		24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		25	if (length $widget->{tooltip}) {
		26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
		28	$TOOLTIP->hide;
		29
		30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
		32
		33	return if $ENV{CFPLUS_DEBUG} & 8;
		34
		35	my $tip = $widget->{tooltip};
		36
		37	$tip = $tip->($widget) if CODE:: eq ref $tip;
		38
		39	$TOOLTIP->set_tooltip_from ($widget);
		40	$TOOLTIP->show;
		41	}
		42
		43	return;
		44	}
		45	}
		46	}
		47
		48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
		50	delete $TOOLTIP->{owner};
		51	});
20		52
21	sub get_layout {	53	sub get_layout {
22	my $layout;	54	my $layout;
23		55
24	for (grep { $_->{name} } values %WIDGET) {	56	for (grep { $_->{name} } values %WIDGET) {
…		…
39	my ($layout) = @_;	71	my ($layout) = @_;
40		72
41	$LAYOUT = $layout;	73	$LAYOUT = $layout;
42	}	74	}
43		75
44	sub check_tooltip {
45	return if $ENV{CFPLUS_DEBUG} & 8;
46
47	if (!$GRAB) {
48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49	if (length $widget->{tooltip}) {
50	if ($TOOLTIP->{owner} != $widget) {
51	$TOOLTIP->hide;
52
53	$TOOLTIP->{owner} = $widget;
54
55	my $tip = $widget->{tooltip};
56
57	$tip = $tip->($widget) if CODE:: eq ref $tip;
58
59	$TOOLTIP->set_tooltip_from ($widget);
60	$TOOLTIP->show;
61	}
62
63	return;
64	}
65	}
66	}
67
68	$TOOLTIP->hide;
69	delete $TOOLTIP->{owner};
70	}
71
72	# class methods for events	76	# class methods for events
73	sub feed_sdl_key_down_event {	77	sub feed_sdl_key_down_event {
74	$FOCUS->emit (key_down => $_[0])	78	$FOCUS->emit (key_down => $_[0])
75	if $FOCUS;	79	if $FOCUS;
76	}	80	}
…		…
78	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
79	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
80	if $FOCUS;	84	if $FOCUS;
81	}	85	}
82		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
83	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
84	my ($ev) = @_;	101	my ($ev) = @_;
85	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
86		103
87	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
88	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
89		108
90	$GRAB = $widget;	109	$GRAB = $widget;
91	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
92		111
93	check_tooltip;	112	$TOOLTIP_WATCHER->cb->();
94	}	113	}
95		114
96	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
97		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
98	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	117	# mousewheel
99	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	}
100	}	125	}
101		126
102	sub feed_sdl_button_up_event {	127	sub feed_sdl_button_up_event {
103	my ($ev) = @_;	128	my ($ev) = @_;
104	my ($x, $y) = ($ev->{x}, $ev->{y});
105		129
106	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	130	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107		131
108	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	132	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109		133
110	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	134	$GRAB->emit (button_up => $ev)
111	if $GRAB;	135	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112		136
113	if (!$BUTTON_STATE) {	137	unless ($BUTTON_STATE) {
114	my $grab = $GRAB; undef $GRAB;	138	my $grab = $GRAB; undef $GRAB;
115	$grab->update if $grab;	139	$grab->update if $grab;
116	$GRAB->update if $GRAB;	140	$GRAB->update if $GRAB;
117		141
118	check_tooltip;	142	check_hover $widget;
		143	$TOOLTIP_WATCHER->cb->();
119	}	144	}
120	}	145	}
121		146
122	sub feed_sdl_motion_event {	147	sub feed_sdl_motion_event {
123	my ($ev) = @_;	148	my ($ev) = @_;
124	my ($x, $y) = ($ev->{x}, $ev->{y});	149	my ($x, $y) = ($ev->{x}, $ev->{y});
125		150
126	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	151	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127		152
128	if ($widget != $HOVER) {	153	check_hover $widget;
129	my $hover = $HOVER; $HOVER = $widget;
130		154
131	$hover->update if $hover && $hover->{can_hover};	155	$HOVER->emit (mouse_motion => $ev)
132	$HOVER->update if $HOVER && $HOVER->{can_hover};
133
134	check_tooltip;
135	}
136
137	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138	if $HOVER;	156	if $HOVER;
139	}	157	}
140		158
141	# convert position array to integers	159	# convert position array to integers
142	sub harmonize {	160	sub harmonize {
…		…
192	reconfigure_widgets;	210	reconfigure_widgets;
193	}	211	}
194		212
195	#############################################################################	213	#############################################################################
196		214
		215	package CFPlus::UI::Event;
		216
		217	sub xy {
		218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		219	}
		220
		221	#############################################################################
		222
197	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
198		224
199	use strict;	225	use strict;
200		226
201	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
202		228
203	sub new {	229	sub new {
204	my $class = shift;	230	my $class = shift;
205		231
206	my $self = bless {	232	my $self = bless {
…		…
211	h => undef,	237	h => undef,
212	can_events => 1,	238	can_events => 1,
213	@_	239	@_
214	}, $class;	240	}, $class;
215		241
216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
217		243
218	for (keys %$self) {	244	for (keys %$self) {
219	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
220	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
221	}	247	}
222	}	248	}
223		249
224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
225	$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};
226	$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};
227	$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};
228	$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};
229		255
230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232		258
233	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
238		264
239	sub destroy {	265	sub destroy {
240	my ($self) = @_;	266	my ($self) = @_;
241		267
242	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
243	%$self = ();	270	%$self = ();
244	}	271	}
245		272
		273	sub TO_JSON {
		274	{ __widget_ref__ => $_[0]{s_id} }
		275	}
		276
246	sub show {	277	sub show {
247	my ($self) = @_;	278	my ($self) = @_;
248		279
249	return if $self->{parent};	280	return if $self->{parent};
250		281
251	$CFClient::UI::ROOT->add ($self);	282	$CFPlus::UI::ROOT->add ($self);
252	}	283	}
253		284
254	sub set_visible {	285	sub set_visible {
255	my ($self) = @_;	286	my ($self) = @_;
256		287
…		…
271		302
272	return unless $self->{visible};	303	return unless $self->{visible};
273		304
274	$_->set_invisible for $self->children;	305	$_->set_invisible for $self->children;
275		306
		307	delete $self->{visible};
276	delete $self->{root};	308	delete $self->{root};
277	delete $self->{visible};
278		309
279	undef $GRAB if $GRAB == $self;	310	undef $GRAB if $GRAB == $self;
280	undef $HOVER if $HOVER == $self;	311	undef $HOVER if $HOVER == $self;
281		312
282	CFClient::UI::check_tooltip	313	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
283	if $TOOLTIP->{owner} == $self;	314	if $TOOLTIP->{owner} == $self;
284		315
285	$self->focus_out;	316	$self->emit ("focus_out");
286
287	$self->emit (visibility_change => 0);	317	$self->emit (visibility_change => 0);
288	}	318	}
289		319
290	sub set_visibility {	320	sub set_visibility {
291	my ($self, $visible) = @_;	321	my ($self, $visible) = @_;
292		322
293	return if $self->{visible} == $visible;	323	return if $self->{visible} == $visible;
294		324
295	$visible ? $self->hide	325	$visible ? $self->show
296	: $self->show;	326	: $self->hide;
297	}	327	}
298		328
299	sub toggle_visibility {	329	sub toggle_visibility {
300	my ($self) = @_;	330	my ($self) = @_;
301		331
…		…
314	}	344	}
315		345
316	sub move_abs {	346	sub move_abs {
317	my ($self, $x, $y, $z) = @_;	347	my ($self, $x, $y, $z) = @_;
318		348
319	$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;
320	$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;
321	$self->{z} = $z if defined $z;	351	$self->{z} = $z if defined $z;
322		352
323	$self->update;	353	$self->update;
324	}	354	}
325		355
…		…
335	sub size_request {	365	sub size_request {
336	require Carp;	366	require Carp;
337	Carp::confess "size_request is abstract";	367	Carp::confess "size_request is abstract";
338	}	368	}
339		369
		370	sub baseline_shift {
		371	0
		372	}
		373
340	sub configure {	374	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	375	my ($self, $x, $y, $w, $h) = @_;
342		376
343	if ($self->{aspect}) {	377	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	378	my ($ow, $oh) = ($w, $h);
345		379
346	$w = List::Util::min $w, int $h * $self->{aspect};	380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347	$h = List::Util::min $h, int $w / $self->{aspect};	381	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348		382
349	# use alignment to adjust x, y	383	# use alignment to adjust x, y
350		384
351	$x += int 0.5 * ($ow - $w);	385	$x += int 0.5 * ($ow - $w);
352	$y += int 0.5 * ($oh - $h);	386	$y += int 0.5 * ($oh - $h);
…		…
366		400
367	$self->{root}{size_alloc}{$self+0} = $self;	401	$self->{root}{size_alloc}{$self+0} = $self;
368	}	402	}
369	}	403	}
370		404
371	sub size_allocate {
372	# nothing to be done
373	}
374
375	sub children {	405	sub children {
376	# nop	406	# nop
377	}	407	}
378		408
379	sub visible_children {	409	sub visible_children {
…		…
381	}	411	}
382		412
383	sub set_max_size {	413	sub set_max_size {
384	my ($self, $w, $h) = @_;	414	my ($self, $w, $h) = @_;
385		415
386	delete $self->{max_w}; $self->{max_w} = $w if $w;	416	$self->{max_w} = int $w if defined $w;
387	delete $self->{max_h}; $self->{max_h} = $h if $h;	417	$self->{max_h} = int $h if defined $h;
		418
		419	$self->realloc;
388	}	420	}
389		421
390	sub set_tooltip {	422	sub set_tooltip {
391	my ($self, $tooltip) = @_;	423	my ($self, $tooltip) = @_;
392		424
…		…
395		427
396	return if $self->{tooltip} eq $tooltip;	428	return if $self->{tooltip} eq $tooltip;
397		429
398	$self->{tooltip} = $tooltip;	430	$self->{tooltip} = $tooltip;
399		431
400	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
401	delete $CFClient::UI::TOOLTIP->{owner};	433	delete $CFPlus::UI::TOOLTIP->{owner};
402	CFClient::UI::check_tooltip;	434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
403	}	435	}
404	}	436	}
405		437
406	# translate global coordinates to local coordinate system	438	# translate global coordinates to local coordinate system
407	sub coord2local {	439	sub coord2local {
408	my ($self, $x, $y) = @_;	440	my ($self, $x, $y) = @_;
409		441
		442	Carp::confess unless $self->{parent};#d#
		443
410	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	444	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
411	}	445	}
412		446
413	# translate local coordinates to global coordinate system	447	# translate local coordinates to global coordinate system
414	sub coord2global {	448	sub coord2global {
415	my ($self, $x, $y) = @_;	449	my ($self, $x, $y) = @_;
416		450
		451	Carp::confess unless $self->{parent};#d#
		452
417	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418	}	454	}
419		455
420	sub focus_in {	456	sub invoke_focus_in {
421	my ($self) = @_;	457	my ($self) = @_;
422		458
423	return if $FOCUS == $self;	459	return if $FOCUS == $self;
424	return unless $self->{can_focus};	460	return unless $self->{can_focus};
425		461
426	my $focus = $FOCUS; $FOCUS = $self;	462	$FOCUS = $self;
427		463
428	$self->_emit (focus_in => $focus);	464	$self->update;
429		465
430	$focus->update if $focus;	466	0
431	$FOCUS->update;
432	}	467	}
433		468
434	sub focus_out {	469	sub invoke_focus_out {
435	my ($self) = @_;	470	my ($self) = @_;
436		471
437	return unless $FOCUS == $self;	472	return unless $FOCUS == $self;
438		473
439	my $focus = $FOCUS; undef $FOCUS;	474	undef $FOCUS;
440		475
441	$self->_emit (focus_out => $focus);	476	$self->update;
442		477
443	$focus->update if $focus; #?
444
445	$::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
446	unless $FOCUS;	479	unless $FOCUS;
447	}
448		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
449	sub mouse_motion { 0 }	491	sub invoke_mouse_motion { 0 }
450	sub button_up { 0 }	492	sub invoke_button_up { 0 }
451	sub key_down { 0 }	493	sub invoke_key_down { 0 }
452	sub key_up { 0 }	494	sub invoke_key_up { 0 }
		495	sub invoke_mouse_wheel { 0 }
453		496
454	sub button_down {	497	sub invoke_button_down {
455	my ($self, $ev, $x, $y) = @_;	498	my ($self, $ev, $x, $y) = @_;
456		499
457	$self->focus_in;	500	$self->grab_focus;
458		501
459	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)
460	}	550	}
461		551
462	sub find_widget {	552	sub find_widget {
463	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
464		554
…		…
472	}	562	}
473		563
474	sub set_parent {	564	sub set_parent {
475	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
476		566
477	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
478	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
479	}
480
481	sub connect {
482	my ($self, $signal, $cb) = @_;
483
484	push @{ $self->{signal_cb}{$signal} }, $cb;
485	}
486
487	sub _emit {
488	my ($self, $signal, @args) = @_;
489
490	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491	}
492
493	sub emit {
494	my ($self, $signal, @args) = @_;
495
496	$self->_emit ($signal, @args)
497	|| $self->$signal (@args);
498	}
499
500	sub visibility_change {
501	#my ($self, $visible) = @_;
502	}	569	}
503		570
504	sub realloc {	571	sub realloc {
505	my ($self) = @_;	572	my ($self) = @_;
506		573
…		…
539	return unless $self->{h} && $self->{w};	606	return unless $self->{h} && $self->{w};
540		607
541	# update screen rectangle	608	# update screen rectangle
542	local $draw_x = $draw_x + $self->{x};	609	local $draw_x = $draw_x + $self->{x};
543	local $draw_y = $draw_y + $self->{y};	610	local $draw_y = $draw_y + $self->{y};
544	local $draw_w = $draw_x + $self->{w};
545	local $draw_h = $draw_y + $self->{h};
546		611
547	# skip widgets that are entirely outside the drawing area	612	# skip widgets that are entirely outside the drawing area
548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	613	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	614	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550		615
…		…
573	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
574	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
575	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
576	glEnd;	641	glEnd;
577	glPopMatrix;	642	glPopMatrix;
578	#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;
579	}	644	}
580		645
581	$self->_draw;	646	$self->_draw;
582	glPopMatrix;	647	glPopMatrix;
583	}	648	}
…		…
586	my ($self) = @_;	651	my ($self) = @_;
587		652
588	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
589	}	654	}
590		655
		656	my $cntx;#d#
591	sub DESTROY {	657	sub DESTROY {
592	my ($self) = @_;	658	my ($self) = @_;
593		659
		660	return if CFPlus::in_destruct;
		661
		662	eval { $self->destroy };
		663	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		664
594	delete $WIDGET{$self+0};	665	delete $WIDGET{$self+0};
595	#$self->deactivate;
596	}	666	}
597		667
598	#############################################################################	668	#############################################################################
599		669
600	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
601		671
602	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
603		673
604	use strict;	674	use strict;
605	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
606		676
607	sub new {	677	sub new {
608	my $class = shift;	678	my $class = shift;
609		679
610	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
641	}	711	}
642	}	712	}
643		713
644	#############################################################################	714	#############################################################################
645		715
646	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
647		717
648	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
649		719
650	sub new {	720	sub new {
651	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
652	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
653	}	723	}
…		…
660		730
661	sub draw { }	731	sub draw { }
662		732
663	#############################################################################	733	#############################################################################
664		734
665	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
666		736
667	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
668		738
669	sub new {	739	sub new {
670	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
671		741
672	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
681	if $children;	751	if $children;
682		752
683	$self	753	$self
684	}	754	}
685		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
686	sub add {	764	sub add {
687	my ($self, @widgets) = @_;	765	my ($self, @widgets) = @_;
688		766
689	$_->set_parent ($self)	767	$_->set_parent ($self)
690	for @widgets;	768	for @widgets;
…		…
750	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
751	}	829	}
752		830
753	#############################################################################	831	#############################################################################
754		832
755	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
756		834
757	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
758		836
759	sub new {	837	sub new {
760	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
761		839
762	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763		841
764	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
765	}	843	}
766		844
767	sub add {	845	sub add {
768	my ($self, $child) = @_;	846	my ($self, $child) = @_;
769		847
770	$self->{children} = [];	848	$self->SUPER::remove ($_) for @{ $self->{children} };
771
772	$self->SUPER::add ($child);	849	$self->SUPER::add ($child);
773	}	850	}
774		851
775	sub remove {	852	sub remove {
776	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
777		854
778	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
779		856
780	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
781	unless @{$self->{children}};	858	unless @{$self->{children}};
782	}	859	}
783		860
784	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
785		862
786	sub size_request {	863	sub size_request {
787	$_[0]{children}[0]->size_request	864	$_[0]{children}[0]->size_request
788	}	865	}
789		866
790	sub size_allocate {	867	sub invoke_size_allocate {
791	my ($self, $w, $h) = @_;	868	my ($self, $w, $h) = @_;
792		869
793	$self->{children}[0]->configure (0, 0, $w, $h);	870	$self->{children}[0]->configure (0, 0, $w, $h);
		871
		872	1
794	}	873	}
795		874
796	#############################################################################	875	#############################################################################
797		876
798	# back-buffered drawing area	877	# back-buffered drawing area
799		878
800	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
801		880
802	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
803		882
804	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
805		884
806	sub new {	885	sub new {
807	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
808		887
809	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
814		893
815	$ROOT->on_post_alloc ($self => sub { $self->render_child });	894	$ROOT->on_post_alloc ($self => sub { $self->render_child });
816	$self->SUPER::update;	895	$self->SUPER::update;
817	}	896	}
818		897
819	sub size_allocate {	898	sub invoke_size_allocate {
820	my ($self, $w, $h) = @_;	899	my ($self, $w, $h) = @_;
821		900
822	$self->SUPER::size_allocate ($w, $h);
823	$self->update;	901	$self->update;
		902
		903	$self->SUPER::invoke_size_allocate ($w, $h)
824	}	904	}
825		905
826	sub _render {	906	sub _render {
827	my ($self) = @_;	907	my ($self) = @_;
828		908
…		…
830	}	910	}
831		911
832	sub render_child {	912	sub render_child {
833	my ($self) = @_;	913	my ($self) = @_;
834		914
835	$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 {
836	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
837	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
838		918
839	{	919	{
840	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
841		921
842	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
843	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
844	}	926	}
845
846	$self->_render;
847	};	927	};
848	}	928	}
849		929
850	sub _draw {	930	sub _draw {
851	my ($self) = @_;	931	my ($self) = @_;
852
853	my ($w, $h) = @$self{qw(w h)};
854		932
855	my $tex = $self->{texture}	933	my $tex = $self->{texture}
856	or return;	934	or return;
857		935
858	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860	glEnable GL_BLEND;
861	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
862	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
863		939
864	$tex->draw_quad (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
865		941
866	glDisable GL_BLEND;
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
912	$self->{view_x} = int $x;	991	$self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
913	$self->{view_y} = int $y;	992	$self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
914		993
915	$self->update;	994	$self->update;
916	}	995	}
917		996
918	# hmm, this does not work for topleft of $self... but we should not ask for that	997	# hmm, this does not work for topleft of $self... but we should not ask for that
…		…
937	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1016	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1017	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
939	) {	1018	) {
940	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1019	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941	} else {	1020	} else {
942	$self->CFClient::UI::Base::find_widget ($x, $y)	1021	$self->CFPlus::UI::Base::find_widget ($x, $y)
943	}	1022	}
944	}	1023	}
945		1024
946	sub _render {	1025	sub _render {
947	my ($self) = @_;	1026	my ($self) = @_;
948		1027
949	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1028	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};	1029	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
951		1030
952	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1031	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953		1032
954	$self->SUPER::_render;	1033	$self->SUPER::_render;
955	}	1034	}
956		1035
957	#############################################################################	1036	#############################################################################
958		1037
959	package CFClient::UI::ScrolledWindow;	1038	package CFPlus::UI::ScrolledWindow;
960		1039
961	our @ISA = CFClient::UI::HBox::;	1040	our @ISA = CFPlus::UI::Table::;
962		1041
963	sub new {	1042	sub new {
964	my ($class, %arg) = @_;	1043	my ($class, %arg) = @_;
965		1044
966	my $child = delete $arg{child};	1045	my $child = delete $arg{child};
967		1046
968	my $self;	1047	my $self;
969		1048
970	my $slider = new CFClient::UI::Slider	1049	my $hslider = new CFPlus::UI::Slider
		1050	vertical => 0,
		1051	range => [0, 0, 1, 0.01], # HACK fix
		1052	on_changed => sub {
		1053	$self->{hpos} = $_[1];
		1054	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1055	},
		1056	;
		1057
		1058	my $vslider = new CFPlus::UI::Slider
971	vertical => 1,	1059	vertical => 1,
972	range => [0, 0, 1, 0.01], # HACK fix	1060	range => [0, 0, 1, 0.01], # HACK fix
973	on_changed => sub {	1061	on_changed => sub {
974	$self->{vp}->set_offset (0, $_[1]);	1062	$self->{vpos} = $_[1];
		1063	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
975	},	1064	},
976	;	1065	;
977		1066
978	$self = $class->SUPER::new (	1067	$self = $class->SUPER::new (
979	vp => (new CFClient::UI::ViewPort expand => 1),	1068	scroll_x => 0,
		1069	scroll_y => 1,
		1070	can_events => 1,
980	slider => $slider,	1071	hslider => $hslider,
		1072	vslider => $vslider,
		1073	col_expand => [1, 0],
		1074	row_expand => [1, 0],
981	%arg,	1075	%arg,
982	);	1076	);
983		1077
		1078	$self->{vp} = new CFPlus::UI::ViewPort
		1079	expand => 1,
		1080	scroll_x => $self->{scroll_x},
		1081	scroll_y => $self->{scroll_y},
		1082	;
		1083
984	$self->SUPER::add ($self->{vp}, $self->{slider});	1084	$self->SUPER::add (0, 0, $self->{vp});
		1085
985	$self->add ($child) if $child;	1086	$self->add ($child) if $child;
986		1087
987	$self	1088	$self
988	}	1089	}
		1090
		1091	#TODO# update range on size_allocate depending on child
989		1092
990	sub add {	1093	sub add {
991	my ($self, $widget) = @_;	1094	my ($self, $widget) = @_;
992		1095
993	$self->{vp}->add ($self->{child} = $widget);	1096	$self->{vp}->add ($self->{child} = $widget);
994	}	1097	}
995		1098
		1099	sub update_slider {
		1100	my ($self) = @_;
		1101
		1102	my $child = ($self->{vp} or return)->child;
		1103
		1104	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1105	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1106
		1107	my $visible = $w1 > $w2;
		1108	if ($visible != $self->{hslider}{visible}) {
		1109	$visible ? $self->SUPER::add (0, 1, $self->{hslider})
		1110	: $self->{hslider}->hide;
		1111	}
		1112
		1113	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1114	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1115
		1116	my $visible = $h1 > $h2;
		1117	if ($visible != $self->{vslider}{visible}) {
		1118	$visible ? $self->SUPER::add (1, 0, $self->{vslider})
		1119	: $self->{vslider}->hide;
		1120	}
		1121	}
		1122
996	sub update {	1123	sub update {
997	my ($self) = @_;	1124	my ($self) = @_;
998		1125
999	$self->SUPER::update;	1126	$self->SUPER::update;
1000		1127	$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	}	1128	}
1005		1129
		1130	sub invoke_mouse_wheel {
		1131	my ($self, $ev) = @_;
		1132
		1133	return 0 unless $ev->{dy}; # only vertical movements for now
		1134
		1135	$self->{vslider}->emit (mouse_wheel => $ev);
		1136
		1137	1
		1138	}
		1139
		1140	sub invoke_button_down {
		1141	my ($self, $ev, $x, $y) = @_;
		1142
		1143	if ($ev->{button} == 2) {
		1144	$self->grab_focus;
		1145
		1146	$self->{motion} = sub {
		1147	my ($ev, $x, $y) = @_;
		1148
		1149	$self->{vp}->set_offset (
		1150	$self->{vp}{view_x} - $ev->{xrel},
		1151	$self->{vp}{view_y} - $ev->{yrel},
		1152	);
		1153	};
		1154
		1155	return 1;
		1156	}
		1157
		1158	0
		1159	}
		1160
		1161	sub invoke_button_up {
		1162	my ($self, $ev, $x, $y) = @_;
		1163
		1164	if (delete $self->{motion}) {
		1165	return 1;
		1166	}
		1167
		1168	0
		1169	}
		1170
		1171	sub invoke_mouse_motion {
		1172	my ($self, $ev, $x, $y) = @_;
		1173
		1174	if ($self->{motion}) {
		1175	$self->{motion}->($ev, $x, $y);
		1176	return 1;
		1177	}
		1178
		1179	0
		1180	}
		1181
1006	sub size_allocate {	1182	sub invoke_size_allocate {
1007	my ($self, $w, $h) = @_;	1183	my ($self, $w, $h) = @_;
1008		1184
		1185	$self->update_slider;
1009	$self->SUPER::size_allocate ($w, $h);	1186	$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	}	1187	}
1014
1015	#TODO# update range on size_allocate depending on child
1016	# update viewport offset on scroll
1017		1188
1018	#############################################################################	1189	#############################################################################
1019		1190
1020	package CFClient::UI::Frame;	1191	package CFPlus::UI::Frame;
1021		1192
1022	our @ISA = CFClient::UI::Bin::;	1193	our @ISA = CFPlus::UI::Bin::;
1023		1194
1024	use CFClient::OpenGL;	1195	use CFPlus::OpenGL;
1025		1196
1026	sub new {	1197	sub new {
1027	my $class = shift;	1198	my $class = shift;
1028		1199
1029	$class->SUPER::new (	1200	$class->SUPER::new (
…		…
1055	$self->SUPER::_draw;	1226	$self->SUPER::_draw;
1056	}	1227	}
1057		1228
1058	#############################################################################	1229	#############################################################################
1059		1230
1060	package CFClient::UI::FancyFrame;	1231	package CFPlus::UI::FancyFrame;
1061		1232
1062	our @ISA = CFClient::UI::Bin::;	1233	our @ISA = CFPlus::UI::Bin::;
1063		1234
1064	use CFClient::OpenGL;	1235	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		1236
1074	sub new {	1237	sub new {
1075	my ($class, %arg) = @_;	1238	my ($class, %arg) = @_;
1076		1239
1077	my $title = delete $arg{title};	1240	if ((exists $arg{label}) && !ref $arg{label}) {
		1241	$arg{label} = new CFPlus::UI::Label
		1242	align => 1,
		1243	valign => 0,
		1244	text => $arg{label},
		1245	fontsize => ($arg{border} || 0.8) * 0.75;
		1246	}
		1247
		1248	my $self = $class->SUPER::new (
		1249	# label => "",
		1250	fg => [0.6, 0.3, 0.1],
		1251	border => 0.8,
		1252	style => 'single',
		1253	%arg,
		1254	);
		1255
		1256	$self
		1257	}
		1258
		1259	sub add {
		1260	my ($self, @widgets) = @_;
		1261
		1262	$self->SUPER::add (@widgets);
		1263	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1264	}
		1265
		1266	sub border {
		1267	int $_[0]{border} * $::FONTSIZE
		1268	}
		1269
		1270	sub size_request {
		1271	my ($self) = @_;
		1272
		1273	($self->{label_w}, undef) = $self->{label}->size_request
		1274	if $self->{label};
		1275
		1276	my ($w, $h) = $self->SUPER::size_request;
		1277
		1278	(
		1279	$w + $self->border * 2,
		1280	$h + $self->border * 2,
		1281	)
		1282	}
		1283
		1284	sub invoke_size_allocate {
		1285	my ($self, $w, $h) = @_;
		1286
		1287	my $border = $self->border;
		1288
		1289	$w -= List::Util::max 0, $border * 2;
		1290	$h -= List::Util::max 0, $border * 2;
		1291
		1292	if (my $label = $self->{label}) {
		1293	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1294	$label->{h} = List::Util::min $h, $border;
		1295	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1296	}
		1297
		1298	$self->child->configure ($border, $border, $w, $h);
		1299
		1300	1
		1301	}
		1302
		1303	sub _draw {
		1304	my ($self) = @_;
		1305
		1306	my $child = $self->{children}[0];
		1307
		1308	my $border = $self->border;
		1309	my ($w, $h) = ($self->{w}, $self->{h});
		1310
		1311	$child->draw;
		1312
		1313	glColor @{$self->{fg}};
		1314	glBegin GL_LINE_STRIP;
		1315	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1316	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1317	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1318	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1319	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1320	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1321	glEnd;
		1322
		1323	if ($self->{label}) {
		1324	glTranslate $border * 2, 0;
		1325	$self->{label}->_draw;
		1326	}
		1327	}
		1328
		1329	#############################################################################
		1330
		1331	package CFPlus::UI::Toplevel;
		1332
		1333	our @ISA = CFPlus::UI::Bin::;
		1334
		1335	use CFPlus::OpenGL;
		1336
		1337	my $bg =
		1338	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
		1339	mipmap => 1, wrap => 1;
		1340
		1341	my @border =
		1342	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1343	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1344
		1345	sub new {
		1346	my ($class, %arg) = @_;
1078		1347
1079	my $self = $class->SUPER::new (	1348	my $self = $class->SUPER::new (
1080	bg => [1, 1, 1, 1],	1349	bg => [1, 1, 1, 1],
1081	border_bg => [1, 1, 1, 1],	1350	border_bg => [1, 1, 1, 1],
1082	border => 0.6,	1351	border => 0.6,
1083	can_events => 1,	1352	can_events => 1,
1084	min_w => 16,	1353	min_w => 64,
1085	min_h => 16,	1354	min_h => 32,
1086	%arg,	1355	%arg,
1087	);	1356	);
1088		1357
1089	$self->{title} = new CFClient::UI::Label	1358	$self->{title_widget} = new CFPlus::UI::Label
1090	align => 0,	1359	align => 0,
1091	valign => 1,	1360	valign => 1,
1092	text => $title,	1361	text => $self->{title},
1093	fontsize => $self->{border}	1362	fontsize => $self->{border},
1094	if defined $title;	1363	if exists $self->{title};
		1364
		1365	if ($self->{has_close_button}) {
		1366	$self->{close_button} =
		1367	new CFPlus::UI::ImageButton
		1368	path => 'x1_close.png',
		1369	on_activate => sub { $self->emit ("delete") };
		1370
		1371	$self->CFPlus::UI::Container::add ($self->{close_button});
		1372	}
1095		1373
1096	$self	1374	$self
1097	}	1375	}
1098		1376
1099	sub add {	1377	sub add {
1100	my ($self, @widgets) = @_;	1378	my ($self, @widgets) = @_;
1101		1379
1102	$self->SUPER::add (@widgets);	1380	$self->SUPER::add (@widgets);
		1381	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1382	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104	}	1383	}
1105		1384
1106	sub border {	1385	sub border {
1107	int $_[0]{border} * $::FONTSIZE	1386	int $_[0]{border} * $::FONTSIZE
1108	}	1387	}
1109		1388
1110	sub size_request {	1389	sub size_request {
1111	my ($self) = @_;	1390	my ($self) = @_;
1112		1391
1113	$self->{title}->size_request	1392	$self->{title_widget}->size_request
1114	if $self->{title};	1393	if $self->{title_widget};
		1394
		1395	$self->{close_button}->size_request
		1396	if $self->{close_button};
1115		1397
1116	my ($w, $h) = $self->SUPER::size_request;	1398	my ($w, $h) = $self->SUPER::size_request;
1117		1399
1118	(	1400	(
1119	$w + $self->border * 2,	1401	$w + $self->border * 2,
1120	$h + $self->border * 2,	1402	$h + $self->border * 2,
1121	)	1403	)
1122	}	1404	}
1123		1405
1124	sub size_allocate {	1406	sub invoke_size_allocate {
1125	my ($self, $w, $h) = @_;	1407	my ($self, $w, $h) = @_;
1126		1408
1127	if ($self->{title}) {	1409	if ($self->{title_widget}) {
1128	$self->{title}{w} = $w;	1410	$self->{title_widget}{w} = $w;
1129	$self->{title}{h} = $h;	1411	$self->{title_widget}{h} = $h;
1130	$self->{title}->size_allocate ($w, $h);	1412	$self->{title_widget}->invoke_size_allocate ($w, $h);
1131	}	1413	}
1132		1414
1133	my $border = $self->border;	1415	my $border = $self->border;
1134		1416
1135	$h -= List::Util::max 0, $border * 2;	1417	$h -= List::Util::max 0, $border * 2;
1136	$w -= List::Util::max 0, $border * 2;	1418	$w -= List::Util::max 0, $border * 2;
		1419
		1420	$self->child->configure ($border, $border, $w, $h);
		1421
		1422	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1423	if $self->{close_button};
		1424
		1425	1
		1426	}
		1427
		1428	sub invoke_delete {
		1429	my ($self) = @_;
		1430
		1431	$self->hide;
1137		1432
1138	$self->child->configure ($border, $border, $w, $h);	1433	1
1139	}	1434	}
1140		1435
1141	sub button_down {	1436	sub invoke_button_down {
1142	my ($self, $ev, $x, $y) = @_;	1437	my ($self, $ev, $x, $y) = @_;
1143		1438
1144	my ($w, $h) = @$self{qw(w h)};	1439	my ($w, $h) = @$self{qw(w h)};
1145	my $border = $self->border;	1440	my $border = $self->border;
1146		1441
…		…
1177		1472
1178	($x, $y) = ($ev->{x}, $ev->{y});	1473	($x, $y) = ($ev->{x}, $ev->{y});
1179		1474
1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1475	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181	# HACK: the next line is required to enforce placement	1476	# HACK: the next line is required to enforce placement
1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1477	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183	};	1478	};
1184	} else {	1479	} else {
1185	return 0;	1480	return 0;
1186	}	1481	}
1187		1482
1188	1	1483	1
1189	}	1484	}
1190		1485
1191	sub button_up {	1486	sub invoke_button_up {
1192	my ($self, $ev, $x, $y) = @_;	1487	my ($self, $ev, $x, $y) = @_;
1193		1488
1194	!!delete $self->{motion}	1489	! ! delete $self->{motion}
1195	}	1490	}
1196		1491
1197	sub mouse_motion {	1492	sub invoke_mouse_motion {
1198	my ($self, $ev, $x, $y) = @_;	1493	my ($self, $ev, $x, $y) = @_;
1199		1494
1200	$self->{motion}->($ev, $x, $y) if $self->{motion};	1495	$self->{motion}->($ev, $x, $y) if $self->{motion};
1201		1496
1202	!!$self->{motion}	1497	! ! $self->{motion}
		1498	}
		1499
		1500	sub invoke_visibility_change {
		1501	my ($self, $visible) = @_;
		1502
		1503	delete $self->{motion} unless $visible;
		1504
		1505	0
1203	}	1506	}
1204		1507
1205	sub _draw {	1508	sub _draw {
1206	my ($self) = @_;	1509	my ($self) = @_;
1207		1510
…		…
1233		1536
1234	glDisable GL_TEXTURE_2D;	1537	glDisable GL_TEXTURE_2D;
1235		1538
1236	$child->draw;	1539	$child->draw;
1237		1540
1238	if ($self->{title}) {	1541	if ($self->{title_widget}) {
1239	glTranslate 0, $border - $self->{h};	1542	glTranslate 0, $border - $self->{h};
1240	$self->{title}->_draw;	1543	$self->{title_widget}->_draw;
		1544
		1545	glTranslate 0, - ($border - $self->{h});
1241	}	1546	}
		1547
		1548	$self->{close_button}->draw
		1549	if $self->{close_button};
1242	}	1550	}
1243		1551
1244	#############################################################################	1552	#############################################################################
1245		1553
1246	package CFClient::UI::Table;	1554	package CFPlus::UI::Table;
1247		1555
1248	our @ISA = CFClient::UI::Base::;	1556	our @ISA = CFPlus::UI::Base::;
1249		1557
1250	use List::Util qw(max sum);	1558	use List::Util qw(max sum);
1251		1559
1252	use CFClient::OpenGL;	1560	use CFPlus::OpenGL;
1253		1561
1254	sub new {	1562	sub new {
1255	my $class = shift;	1563	my $class = shift;
1256		1564
1257	$class->SUPER::new (	1565	$class->SUPER::new (
		1566	children => [],
1258	col_expand => [],	1567	col_expand => [],
		1568	row_expand => [],
1259	@_,	1569	@_,
1260	)	1570	)
1261	}	1571	}
1262		1572
1263	sub children {	1573	sub children {
1264	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1574	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265	}	1575	}
1266		1576
		1577	# TODO: store row/col info in child widget and use standard add/del
1267	sub add {	1578	sub add {
1268	my ($self, $x, $y, $child) = @_;	1579	my ($self) = shift;
1269		1580
		1581	while (@_) {
		1582	my ($x, $y, $child) = splice @_, 0, 3, ();
1270	$child->set_parent ($self);	1583	$child->set_parent ($self);
1271	$self->{children}[$y][$x] = $child;	1584	$self->{children}[$y][$x] = $child;
		1585	}
1272		1586
		1587	$self->{force_realloc} = 1;
		1588	$self->{force_size_alloc} = 1;
1273	$self->realloc;	1589	$self->realloc;
		1590	}
		1591
		1592	sub remove {
		1593	my ($self, $child) = @_;
		1594
		1595	for (@{ $self->{children} }) {
		1596	for (@{ $_ || [] }) {
		1597	$_ = undef if $_ == $child;
		1598	}
		1599	}
1274	}	1600	}
1275		1601
1276	# TODO: move to container class maybe? send children a signal on removal?	1602	# TODO: move to container class maybe? send children a signal on removal?
1277	sub clear {	1603	sub clear {
1278	my ($self) = @_;	1604	my ($self) = @_;
…		…
1319	(sum @$ws),	1645	(sum @$ws),
1320	(sum @$hs),	1646	(sum @$hs),
1321	)	1647	)
1322	}	1648	}
1323		1649
1324	sub size_allocate {	1650	sub invoke_size_allocate {
1325	my ($self, $w, $h) = @_;	1651	my ($self, $w, $h) = @_;
1326		1652
1327	my ($ws, $hs) = $self->get_wh;	1653	my ($ws, $hs) = $self->get_wh;
1328		1654
1329	my $req_w = (sum @$ws) || 1;	1655	my $req_w = (sum @$ws) || 1;
1330	my $req_h = (sum @$hs) || 1;	1656	my $req_h = (sum @$hs) || 1;
1331		1657
1332	# TODO: nicer code && do row_expand	1658	# TODO: nicer code
1333	my @col_expand = @{$self->{col_expand}};	1659	my @col_expand = @{$self->{col_expand}};
1334	@col_expand = (1) x @$ws unless @col_expand;	1660	@col_expand = (1) x @$ws unless @col_expand;
1335	my $col_expand = (sum @col_expand) || 1;	1661	my $col_expand = (sum @col_expand) || 1;
1336		1662
1337	# linearly scale sizes
1338	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1663	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340		1664
1341	CFClient::UI::harmonize $ws;	1665	CFPlus::UI::harmonize $ws;
		1666
		1667	my @row_expand = @{$self->{row_expand}};
		1668	@row_expand = (1) x @$ws unless @row_expand;
		1669	my $row_expand = (sum @row_expand) || 1;
		1670
		1671	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1672
1342	CFClient::UI::harmonize $hs;	1673	CFPlus::UI::harmonize $hs;
1343		1674
1344	my $y;	1675	my $y;
1345		1676
1346	for my $r (0 .. $#{$self->{children}}) {	1677	for my $r (0 .. $#{$self->{children}}) {
1347	my $row = $self->{children}[$r]	1678	my $row = $self->{children}[$r]
…		…
1361	}	1692	}
1362		1693
1363	$y += $row_h;	1694	$y += $row_h;
1364	}	1695	}
1365		1696
		1697	1
1366	}	1698	}
1367		1699
1368	sub find_widget {	1700	sub find_widget {
1369	my ($self, $x, $y) = @_;	1701	my ($self, $x, $y) = @_;
1370		1702
…		…
1389	}	1721	}
1390	}	1722	}
1391		1723
1392	#############################################################################	1724	#############################################################################
1393		1725
1394	package CFClient::UI::Box;	1726	package CFPlus::UI::Fixed;
1395		1727
		1728	use List::Util qw(min max);
		1729
1396	our @ISA = CFClient::UI::Container::;	1730	our @ISA = CFPlus::UI::Container::;
		1731
		1732	sub add {
		1733	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1734
		1735	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1736	$self->SUPER::add ($child);
		1737	}
		1738
		1739	sub _scale($$$) {
		1740	my ($mode, $val, $max) = @_;
		1741
		1742	$mode eq "abs" ? $val
		1743	: $mode eq "rel" ? $val * $max
		1744	: 0
		1745	}
		1746
		1747	sub size_request {
		1748	my ($self) = @_;
		1749
		1750	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1751
		1752	# determine overall size by querying abs widgets
		1753	for my $child ($self->visible_children) {
		1754	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1755
		1756	if ($pos eq "abs") {
		1757	$w = _scale $size, $w, $child->{req_w};
		1758	$h = _scale $size, $h, $child->{req_h};
		1759
		1760	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1761	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1762	}
		1763	}
		1764
		1765	my $W = $x2 - $x1;
		1766	my $H = $y2 - $y1;
		1767
		1768	# now layout remaining widgets
		1769	for my $child ($self->visible_children) {
		1770	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1771
		1772	if ($pos ne "abs") {
		1773	$x = _scale $pos, $x, $W;
		1774	$y = _scale $pos, $x, $H;
		1775	$w = _scale $size, $w, $child->{req_w};
		1776	$h = _scale $size, $h, $child->{req_h};
		1777
		1778	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1779	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1780	}
		1781	}
		1782
		1783	my $W = $x2 - $x1;
		1784	my $H = $y2 - $y1;
		1785
		1786	($W, $H)
		1787	}
		1788
		1789	sub invoke_size_allocate {
		1790	my ($self, $W, $H) = @_;
		1791
		1792	for my $child ($self->visible_children) {
		1793	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1794
		1795	$x = _scale $pos, $x, $W;
		1796	$y = _scale $pos, $x, $H;
		1797	$w = _scale $size, $w, $child->{req_w};
		1798	$h = _scale $size, $h, $child->{req_h};
		1799
		1800	$child->configure ($x, $y, $w, $h);
		1801	}
		1802
		1803	1
		1804	}
		1805
		1806	#############################################################################
		1807
		1808	package CFPlus::UI::Box;
		1809
		1810	our @ISA = CFPlus::UI::Container::;
1397		1811
1398	sub size_request {	1812	sub size_request {
1399	my ($self) = @_;	1813	my ($self) = @_;
1400		1814
1401	$self->{vertical}	1815	$self->{vertical}
…		…
1407	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1821	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1822	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1409	)	1823	)
1410	}	1824	}
1411		1825
1412	sub size_allocate {	1826	sub invoke_size_allocate {
1413	my ($self, $w, $h) = @_;	1827	my ($self, $w, $h) = @_;
1414		1828
1415	my $space = $self->{vertical} ? $h : $w;	1829	my $space = $self->{vertical} ? $h : $w;
1416	my $children = $self->{children};	1830	my @children = $self->visible_children;
1417		1831
1418	my @req;	1832	my @req;
1419		1833
1420	if ($self->{homogeneous}) {	1834	if ($self->{homogeneous}) {
1421	@req = ($space / (@$children || 1)) x @$children;	1835	@req = ($space / (@children || 1)) x @children;
1422	} else {	1836	} else {
1423	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1837	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424	my $req = List::Util::sum @req;	1838	my $req = List::Util::sum @req;
1425		1839
1426	if ($req > $space) {	1840	if ($req > $space) {
1427	# ah well, not enough space	1841	# ah well, not enough space
1428	$_ *= $space / $req for @req;	1842	$_ *= $space / $req for @req;
1429	} else {	1843	} else {
1430	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1844	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431		1845
1432	$space = ($space - $req) / $expand; # remaining space to give away	1846	$space = ($space - $req) / $expand; # remaining space to give away
1433		1847
1434	$req[$_] += $space * $children->[$_]{expand}	1848	$req[$_] += $space * $children[$_]{expand}
1435	for 0 .. $#$children;	1849	for 0 .. $#children;
1436	}	1850	}
1437	}	1851	}
1438		1852
1439	CFClient::UI::harmonize \@req;	1853	CFPlus::UI::harmonize \@req;
1440		1854
1441	my $pos = 0;	1855	my $pos = 0;
1442	for (0 .. $#$children) {	1856	for (0 .. $#children) {
1443	my $alloc = $req[$_];	1857	my $alloc = $req[$_];
1444	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1858	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445		1859
1446	$pos += $alloc;	1860	$pos += $alloc;
1447	}	1861	}
1448		1862
1449	1	1863	1
1450	}	1864	}
1451		1865
1452	#############################################################################	1866	#############################################################################
1453		1867
1454	package CFClient::UI::HBox;	1868	package CFPlus::UI::HBox;
1455		1869
1456	our @ISA = CFClient::UI::Box::;	1870	our @ISA = CFPlus::UI::Box::;
1457		1871
1458	sub new {	1872	sub new {
1459	my $class = shift;	1873	my $class = shift;
1460		1874
1461	$class->SUPER::new (	1875	$class->SUPER::new (
…		…
1464	)	1878	)
1465	}	1879	}
1466		1880
1467	#############################################################################	1881	#############################################################################
1468		1882
1469	package CFClient::UI::VBox;	1883	package CFPlus::UI::VBox;
1470		1884
1471	our @ISA = CFClient::UI::Box::;	1885	our @ISA = CFPlus::UI::Box::;
1472		1886
1473	sub new {	1887	sub new {
1474	my $class = shift;	1888	my $class = shift;
1475		1889
1476	$class->SUPER::new (	1890	$class->SUPER::new (
…		…
1479	)	1893	)
1480	}	1894	}
1481		1895
1482	#############################################################################	1896	#############################################################################
1483		1897
1484	package CFClient::UI::Label;	1898	package CFPlus::UI::Label;
1485		1899
1486	our @ISA = CFClient::UI::DrawBG::;	1900	our @ISA = CFPlus::UI::DrawBG::;
1487		1901
1488	use CFClient::OpenGL;	1902	use CFPlus::OpenGL;
1489		1903
1490	sub new {	1904	sub new {
1491	my ($class, %arg) = @_;	1905	my ($class, %arg) = @_;
1492		1906
1493	my $self = $class->SUPER::new (	1907	my $self = $class->SUPER::new (
…		…
1496	#active_bg => none	1910	#active_bg => none
1497	#font => default_font	1911	#font => default_font
1498	#text => initial text	1912	#text => initial text
1499	#markup => initial narkup	1913	#markup => initial narkup
1500	#max_w => maximum pixel width	1914	#max_w => maximum pixel width
		1915	#style => 0, # render flags
1501	ellipsise => 3, # end	1916	ellipsise => 3, # end
1502	layout => (new CFClient::Layout),	1917	layout => (new CFPlus::Layout),
1503	fontsize => 1,	1918	fontsize => 1,
1504	align => -1,	1919	align => -1,
1505	valign => -1,	1920	valign => -1,
1506	padding_x => 2,	1921	padding_x => 2,
1507	padding_y => 2,	1922	padding_y => 2,
1508	can_events => 0,	1923	can_events => 0,
1509	%arg	1924	%arg
1510	);	1925	);
1511		1926
1512	if (exists $self->{template}) {	1927	if (exists $self->{template}) {
1513	my $layout = new CFClient::Layout;	1928	my $layout = new CFPlus::Layout;
1514	$layout->set_text (delete $self->{template});	1929	$layout->set_text (delete $self->{template});
1515	$self->{template} = $layout;	1930	$self->{template} = $layout;
1516	}	1931	}
1517		1932
1518	if (exists $self->{markup}) {	1933	if (exists $self->{markup}) {
…		…
1522	}	1937	}
1523		1938
1524	$self	1939	$self
1525	}	1940	}
1526		1941
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 {	1942	sub update {
1538	my ($self) = @_;	1943	my ($self) = @_;
1539		1944
1540	delete $self->{texture};	1945	delete $self->{texture};
1541	$self->SUPER::update;	1946	$self->SUPER::update;
1542	}	1947	}
1543		1948
		1949	sub realloc {
		1950	my ($self) = @_;
		1951
		1952	delete $self->{ox};
		1953	$self->SUPER::realloc;
		1954	}
		1955
1544	sub set_text {	1956	sub set_text {
1545	my ($self, $text) = @_;	1957	my ($self, $text) = @_;
1546		1958
1547	return if $self->{text} eq "T$text";	1959	return if $self->{text} eq "T$text";
1548	$self->{text} = "T$text";	1960	$self->{text} = "T$text";
1549		1961
1550	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1551	$self->{layout}->set_text ($text);	1962	$self->{layout}->set_text ($text);
1552		1963
		1964	delete $self->{size_req};
1553	$self->realloc;	1965	$self->realloc;
1554	$self->update;	1966	$self->update;
1555	}	1967	}
1556		1968
1557	sub set_markup {	1969	sub set_markup {
…		…
1560	return if $self->{text} eq "M$markup";	1972	return if $self->{text} eq "M$markup";
1561	$self->{text} = "M$markup";	1973	$self->{text} = "M$markup";
1562		1974
1563	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1975	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1564		1976
1565	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1566	$self->{layout}->set_markup ($markup);	1977	$self->{layout}->set_markup ($markup);
1567		1978
		1979	delete $self->{size_req};
1568	$self->realloc;	1980	$self->realloc;
1569	$self->update;	1981	$self->update;
1570	}	1982	}
1571		1983
1572	sub size_request {	1984	sub size_request {
1573	my ($self) = @_;	1985	my ($self) = @_;
1574		1986
		1987	$self->{size_req} ||= do {
1575	$self->{layout}->set_font ($self->{font}) if $self->{font};	1988	$self->{layout}->set_font ($self->{font}) if $self->{font};
1576	$self->{layout}->set_width ($self->{max_w} || -1);	1989	$self->{layout}->set_width ($self->{max_w} || -1);
1577	$self->{layout}->set_ellipsise ($self->{ellipsise});	1990	$self->{layout}->set_ellipsise ($self->{ellipsise});
1578	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1991	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1579	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1992	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1580		1993
1581	my ($w, $h) = $self->{layout}->size;	1994	my ($w, $h) = $self->{layout}->size;
1582		1995
1583	if (exists $self->{template}) {	1996	if (exists $self->{template}) {
1584	$self->{template}->set_font ($self->{font}) if $self->{font};	1997	$self->{template}->set_font ($self->{font}) if $self->{font};
		1998	$self->{template}->set_width ($self->{max_w} || -1);
1585	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1999	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1586		2000
1587	my ($w2, $h2) = $self->{template}->size;	2001	my ($w2, $h2) = $self->{template}->size;
1588		2002
1589	$w = List::Util::max $w, $w2;	2003	$w = List::Util::max $w, $w2;
1590	$h = List::Util::max $h, $h2;	2004	$h = List::Util::max $h, $h2;
		2005	}
		2006
		2007	[$w, $h]
1591	}	2008	};
1592		2009
1593	($w, $h)	2010	@{ $self->{size_req} }
1594	}	2011	}
1595		2012
		2013	sub baseline_shift {
		2014	$_[0]{layout}->descent
		2015	}
		2016
1596	sub size_allocate {	2017	sub invoke_size_allocate {
1597	my ($self, $w, $h) = @_;	2018	my ($self, $w, $h) = @_;
1598		2019
1599	delete $self->{ox};	2020	delete $self->{ox};
1600		2021
1601	delete $self->{texture}	2022	delete $self->{texture}
1602	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	2023	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		2024
		2025	1
1603	}	2026	}
1604		2027
1605	sub set_fontsize {	2028	sub set_fontsize {
1606	my ($self, $fontsize) = @_;	2029	my ($self, $fontsize) = @_;
1607		2030
1608	$self->{fontsize} = $fontsize;	2031	$self->{fontsize} = $fontsize;
		2032	delete $self->{size_req};
1609	delete $self->{texture};	2033	delete $self->{texture};
1610		2034
1611	$self->realloc;	2035	$self->realloc;
1612	}	2036	}
1613		2037
		2038	sub reconfigure {
		2039	my ($self) = @_;
		2040
		2041	delete $self->{size_req};
		2042	delete $self->{texture};
		2043
		2044	$self->SUPER::reconfigure;
		2045	}
		2046
1614	sub _draw {	2047	sub _draw {
1615	my ($self) = @_;	2048	my ($self) = @_;
1616		2049
1617	$self->SUPER::_draw; # draw background, if applicable	2050	$self->SUPER::_draw; # draw background, if applicable
1618		2051
1619	my $tex = $self->{texture} ||= do {	2052	my $size = $self->{texture} ||= do {
1620	$self->{layout}->set_foreground (@{$self->{fg}});	2053	$self->{layout}->set_foreground (@{$self->{fg}});
1621	$self->{layout}->set_font ($self->{font}) if $self->{font};	2054	$self->{layout}->set_font ($self->{font}) if $self->{font};
1622	$self->{layout}->set_width ($self->{w});	2055	$self->{layout}->set_width ($self->{w});
1623	$self->{layout}->set_ellipsise ($self->{ellipsise});	2056	$self->{layout}->set_ellipsise ($self->{ellipsise});
1624	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2057	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1625	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2058	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1626		2059
1627	new_from_layout CFClient::Texture $self->{layout}	2060	[$self->{layout}->size]
1628	};	2061	};
1629		2062
1630	unless (exists $self->{ox}) {	2063	unless (exists $self->{ox}) {
1631	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2064	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1632	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2065	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1633	: ($self->{w} - $tex->{w}) * 0.5);	2066	: ($self->{w} - $size->[0]) * 0.5);
1634		2067
1635	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2068	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1636	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2069	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1637	: ($self->{h} - $tex->{h}) * 0.5);	2070	: ($self->{h} - $size->[1]) * 0.5);
1638	};	2071	};
1639		2072
1640	glEnable GL_TEXTURE_2D;	2073	my $w = List::Util::min $self->{w} + 4, $size->[0];
1641	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2074	my $h = List::Util::min $self->{h} + 2, $size->[1];
1642		2075
1643	if ($tex->{format} == GL_ALPHA) {	2076	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1644	glColor @{$self->{fg}};
1645	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1646	} else {
1647	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1648	}
1649
1650	glDisable GL_TEXTURE_2D;
1651	}	2077	}
1652		2078
1653	#############################################################################	2079	#############################################################################
1654		2080
1655	package CFClient::UI::EntryBase;	2081	package CFPlus::UI::EntryBase;
1656		2082
1657	our @ISA = CFClient::UI::Label::;	2083	our @ISA = CFPlus::UI::Label::;
1658		2084
1659	use CFClient::OpenGL;	2085	use CFPlus::OpenGL;
1660		2086
1661	sub new {	2087	sub new {
1662	my $class = shift;	2088	my $class = shift;
1663		2089
1664	$class->SUPER::new (	2090	$class->SUPER::new (
…		…
1668	active_fg => [0, 0, 0],	2094	active_fg => [0, 0, 0],
1669	can_hover => 1,	2095	can_hover => 1,
1670	can_focus => 1,	2096	can_focus => 1,
1671	valign => 0,	2097	valign => 0,
1672	can_events => 1,	2098	can_events => 1,
		2099	ellipsise => 0,
1673	#text => ...	2100	#text => ...
		2101	#hidden => "*",
1674	@_	2102	@_
1675	)	2103	)
1676	}	2104	}
1677		2105
1678	sub _set_text {	2106	sub _set_text {
…		…
1685	$self->{last_activity} = $::NOW;	2113	$self->{last_activity} = $::NOW;
1686	$self->{text} = $text;	2114	$self->{text} = $text;
1687		2115
1688	$text =~ s/./*/g if $self->{hidden};	2116	$text =~ s/./*/g if $self->{hidden};
1689	$self->{layout}->set_text ("$text ");	2117	$self->{layout}->set_text ("$text ");
		2118	delete $self->{size_req};
1690		2119
1691	$self->_emit (changed => $self->{text});	2120	$self->emit (changed => $self->{text});
		2121
		2122	$self->realloc;
1692	$self->update;	2123	$self->update;
1693	}	2124	}
1694		2125
1695	sub set_text {	2126	sub set_text {
1696	my ($self, $text) = @_;	2127	my ($self, $text) = @_;
1697		2128
1698	$self->{cursor} = length $text;	2129	$self->{cursor} = length $text;
1699	$self->_set_text ($text);	2130	$self->_set_text ($text);
1700
1701	$self->realloc;
1702	}	2131	}
1703		2132
1704	sub get_text {	2133	sub get_text {
1705	$_[0]{text}	2134	$_[0]{text}
1706	}	2135	}
…		…
1711	my ($w, $h) = $self->SUPER::size_request;	2140	my ($w, $h) = $self->SUPER::size_request;
1712		2141
1713	($w + 1, $h) # add 1 for cursor	2142	($w + 1, $h) # add 1 for cursor
1714	}	2143	}
1715		2144
1716	sub key_down {	2145	sub invoke_key_down {
1717	my ($self, $ev) = @_;	2146	my ($self, $ev) = @_;
1718		2147
1719	my $mod = $ev->{mod};	2148	my $mod = $ev->{mod};
1720	my $sym = $ev->{sym};	2149	my $sym = $ev->{sym};
1721	my $uni = $ev->{unicode};	2150	my $uni = $ev->{unicode};
1722		2151
1723	my $text = $self->get_text;	2152	my $text = $self->get_text;
		2153
		2154	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1724		2155
1725	if ($uni == 8) {	2156	if ($uni == 8) {
1726	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2157	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1727	} elsif ($uni == 127) {	2158	} elsif ($uni == 127) {
1728	substr $text, $self->{cursor}, 1, "";	2159	substr $text, $self->{cursor}, 1, "";
1729	} elsif ($sym == CFClient::SDLK_LEFT) {	2160	} elsif ($sym == CFPlus::SDLK_LEFT) {
1730	--$self->{cursor} if $self->{cursor};	2161	--$self->{cursor} if $self->{cursor};
1731	} elsif ($sym == CFClient::SDLK_RIGHT) {	2162	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1732	++$self->{cursor} if $self->{cursor} < length $self->{text};	2163	++$self->{cursor} if $self->{cursor} < length $self->{text};
1733	} elsif ($sym == CFClient::SDLK_HOME) {	2164	} elsif ($sym == CFPlus::SDLK_HOME) {
		2165	# what a hack
		2166	$self->{cursor} =
		2167	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2168	? length $1
		2169	: 0;
		2170	} elsif ($sym == CFPlus::SDLK_END) {
		2171	# uh, again
		2172	$self->{cursor} =
		2173	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2174	? $self->{cursor} + length $1
		2175	: length $self->{text};
		2176	} elsif ($uni == 21) { # ctrl-u
		2177	$text = "";
1734	$self->{cursor} = 0;	2178	$self->{cursor} = 0;
1735	} elsif ($sym == CFClient::SDLK_END) {
1736	$self->{cursor} = length $text;
1737	} elsif ($uni == 27) {	2179	} elsif ($uni == 27) {
1738	$self->_emit ('escape');	2180	$self->emit ('escape');
1739	} elsif ($uni) {	2181	} elsif ($uni == 0x0d) {
		2182	substr $text, $self->{cursor}++, 0, "\012";
		2183	} elsif ($uni >= 0x20) {
1740	substr $text, $self->{cursor}++, 0, chr $uni;	2184	substr $text, $self->{cursor}++, 0, chr $uni;
1741	} else {	2185	} else {
1742	return 0;	2186	return 0;
1743	}	2187	}
1744		2188
1745	$self->_set_text ($text);	2189	$self->_set_text ($text);
1746		2190
1747	$self->realloc;	2191	$self->realloc;
		2192	$self->update;
1748		2193
1749	1	2194	1
1750	}	2195	}
1751		2196
1752	sub focus_in {	2197	sub invoke_focus_in {
1753	my ($self) = @_;	2198	my ($self) = @_;
1754		2199
1755	$self->{last_activity} = $::NOW;	2200	$self->{last_activity} = $::NOW;
1756		2201
1757	$self->SUPER::focus_in;	2202	$self->SUPER::invoke_focus_in
1758	}	2203	}
1759		2204
1760	sub button_down {	2205	sub invoke_button_down {
1761	my ($self, $ev, $x, $y) = @_;	2206	my ($self, $ev, $x, $y) = @_;
1762		2207
1763	$self->SUPER::button_down ($ev, $x, $y);	2208	$self->SUPER::invoke_button_down ($ev, $x, $y);
1764		2209
1765	my $idx = $self->{layout}->xy_to_index ($x, $y);	2210	my $idx = $self->{layout}->xy_to_index ($x, $y);
1766		2211
1767	# byte-index to char-index	2212	# byte-index to char-index
1768	my $text = $self->{text};	2213	my $text = $self->{text};
1769	utf8::encode $text;	2214	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1770	$self->{cursor} = length substr $text, 0, $idx;	2215	$self->{cursor} = length $text;
1771		2216
1772	$self->_set_text ($self->{text});	2217	$self->_set_text ($self->{text});
1773	$self->update;	2218	$self->update;
1774		2219
1775	1	2220	1
1776	}	2221	}
1777		2222
1778	sub mouse_motion {	2223	sub invoke_mouse_motion {
1779	my ($self, $ev, $x, $y) = @_;	2224	my ($self, $ev, $x, $y) = @_;
1780	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2225	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1781		2226
1782	0	2227	1
1783	}	2228	}
1784		2229
1785	sub _draw {	2230	sub _draw {
1786	my ($self) = @_;	2231	my ($self) = @_;
1787		2232
…		…
1814	utf8::encode $text;	2259	utf8::encode $text;
1815		2260
1816	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2261	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1817	}	2262	}
1818		2263
1819	glColor @{$self->{fg}};
1820	glBegin GL_LINES;	2264	glBegin GL_LINES;
1821	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2265	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1822	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2266	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1823	glEnd;	2267	glEnd;
1824	}	2268	}
1825	}	2269	}
1826		2270
		2271	#############################################################################
		2272
1827	package CFClient::UI::Entry;	2273	package CFPlus::UI::Entry;
1828		2274
1829	our @ISA = CFClient::UI::EntryBase::;	2275	our @ISA = CFPlus::UI::EntryBase::;
1830		2276
1831	use CFClient::OpenGL;	2277	use CFPlus::OpenGL;
1832		2278
1833	sub key_down {	2279	sub invoke_key_down {
1834	my ($self, $ev) = @_;	2280	my ($self, $ev) = @_;
1835		2281
1836	my $sym = $ev->{sym};	2282	my $sym = $ev->{sym};
1837		2283
1838	if ($sym == 13) {	2284	if ($ev->{uni} == 0x0d || $sym == 13) {
1839	unshift @{$self->{history}},	2285	unshift @{$self->{history}},
1840	my $txt = $self->get_text;	2286	my $txt = $self->get_text;
		2287
1841	$self->{history_pointer} = -1;	2288	$self->{history_pointer} = -1;
1842	$self->{history_saveback} = '';	2289	$self->{history_saveback} = '';
1843	$self->_emit (activate => $txt);	2290	$self->emit (activate => $txt);
1844	$self->update;	2291	$self->update;
1845		2292
1846	} elsif ($sym == CFClient::SDLK_UP) {	2293	} elsif ($sym == CFPlus::SDLK_UP) {
1847	if ($self->{history_pointer} < 0) {	2294	if ($self->{history_pointer} < 0) {
1848	$self->{history_saveback} = $self->get_text;	2295	$self->{history_saveback} = $self->get_text;
1849	}	2296	}
1850	if (@{$self->{history} || []} > 0) {	2297	if (@{$self->{history} || []} > 0) {
1851	$self->{history_pointer}++;	2298	$self->{history_pointer}++;
…		…
1853	$self->{history_pointer} = @{$self->{history} || []} - 1;	2300	$self->{history_pointer} = @{$self->{history} || []} - 1;
1854	}	2301	}
1855	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2302	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1856	}	2303	}
1857		2304
1858	} elsif ($sym == CFClient::SDLK_DOWN) {	2305	} elsif ($sym == CFPlus::SDLK_DOWN) {
1859	$self->{history_pointer}--;	2306	$self->{history_pointer}--;
1860	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2307	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1861		2308
1862	if ($self->{history_pointer} >= 0) {	2309	if ($self->{history_pointer} >= 0) {
1863	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2310	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1864	} else {	2311	} else {
1865	$self->set_text ($self->{history_saveback});	2312	$self->set_text ($self->{history_saveback});
1866	}	2313	}
1867		2314
1868	} else {	2315	} else {
1869	return $self->SUPER::key_down ($ev)	2316	return $self->SUPER::invoke_key_down ($ev)
1870	}	2317	}
1871		2318
1872	1	2319	1
1873	}	2320	}
1874		2321
1875	#############################################################################	2322	#############################################################################
1876		2323
		2324	package CFPlus::UI::TextEdit;
		2325
		2326	our @ISA = CFPlus::UI::EntryBase::;
		2327
		2328	use CFPlus::OpenGL;
		2329
		2330	sub move_cursor_ver {
		2331	my ($self, $dy) = @_;
		2332
		2333	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2334
		2335	$y += $dy;
		2336
		2337	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2338	$self->{cursor} = $index;
		2339	delete $self->{cur_h};
		2340	$self->update;
		2341	return;
		2342	}
		2343	}
		2344
		2345	sub invoke_key_down {
		2346	my ($self, $ev) = @_;
		2347
		2348	my $sym = $ev->{sym};
		2349
		2350	if ($sym == CFPlus::SDLK_UP) {
		2351	$self->move_cursor_ver (-1);
		2352	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2353	$self->move_cursor_ver (+1);
		2354	} else {
		2355	return $self->SUPER::invoke_key_down ($ev)
		2356	}
		2357
		2358	1
		2359	}
		2360
		2361	#############################################################################
		2362
1877	package CFClient::UI::Button;	2363	package CFPlus::UI::Button;
1878		2364
1879	our @ISA = CFClient::UI::Label::;	2365	our @ISA = CFPlus::UI::Label::;
1880		2366
1881	use CFClient::OpenGL;	2367	use CFPlus::OpenGL;
1882		2368
1883	my @tex =	2369	my @tex =
1884	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2370	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1885	qw(b1_button_active.png);	2371	qw(b1_button_active.png);
1886		2372
1887	sub new {	2373	sub new {
1888	my $class = shift;	2374	my $class = shift;
1889		2375
…		…
1898	can_events => 1,	2384	can_events => 1,
1899	@_	2385	@_
1900	)	2386	)
1901	}	2387	}
1902		2388
1903	sub activate { }
1904
1905	sub button_up {	2389	sub invoke_button_up {
1906	my ($self, $ev, $x, $y) = @_;	2390	my ($self, $ev, $x, $y) = @_;
1907		2391
1908	$self->emit ("activate")	2392	$self->emit ("activate")
1909	if $x >= 0 && $x < $self->{w}	2393	if $x >= 0 && $x < $self->{w}
1910	&& $y >= 0 && $y < $self->{h};	2394	&& $y >= 0 && $y < $self->{h};
…		…
1913	}	2397	}
1914		2398
1915	sub _draw {	2399	sub _draw {
1916	my ($self) = @_;	2400	my ($self) = @_;
1917		2401
1918	local $self->{fg} = $self->{fg};	2402	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1919
1920	if ($GRAB == $self) {
1921	$self->{fg} = $self->{active_fg};
1922	}
1923		2403
1924	glEnable GL_TEXTURE_2D;	2404	glEnable GL_TEXTURE_2D;
1925	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2405	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1926	glColor 0, 0, 0, 1;	2406	glColor 0, 0, 0, 1;
1927		2407
…		…
1932	$self->SUPER::_draw;	2412	$self->SUPER::_draw;
1933	}	2413	}
1934		2414
1935	#############################################################################	2415	#############################################################################
1936		2416
1937	package CFClient::UI::CheckBox;	2417	package CFPlus::UI::CheckBox;
1938		2418
1939	our @ISA = CFClient::UI::DrawBG::;	2419	our @ISA = CFPlus::UI::DrawBG::;
1940		2420
1941	my @tex =	2421	my @tex =
1942	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2422	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1943	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2423	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1944		2424
1945	use CFClient::OpenGL;	2425	use CFPlus::OpenGL;
1946		2426
1947	sub new {	2427	sub new {
1948	my $class = shift;	2428	my $class = shift;
1949		2429
1950	$class->SUPER::new (	2430	$class->SUPER::new (
…		…
1964	my ($self) = @_;	2444	my ($self) = @_;
1965		2445
1966	(6) x 2	2446	(6) x 2
1967	}	2447	}
1968		2448
		2449	sub toggle {
		2450	my ($self) = @_;
		2451
		2452	$self->{state} = !$self->{state};
		2453	$self->emit (changed => $self->{state});
		2454	$self->update;
		2455	}
		2456
1969	sub button_down {	2457	sub invoke_button_down {
1970	my ($self, $ev, $x, $y) = @_;	2458	my ($self, $ev, $x, $y) = @_;
1971		2459
1972	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2460	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1973	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2461	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1974	$self->{state} = !$self->{state};	2462	$self->toggle;
1975	$self->_emit (changed => $self->{state});
1976	} else {	2463	} else {
1977	return 0	2464	return 0
1978	}	2465	}
1979		2466
1980	1	2467	1
…		…
2000	glDisable GL_TEXTURE_2D;	2487	glDisable GL_TEXTURE_2D;
2001	}	2488	}
2002		2489
2003	#############################################################################	2490	#############################################################################
2004		2491
2005	package CFClient::UI::Image;	2492	package CFPlus::UI::Image;
2006		2493
2007	our @ISA = CFClient::UI::Base::;	2494	our @ISA = CFPlus::UI::Base::;
2008		2495
2009	use CFClient::OpenGL;	2496	use CFPlus::OpenGL;
2010	use Carp qw/confess/;
2011		2497
2012	our %loaded_images;	2498	our %texture_cache;
2013		2499
2014	sub new {	2500	sub new {
2015	my $class = shift;	2501	my $class = shift;
2016		2502
2017	my $self = $class->SUPER::new (can_events => 0, @_);	2503	my $self = $class->SUPER::new (
		2504	can_events => 0,
		2505	@_,
		2506	);
2018		2507
2019	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2508	$self->{path} || $self->{tex}
		2509	or Carp::croak "'path' or 'tex' attributes required";
2020		2510
2021	$loaded_images{$self->{image}} ||=	2511	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2022	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2512	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2023		2513
2024	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2514	CFPlus::weaken $texture_cache{$self->{path}};
2025		2515
2026	Scalar::Util::weaken $loaded_images{$self->{image}};	2516	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2027
2028	$self->{aspect} = $tex->{w} / $tex->{h};
2029		2517
2030	$self	2518	$self
2031	}	2519	}
2032		2520
		2521	sub STORABLE_freeze {
		2522	my ($self, $cloning) = @_;
		2523
		2524	$self->{path}
		2525	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2526
		2527	$self->{path}
		2528	}
		2529
		2530	sub STORABLE_attach {
		2531	my ($self, $cloning, $path) = @_;
		2532
		2533	$self->new (path => $path)
		2534	}
		2535
2033	sub size_request {	2536	sub size_request {
2034	my ($self) = @_;	2537	my ($self) = @_;
2035		2538
2036	($self->{tex}->{w}, $self->{tex}->{h})	2539	($self->{tex}{w}, $self->{tex}{h})
2037	}	2540	}
2038		2541
2039	sub _draw {	2542	sub _draw {
2040	my ($self) = @_;	2543	my ($self) = @_;
2041		2544
…		…
2051	}	2554	}
2052		2555
2053	glEnable GL_TEXTURE_2D;	2556	glEnable GL_TEXTURE_2D;
2054	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2557	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055		2558
2056	$tex->draw_quad_alpha (0, 0, $w, $h);	2559	$tex->draw_quad (0, 0, $w, $h);
2057		2560
2058	glDisable GL_TEXTURE_2D;	2561	glDisable GL_TEXTURE_2D;
2059	}	2562	}
2060		2563
2061	#############################################################################	2564	#############################################################################
2062		2565
		2566	package CFPlus::UI::ImageButton;
		2567
		2568	our @ISA = CFPlus::UI::Image::;
		2569
		2570	use CFPlus::OpenGL;
		2571
		2572	my %textures;
		2573
		2574	sub new {
		2575	my $class = shift;
		2576
		2577	my $self = $class->SUPER::new (
		2578	padding_x => 4,
		2579	padding_y => 4,
		2580	fg => [1, 1, 1],
		2581	active_fg => [0, 0, 1],
		2582	can_hover => 1,
		2583	align => 0,
		2584	valign => 0,
		2585	can_events => 1,
		2586	@_
		2587	);
		2588	}
		2589
		2590	sub invoke_button_up {
		2591	my ($self, $ev, $x, $y) = @_;
		2592
		2593	$self->emit ("activate")
		2594	if $x >= 0 && $x < $self->{w}
		2595	&& $y >= 0 && $y < $self->{h};
		2596
		2597	1
		2598	}
		2599
		2600	#############################################################################
		2601
2063	package CFClient::UI::VGauge;	2602	package CFPlus::UI::VGauge;
2064		2603
2065	our @ISA = CFClient::UI::Base::;	2604	our @ISA = CFPlus::UI::Base::;
2066		2605
2067	use List::Util qw(min max);	2606	use List::Util qw(min max);
2068		2607
2069	use CFClient::OpenGL;	2608	use CFPlus::OpenGL;
2070		2609
2071	my %tex = (	2610	my %tex = (
2072	food => [	2611	food => [
2073	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2612	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2074	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2613	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2075	],	2614	],
2076	grace => [	2615	grace => [
2077	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2616	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2078	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2617	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2079	],	2618	],
2080	hp => [	2619	hp => [
2081	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2620	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2082	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2621	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2083	],	2622	],
2084	mana => [	2623	mana => [
2085	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2624	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2086	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2625	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2087	],	2626	],
2088	);	2627	);
2089		2628
2090	# eg. VGauge->new (gauge => 'food'), default gauge: food	2629	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2150	my $ycut1 = max 0, min 1, $ycut;	2689	my $ycut1 = max 0, min 1, $ycut;
2151	my $ycut2 = max 0, min 1, $ycut - 1;	2690	my $ycut2 = max 0, min 1, $ycut - 1;
2152		2691
2153	my $h1 = $self->{h} * (1 - $ycut1);	2692	my $h1 = $self->{h} * (1 - $ycut1);
2154	my $h2 = $self->{h} * (1 - $ycut2);	2693	my $h2 = $self->{h} * (1 - $ycut2);
		2694	my $h3 = $self->{h};
		2695
		2696	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2155		2697
2156	glEnable GL_BLEND;	2698	glEnable GL_BLEND;
2157	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2699	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2158	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2700	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2159	glEnable GL_TEXTURE_2D;	2701	glEnable GL_TEXTURE_2D;
…		…
2178		2720
2179	if ($t3) {	2721	if ($t3) {
2180	glBindTexture GL_TEXTURE_2D, $t3->{name};	2722	glBindTexture GL_TEXTURE_2D, $t3->{name};
2181	glBegin GL_QUADS;	2723	glBegin GL_QUADS;
2182	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2724	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2183	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2725	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2184	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2726	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2185	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2727	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2186	glEnd;	2728	glEnd;
2187	}	2729	}
2188		2730
2189	glDisable GL_BLEND;	2731	glDisable GL_BLEND;
2190	glDisable GL_TEXTURE_2D;	2732	glDisable GL_TEXTURE_2D;
2191	}	2733	}
2192		2734
2193	#############################################################################	2735	#############################################################################
2194		2736
2195	package CFClient::UI::Gauge;	2737	package CFPlus::UI::Gauge;
2196		2738
2197	our @ISA = CFClient::UI::VBox::;	2739	our @ISA = CFPlus::UI::VBox::;
2198		2740
2199	sub new {	2741	sub new {
2200	my ($class, %arg) = @_;	2742	my ($class, %arg) = @_;
2201		2743
2202	my $self = $class->SUPER::new (	2744	my $self = $class->SUPER::new (
…		…
2204	can_hover => 1,	2746	can_hover => 1,
2205	can_events => 1,	2747	can_events => 1,
2206	%arg,	2748	%arg,
2207	);	2749	);
2208		2750
2209	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2751	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2210	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2752	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2211	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2753	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2212		2754
2213	$self	2755	$self
2214	}	2756	}
2215		2757
2216	sub set_fontsize {	2758	sub set_fontsize {
…		…
2237	$self->{value}->set_text ($val);	2779	$self->{value}->set_text ($val);
2238	}	2780	}
2239		2781
2240	#############################################################################	2782	#############################################################################
2241		2783
2242	package CFClient::UI::Slider;	2784	package CFPlus::UI::Slider;
2243		2785
2244	use strict;	2786	use strict;
2245		2787
2246	use CFClient::OpenGL;	2788	use CFPlus::OpenGL;
2247		2789
2248	our @ISA = CFClient::UI::DrawBG::;	2790	our @ISA = CFPlus::UI::DrawBG::;
2249		2791
2250	my @tex =	2792	my @tex =
2251	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2793	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2252	qw(s1_slider.png s1_slider_bg.png);	2794	qw(s1_slider.png s1_slider_bg.png);
2253		2795
2254	sub new {	2796	sub new {
2255	my $class = shift;	2797	my $class = shift;
2256		2798
…		…
2277	$self->update;	2819	$self->update;
2278		2820
2279	$self	2821	$self
2280	}	2822	}
2281		2823
2282	sub changed { }
2283
2284	sub set_range {	2824	sub set_range {
2285	my ($self, $range) = @_;	2825	my ($self, $range) = @_;
2286		2826
2287	($range, $self->{range}) = ($self->{range}, $range);	2827	($range, $self->{range}) = ($self->{range}, $range);
2288		2828
2289	$self->update
2290	if "@$range" ne "@{$self->{range}}";	2829	if ("@$range" ne "@{$self->{range}}") {
		2830	$self->update;
		2831	$self->set_value ($self->{range}[0]);
		2832	}
2291	}	2833	}
2292		2834
2293	sub set_value {	2835	sub set_value {
2294	my ($self, $value) = @_;	2836	my ($self, $value) = @_;
2295		2837
…		…
2306	if $unit;	2848	if $unit;
2307		2849
2308	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2850	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2309		2851
2310	if ($value != $old_value) {	2852	if ($value != $old_value) {
2311	$self->_emit (changed => $value);	2853	$self->emit (changed => $value);
2312	$self->update;	2854	$self->update;
2313	}	2855	}
2314	}	2856	}
2315		2857
2316	sub size_request {	2858	sub size_request {
2317	my ($self) = @_;	2859	my ($self) = @_;
2318		2860
2319	($self->{req_w}, $self->{req_h})	2861	($self->{req_w}, $self->{req_h})
2320	}	2862	}
2321		2863
2322	sub button_down {	2864	sub invoke_button_down {
2323	my ($self, $ev, $x, $y) = @_;	2865	my ($self, $ev, $x, $y) = @_;
2324		2866
2325	$self->SUPER::button_down ($ev, $x, $y);	2867	$self->SUPER::invoke_button_down ($ev, $x, $y);
2326		2868
2327	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2869	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2328		2870
2329	$self->mouse_motion ($ev, $x, $y)	2871	$self->invoke_mouse_motion ($ev, $x, $y)
2330	}	2872	}
2331		2873
2332	sub mouse_motion {	2874	sub invoke_mouse_motion {
2333	my ($self, $ev, $x, $y) = @_;	2875	my ($self, $ev, $x, $y) = @_;
2334		2876
2335	if ($GRAB == $self) {	2877	if ($GRAB == $self) {
2336	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2878	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2337		2879
…		…
2343	} else {	2885	} else {
2344	return 0;	2886	return 0;
2345	}	2887	}
2346		2888
2347	1	2889	1
		2890	}
		2891
		2892	sub invoke_mouse_wheel {
		2893	my ($self, $ev) = @_;
		2894
		2895	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2896
		2897	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2898
		2899	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2900
		2901	! ! $delta
2348	}	2902	}
2349		2903
2350	sub update {	2904	sub update {
2351	my ($self) = @_;	2905	my ($self) = @_;
2352		2906
…		…
2401	glDisable GL_TEXTURE_2D;	2955	glDisable GL_TEXTURE_2D;
2402	}	2956	}
2403		2957
2404	#############################################################################	2958	#############################################################################
2405		2959
2406	package CFClient::UI::ValSlider;	2960	package CFPlus::UI::ValSlider;
2407		2961
2408	our @ISA = CFClient::UI::HBox::;	2962	our @ISA = CFPlus::UI::HBox::;
2409		2963
2410	sub new {	2964	sub new {
2411	my ($class, %arg) = @_;	2965	my ($class, %arg) = @_;
2412		2966
2413	my $range = delete $arg{range};	2967	my $range = delete $arg{range};
2414		2968
2415	my $self = $class->SUPER::new (	2969	my $self = $class->SUPER::new (
2416	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2970	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2417	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2971	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2418	to_value => sub { shift },	2972	to_value => sub { shift },
2419	from_value => sub { shift },	2973	from_value => sub { shift },
2420	%arg,	2974	%arg,
2421	);	2975	);
2422		2976
…		…
2442	sub set_range { shift->{slider}->set_range (@_) }	2996	sub set_range { shift->{slider}->set_range (@_) }
2443	sub set_value { shift->{slider}->set_value (@_) }	2997	sub set_value { shift->{slider}->set_value (@_) }
2444		2998
2445	#############################################################################	2999	#############################################################################
2446		3000
2447	package CFClient::UI::TextView;	3001	package CFPlus::UI::TextScroller;
2448		3002
2449	our @ISA = CFClient::UI::HBox::;	3003	our @ISA = CFPlus::UI::HBox::;
2450		3004
2451	use CFClient::OpenGL;	3005	use CFPlus::OpenGL;
2452		3006
2453	sub new {	3007	sub new {
2454	my $class = shift;	3008	my $class = shift;
2455		3009
2456	my $self = $class->SUPER::new (	3010	my $self = $class->SUPER::new (
2457	fontsize => 1,	3011	fontsize => 1,
2458	can_events => 0,	3012	can_events => 1,
		3013	indent => 0,
2459	#font => default_font	3014	#font => default_font
2460	@_,	3015	@_,
2461		3016
2462	layout => (new CFClient::Layout 1),	3017	layout => (new CFPlus::Layout),
2463	par => [],	3018	par => [],
		3019	max_par => 0,
2464	height => 0,	3020	height => 0,
2465	children => [	3021	children => [
2466	(new CFClient::UI::Empty expand => 1),	3022	(new CFPlus::UI::Empty expand => 1),
2467	(new CFClient::UI::Slider vertical => 1),	3023	(new CFPlus::UI::Slider vertical => 1),
2468	],	3024	],
2469	);	3025	);
2470		3026
2471	$self->{children}[1]->connect (changed => sub { $self->update });	3027	$self->{children}[1]->connect (changed => sub { $self->update });
2472		3028
…		…
2478		3034
2479	$self->{fontsize} = $fontsize;	3035	$self->{fontsize} = $fontsize;
2480	$self->reflow;	3036	$self->reflow;
2481	}	3037	}
2482		3038
		3039	sub size_request {
		3040	my ($self) = @_;
		3041
		3042	my ($empty, $slider) = @{ $self->{children} };
		3043
		3044	local $self->{children} = [$empty, $slider];
		3045	$self->SUPER::size_request
		3046	}
		3047
2483	sub size_allocate {	3048	sub invoke_size_allocate {
2484	my ($self, $w, $h) = @_;	3049	my ($self, $w, $h) = @_;
2485		3050
2486	$self->SUPER::size_allocate ($w, $h);	3051	my ($empty, $slider, @other) = @{ $self->{children} };
		3052	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2487		3053
2488	$self->{layout}->set_font ($self->{font}) if $self->{font};	3054	$self->{layout}->set_font ($self->{font}) if $self->{font};
2489	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3055	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2490	$self->{layout}->set_width ($self->{children}[0]{w});	3056	$self->{layout}->set_width ($empty->{w});
		3057	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2491		3058
2492	$self->reflow;	3059	$self->reflow;
2493	}
2494		3060
2495	sub text_size {	3061	local $self->{children} = [$empty, $slider];
		3062	$self->SUPER::invoke_size_allocate ($w, $h)
		3063	}
		3064
		3065	sub invoke_mouse_wheel {
2496	my ($self, $text, $indent) = @_;	3066	my ($self, $ev) = @_;
		3067
		3068	return 0 unless $ev->{dy}; # only vertical movements
		3069
		3070	$self->{children}[1]->emit (mouse_wheel => $ev);
		3071
		3072	1
		3073	}
		3074
		3075	sub get_layout {
		3076	my ($self, $para) = @_;
2497		3077
2498	my $layout = $self->{layout};	3078	my $layout = $self->{layout};
2499		3079
		3080	$layout->set_font ($self->{font}) if $self->{font};
		3081	$layout->set_foreground (@{$para->{fg}});
2500	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3082	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2501	$layout->set_width ($self->{children}[0]{w} - $indent);	3083	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		3084	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2502	$layout->set_markup ($text);	3085	$layout->set_markup ($para->{markup});
		3086
		3087	$layout->set_shapes (
		3088	map
		3089	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3090	@{$para->{widget}}
2503		3091	);
		3092
2504	$layout->size	3093	$layout
2505	}	3094	}
2506		3095
2507	sub reflow {	3096	sub reflow {
2508	my ($self) = @_;	3097	my ($self) = @_;
2509		3098
…		…
2516		3105
2517	# todo: base offset on lines or so, not on pixels	3106	# todo: base offset on lines or so, not on pixels
2518	$self->{children}[1]->set_value ($offset);	3107	$self->{children}[1]->set_value ($offset);
2519	}	3108	}
2520		3109
		3110	sub current_paragraph {
		3111	my ($self) = @_;
		3112
		3113	$self->{top_paragraph} - 1
		3114	}
		3115
		3116	sub scroll_to {
		3117	my ($self, $para) = @_;
		3118
		3119	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3120
		3121	$self->{scroll_to} = $para;
		3122	$self->update;
		3123	}
		3124
2521	sub clear {	3125	sub clear {
2522	my ($self) = @_;	3126	my ($self) = @_;
		3127
		3128	my (undef, undef, @other) = @{ $self->{children} };
		3129	$self->remove ($_) for @other;
2523		3130
2524	$self->{par} = [];	3131	$self->{par} = [];
2525	$self->{height} = 0;	3132	$self->{height} = 0;
2526	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3133	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2527	}	3134	}
2528		3135
2529	sub add_paragraph {	3136	sub add_paragraph {
2530	my ($self, $color, $text, $indent) = @_;	3137	my $self = shift;
2531		3138
2532	for my $line (split /\n/, $text) {	3139	for my $para (@_) {
2533	my ($w, $h) = $self->text_size ($line);	3140	$para = {
		3141	fg => [1, 1, 1, 1],
		3142	indent => 0,
		3143	markup => "",
		3144	widget => [],
		3145	ref $para ? %$para : (markup => $para),
		3146	w => 1e10,
		3147	wrapped => 1,
		3148	};
		3149
		3150	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3151	push @{$self->{par}}, $para;
		3152	}
		3153
		3154	if (my $max = $self->{max_par}) {
		3155	shift @{$self->{par}} while @{$self->{par}} > $max;
		3156	}
		3157
		3158	$self->{need_reflow}++;
		3159	$self->update;
		3160	}
		3161
		3162	sub scroll_to_bottom {
		3163	my ($self) = @_;
		3164
		3165	$self->{scroll_to} = $#{$self->{par}};
		3166	$self->update;
		3167	}
		3168
		3169	sub force_uptodate {
		3170	my ($self) = @_;
		3171
		3172	if (delete $self->{need_reflow}) {
		3173	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3174
		3175	my $height = 0;
		3176
		3177	for my $para (@{$self->{par}}) {
		3178	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3179	my $layout = $self->get_layout ($para);
		3180	my ($w, $h) = $layout->size;
		3181
		3182	$para->{w} = $w + $para->{indent};
		3183	$para->{h} = $h;
		3184	$para->{wrapped} = $layout->has_wrapped;
		3185	}
		3186
		3187	$para->{y} = $height;
		3188	$height += $para->{h};
		3189	}
		3190
2534	$self->{height} += $h;	3191	$self->{height} = $height;
2535	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3192	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2536	}
2537		3193
2538	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3194	delete $self->{texture};
		3195	}
		3196
		3197	if (my $paridx = delete $self->{scroll_to}) {
		3198	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3199	}
2539	}	3200	}
2540		3201
2541	sub update {	3202	sub update {
2542	my ($self) = @_;	3203	my ($self) = @_;
2543		3204
…		…
2545		3206
2546	return unless $self->{h} > 0;	3207	return unless $self->{h} > 0;
2547		3208
2548	delete $self->{texture};	3209	delete $self->{texture};
2549		3210
2550	$ROOT->on_post_alloc ($self, sub {	3211	$ROOT->on_post_alloc ($self => sub {
		3212	$self->force_uptodate;
		3213
2551	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3214	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2552		3215
2553	if (delete $self->{need_reflow}) {
2554	my $height = 0;
2555
2556	my $layout = $self->{layout};
2557
2558	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2559
2560	for (@{$self->{par}}) {
2561	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2562	$layout->set_width ($W - $_->[3]);
2563	$layout->set_markup ($_->[4]);
2564	my ($w, $h) = $layout->size;
2565	$_->[0] = $w + $_->[3];
2566	$_->[1] = $h;
2567	}
2568
2569	$height += $_->[1];
2570	}
2571
2572	$self->{height} = $height;
2573
2574	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2575
2576	delete $self->{texture};
2577	}
2578
2579	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3216	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2580	glClearColor 0.5, 0.5, 0.5, 0;	3217	glClearColor 0, 0, 0, 0;
2581	glClear GL_COLOR_BUFFER_BIT;	3218	glClear GL_COLOR_BUFFER_BIT;
2582		3219
		3220	package CFPlus::UI::Base;
		3221	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3222	(0, 0, $self->{w}, $self->{h});
		3223
		3224	my $top = int $self->{children}[1]{range}[0];
		3225
		3226	my $paridx = 0;
		3227	my $top_paragraph;
2583	my $top = int $self->{children}[1]{range}[0];	3228	my $top = int $self->{children}[1]{range}[0];
2584		3229
2585	my $y0 = $top;	3230	my $y0 = $top;
2586	my $y1 = $top + $H;	3231	my $y1 = $top + $H;
2587		3232
2588	my $y = 0;
2589
2590	my $layout = $self->{layout};
2591
2592	$layout->set_font ($self->{font}) if $self->{font};
2593
2594	glEnable GL_BLEND;
2595	#TODO# not correct in windows where rgba is forced off
2596	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2597
2598	for my $par (@{$self->{par}}) {	3233	for my $para (@{$self->{par}}) {
2599	my $h = $par->[1];	3234	my $h = $para->{h};
		3235	my $y = $para->{y};
2600		3236
2601	if ($y0 < $y + $h && $y < $y1) {	3237	if ($y0 < $y + $h && $y < $y1) {
2602	$layout->set_foreground (@{ $par->[2] });	3238	my $layout = $self->get_layout ($para);
2603	$layout->set_width ($W - $par->[3]);
2604	$layout->set_markup ($par->[4]);
2605		3239
2606	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3240	$layout->render ($para->{indent}, $y - $y0);
2607		3241
2608	glRasterPos $par->[3], $y - $y0;	3242	if (my @w = @{ $para->{widget} }) {
2609	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3243	my @s = $layout->get_shapes;
		3244
		3245	for (@w) {
		3246	my ($dx, $dy) = splice @s, 0, 2, ();
		3247
		3248	$_->{x} = $dx + $para->{indent};
		3249	$_->{y} = $dy + $y - $y0;
		3250
		3251	$_->draw;
		3252	}
		3253	}
2610	}	3254	}
2611		3255
2612	$y += $h;	3256	$paridx++;
		3257	$top_paragraph ||= $paridx if $y >= $top;
2613	}	3258	}
2614		3259
2615	glDisable GL_BLEND;	3260	$self->{top_paragraph} = $top_paragraph;
2616	};	3261	};
2617	});	3262	});
2618	}	3263	}
2619		3264
		3265	sub reconfigure {
		3266	my ($self) = @_;
		3267
		3268	$self->SUPER::reconfigure;
		3269
		3270	$_->{w} = 1e10 for @{ $self->{par} };
		3271	$self->reflow;
		3272	}
		3273
2620	sub _draw {	3274	sub _draw {
2621	my ($self) = @_;	3275	my ($self) = @_;
2622		3276
2623	glEnable GL_TEXTURE_2D;	3277	glEnable GL_TEXTURE_2D;
2624	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3278	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625	glColor 1, 1, 1, 1;	3279	glColor 0, 0, 0, 1;
2626	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3280	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2627	glDisable GL_TEXTURE_2D;	3281	glDisable GL_TEXTURE_2D;
2628		3282
2629	$self->{children}[1]->draw;	3283	$self->{children}[1]->draw;
2630
2631	}	3284	}
2632		3285
2633	#############################################################################	3286	#############################################################################
2634		3287
2635	package CFClient::UI::Animator;	3288	package CFPlus::UI::Animator;
2636		3289
2637	use CFClient::OpenGL;	3290	use CFPlus::OpenGL;
2638		3291
2639	our @ISA = CFClient::UI::Bin::;	3292	our @ISA = CFPlus::UI::Bin::;
2640		3293
2641	sub moveto {	3294	sub moveto {
2642	my ($self, $x, $y) = @_;	3295	my ($self, $x, $y) = @_;
2643		3296
2644	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3297	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2672	glPopMatrix;	3325	glPopMatrix;
2673	}	3326	}
2674		3327
2675	#############################################################################	3328	#############################################################################
2676		3329
2677	package CFClient::UI::Flopper;	3330	package CFPlus::UI::Flopper;
2678		3331
2679	our @ISA = CFClient::UI::Button::;	3332	our @ISA = CFPlus::UI::Button::;
2680		3333
2681	sub new {	3334	sub new {
2682	my $class = shift;	3335	my $class = shift;
2683		3336
2684	my $self = $class->SUPER::new (	3337	my $self = $class->SUPER::new (
…		…
2696	$self->{other}->toggle_visibility;	3349	$self->{other}->toggle_visibility;
2697	}	3350	}
2698		3351
2699	#############################################################################	3352	#############################################################################
2700		3353
2701	package CFClient::UI::Tooltip;	3354	package CFPlus::UI::Tooltip;
2702		3355
2703	our @ISA = CFClient::UI::Bin::;	3356	our @ISA = CFPlus::UI::Bin::;
2704		3357
2705	use CFClient::OpenGL;	3358	use CFPlus::OpenGL;
2706		3359
2707	sub new {	3360	sub new {
2708	my $class = shift;	3361	my $class = shift;
2709		3362
2710	$class->SUPER::new (	3363	$class->SUPER::new (
…		…
2713	)	3366	)
2714	}	3367	}
2715		3368
2716	sub set_tooltip_from {	3369	sub set_tooltip_from {
2717	my ($self, $widget) = @_;	3370	my ($self, $widget) = @_;
		3371
		3372	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3373	if $widget->{tooltip} =~ /^#(.*)$/;
2718		3374
2719	my $tooltip = $widget->{tooltip};	3375	my $tooltip = $widget->{tooltip};
2720		3376
2721	if ($ENV{CFPLUS_DEBUG} & 2) {	3377	if ($ENV{CFPLUS_DEBUG} & 2) {
2722	$tooltip .= "\n\n" . (ref $widget) . "\n"	3378	$tooltip .= "\n\n" . (ref $widget) . "\n"
2723	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3379	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2724	. "req $widget->{req_w} $widget->{req_h}\n"	3380	. "req $widget->{req_w} $widget->{req_h}\n"
2725	. "visible $widget->{visible}";	3381	. "visible $widget->{visible}";
2726	}	3382	}
2727		3383
		3384	$tooltip =~ s/^\n+//;
		3385	$tooltip =~ s/\n+$//;
		3386
2728	$self->add (new CFClient::UI::Label	3387	$self->add (new CFPlus::UI::Label
2729	markup => $tooltip,	3388	markup => $tooltip,
2730	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3389	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2731	fontsize => 0.8,	3390	fontsize => 0.8,
2732	fg => [0, 0, 0, 1],	3391	style => 1, # FLAG_INVERSE
2733	ellipsise => 0,	3392	ellipsise => 0,
2734	font => ($widget->{tooltip_font} || $::FONT_PROP),	3393	font => ($widget->{tooltip_font} || $::FONT_PROP),
2735	);	3394	);
2736	}	3395	}
2737		3396
…		…
2741	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3400	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2742		3401
2743	($w + 4, $h + 4)	3402	($w + 4, $h + 4)
2744	}	3403	}
2745		3404
2746	sub size_allocate {	3405	sub invoke_size_allocate {
2747	my ($self, $w, $h) = @_;	3406	my ($self, $w, $h) = @_;
2748		3407
2749	$self->SUPER::size_allocate ($w - 4, $h - 4);	3408	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2750	}	3409	}
2751		3410
2752	sub visibility_change {	3411	sub invoke_visibility_change {
2753	my ($self, $visible) = @_;	3412	my ($self, $visible) = @_;
2754		3413
2755	return unless $visible;	3414	return unless $visible;
2756		3415
2757	$self->{root}->on_post_alloc ("move_$self" => sub {	3416	$self->{root}->on_post_alloc ("move_$self" => sub {
2758	my $widget = $self->{owner}	3417	my $widget = $self->{owner}
2759	or return;	3418	or return;
2760		3419
		3420	if ($widget->{visible}) {
2761	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3421	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2762		3422
2763	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3423	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2764	if $x + $self->{w} > $::WIDTH;	3424	if $x + $self->{w} > $self->{root}{w};
2765		3425
2766	$self->move_abs ($x, $y);	3426	$self->move_abs ($x, $y);
		3427	} else {
		3428	$self->hide;
		3429	}
2767	});	3430	});
2768	}	3431	}
2769		3432
2770	sub _draw {	3433	sub _draw {
2771	my ($self) = @_;	3434	my ($self) = @_;
…		…
2795	$self->SUPER::_draw;	3458	$self->SUPER::_draw;
2796	}	3459	}
2797		3460
2798	#############################################################################	3461	#############################################################################
2799		3462
2800	package CFClient::UI::Face;	3463	package CFPlus::UI::Face;
2801		3464
2802	our @ISA = CFClient::UI::Base::;	3465	our @ISA = CFPlus::UI::DrawBG::;
2803		3466
2804	use CFClient::OpenGL;	3467	use CFPlus::OpenGL;
2805		3468
2806	sub new {	3469	sub new {
2807	my $class = shift;	3470	my $class = shift;
2808		3471
2809	my $self = $class->SUPER::new (	3472	my $self = $class->SUPER::new (
		3473	size_w => 32,
		3474	size_h => 8,
2810	aspect => 1,	3475	aspect => 1,
2811	can_events => 0,	3476	can_events => 0,
2812	@_,	3477	@_,
2813	);	3478	);
2814		3479
2815	if ($self->{anim} && $self->{animspeed}) {	3480	if ($self->{anim} && $self->{animspeed}) {
2816	Scalar::Util::weaken (my $widget = $self);	3481	CFPlus::weaken (my $widget = $self);
2817		3482
2818	$self->{timer} = Event->timer (	3483	$self->{timer} = Event->timer (
2819	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3484	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2820	hard => 1,	3485	hard => 1,
2821	interval => $self->{animspeed},	3486	interval => $self->{animspeed},
2822	cb => sub {	3487	cb => sub {
		3488	return unless $::CONN;
		3489
2823	++$widget->{frame};	3490	++$widget->{frame};
		3491	$self->update_face;
2824	$widget->update;	3492	$self->update;
2825	},	3493	},
2826	);	3494	);
		3495
		3496	$self->update_face;
2827	}	3497	}
2828		3498
2829	$self	3499	$self
2830	}	3500	}
2831		3501
		3502	sub update_face {
		3503	my ($self) = @_;
		3504
		3505	return unless $::CONN;
		3506
		3507	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3508	if ($anim && @$anim) {
		3509	delete $self->{wait_face};
		3510	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3511	}
		3512	}
		3513	}
		3514
2832	sub size_request {	3515	sub size_request {
2833	(32, 8)	3516	my ($self) = @_;
		3517
		3518	if ($::CONN) {
		3519	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3520	if (my $tex = $::CONN->{texture}[$faceid]) {
		3521	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3522	} else {
		3523	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3524	$self->realloc;
		3525	});
		3526	}
		3527	}
		3528	}
		3529
		3530	($self->{size_w} || 8, $self->{size_h} || 8)
2834	}	3531	}
2835		3532
2836	sub update {	3533	sub update {
2837	my ($self) = @_;	3534	my ($self) = @_;
2838		3535
…		…
2844	sub _draw {	3541	sub _draw {
2845	my ($self) = @_;	3542	my ($self) = @_;
2846		3543
2847	return unless $::CONN;	3544	return unless $::CONN;
2848		3545
2849	my $face;	3546	$self->SUPER::_draw;
2850		3547
2851	if ($self->{frame}) {
2852	my $anim = $::CONN->{anim}[$self->{anim}];	3548	my $faceid = $::CONN->{faceid}[$self->{face}]
2853		3549	or return;
2854	$face = $anim->[ $self->{frame} % @$anim ]
2855	if $anim && @$anim;
2856	}
2857		3550
2858	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3551	my $tex = $::CONN->{texture}[$faceid];
2859		3552
2860	if ($tex) {	3553	if ($tex) {
2861	glEnable GL_TEXTURE_2D;	3554	glEnable GL_TEXTURE_2D;
2862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3555	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2863	glColor 1, 1, 1, 1;	3556	glColor 0, 0, 0, 1;
2864	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3557	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2865	glDisable GL_TEXTURE_2D;	3558	glDisable GL_TEXTURE_2D;
2866	}	3559	}
2867	}	3560	}
2868		3561
2869	sub DESTROY {	3562	sub destroy {
2870	my ($self) = @_;	3563	my ($self) = @_;
2871		3564
2872	$self->{timer}->cancel	3565	$self->{timer}->cancel
2873	if $self->{timer};	3566	if $self->{timer};
2874		3567
2875	$self->SUPER::DESTROY;	3568	$self->SUPER::destroy;
2876	}	3569	}
2877		3570
2878	#############################################################################	3571	#############################################################################
2879		3572
2880	package CFClient::UI::Buttonbar;	3573	package CFPlus::UI::Buttonbar;
2881		3574
2882	our @ISA = CFClient::UI::HBox::;	3575	our @ISA = CFPlus::UI::HBox::;
2883		3576
2884	# TODO: should actualyl wrap buttons and other goodies.	3577	# TODO: should actually wrap buttons and other goodies.
2885		3578
2886	#############################################################################	3579	#############################################################################
2887		3580
2888	package CFClient::UI::Menu;	3581	package CFPlus::UI::Menu;
2889		3582
2890	our @ISA = CFClient::UI::FancyFrame::;	3583	our @ISA = CFPlus::UI::Toplevel::;
2891		3584
2892	use CFClient::OpenGL;	3585	use CFPlus::OpenGL;
2893		3586
2894	sub new {	3587	sub new {
2895	my $class = shift;	3588	my $class = shift;
2896		3589
2897	my $self = $class->SUPER::new (	3590	my $self = $class->SUPER::new (
2898	items => [],	3591	items => [],
2899	z => 100,	3592	z => 100,
2900	@_,	3593	@_,
2901	);	3594	);
2902		3595
2903	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3596	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2904		3597
2905	for my $item (@{ $self->{items} }) {	3598	for my $item (@{ $self->{items} }) {
2906	my ($widget, $cb) = @$item;	3599	my ($widget, $cb, $tooltip) = @$item;
2907		3600
2908	# handle various types of items, only text for now	3601	# handle various types of items, only text for now
2909	if (!ref $widget) {	3602	if (!ref $widget) {
		3603	if ($widget =~ /\t/) {
		3604	my ($left, $right) = split /\t/, $widget, 2;
		3605
2910	$widget = new CFClient::UI::Label	3606	$widget = new CFPlus::UI::HBox
2911	can_hover => 1,	3607	can_hover => 1,
2912	can_events => 1,	3608	can_events => 1,
		3609	tooltip => $tooltip,
		3610	children => [
		3611	(new CFPlus::UI::Label markup => $left, expand => 1),
		3612	(new CFPlus::UI::Label markup => $right, align => +1),
		3613	],
		3614	;
		3615
		3616	} else {
		3617	$widget = new CFPlus::UI::Label
		3618	can_hover => 1,
		3619	can_events => 1,
2913	text => $widget;	3620	markup => $widget,
		3621	tooltip => $tooltip;
		3622	}
2914	}	3623	}
2915		3624
2916	$self->{item}{$widget} = $item;	3625	$self->{item}{$widget} = $item;
2917		3626
2918	$self->{vbox}->add ($widget);	3627	$self->{vbox}->add ($widget);
…		…
2923		3632
2924	# popup given the event (must be a mouse button down event currently)	3633	# popup given the event (must be a mouse button down event currently)
2925	sub popup {	3634	sub popup {
2926	my ($self, $ev) = @_;	3635	my ($self, $ev) = @_;
2927		3636
2928	$self->_emit ("popdown");	3637	$self->emit ("popdown");
2929		3638
2930	# maybe save $GRAB? must be careful about events...	3639	# maybe save $GRAB? must be careful about events...
2931	$GRAB = $self;	3640	$GRAB = $self;
2932	$self->{button} = $ev->{button};	3641	$self->{button} = $ev->{button};
2933		3642
2934	$self->show;	3643	$self->show;
2935	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3644	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2936	}	3645	}
2937		3646
2938	sub mouse_motion {	3647	sub invoke_mouse_motion {
2939	my ($self, $ev, $x, $y) = @_;	3648	my ($self, $ev, $x, $y) = @_;
2940		3649
2941	# TODO: should use vbox->find_widget or so	3650	# TODO: should use vbox->find_widget or so
2942	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3651	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2943	$self->{hover} = $self->{item}{$HOVER};	3652	$self->{hover} = $self->{item}{$HOVER};
2944		3653
2945	0	3654	0
2946	}	3655	}
2947		3656
2948	sub button_up {	3657	sub invoke_button_up {
2949	my ($self, $ev, $x, $y) = @_;	3658	my ($self, $ev, $x, $y) = @_;
2950		3659
2951	if ($ev->{button} == $self->{button}) {	3660	if ($ev->{button} == $self->{button}) {
2952	undef $GRAB;	3661	undef $GRAB;
2953	$self->hide;	3662	$self->hide;
2954		3663
2955	$self->_emit ("popdown");	3664	$self->emit ("popdown");
2956	$self->{hover}[1]->() if $self->{hover};	3665	$self->{hover}[1]->() if $self->{hover};
2957	} else {	3666	} else {
2958	return 0	3667	return 0
2959	}	3668	}
2960		3669
2961	1	3670	1
2962	}	3671	}
2963		3672
2964	#############################################################################	3673	#############################################################################
2965		3674
2966	package CFClient::UI::Multiplexer;	3675	package CFPlus::UI::Multiplexer;
2967		3676
2968	our @ISA = CFClient::UI::Container::;	3677	our @ISA = CFPlus::UI::Container::;
2969		3678
2970	sub new {	3679	sub new {
2971	my $class = shift;	3680	my $class = shift;
2972		3681
2973	my $self = $class->SUPER::new (	3682	my $self = $class->SUPER::new (
…		…
2987		3696
2988	$self->{current} = $self->{children}[0]	3697	$self->{current} = $self->{children}[0]
2989	if @{ $self->{children} };	3698	if @{ $self->{children} };
2990	}	3699	}
2991		3700
		3701	sub get_current_page {
		3702	my ($self) = @_;
		3703
		3704	$self->{current}
		3705	}
		3706
2992	sub set_current_page {	3707	sub set_current_page {
2993	my ($self, $page_or_widget) = @_;	3708	my ($self, $page_or_widget) = @_;
2994		3709
2995	my $widget = ref $page_or_widget	3710	my $widget = ref $page_or_widget
2996	? $page_or_widget	3711	? $page_or_widget
2997	: $self->{children}[$page_or_widget];	3712	: $self->{children}[$page_or_widget];
2998		3713
2999	$self->{current} = $widget;	3714	$self->{current} = $widget;
3000	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3715	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3001		3716
3002	$self->_emit (page_changed => $self->{current});	3717	$self->emit (page_changed => $self->{current});
3003		3718
3004	$self->realloc;	3719	$self->realloc;
3005	}	3720	}
3006		3721
3007	sub visible_children {	3722	sub visible_children {
…		…
3012	my ($self) = @_;	3727	my ($self) = @_;
3013		3728
3014	$self->{current}->size_request	3729	$self->{current}->size_request
3015	}	3730	}
3016		3731
3017	sub size_allocate {	3732	sub invoke_size_allocate {
3018	my ($self, $w, $h) = @_;	3733	my ($self, $w, $h) = @_;
3019		3734
3020	$self->{current}->configure (0, 0, $w, $h);	3735	$self->{current}->configure (0, 0, $w, $h);
		3736
		3737	1
3021	}	3738	}
3022		3739
3023	sub _draw {	3740	sub _draw {
3024	my ($self) = @_;	3741	my ($self) = @_;
3025		3742
3026	$self->{current}->draw;	3743	$self->{current}->draw;
3027	}	3744	}
3028		3745
3029	#############################################################################	3746	#############################################################################
3030		3747
3031	package CFClient::UI::Notebook;	3748	package CFPlus::UI::Notebook;
3032		3749
3033	our @ISA = CFClient::UI::VBox::;	3750	our @ISA = CFPlus::UI::VBox::;
3034		3751
3035	sub new {	3752	sub new {
3036	my $class = shift;	3753	my $class = shift;
3037		3754
3038	my $self = $class->SUPER::new (	3755	my $self = $class->SUPER::new (
3039	buttonbar => (new CFClient::UI::Buttonbar),	3756	buttonbar => (new CFPlus::UI::Buttonbar),
3040	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3757	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3041	# filter => # will be put between multiplexer and $self	3758	# filter => # will be put between multiplexer and $self
3042	@_,	3759	@_,
3043	);	3760	);
3044		3761
3045	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3762	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3049	}	3766	}
3050		3767
3051	sub add {	3768	sub add {
3052	my ($self, $title, $widget, $tooltip) = @_;	3769	my ($self, $title, $widget, $tooltip) = @_;
3053		3770
3054	Scalar::Util::weaken $self;	3771	CFPlus::weaken $self;
3055		3772
3056	$self->{buttonbar}->add (new CFClient::UI::Button	3773	$self->{buttonbar}->add (new CFPlus::UI::Button
3057	markup => $title,	3774	markup => $title,
3058	tooltip => $tooltip,	3775	tooltip => $tooltip,
3059	on_activate => sub { $self->set_current_page ($widget) },	3776	on_activate => sub { $self->set_current_page ($widget) },
3060	);	3777	);
3061		3778
3062	$self->{multiplexer}->add ($widget);	3779	$self->{multiplexer}->add ($widget);
3063	}	3780	}
3064		3781
		3782	sub get_current_page {
		3783	my ($self) = @_;
		3784
		3785	$self->{multiplexer}->get_current_page
		3786	}
		3787
3065	sub set_current_page {	3788	sub set_current_page {
3066	my ($self, $page) = @_;	3789	my ($self, $page) = @_;
3067		3790
3068	$self->{multiplexer}->set_current_page ($page);	3791	$self->{multiplexer}->set_current_page ($page);
3069	$self->_emit (page_changed => $self->{multiplexer}{current});	3792	$self->emit (page_changed => $self->{multiplexer}{current});
3070	}	3793	}
3071		3794
3072	#############################################################################	3795	#############################################################################
3073		3796
3074	package CFClient::UI::Statusbox;	3797	package CFPlus::UI::Selector;
3075		3798
		3799	use utf8;
		3800
3076	our @ISA = CFClient::UI::VBox::;	3801	our @ISA = CFPlus::UI::Button::;
3077		3802
3078	sub new {	3803	sub new {
3079	my $class = shift;	3804	my $class = shift;
3080		3805
3081	$class->SUPER::new (	3806	my $self = $class->SUPER::new (
		3807	options => [], # [value, title, longdesc], ...
		3808	value => undef,
		3809	@_,
		3810	);
		3811
		3812	$self->_set_value ($self->{value});
		3813
		3814	$self
		3815	}
		3816
		3817	sub invoke_button_down {
		3818	my ($self, $ev) = @_;
		3819
		3820	my @menu_items;
		3821
		3822	for (@{ $self->{options} }) {
		3823	my ($value, $title, $tooltip) = @$_;
		3824
		3825	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3826	}
		3827
		3828	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3829	}
		3830
		3831	sub _set_value {
		3832	my ($self, $value) = @_;
		3833
		3834	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3835	or return;
		3836
		3837	$self->{value} = $item->[0];
		3838	$self->set_markup ("$item->[1] ⇓");
		3839	$self->set_tooltip ($item->[2]);
		3840	}
		3841
		3842	sub set_value {
		3843	my ($self, $value) = @_;
		3844
		3845	return unless $self->{value} ne $value;
		3846
		3847	$self->_set_value ($value);
		3848	$self->emit (changed => $value);
		3849	}
		3850
		3851	#############################################################################
		3852
		3853	package CFPlus::UI::Statusbox;
		3854
		3855	our @ISA = CFPlus::UI::VBox::;
		3856
		3857	sub new {
		3858	my $class = shift;
		3859
		3860	my $self = $class->SUPER::new (
3082	fontsize => 0.8,	3861	fontsize => 0.8,
3083	@_,	3862	@_,
3084	)	3863	);
		3864
		3865	CFPlus::weaken (my $this = $self);
		3866
		3867	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3868
		3869	$self
3085	}	3870	}
3086		3871
3087	sub reorder {	3872	sub reorder {
3088	my ($self) = @_;	3873	my ($self) = @_;
3089	my $NOW = time;	3874	my $NOW = Time::HiRes::time;
		3875
		3876	# freeze display when hovering over any label
		3877	return if $CFPlus::UI::TOOLTIP->{owner}
		3878	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
		3879	values %{ $self->{item} };
3090		3880
3091	while (my ($k, $v) = each %{ $self->{item} }) {	3881	while (my ($k, $v) = each %{ $self->{item} }) {
3092	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3882	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3093	}	3883	}
3094		3884
…		…
3097	my @items = sort {	3887	my @items = sort {
3098	$a->{pri} <=> $b->{pri}	3888	$a->{pri} <=> $b->{pri}
3099	or $b->{id} <=> $a->{id}	3889	or $b->{id} <=> $a->{id}
3100	} values %{ $self->{item} };	3890	} values %{ $self->{item} };
3101		3891
		3892	$self->{timer}->interval (1);
		3893
3102	my $count = 10 + 1;	3894	my $count = 10 + 1;
3103	for my $item (@items) {	3895	for my $item (@items) {
3104	last unless --$count;	3896	last unless --$count;
3105		3897
3106	push @widgets, $item->{label} ||= do {	3898	my $label = $item->{label} ||= do {
3107	# TODO: doesn't handle markup well (read as: at all)	3899	# TODO: doesn't handle markup well (read as: at all)
3108	my $short = $item->{count} > 1	3900	my $short = $item->{count} > 1
3109	? "<b>$item->{count} ×</b> $item->{text}"	3901	? "<b>$item->{count} ×</b> $item->{text}"
3110	: $item->{text};	3902	: $item->{text};
3111		3903
3112	for ($short) {	3904	for ($short) {
3113	s/^\s+//;	3905	s/^\s+//;
3114	s/\s+/ /g;	3906	s/\s+/ /g;
3115	}	3907	}
3116		3908
3117	new CFClient::UI::Label	3909	new CFPlus::UI::Label
3118	markup => $short,	3910	markup => $short,
3119	tooltip => $item->{tooltip},	3911	tooltip => $item->{tooltip},
3120	tooltip_font => $::FONT_PROP,	3912	tooltip_font => $::FONT_PROP,
3121	tooltip_width => 0.67,	3913	tooltip_width => 0.67,
3122	fontsize => $item->{fontsize} || $self->{fontsize},	3914	fontsize => $item->{fontsize} || $self->{fontsize},
3123	max_w => $::WIDTH * 0.44,	3915	max_w => $::WIDTH * 0.44,
3124	fg => $item->{fg},	3916	fg => [@{ $item->{fg} }],
3125	can_events => 1,	3917	can_events => 1,
3126	can_hover => 1	3918	can_hover => 1
3127	};	3919	};
		3920
		3921	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3922	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3923	$label->update;
		3924	$label->set_max_size (undef, $label->{req_h} * $diff)
		3925	if $diff < 1;
		3926	$self->{timer}->interval (1/30);
		3927	} else {
		3928	$label->{fg}[3] = $item->{fg}[3] || 1;
		3929	}
		3930
		3931	push @widgets, $label;
3128	}	3932	}
3129		3933
3130	$self->clear;	3934	$self->clear;
3131	$self->SUPER::add (reverse @widgets);	3935	$self->SUPER::add (reverse @widgets);
3132	}	3936	}
…		…
3137	$text =~ s/^\s+//;	3941	$text =~ s/^\s+//;
3138	$text =~ s/\s+$//;	3942	$text =~ s/\s+$//;
3139		3943
3140	return unless $text;	3944	return unless $text;
3141		3945
3142	my $timeout = time + ((delete $arg{timeout}) || 60);	3946	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3143		3947
3144	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3948	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3145		3949
3146	if (my $item = $self->{item}{$group}) {	3950	if (my $item = $self->{item}{$group}) {
3147	if ($item->{text} eq $text) {	3951	if ($item->{text} eq $text) {
3148	$item->{count}++;	3952	$item->{count}++;
3149	} else {	3953	} else {
3150	$item->{count} = 1;	3954	$item->{count} = 1;
3151	$item->{text} = $item->{tooltip} = $text;	3955	$item->{text} = $item->{tooltip} = $text;
3152	}	3956	}
3153	$item->{id} = ++$self->{id};	3957	$item->{id} += 0.2;#d#
3154	$item->{timeout} = $timeout;	3958	$item->{timeout} = $timeout;
3155	delete $item->{label};	3959	delete $item->{label};
3156	} else {	3960	} else {
3157	$self->{item}{$group} = {	3961	$self->{item}{$group} = {
3158	id => ++$self->{id},	3962	id => ++$self->{id},
…		…
3164	count => 1,	3968	count => 1,
3165	%arg,	3969	%arg,
3166	};	3970	};
3167	}	3971	}
3168		3972
		3973	$ROOT->on_refresh (reorder => sub {
3169	$self->reorder;	3974	$self->reorder;
		3975	});
3170	}	3976	}
3171		3977
3172	sub reconfigure {	3978	sub reconfigure {
3173	my ($self) = @_;	3979	my ($self) = @_;
3174		3980
…		…
3177		3983
3178	$self->reorder;	3984	$self->reorder;
3179	$self->SUPER::reconfigure;	3985	$self->SUPER::reconfigure;
3180	}	3986	}
3181		3987
		3988	sub destroy {
		3989	my ($self) = @_;
		3990
		3991	$self->{timer}->cancel;
		3992
		3993	$self->SUPER::destroy;
		3994	}
		3995
3182	#############################################################################	3996	#############################################################################
3183		3997
3184	package CFClient::UI::Inventory;
3185
3186	our @ISA = CFClient::UI::ScrolledWindow::;
3187
3188	sub new {
3189	my $class = shift;
3190
3191	my $self = $class->SUPER::new (
3192	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3193	@_,
3194	);
3195
3196	$self
3197	}
3198
3199	sub set_items {
3200	my ($self, $items) = @_;
3201
3202	$self->{child}->clear;
3203	return unless $items;
3204
3205	my @items = sort {
3206	($a->{type} <=> $b->{type})
3207	or ($a->{name} cmp $b->{name})
3208	} @$items;
3209
3210	$self->{real_items} = \@items;
3211
3212	my $row = 0;
3213	for my $item (@items) {
3214	CFClient::Item::update_widgets $item;
3215
3216	$self->{child}->add (0, $row, $item->{face_widget});
3217	$self->{child}->add (1, $row, $item->{desc_widget});
3218	$self->{child}->add (2, $row, $item->{weight_widget});
3219
3220	$row++;
3221	}
3222	}
3223
3224	#############################################################################
3225
3226	package CFClient::UI::BindEditor;
3227
3228	our @ISA = CFClient::UI::FancyFrame::;
3229
3230	sub new {
3231	my $class = shift;
3232
3233	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3234
3235	$self->add (my $vb = new CFClient::UI::VBox);
3236
3237
3238	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3239	text => "start recording",
3240	tooltip => "Start/Stops recording of actions."
3241	."All subsequent actions after the recording started will be captured."
3242	."The actions are displayed after the record was stopped."
3243	."To bind the action you have to click on the 'Bind' button",
3244	on_activate => sub {
3245	unless ($self->{recording}) {
3246	$self->start;
3247	} else {
3248	$self->stop;
3249	}
3250	});
3251
3252	$vb->add (new CFClient::UI::Label text => "Actions:");
3253	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3254
3255	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3256	$vb->add (my $hb = new CFClient::UI::HBox);
3257	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3258	$hb->add (new CFClient::UI::Button
3259	text => "bind",
3260	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3261	on_activate => sub {
3262	$self->ask_for_bind;
3263	});
3264
3265	$vb->add (my $hb = new CFClient::UI::HBox);
3266	$hb->add (new CFClient::UI::Button
3267	text => "ok",
3268	expand => 1,
3269	tooltip => "This closes the binding editor and saves the binding",
3270	on_activate => sub {
3271	$self->hide;
3272	$self->commit;
3273	});
3274
3275	$hb->add (new CFClient::UI::Button
3276	text => "cancel",
3277	expand => 1,
3278	tooltip => "This closes the binding editor without saving",
3279	on_activate => sub {
3280	$self->hide;
3281	$self->{binding_cancel}->()
3282	if $self->{binding_cancel};
3283	});
3284
3285	$self->update_binding_widgets;
3286
3287	$self
3288	}
3289
3290	sub commit {
3291	my ($self) = @_;
3292	my ($mod, $sym, $cmds) = $self->get_binding;
3293	if ($sym != 0 && @$cmds > 0) {
3294	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3295	."'. Don't forget 'Save Config'!");
3296	$self->{binding_change}->($mod, $sym, $cmds)
3297	if $self->{binding_change};
3298	} else {
3299	$::STATUSBOX->add ("No action bound, no key or action specified!");
3300	$self->{binding_cancel}->()
3301	if $self->{binding_cancel};
3302	}
3303	}
3304
3305	sub start {
3306	my ($self) = @_;
3307
3308	$self->{rec_btn}->set_text ("stop recording");
3309	$self->{recording} = 1;
3310	$self->clear_command_list;
3311	$::CONN->start_record if $::CONN;
3312	}
3313
3314	sub stop {
3315	my ($self) = @_;
3316
3317	$self->{rec_btn}->set_text ("start recording");
3318	$self->{recording} = 0;
3319
3320	my $rec;
3321	$rec = $::CONN->stop_record if $::CONN;
3322	return unless ref $rec eq 'ARRAY';
3323	$self->set_command_list ($rec);
3324	}
3325
3326
3327	sub ask_for_bind_and_commit {
3328	my ($self) = @_;
3329	$self->ask_for_bind (1);
3330	}
3331
3332	sub ask_for_bind {
3333	my ($self, $commit) = @_;
3334
3335	CFClient::Binder::open_binding_dialog (sub {
3336	my ($mod, $sym) = @_;
3337	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3338	$self->update_binding_widgets;
3339	$self->commit if $commit;
3340	});
3341	}
3342
3343	# $mod and $sym are the modifiers and key symbol
3344	# $cmds is a array ref of strings (the commands)
3345	# $cb is the callback that is executed on OK
3346	# $ccb is the callback that is executed on CANCEL and
3347	# when the binding was unsuccessful on OK
3348	sub set_binding {
3349	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3350
3351	$self->clear_command_list;
3352	$self->{recording} = 0;
3353	$self->{rec_btn}->set_text ("start recording");
3354
3355	$self->{binding} = [$mod, $sym];
3356	$self->{commands} = $cmds;
3357
3358	$self->{binding_change} = $cb;
3359	$self->{binding_cancel} = $ccb;
3360
3361	$self->update_binding_widgets;
3362	}
3363
3364	# this is a shortcut method that asks for a binding
3365	# and then just binds it.
3366	sub do_quick_binding {
3367	my ($self, $cmds) = @_;
3368	$self->set_binding (undef, undef, $cmds, sub {
3369	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3370	});
3371	$self->ask_for_bind (1);
3372	}
3373
3374	sub update_binding_widgets {
3375	my ($self) = @_;
3376	my ($mod, $sym, $cmds) = $self->get_binding;
3377	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3378	$self->set_command_list ($cmds);
3379	}
3380
3381	sub get_binding {
3382	my ($self) = @_;
3383	return (
3384	$self->{binding}->[0],
3385	$self->{binding}->[1],
3386	[ grep { defined $_ } @{$self->{commands}} ]
3387	);
3388	}
3389
3390	sub clear_command_list {
3391	my ($self) = @_;
3392	$self->{cmdbox}->clear ();
3393	}
3394
3395	sub set_command_list {
3396	my ($self, $cmds) = @_;
3397
3398	$self->{cmdbox}->clear ();
3399	$self->{commands} = $cmds;
3400
3401	my $idx = 0;
3402
3403	for (@$cmds) {
3404	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3405
3406	my $i = $idx;
3407	$hb->add (new CFClient::UI::Label text => $_);
3408	$hb->add (new CFClient::UI::Button
3409	text => "delete",
3410	tooltip => "Deletes the action from the record",
3411	on_activate => sub {
3412	$self->{cmdbox}->remove ($hb);
3413	$cmds->[$i] = undef;
3414	});
3415
3416
3417	$idx++
3418	}
3419	}
3420
3421	#############################################################################
3422
3423	package CFClient::UI::SpellList;
3424
3425	our @ISA = CFClient::UI::Table::;
3426
3427	sub new {
3428	my $class = shift;
3429
3430	my $self = $class->SUPER::new (
3431	binding => [],
3432	commands => [],
3433	@_,
3434	)
3435	}
3436
3437	# XXX: Do sorting? Argl...
3438	sub add_spell {
3439	my ($self, $spell) = @_;
3440	$self->{spells}->{$spell->{name}} = $spell;
3441
3442	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3443	face => $spell->{face},
3444	can_hover => 1,
3445	can_events => 1,
3446	tooltip => $spell->{message});
3447
3448	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3449	text => $spell->{name},
3450	can_hover => 1,
3451	can_events => 1,
3452	tooltip => $spell->{message},
3453	expand => 1);
3454
3455	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3456	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3457	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3458	expand => 1);
3459
3460	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3461	text => "bind to key",
3462	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3463	}
3464
3465	sub rebuild_spell_list {
3466	my ($self) = @_;
3467	$self->{tbl_idx} = 0;
3468	$self->add_spell ($_) for values %{$self->{spells}};
3469	}
3470
3471	sub remove_spell {
3472	my ($self, $spell) = @_;
3473	delete $self->{spells}->{$spell->{name}};
3474	$self->rebuild_spell_list;
3475	}
3476
3477	#############################################################################
3478
3479	package CFClient::UI::Root;	3998	package CFPlus::UI::Root;
3480		3999
3481	our @ISA = CFClient::UI::Container::;	4000	our @ISA = CFPlus::UI::Container::;
3482		4001
		4002	use List::Util qw(min max);
		4003
3483	use CFClient::OpenGL;	4004	use CFPlus::OpenGL;
3484		4005
3485	sub new {	4006	sub new {
3486	my $class = shift;	4007	my $class = shift;
3487		4008
3488	my $self = $class->SUPER::new (	4009	my $self = $class->SUPER::new (
3489	visible => 1,	4010	visible => 1,
3490	@_,	4011	@_,
3491	);	4012	);
3492		4013
3493	Scalar::Util::weaken ($self->{root} = $self);	4014	CFPlus::weaken ($self->{root} = $self);
3494		4015
3495	$self	4016	$self
3496	}	4017	}
3497		4018
3498	sub size_request {	4019	sub size_request {
…		…
3513	$coord = $max - $size if $coord > $max - $size;	4034	$coord = $max - $size if $coord > $max - $size;
3514		4035
3515	int $coord + 0.5	4036	int $coord + 0.5
3516	}	4037	}
3517		4038
3518	sub size_allocate {	4039	sub invoke_size_allocate {
3519	my ($self, $w, $h) = @_;	4040	my ($self, $w, $h) = @_;
3520		4041
3521	for my $child ($self->children) {	4042	for my $child ($self->children) {
3522	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	4043	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3523		4044
…		…
3527	$X = _to_pixel $X, $W, $self->{w};	4048	$X = _to_pixel $X, $W, $self->{w};
3528	$Y = _to_pixel $Y, $H, $self->{h};	4049	$Y = _to_pixel $Y, $H, $self->{h};
3529		4050
3530	$child->configure ($X, $Y, $W, $H);	4051	$child->configure ($X, $Y, $W, $H);
3531	}	4052	}
		4053
		4054	1
3532	}	4055	}
3533		4056
3534	sub coord2local {	4057	sub coord2local {
3535	my ($self, $x, $y) = @_;	4058	my ($self, $x, $y) = @_;
3536		4059
…		…
3621		4144
3622	delete $queue{$widget+0};	4145	delete $queue{$widget+0};
3623		4146
3624	my ($w, $h) = $widget->size_request;	4147	my ($w, $h) = $widget->size_request;
3625		4148
3626	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	4149	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	4150	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		4151
		4152	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4153	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3628		4154
3629	$w = $widget->{force_w} if exists $widget->{force_w};	4155	$w = $widget->{force_w} if exists $widget->{force_w};
3630	$h = $widget->{force_h} if exists $widget->{force_h};	4156	$h = $widget->{force_h} if exists $widget->{force_h};
3631		4157
3632	if ($widget->{req_w} != $w || $widget->{req_h} != $h	4158	if ($widget->{req_w} != $w || $widget->{req_h} != $h
…		…
3658		4184
3659	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4185	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3660		4186
3661	$w = 0 if $w < 0;	4187	$w = 0 if $w < 0;
3662	$h = 0 if $h < 0;	4188	$h = 0 if $h < 0;
		4189
		4190	$w = max $widget->{min_w}, $w;
		4191	$h = max $widget->{min_h}, $h;
		4192
		4193	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4194	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4195
		4196	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4197	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3663		4198
3664	$w = int $w + 0.5;	4199	$w = int $w + 0.5;
3665	$h = int $h + 0.5;	4200	$h = int $h + 0.5;
3666		4201
3667	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4202	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
…		…
3691	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4226	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3692	glMatrixMode GL_MODELVIEW;	4227	glMatrixMode GL_MODELVIEW;
3693	glLoadIdentity;	4228	glLoadIdentity;
3694		4229
3695	{	4230	{
3696	package CFClient::UI::Base;	4231	package CFPlus::UI::Base;
3697		4232
3698	($draw_x, $draw_y, $draw_w, $draw_h) =	4233	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3699	(0, 0, $self->{w}, $self->{h});	4234	(0, 0, $self->{w}, $self->{h});
3700	}
3701		4235
3702	$self->_draw;	4236	$self->_draw;
		4237	}
3703	}	4238	}
3704		4239
3705	#############################################################################	4240	#############################################################################
3706		4241
3707	package CFClient::UI;	4242	package CFPlus::UI;
3708		4243
3709	$ROOT = new CFClient::UI::Root;	4244	$ROOT = new CFPlus::UI::Root;
3710	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4245	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3711		4246
3712	1	4247	1
3713		4248

Diff Legend

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