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

Diff Legend

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