ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC vs.
Revision 1.381 by root, Thu Jul 19 13:45:18 2007 UTC

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

Diff Legend

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