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.216 by root, Fri May 19 16:43:57 2006 UTC vs.
Revision 1.249 by root, Sun May 28 01:40:02 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
		20
		21	sub get_layout {
		22	for (grep { $_->{name} } values %WIDGET) {
		23	$LAYOUT->{$_->{name}} = {
		24	x => $_->{x} / $::WIDTH,
		25	y => $_->{y} / $::HEIGHT,
		26	w => $_->{w} / $::WIDTH,
		27	h => $_->{h} / $::HEIGHT
		28	};
		29	}
		30
		31	return $LAYOUT;
		32	}
		33
		34	sub set_layout {
		35	my ($layout) = @_;
		36	$LAYOUT = $layout;
		37	}
18		38
19	sub check_tooltip {	39	sub check_tooltip {
20	if (!$GRAB) {	40	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
50	delete $TOOLTIP->{owner};	70	delete $TOOLTIP->{owner};
51	}	71	}
52		72
53	# class methods for events	73	# class methods for events
54	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	75	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	76	if $FOCUS;
57	}	77	}
58		78
59	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	80	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	81	if $FOCUS;
62	}	82	}
63		83
64	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	85	my ($ev) = @_;
…		…
74	check_tooltip;	94	check_tooltip;
75	}	95	}
76		96
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		98
79	if ($GRAB) {	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	100	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	101	}
84		102
85	sub feed_sdl_button_up_event {	103	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	104	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	105	my ($x, $y) = ($ev->{x}, $ev->{y});
88		106
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		108
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		110
93	if ($GRAB) {	111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	112	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		113
98	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	116	$grab->update if $grab;
101	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		134
119	check_tooltip;	135	check_tooltip;
120	}	136	}
121		137
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	139	if $HOVER;
126	}	140	}
127		141
128	# convert position array to integers	142	# convert position array to integers
129	sub harmonize {	143	sub harmonize {
130	my ($vals) = @_;	144	my ($vals) = @_;
…		…
136	$rem += $_ - $i;	150	$rem += $_ - $i;
137	$_ = $i;	151	$_ = $i;
138	}	152	}
139	}	153	}
140		154
		155	sub full_refresh {
		156	# make a copy, otherwise for complains about freed values.
		157	my @widgets = values %WIDGET;
		158
		159	$_->update
		160	for @widgets;
		161	}
		162
		163	sub reconfigure_widgets {
		164	# make a copy, otherwise C<for> complains about freed values.
		165	my @widgets = values %WIDGET;
		166
		167	$_->reconfigure
		168	for @widgets;
		169	}
		170
141	# call when resolution changes etc.	171	# call when resolution changes etc.
142	sub rescale_widgets {	172	sub rescale_widgets {
143	my ($sx, $sy) = @_;	173	my ($sx, $sy) = @_;
144		174
145	# make a copy, otherwise for complains about freed values.
146	my @widgets = values %WIDGET;	175	for my $widget (values %WIDGET) {
147
148	for my $widget (@widgets) {
149	if ($widget->{toplevel}) {	176	if ($widget->{is_toplevel}) {
150	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
151	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
153	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	180	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
155	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	181	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	182	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
157	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
158	}	183	}
159
160	$widget->reconfigure;
161	}	184	}
		185
		186	reconfigure_widgets;
162	}	187	}
163		188
164	#############################################################################	189	#############################################################################
165		190
166	package CFClient::UI::Base;	191	package CFClient::UI::Base;
…		…
179	can_events => 1,	204	can_events => 1,
180	@_	205	@_
181	}, $class;	206	}, $class;
182		207
183	for (keys %$self) {	208	for (keys %$self) {
184	if (/^connect_(.*)$/) {	209	if (/^on_(.*)$/) {
185	$self->connect ($1 => delete $self->{$_});	210	$self->connect ($1 => delete $self->{$_});
186	}	211	}
187	}	212	}
188		213
189	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190		215
		216	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		217	$self->{req_x} = $layout->{x} * $::WIDTH;
		218	$self->{req_y} = $layout->{y} * $::HEIGHT;
		219	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		220	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		221	}
		222
191	$self	223	$self
		224	}
		225
		226	sub toggle_visibility {
		227	my ($self) = @_;
		228
		229	if ($self->{visible}) {
		230	$self->hide;
		231	} else {
		232	$self->show;
		233	}
192	}	234	}
193		235
194	sub destroy {	236	sub destroy {
195	my ($self) = @_;	237	my ($self) = @_;
196		238
…		…
204	return if $self->{parent};	246	return if $self->{parent};
205		247
206	$CFClient::UI::ROOT->add ($self);	248	$CFClient::UI::ROOT->add ($self);
207	}	249	}
208		250
209	sub hide {	251	sub center {
210	my ($self) = @_;	252	my ($self) = @_;
		253
		254	$CFClient::UI::ROOT->on_post_alloc (
		255	"center_$self" => sub {
		256	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
		257	},
		258	);
		259
		260	$self->update;
		261	}
		262
		263	sub set_visible {
		264	my ($self) = @_;
		265
		266	return if $self->{visible};
		267
		268	$self->{root} = $self->{parent}{root};
		269	$self->{visible} = $self->{parent}{visible} + 1;
		270
		271	$self->emit (visibility_change => 1);
		272	}
		273
		274	sub set_invisible {
		275	my ($self) = @_;
		276
		277	return unless $self->{visible};
		278
		279	# broken show/hide model
		280
		281	delete $self->{root};
		282	delete $self->{visible};
211		283
212	undef $GRAB if $GRAB == $self;	284	undef $GRAB if $GRAB == $self;
213	undef $HOVER if $HOVER == $self;	285	undef $HOVER if $HOVER == $self;
		286
		287	CFClient::UI::check_tooltip
		288	if $CFClient::UI::TOOLTIP->{owner} == $self;
		289
		290	$self->focus_out;
		291
		292	$self->emit (visibility_change => 0);
		293	}
		294
		295	sub hide {
		296	my ($self) = @_;
		297
		298	$self->set_invisible;
214		299
215	$self->{parent}->remove ($self)	300	$self->{parent}->remove ($self)
216	if $self->{parent};	301	if $self->{parent};
217	}	302	}
218		303
…		…
227	}	312	}
228		313
229	sub set_size {	314	sub set_size {
230	my ($self, $w, $h) = @_;	315	my ($self, $w, $h) = @_;
231		316
232	$self->{user_w} = $w;	317	$self->{def_w} = $w;
233	$self->{user_h} = $h;	318	$self->{def_h} = $h;
234		319
235	$self->check_size;	320	$self->check_size;
236	}	321	}
237		322
238	sub size_request {	323	sub size_request {
…		…
288	}	373	}
289		374
290	sub set_tooltip {	375	sub set_tooltip {
291	my ($self, $tooltip) = @_;	376	my ($self, $tooltip) = @_;
292		377
		378	$tooltip =~ s/^\s+//;
		379	$tooltip =~ s/\s+$//;
		380
		381	return if $self->{tooltip} eq $tooltip;
		382
293	$self->{tooltip} = $tooltip;	383	$self->{tooltip} = $tooltip;
294		384
295	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	385	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296	delete $CFClient::UI::TOOLTIP->{owner};	386	delete $CFClient::UI::TOOLTIP->{owner};
297	CFClient::UI::check_tooltip;	387	CFClient::UI::check_tooltip;
…		…
318	return if $FOCUS == $self;	408	return if $FOCUS == $self;
319	return unless $self->{can_focus};	409	return unless $self->{can_focus};
320		410
321	my $focus = $FOCUS; $FOCUS = $self;	411	my $focus = $FOCUS; $FOCUS = $self;
322		412
323	$self->emit (focus_in => $focus);	413	$self->_emit (focus_in => $focus);
324		414
325	$focus->update if $focus;	415	$focus->update if $focus;
326	$FOCUS->update;	416	$FOCUS->update;
327	}	417	}
328		418
…		…
331		421
332	return unless $FOCUS == $self;	422	return unless $FOCUS == $self;
333		423
334	my $focus = $FOCUS; undef $FOCUS;	424	my $focus = $FOCUS; undef $FOCUS;
335		425
336	$self->emit (focus_out => $focus);	426	$self->_emit (focus_out => $focus);
337		427
338	$focus->update if $focus; #?	428	$focus->update if $focus; #?
		429
		430	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		431	unless $FOCUS;
339	}	432	}
340		433
341	sub mouse_motion { }	434	sub mouse_motion { }
342	sub button_up { }	435	sub button_up { }
343	sub key_down { }	436	sub key_down { }
344	sub key_up { }	437	sub key_up { }
345		438
346	sub button_down {	439	sub button_down {
347	my ($self, $ev, $x, $y) = @_;	440	my ($self, $ev, $x, $y) = @_;
348		441
349	$self->focus_in;	442	$self->focus_in;
…		…
383	if ($ENV{PCLIENT_DEBUG}) {	476	if ($ENV{PCLIENT_DEBUG}) {
384	glPushMatrix;	477	glPushMatrix;
385	glColor 1, 1, 0, 1;	478	glColor 1, 1, 0, 1;
386	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	479	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387	glBegin GL_LINE_LOOP;	480	glBegin GL_LINE_LOOP;
388	glVertex 0 , 0;	481	glVertex 0 , 0;
389	glVertex $self->{w}, 0;	482	glVertex $self->{w} - 1, 0;
390	glVertex $self->{w}, $self->{h};	483	glVertex $self->{w} - 1, $self->{h} - 1;
391	glVertex 0 , $self->{h};	484	glVertex 0 , $self->{h} - 1;
392	glEnd;	485	glEnd;
393	glPopMatrix;	486	glPopMatrix;
394	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	487	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
395	}	488	}
396	}	489	}
…		…
416	sub set_parent {	509	sub set_parent {
417	my ($self, $parent) = @_;	510	my ($self, $parent) = @_;
418		511
419	Scalar::Util::weaken ($self->{parent} = $parent);	512	Scalar::Util::weaken ($self->{parent} = $parent);
420		513
421	# TODO: req_w _does_change after ->reconfigure	514	$self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
		515
422	$self->check_size	516	$self->check_size;
423	unless exists $self->{req_w};
424	}	517	}
425		518
426	sub check_size {	519	sub check_size {
427	my ($self, $forced) = @_;	520	my ($self, $forced) = @_;
428		521
…		…
441	my ($self, $signal, $cb) = @_;	534	my ($self, $signal, $cb) = @_;
442		535
443	push @{ $self->{signal_cb}{$signal} }, $cb;	536	push @{ $self->{signal_cb}{$signal} }, $cb;
444	}	537	}
445		538
		539	sub _emit {
		540	my ($self, $signal, @args) = @_;
		541
		542	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		543	}
		544
446	sub emit {	545	sub emit {
447	my ($self, $signal, @args) = @_;	546	my ($self, $signal, @args) = @_;
448		547
449	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	548	$self->_emit ($signal, @args)
		549	|| $self->$signal (@args);
		550	}
		551
		552	sub visibility_change {
		553	#my ($self, $visible) = @_;
450	}	554	}
451		555
452	sub DESTROY {	556	sub DESTROY {
453	my ($self) = @_;	557	my ($self) = @_;
454		558
…		…
567	delete $child->{parent};	671	delete $child->{parent};
568	$child->hide;	672	$child->hide;
569		673
570	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	674	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571		675
572	$self->check_size;	676	$self->check_size (1);
573	$self->update;	677	$self->update;
574	}	678	}
575		679
576	sub clear {	680	sub clear {
577	my ($self) = @_;	681	my ($self) = @_;
…		…
717		821
718	package CFClient::UI::ViewPort;	822	package CFClient::UI::ViewPort;
719		823
720	our @ISA = CFClient::UI::Window::;	824	our @ISA = CFClient::UI::Window::;
721		825
		826	sub new {
		827	my $class = shift;
		828
		829	$class->SUPER::new (
		830	scroll_x => 0,
		831	scroll_y => 1,
		832	@_,
		833	)
		834	}
		835
722	sub size_request {	836	sub size_request {
723	my ($self) = @_;	837	my ($self) = @_;
724		838
725	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	839	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
726	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
727		840
728	@$self{qw(child_w child_h)}	841	$w = 10 if $self->{scroll_x};
		842	$h = 10 if $self->{scroll_y};
		843
		844	($w, $h)
729	}	845	}
730		846
731	sub size_allocate {	847	sub size_allocate {
732	my ($self, $w, $h) = @_;	848	my ($self, $w, $h) = @_;
733		849
		850	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		851	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		852
		853	$self->child->configure (0, 0, $w, $h);
734	$self->update;	854	$self->update;
735	}	855	}
736		856
737	sub set_offset {	857	sub set_offset {
738	my ($self, $x, $y) = @_;	858	my ($self, $x, $y) = @_;
…		…
789	my $class = shift;	909	my $class = shift;
790		910
791	my $self;	911	my $self;
792		912
793	my $slider = new CFClient::UI::Slider	913	my $slider = new CFClient::UI::Slider
794	vertical => 1,	914	vertical => 1,
795	range => [0, 0, 1, 0.01], # HACK fix	915	range => [0, 0, 1, 0.01], # HACK fix
796	connect_changed => sub {	916	on_changed => sub {
797	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	917	$self->{vp}->set_offset (0, $_[1]);
798	},	918	},
799	;	919	;
800		920
801	$self = $class->SUPER::new (	921	$self = $class->SUPER::new (
802	vp => (new CFClient::UI::ViewPort),	922	vp => (new CFClient::UI::ViewPort expand => 1),
803	slider => $slider,	923	slider => $slider,
804	@_,	924	@_,
805	);	925	);
806		926
807	$self->{vp}->add ($self->{scrolled});	927	$self->{vp}->add ($self->{scrolled});
808	$self->add ($self->{vp});	928	$self->add ($self->{vp});
809	$self->add ($self->{slider});	929	$self->add ($self->{slider});
810		930
811	$self	931	$self
		932	}
		933
		934	sub update {
		935	my ($self) = @_;
		936
		937	$self->SUPER::update;
		938
		939	# todo: overwrite size_allocate of child
		940	my $child = $self->{vp}->child;
		941	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		942	}
		943
		944	sub size_allocate {
		945	my ($self, $w, $h) = @_;
		946
		947	$self->SUPER::size_allocate ($w, $h);
		948
		949	my $child = $self->{vp}->child;
		950	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
812	}	951	}
813		952
814	#TODO# update range on size_allocate depending on child	953	#TODO# update range on size_allocate depending on child
815	# update viewport offset on scroll	954	# update viewport offset on scroll
816		955
…		…
867	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1006	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
868		1007
869	sub new {	1008	sub new {
870	my $class = shift;	1009	my $class = shift;
871		1010
872	# TODO: user_x, user_y, overwrite moveto?
873
874	my $self = $class->SUPER::new (	1011	my $self = $class->SUPER::new (
875	bg => [1, 1, 1, 1],	1012	bg => [1, 1, 1, 1],
876	border_bg => [1, 1, 1, 1],	1013	border_bg => [1, 1, 1, 1],
877	border => 0.6,	1014	border => 0.6,
878	toplevel => 1,	1015	is_toplevel => 1,
879	can_events => 1,	1016	can_events => 1,
880	@_	1017	@_
881	);	1018	);
882		1019
883	$self->{title} &&= new CFClient::UI::Label	1020	$self->{title} &&= new CFClient::UI::Label
884	align => 0,	1021	align => 0,
…		…
937	my ($ev, $x, $y) = @_;	1074	my ($ev, $x, $y) = @_;
938		1075
939	my $dx = $ev->{x} - $ox;	1076	my $dx = $ev->{x} - $ox;
940	my $dy = $ev->{y} - $oy;	1077	my $dy = $ev->{y} - $oy;
941		1078
		1079	$self->{user_x} = $wx + $dx * $mx;
		1080	$self->{user_y} = $wy + $dy * $my;
942	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1081	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
943	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1082	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
944	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1083	$self->move ($self->{user_x}, $self->{user_y});
945	$self->check_size;	1084	$self->check_size;
946	};	1085	};
947		1086
948	} elsif ($lr ^ $td) {	1087	} elsif ($lr ^ $td) {
949	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1088	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
952	$self->{motion} = sub {	1091	$self->{motion} = sub {
953	my ($ev, $x, $y) = @_;	1092	my ($ev, $x, $y) = @_;
954		1093
955	($x, $y) = ($ev->{x}, $ev->{y});	1094	($x, $y) = ($ev->{x}, $ev->{y});
956		1095
957	$self->move ($bx + $x - $ox, $by + $y - $oy);	1096	$self->{user_x} = $bx + $x - $ox;
		1097	$self->{user_y} = $by + $y - $oy;
		1098
		1099	$self->move ($self->{user_x}, $self->{user_y});
958	$self->update;	1100	$self->update;
959	};	1101	};
960	}	1102	}
961	}	1103	}
962		1104
…		…
1024	sub new {	1166	sub new {
1025	my $class = shift;	1167	my $class = shift;
1026		1168
1027	$class->SUPER::new (	1169	$class->SUPER::new (
1028	col_expand => [],	1170	col_expand => [],
1029	@_	1171	@_,
1030	)	1172	)
		1173	}
		1174
		1175	sub children {
		1176	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031	}	1177	}
1032		1178
1033	sub add {	1179	sub add {
1034	my ($self, $x, $y, $child) = @_;	1180	my ($self, $x, $y, $child) = @_;
1035		1181
1036	$child->set_parent ($self);	1182	$child->set_parent ($self);
1037	$self->{children}[$y][$x] = $child;	1183	$self->{children}[$y][$x] = $child;
1038		1184
1039	$child->check_size;	1185	$self->check_size (1);
1040	}	1186	}
1041		1187
1042	sub children {
1043	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044	}
1045
1046	# TODO: move to container class maybe? send childs a signal on removal?	1188	# TODO: move to container class maybe? send children a signal on removal?
1047	sub clear {	1189	sub clear {
1048	my ($self) = @_;	1190	my ($self) = @_;
1049		1191
1050	my @children = $self->children;	1192	my @children = $self->children;
1051	delete $self->{children};	1193	delete $self->{children};
…		…
1053	for (@children) {	1195	for (@children) {
1054	delete $_->{parent};	1196	delete $_->{parent};
1055	$_->hide;	1197	$_->hide;
1056	}	1198	}
1057		1199
		1200	$self->check_size (1);
1058	$self->update;	1201	$self->update;
1059	}	1202	}
1060		1203
1061	sub get_wh {	1204	sub get_wh {
1062	my ($self) = @_;	1205	my ($self) = @_;
…		…
1094	sub size_allocate {	1237	sub size_allocate {
1095	my ($self, $w, $h) = @_;	1238	my ($self, $w, $h) = @_;
1096		1239
1097	my ($ws, $hs) = $self->get_wh;	1240	my ($ws, $hs) = $self->get_wh;
1098		1241
1099	my $req_w = sum @$ws;	1242	my $req_w = (sum @$ws) || 1;
1100	my $req_h = sum @$hs;	1243	my $req_h = (sum @$hs) || 1;
1101		1244
1102	# TODO: nicer code && do row_expand	1245	# TODO: nicer code && do row_expand
1103	my @col_expand = @{$self->{col_expand}};	1246	my @col_expand = @{$self->{col_expand}};
1104	@col_expand = (1) x @$ws unless @col_expand;	1247	@col_expand = (1) x @$ws unless @col_expand;
1105	my $col_expand = (sum @col_expand) || 1;	1248	my $col_expand = (sum @col_expand) || 1;
…		…
1159	}	1302	}
1160	}	1303	}
1161		1304
1162	#############################################################################	1305	#############################################################################
1163		1306
1164	package CFClient::UI::HBox;	1307	package CFClient::UI::Box;
1165
1166	# TODO: wrap into common Box base class
1167		1308
1168	our @ISA = CFClient::UI::Container::;	1309	our @ISA = CFClient::UI::Container::;
1169		1310
1170	sub size_request {	1311	sub size_request {
1171	my ($self) = @_;	1312	my ($self) = @_;
1172		1313
1173	my @alloc = map [$_->size_request], @{$self->{children}};	1314	$self->{vertical}
1174		1315	? (
1175	(	1316	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1176	(List::Util::sum map $_->[0], @alloc),	1317	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1177	(List::Util::max map $_->[1], @alloc),	1318	)
1178	)	1319	: (
		1320	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1321	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1322	)
1179	}	1323	}
1180		1324
1181	sub size_allocate {	1325	sub size_allocate {
1182	my ($self, $w, $h) = @_;	1326	my ($self, $w, $h) = @_;
1183		1327
1184	($h, $w) = ($w, $h);	1328	my $space = $self->{vertical} ? $h : $w;
1185
1186	my $children = $self->{children};	1329	my $children = $self->{children};
1187		1330
1188	my @h = map $_->{req_w}, @$children;	1331	my @req;
1189		1332
1190	my $req_h = List::Util::sum @h;	1333	if ($self->{homogeneous}) {
1191		1334	@req = ($space / (@$children || 1)) x @$children;
1192	if ($req_h > $h) {
1193	# ah well, not enough space
1194	$_ *= $h / $req_h for @h;
1195	} else {	1335	} else {
		1336	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1337	my $req = List::Util::sum @req;
		1338
		1339	if ($req > $space) {
		1340	# ah well, not enough space
		1341	$_ *= $space / $req for @req;
		1342	} else {
1196	my $exp = List::Util::sum map $_->{expand}, @$children;	1343	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1197	$exp ||= 1;
1198		1344
		1345	$space = ($space - $req) / $expand; # remaining space to give away
		1346
		1347	$req[$_] += $space * $children->[$_]{expand}
1199	for (0 .. $#$children) {	1348	for 0 .. $#$children;
1200	my $child = $children->[$_];
1201
1202	my $alloc_h = $h[$_];
1203	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1204	$h[$_] = $alloc_h;
1205	}	1349	}
1206	}	1350	}
1207		1351
1208	CFClient::UI::harmonize \@h;	1352	CFClient::UI::harmonize \@req;
1209		1353
1210	my $y = 0;	1354	my $pos = 0;
1211	for (0 .. $#$children) {	1355	for (0 .. $#$children) {
1212	my $child = $children->[$_];
1213	my $h = $h[$_];	1356	my $alloc = $req[$_];
1214	$child->configure ($y, 0, $h, $w);	1357	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1215		1358
1216	$y += $h;	1359	$pos += $alloc;
1217	}	1360	}
1218		1361
1219	1	1362	1
1220	}	1363	}
1221		1364
1222	#############################################################################	1365	#############################################################################
1223		1366
		1367	package CFClient::UI::HBox;
		1368
		1369	our @ISA = CFClient::UI::Box::;
		1370
		1371	sub new {
		1372	my $class = shift;
		1373
		1374	$class->SUPER::new (
		1375	vertical => 0,
		1376	@_,
		1377	)
		1378	}
		1379
		1380	#############################################################################
		1381
1224	package CFClient::UI::VBox;	1382	package CFClient::UI::VBox;
1225		1383
1226	# TODO: wrap into common Box base class
1227
1228	our @ISA = CFClient::UI::Container::;	1384	our @ISA = CFClient::UI::Box::;
1229		1385
1230	sub size_request {	1386	sub new {
1231	my ($self) = @_;	1387	my $class = shift;
1232		1388
1233	my @alloc = map [$_->size_request], @{$self->{children}};	1389	$class->SUPER::new (
1234		1390	vertical => 1,
1235	(	1391	@_,
1236	(List::Util::max map $_->[0], @alloc),
1237	(List::Util::sum map $_->[1], @alloc),
1238	)	1392	)
1239	}
1240
1241	sub size_allocate {
1242	my ($self, $w, $h) = @_;
1243
1244	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1246	my $children = $self->{children};
1247
1248	my @h = map $_->{req_h}, @$children;
1249
1250	my $req_h = List::Util::sum @h;
1251
1252	if ($req_h > $h) {
1253	# ah well, not enough space
1254	$_ *= $h / $req_h for @h;
1255	} else {
1256	my $exp = List::Util::sum map $_->{expand}, @$children;
1257	$exp ||= 1;
1258
1259	for (0 .. $#$children) {
1260	my $child = $children->[$_];
1261
1262	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1263	}
1264	}
1265
1266	CFClient::UI::harmonize \@h;
1267
1268	my $y = 0;
1269	for (0 .. $#$children) {
1270	my $child = $children->[$_];
1271	my $h = $h[$_];
1272	$child->configure (0, $y, $w, $h);
1273
1274	$y += $h;
1275	}
1276
1277	1
1278	}	1393	}
1279		1394
1280	#############################################################################	1395	#############################################################################
1281		1396
1282	package CFClient::UI::Label;	1397	package CFClient::UI::Label;
…		…
1466	active_fg => [0, 0, 0],	1581	active_fg => [0, 0, 0],
1467	can_hover => 1,	1582	can_hover => 1,
1468	can_focus => 1,	1583	can_focus => 1,
1469	valign => 0,	1584	valign => 0,
1470	can_events => 1,	1585	can_events => 1,
		1586	#text => ...
1471	@_	1587	@_
1472	)	1588	)
1473	}	1589	}
1474		1590
1475	sub _set_text {	1591	sub _set_text {
…		…
1485	$self->{text} = $text;	1601	$self->{text} = $text;
1486		1602
1487	$text =~ s/./*/g if $self->{hidden};	1603	$text =~ s/./*/g if $self->{hidden};
1488	$self->{layout}->set_text ("$text ");	1604	$self->{layout}->set_text ("$text ");
1489		1605
1490	$self->emit (changed => $self->{text});	1606	$self->_emit (changed => $self->{text});
1491	}	1607	}
1492		1608
1493	sub set_text {	1609	sub set_text {
1494	my ($self, $text) = @_;	1610	my ($self, $text) = @_;
1495		1611
…		…
1507	my ($self) = @_;	1623	my ($self) = @_;
1508		1624
1509	my ($w, $h) = $self->SUPER::size_request;	1625	my ($w, $h) = $self->SUPER::size_request;
1510		1626
1511	($w + 1, $h) # add 1 for cursor	1627	($w + 1, $h) # add 1 for cursor
1512	}
1513
1514	sub size_allocate {
1515	my ($self, $w, $h) = @_;
1516
1517	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518	}	1628	}
1519		1629
1520	sub key_down {	1630	sub key_down {
1521	my ($self, $ev) = @_;	1631	my ($self, $ev) = @_;
1522		1632
…		…
1537	} elsif ($sym == CFClient::SDLK_HOME) {	1647	} elsif ($sym == CFClient::SDLK_HOME) {
1538	$self->{cursor} = 0;	1648	$self->{cursor} = 0;
1539	} elsif ($sym == CFClient::SDLK_END) {	1649	} elsif ($sym == CFClient::SDLK_END) {
1540	$self->{cursor} = length $text;	1650	$self->{cursor} = length $text;
1541	} elsif ($uni == 27) {	1651	} elsif ($uni == 27) {
1542	$self->emit ('escape');	1652	$self->_emit ('escape');
1543	} elsif ($uni) {	1653	} elsif ($uni) {
1544	substr $text, $self->{cursor}++, 0, chr $uni;	1654	substr $text, $self->{cursor}++, 0, chr $uni;
1545	}	1655	}
1546		1656
1547	$self->_set_text ($text);	1657	$self->_set_text ($text);
…		…
1634	if ($sym == 13) {	1744	if ($sym == 13) {
1635	unshift @{$self->{history}},	1745	unshift @{$self->{history}},
1636	my $txt = $self->get_text;	1746	my $txt = $self->get_text;
1637	$self->{history_pointer} = -1;	1747	$self->{history_pointer} = -1;
1638	$self->{history_saveback} = '';	1748	$self->{history_saveback} = '';
1639	$self->emit (activate => $txt);	1749	$self->_emit (activate => $txt);
1640	$self->update;	1750	$self->update;
1641		1751
1642	} elsif ($sym == CFClient::SDLK_UP) {	1752	} elsif ($sym == CFClient::SDLK_UP) {
1643	if ($self->{history_pointer} < 0) {	1753	if ($self->{history_pointer} < 0) {
1644	$self->{history_saveback} = $self->get_text;	1754	$self->{history_saveback} = $self->get_text;
…		…
1692	can_events => 1,	1802	can_events => 1,
1693	@_	1803	@_
1694	)	1804	)
1695	}	1805	}
1696		1806
		1807	sub activate { }
		1808
1697	sub button_up {	1809	sub button_up {
1698	my ($self, $ev, $x, $y) = @_;	1810	my ($self, $ev, $x, $y) = @_;
1699		1811
		1812	$self->emit ("activate")
1700	if ($x >= 0 && $x < $self->{w}	1813	if $x >= 0 && $x < $self->{w}
1701	&& $y >= 0 && $y < $self->{h}) {	1814	&& $y >= 0 && $y < $self->{h};
1702	$self->emit ("activate");
1703	}
1704	}	1815	}
1705		1816
1706	sub _draw {	1817	sub _draw {
1707	my ($self) = @_;	1818	my ($self) = @_;
1708		1819
…		…
1760	my ($self, $ev, $x, $y) = @_;	1871	my ($self, $ev, $x, $y) = @_;
1761		1872
1762	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1873	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1763	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1874	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1764	$self->{state} = !$self->{state};	1875	$self->{state} = !$self->{state};
1765	$self->emit (changed => $self->{state});	1876	$self->_emit (changed => $self->{state});
1766	}	1877	}
1767	}	1878	}
1768		1879
1769	sub _draw {	1880	sub _draw {
1770	my ($self) = @_;	1881	my ($self) = @_;
…		…
2045	my $self = $class->SUPER::new (	2156	my $self = $class->SUPER::new (
2046	fg => [1, 1, 1],	2157	fg => [1, 1, 1],
2047	active_fg => [0, 0, 0],	2158	active_fg => [0, 0, 0],
2048	bg => [0, 0, 0, 0.2],	2159	bg => [0, 0, 0, 0.2],
2049	active_bg => [1, 1, 1, 0.5],	2160	active_bg => [1, 1, 1, 0.5],
2050	range => [0, 0, 100, 10],	2161	range => [0, 0, 100, 10, 0],
2051	req_w => $::WIDTH / 80,	2162	req_w => $::WIDTH / 80,
2052	req_h => $::WIDTH / 80,	2163	req_h => $::WIDTH / 80,
2053	vertical => 0,	2164	vertical => 0,
2054	can_hover => 1,	2165	can_hover => 1,
2055	inner_pad => .05,	2166	inner_pad => 0.02,
2056	@_	2167	@_
2057	);	2168	);
2058		2169
2059	$self->set_value ($self->{range}[0]);	2170	$self->set_value ($self->{range}[0]);
2060	$self->update;	2171	$self->update;
2061		2172
2062	$self	2173	$self
2063	}	2174	}
2064		2175
		2176	sub set_range {
		2177	my ($self, $range) = @_;
		2178
		2179	($range, $self->{range}) = ($self->{range}, $range);
		2180
		2181	$self->update
		2182	if "@$range" ne "@{$self->{range}}";
		2183	}
		2184
2065	sub set_value {	2185	sub set_value {
2066	my ($self, $value) = @_;	2186	my ($self, $value) = @_;
2067		2187
2068	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2188	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069		2189
2070	$hi = $lo + 1 if $hi <= $lo;	2190	$hi = $lo + 1 if $hi <= $lo;
2071		2191
		2192	$page = $hi - $lo if $page > $hi - $lo;
		2193
2072	$value = $lo if $value < $lo;	2194	$value = $lo if $value < $lo;
2073	$value = $hi if $value > $hi;	2195	$value = $hi - $page if $value > $hi - $page;
2074		2196
2075	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2197	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076	if $unit;	2198	if $unit;
2077		2199
2078	$page = $hi - $lo if $page > $hi - $lo;
2079
2080	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2200	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081		2201
2082	if ($value != $old_value) {	2202	if ($value != $old_value) {
2083	$self->emit (changed => $value);	2203	$self->_emit (changed => $value);
2084	$self->update;	2204	$self->update;
2085	}	2205	}
2086	}	2206	}
2087		2207
2088	sub size_request {	2208	sub size_request {
…		…
2096		2216
2097	sub button_down {	2217	sub button_down {
2098	my ($self, $ev, $x, $y) = @_;	2218	my ($self, $ev, $x, $y) = @_;
2099		2219
2100	$self->SUPER::button_down ($ev, $x, $y);	2220	$self->SUPER::button_down ($ev, $x, $y);
		2221
		2222	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2223
2101	$self->mouse_motion ($ev, $x, $y);	2224	$self->mouse_motion ($ev, $x, $y);
2102	}	2225	}
2103		2226
2104	sub mouse_motion {	2227	sub mouse_motion {
2105	my ($self, $ev, $x, $y) = @_;	2228	my ($self, $ev, $x, $y) = @_;
…		…
2107	if ($GRAB == $self) {	2230	if ($GRAB == $self) {
2108	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2231	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109		2232
2110	my (undef, $lo, $hi, $page) = @{$self->{range}};	2233	my (undef, $lo, $hi, $page) = @{$self->{range}};
2111		2234
2112	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2235	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113		2236
2114	$self->set_value ($x * ($hi - $lo) + $lo);	2237	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2115	}	2238	}
2116	}	2239	}
2117		2240
2118	sub update {	2241	sub update {
2119	my ($self) = @_;	2242	my ($self) = @_;
2120		2243
2121	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2244	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122	$self->set_value ($self->{range}[0]);	2245	$self->set_value ($self->{range}[0]);
2123		2246
2124	my ($value, $lo, $hi, $page) = @{$self->{range}};	2247	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2248	my $range = ($hi - $page - $lo) || 1e-100;
2125		2249
2126	my $inner_w = 1 - 2 * $self->{inner_pad};	2250	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127		2251
2128	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2252	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2253	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2129		2254
2130	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2255	$value = ($value - $lo) / $range;
2131	$value = $self->{scale} * ($value - $lo);	2256	$value = $value * $self->{scale} + $self->{offset};
2132		2257
2133	$value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135	$value = 0 if $value < 0;
2136	$page = 1 - $value if $value + $page > 1;
2137
2138	$self->{knob_x} = $value;	2258	$self->{knob_x} = $value - $knob_w * 0.5;
2139	$self->{knob_w} = $page;	2259	$self->{knob_w} = $knob_w;
2140	});	2260	});
2141		2261
2142	$self->SUPER::update;	2262	$self->SUPER::update;
2143	}	2263	}
2144		2264
…		…
2168	# draw handle	2288	# draw handle
2169	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2289	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2170		2290
2171	glDisable GL_TEXTURE_2D;	2291	glDisable GL_TEXTURE_2D;
2172	}	2292	}
		2293
		2294	#############################################################################
		2295
		2296	package CFClient::UI::ValSlider;
		2297
		2298	our @ISA = CFClient::UI::HBox::;
		2299
		2300	sub new {
		2301	my ($class, %arg) = @_;
		2302
		2303	my $range = delete $arg{range};
		2304
		2305	my $self = $class->SUPER::new (
		2306	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2307	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2308	to_value => sub { shift },
		2309	from_value => sub { shift },
		2310	%arg,
		2311	);
		2312
		2313	$self->{slider}->connect (changed => sub {
		2314	my ($self, $value) = @_;
		2315	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2316	$self->{parent}->emit (changed => $value);
		2317	});
		2318
		2319	# $self->{entry}->connect (changed => sub {
		2320	# my ($self, $value) = @_;
		2321	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2322	# $self->{parent}->emit (changed => $value);
		2323	# });
		2324
		2325	$self->add ($self->{slider}, $self->{entry});
		2326
		2327	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2328
		2329	$self
		2330	}
		2331
		2332	sub set_range { shift->{slider}->set_range (@_) }
		2333	sub set_value { shift->{slider}->set_value (@_) }
2173		2334
2174	#############################################################################	2335	#############################################################################
2175		2336
2176	package CFClient::UI::TextView;	2337	package CFClient::UI::TextView;
2177		2338
…		…
2207		2368
2208	$self->{fontsize} = $fontsize;	2369	$self->{fontsize} = $fontsize;
2209	$self->reflow;	2370	$self->reflow;
2210	}	2371	}
2211		2372
2212	sub text_height {
2213	my ($self, $text) = @_;
2214
2215	my $layout = $self->{layout};
2216
2217	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218	$layout->set_width ($self->{children}[0]{w});
2219	$layout->set_markup ($text);
2220
2221	($layout->size)[1]
2222	}
2223
2224	sub reflow {
2225	my ($self) = @_;
2226
2227	$self->{need_reflow}++;
2228	$self->update;
2229	}
2230
2231	sub size_allocate {	2373	sub size_allocate {
2232	my ($self, $w, $h) = @_;	2374	my ($self, $w, $h) = @_;
2233		2375
2234	$self->SUPER::size_allocate ($w, $h);	2376	$self->SUPER::size_allocate ($w, $h);
2235		2377
…		…
2238	$self->{layout}->set_width ($self->{children}[0]{w});	2380	$self->{layout}->set_width ($self->{children}[0]{w});
2239		2381
2240	$self->reflow;	2382	$self->reflow;
2241	}	2383	}
2242		2384
		2385	sub text_size {
		2386	my ($self, $text, $indent) = @_;
		2387
		2388	my $layout = $self->{layout};
		2389
		2390	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2391	$layout->set_width ($self->{children}[0]{w} - $indent);
		2392	$layout->set_markup ($text);
		2393
		2394	$layout->size
		2395	}
		2396
		2397	sub reflow {
		2398	my ($self) = @_;
		2399
		2400	$self->{need_reflow}++;
		2401	$self->update;
		2402	}
		2403
		2404	sub set_offset {
		2405	my ($self, $offset) = @_;
		2406
		2407	# todo: base offset on lines or so, not on pixels
		2408	$self->{children}[1]->set_value ($offset);
		2409	}
		2410
		2411	sub clear {
		2412	my ($self) = @_;
		2413
		2414	$self->{par} = [];
		2415	$self->{height} = 0;
		2416	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2417	}
		2418
2243	sub add_paragraph {	2419	sub add_paragraph {
2244	my ($self, $color, $text) = @_;	2420	my ($self, $color, $text, $indent) = @_;
2245		2421
2246	#TODO: intelligently "reformat" paragraph	2422	for my $line (split /\n/, $text) {
2247		2423	my ($w, $h) = $self->text_size ($line);
2248	my $height = $self->text_height ($text);
2249
2250	$self->{height} += $height;	2424	$self->{height} += $h;
		2425	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2426	}
2251		2427
2252	push @{$self->{par}}, [$height, $color, $text];
2253
2254	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2428	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2255	$self->{children}[1]->update;
2256	}	2429	}
2257		2430
2258	sub update {	2431	sub update {
2259	my ($self) = @_;	2432	my ($self) = @_;
2260		2433
…		…
2263	return unless $self->{h} > 0;	2436	return unless $self->{h} > 0;
2264		2437
2265	delete $self->{texture};	2438	delete $self->{texture};
2266		2439
2267	$ROOT->on_post_alloc ($self, sub {	2440	$ROOT->on_post_alloc ($self, sub {
		2441	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2442
2268	if (delete $self->{need_reflow}) {	2443	if (delete $self->{need_reflow}) {
2269	my $height = 0;	2444	my $height = 0;
2270		2445
2271	$height += $_->[0] = $self->text_height ($_->[2])	2446	my $layout = $self->{layout};
		2447
		2448	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2449
2272	for @{$self->{par}};	2450	for (@{$self->{par}}) {
		2451	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2452	$layout->set_width ($W - $_->[3]);
		2453	$layout->set_markup ($_->[4]);
		2454	my ($w, $h) = $layout->size;
		2455	$_->[0] = $w + $_->[3];
		2456	$_->[1] = $h;
		2457	}
		2458
		2459	$height += $_->[1];
		2460	}
2273		2461
2274	$self->{height} = $height;	2462	$self->{height} = $height;
2275		2463
2276	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2464	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2277		2465
2278	delete $self->{texture};	2466	delete $self->{texture};
2279	}	2467	}
2280		2468
2281	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2469	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2282	glClearColor 0.5, 0.5, 0.5, 0;	2470	glClearColor 0.5, 0.5, 0.5, 0;
2283	glClear GL_COLOR_BUFFER_BIT;	2471	glClear GL_COLOR_BUFFER_BIT;
2284		2472
2285	glEnable GL_TEXTURE_2D;
2286	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288	my $top = int $self->{children}[1]{range}[0];	2473	my $top = int $self->{children}[1]{range}[0];
2289		2474
2290	my $y0 = $top;	2475	my $y0 = $top;
2291	my $y1 = $top + $self->{h};	2476	my $y1 = $top + $H;
2292		2477
2293	my $y = 0;	2478	my $y = 0;
2294		2479
2295	my $layout = $self->{layout};	2480	my $layout = $self->{layout};
2296		2481
2297	$layout->set_font ($self->{font}) if $self->{font};	2482	$layout->set_font ($self->{font}) if $self->{font};
2298		2483
		2484	glEnable GL_BLEND;
		2485	#TODO# not correct in windows where rgba is forced off
		2486	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2487
2299	for my $par (@{$self->{par}}) {	2488	for my $par (@{$self->{par}}) {
2300	my $h = $par->[0];	2489	my $h = $par->[1];
2301		2490
2302	if ($y0 < $y + $h && $y < $y1) {	2491	if ($y0 < $y + $h && $y < $y1) {
2303	$layout->set_foreground (@{ $par->[1] });	2492	$layout->set_foreground (@{ $par->[2] });
		2493	$layout->set_width ($W - $par->[3]);
2304	$layout->set_markup ($par->[2]);	2494	$layout->set_markup ($par->[4]);
2305		2495
2306	my ($W, $H) = $layout->size;	2496	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2497
		2498	glRasterPos $par->[3], $y - $y0;
		2499	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308	}	2500	}
2309		2501
2310	$y += $h;	2502	$y += $h;
2311	}	2503	}
2312		2504
2313	glDisable GL_TEXTURE_2D;	2505	glDisable GL_BLEND;
2314	};	2506	};
2315	});	2507	});
2316	}	2508	}
2317		2509
2318	sub _draw {	2510	sub _draw {
…		…
2378		2570
2379	sub new {	2571	sub new {
2380	my $class = shift;	2572	my $class = shift;
2381		2573
2382	my $self = $class->SUPER::new (	2574	my $self = $class->SUPER::new (
2383	state => 0,	2575	state => 0,
2384	connect_activate => \&toggle_flopper,	2576	on_activate => \&toggle_flopper,
2385	@_	2577	@_
2386	);	2578	);
2387		2579
2388	if ($self->{state}) {
2389	$self->{state} = 0;
2390	$self->toggle_flopper;
2391	}
2392
2393	$self	2580	$self
2394	}	2581	}
2395		2582
2396	sub toggle_flopper {	2583	sub toggle_flopper {
2397	my ($self) = @_;	2584	my ($self) = @_;
2398		2585
2399	# TODO: use animation	2586	$self->{other}->toggle_visibility;
2400	if ($self->{state} = !$self->{state}) {
2401	$CFClient::UI::ROOT->add ($self->{other});
2402	$self->{other}->move ($self->coord2global (0, $self->{h}));
2403	$self->emit ("open");
2404	} else {
2405	$CFClient::UI::ROOT->remove ($self->{other});
2406	$self->emit ("close");
2407	}
2408
2409	$self->emit (changed => $self->{state});
2410	}	2587	}
2411		2588
2412	#############################################################################	2589	#############################################################################
2413		2590
2414	package CFClient::UI::Tooltip;	2591	package CFClient::UI::Tooltip;
…		…
2489	use CFClient::OpenGL;	2666	use CFClient::OpenGL;
2490		2667
2491	sub new {	2668	sub new {
2492	my $class = shift;	2669	my $class = shift;
2493		2670
2494	$class->SUPER::new (	2671	my $self = $class->SUPER::new (
2495	aspect => 1,	2672	aspect => 1,
		2673	can_events => 0,
2496	@_,	2674	@_,
2497	)	2675	);
		2676
		2677	if ($self->{anim} && $self->{animspeed}) {
		2678	Scalar::Util::weaken (my $widget = $self);
		2679
		2680	$self->{timer} = Event->timer (
		2681	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2682	hard => 1,
		2683	interval => $self->{animspeed},
		2684	cb => sub {
		2685	++$widget->{frame};
		2686	$widget->update;
		2687	},
		2688	);
		2689	}
		2690
		2691	$self
2498	}	2692	}
2499		2693
2500	sub size_request {	2694	sub size_request {
2501	(32, 8)	2695	(32, 8)
2502	}	2696	}
2503		2697
		2698	sub update {
		2699	my ($self) = @_;
		2700
		2701	return unless $self->{visible};
		2702
		2703	$self->SUPER::update;
		2704	}
		2705
2504	sub _draw {	2706	sub _draw {
2505	my ($self) = @_;	2707	my ($self) = @_;
2506		2708
2507	return unless $::CONN;#d# manage and cache textures differently	2709	return unless $::CONN;
		2710
		2711	my $face;
		2712
		2713	if ($self->{frame}) {
		2714	my $anim = $::CONN->{anim}[$self->{anim}];
		2715
		2716	$face = $anim->[ $self->{frame} % @$anim ]
		2717	if $anim && @$anim;
		2718	}
		2719
2508	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2720	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2509		2721
2510	# TODO animation
2511	if ($tex) {	2722	if ($tex) {
2512	glEnable GL_TEXTURE_2D;	2723	glEnable GL_TEXTURE_2D;
2513	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2724	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514	glColor 1, 1, 1, 1;	2725	glColor 1, 1, 1, 1;
2515	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2726	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516	glDisable GL_TEXTURE_2D;	2727	glDisable GL_TEXTURE_2D;
2517	}	2728	}
2518	}	2729	}
2519		2730
2520	#############################################################################	2731	sub DESTROY {
		2732	my ($self) = @_;
2521		2733
		2734	$self->{timer}->cancel
		2735	if $self->{timer};
		2736
		2737	$self->SUPER::DESTROY;
		2738	}
		2739
		2740	#############################################################################
		2741
2522	package CFClient::UI::InventoryItem;	2742	package CFClient::UI::Inventory;
2523		2743
2524	our @ISA = CFClient::UI::HBox::;	2744	our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526	sub _item_to_desc {
2527	my ($item) = @_;
2528
2529	my $desc =
2530	$item->{nrof} < 2
2531	? $item->{name}
2532	: "$item->{nrof} $item->{name_pl}";
2533
2534	$item->{flags} & Crossfire::Protocol::F_OPEN
2535	and $desc .= " (open)";
2536	$item->{flags} & Crossfire::Protocol::F_APPLIED
2537	and $desc .= " (applied)";
2538	$item->{flags} & Crossfire::Protocol::F_UNPAID
2539	and $desc .= " (unpaid)";
2540	$item->{flags} & Crossfire::Protocol::F_MAGIC
2541	and $desc .= " (magic)";
2542	$item->{flags} & Crossfire::Protocol::F_CURSED
2543	and $desc .= " (cursed)";
2544	$item->{flags} & Crossfire::Protocol::F_DAMNED
2545	and $desc .= " (damned)";
2546	$item->{flags} & Crossfire::Protocol::F_LOCKED
2547	and $desc .= " *";
2548
2549	$desc
2550	}
2551		2745
2552	sub new {	2746	sub new {
2553	my $class = shift;	2747	my $class = shift;
2554		2748
2555	my %args = @_;
2556
2557	my $item = delete $args{item};
2558
2559	my $desc = _item_to_desc ($item);
2560
2561	my $self = $class->SUPER::new (	2749	my $self = $class->SUPER::new (
2562	can_hover => 1,	2750	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2563	can_events => 1,
2564	tooltip => ((CFClient::UI::Label::escape $desc)
2565	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2566	connect_button_down => sub {
2567	my ($self, $ev, $x, $y) = @_;
2568
2569	# todo: maybe put examine on 1? but should just be a tooltip :(
2570	if ($ev->{button} == 1) {
2571	my $targ = $::CONN->{player}{tag};
2572
2573	if ($item->{container} == $::CONN->{player}{tag}) {
2574	$targ = $main::OPENCONT;
2575	}
2576
2577	$::CONN->send ("move $targ $item->{tag} 0");
2578	} elsif ($ev->{button} == 2) {
2579	$::CONN->send ("apply $item->{tag}");
2580	} elsif ($ev->{button} == 3) {
2581	my @menu_items = (
2582	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586	[
2587	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588	sub { $::CONN->send ("lock $item->{tag}") },
2589	],
2590	);
2591
2592	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593	}
2594
2595	1
2596	},
2597	%args
2598	);
2599
2600
2601	$self->add (new CFClient::UI::Face
2602	can_events => 0,
2603	face => $item->{face},
2604	anim => $item->{anim},
2605	animspeed => $item->{animspeed},
2606	);
2607
2608	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2609
2610	$self->{item} = $item;
2611
2612	$self->update_item;
2613
2614	$self
2615	}
2616
2617	sub update_item {
2618	my ($self) = @_;
2619
2620	my $desc = _item_to_desc ($self->{item});
2621
2622	$self->{name_lbl}->set_text ($desc);
2623	}
2624
2625	#############################################################################
2626
2627	package CFClient::UI::Inventory;
2628
2629	our @ISA = CFClient::UI::ScrolledWindow::;
2630
2631	sub new {
2632	my $class = shift;
2633
2634	my $self = $class->SUPER::new (
2635	scrolled => (new CFClient::UI::VBox),
2636	@_,	2751	@_,
2637	);	2752	);
2638		2753
2639	$self	2754	$self
2640	}	2755	}
…		…
2650	or ($a->{name} cmp $b->{name})	2765	or ($a->{name} cmp $b->{name})
2651	} @$items;	2766	} @$items;
2652		2767
2653	$self->{real_items} = \@items;	2768	$self->{real_items} = \@items;
2654		2769
		2770	my $row = 0;
2655	for my $item (@items) {	2771	for my $item (@items) {
2656	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2772	CFClient::Item::update_widgets $item;
2657	$item->update_item ();
2658	}
2659		2773
2660	$self->{scrolled}->add (@items);	2774	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2775	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2776	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2661		2777
2662	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2778	$row++;
2663	}	2779	}
2664
2665	sub size_request {
2666	my ($self) = @_;
2667	($self->{req_w}, $self->{req_h});
2668	}	2780	}
2669		2781
2670	#############################################################################	2782	#############################################################################
2671		2783
2672	package CFClient::UI::Menu;	2784	package CFClient::UI::Menu;
…		…
2707		2819
2708	# popup given the event (must be a mouse button down event currently)	2820	# popup given the event (must be a mouse button down event currently)
2709	sub popup {	2821	sub popup {
2710	my ($self, $ev) = @_;	2822	my ($self, $ev) = @_;
2711		2823
2712	$self->emit ("popdown");	2824	$self->_emit ("popdown");
2713		2825
2714	# maybe save $GRAB? must be careful about events...	2826	# maybe save $GRAB? must be careful about events...
2715	$GRAB = $self;	2827	$GRAB = $self;
2716	$self->{button} = $ev->{button};	2828	$self->{button} = $ev->{button};
2717		2829
…		…
2732		2844
2733	if ($ev->{button} == $self->{button}) {	2845	if ($ev->{button} == $self->{button}) {
2734	undef $GRAB;	2846	undef $GRAB;
2735	$self->hide;	2847	$self->hide;
2736		2848
2737	$self->emit ("popdown");	2849	$self->_emit ("popdown");
2738	$self->{hover}[1]->() if $self->{hover};	2850	$self->{hover}[1]->() if $self->{hover};
2739	}	2851	}
2740	}	2852	}
2741		2853
2742	#############################################################################	2854	#############################################################################
…		…
2804	sub add {	2916	sub add {
2805	my ($self, $text, %arg) = @_;	2917	my ($self, $text, %arg) = @_;
2806		2918
2807	$text =~ s/^\s+//;	2919	$text =~ s/^\s+//;
2808	$text =~ s/\s+$//;	2920	$text =~ s/\s+$//;
		2921
		2922	return unless $text;
2809		2923
2810	my $timeout = time + ((delete $arg{timeout}) || 60);	2924	my $timeout = time + ((delete $arg{timeout}) || 60);
2811		2925
2812	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2926	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813		2927
…		…
2857		2971
2858	sub new {	2972	sub new {
2859	my $class = shift;	2973	my $class = shift;
2860		2974
2861	$class->SUPER::new (	2975	$class->SUPER::new (
		2976	visible => 1,
2862	@_,	2977	@_,
2863	)	2978	)
2864	}	2979	}
2865		2980
2866	sub configure {	2981	sub configure {
…		…
2884	}	2999	}
2885		3000
2886	sub size_allocate {	3001	sub size_allocate {
2887	my ($self, $w, $h) = @_;	3002	my ($self, $w, $h) = @_;
2888		3003
2889	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2890	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2891
2892	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2893	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2894
2895	for my $child ($self->children) {	3004	for my $child ($self->children) {
2896	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3005	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2897		3006
2898	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3007	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2899	if exists $child->{req_x};	3008	if exists $child->{req_x};
2900		3009
2901	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3010	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2902	if exists $child->{req_y};	3011	if exists $child->{req_y};
2903		3012
		3013	delete @$child{qw(req_x req_y)};
		3014
2904	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3015	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2905	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;	3016	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906		3017
2907	$child->configure ($X, $Y, $W, $H);	3018	$child->configure ($X, $Y, $W, $H);
2908	}	3019	}
…		…
2929		3040
2930	sub add {	3041	sub add {
2931	my ($self, @children) = @_;	3042	my ($self, @children) = @_;
2932		3043
2933	for my $child (@children) {	3044	for my $child (@children) {
2934	$child->{toplevel} = 1;	3045	$child->{is_toplevel} = 1;
2935		3046
2936	# integerise window positions	3047	# integerise window positions
2937	$child->{x} = int $child->{x};	3048	$child->{x} = int $child->{x};
2938	$child->{y} = int $child->{y};	3049	$child->{y} = int $child->{y};
2939	}	3050	}
2940		3051
2941	$self->SUPER::add (@children);	3052	$self->SUPER::add (@children);
		3053
		3054	for (my @widgets = @children; my $w = pop @widgets; ) {
		3055	push @widgets, $w->children;
		3056	$w->set_visible;
		3057	}
		3058
		3059	}
		3060
		3061	sub remove {
		3062	my ($self, @children) = @_;
		3063
		3064	$self->SUPER::remove (@children);
		3065
		3066	while (@children) {
		3067	my $w = pop @children;
		3068	push @children, $w->children;
		3069	$w->set_invisible;
		3070	}
2942	}	3071	}
2943		3072
2944	sub on_refresh {	3073	sub on_refresh {
2945	my ($self, $id, $cb) = @_;	3074	my ($self, $id, $cb) = @_;
2946		3075
…		…
2960	$_->()	3089	$_->()
2961	for values %{delete $self->{refresh_hook}};	3090	for values %{delete $self->{refresh_hook}};
2962	}	3091	}
2963		3092
2964	if ($self->{check_size}) {	3093	if ($self->{check_size}) {
2965	my @queue = ([], []);	3094	my @queue;
2966		3095
2967	for (;;) {	3096	for (;;) {
2968	if ($self->{check_size}) {	3097	if ($self->{check_size}) {
2969	# heuristic: check containers last	3098	#TODO use array-of-depth approach
2970	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3099
		3100	@queue = sort { $a->{visible} <=> $b->{visible} }
2971	for values %{delete $self->{check_size}}	3101	@queue, values %{delete $self->{check_size}};
2972	}	3102	}
2973		3103
2974	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3104	my $widget = pop @queue || last;
2975		3105
		3106	defined $widget->{visible} or last; # do not resize invisible widgets
		3107
2976	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3108	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2977	? @$widget{qw(user_w user_h)}	3109	? @$widget{qw(def_w def_h)}
2978	: $widget->size_request;	3110	: $widget->size_request;
2979		3111
2980	if (delete $widget->{force_alloc}	3112	if (delete $widget->{force_alloc}
2981	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3113	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2982	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3114	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
…		…
2991	}	3123	}
2992	}	3124	}
2993	}	3125	}
2994		3126
2995	while ($self->{size_alloc}) {	3127	while ($self->{size_alloc}) {
		3128	for (
		3129	sort { $a->[0]{visible} <=> $b->[0]{visible} }
2996	for (values %{delete $self->{size_alloc}}) {	3130	values %{delete $self->{size_alloc}}
		3131	) {
2997	my ($widget, $w, $h) = @$_;	3132	my ($widget, $w, $h) = @$_;
2998		3133
2999	$w = 0 if $w < 0;	3134	$w = 0 if $w < 0;
3000	$h = 0 if $h < 0;	3135	$h = 0 if $h < 0;
3001		3136
3002	$widget->{w} = $w;	3137	$widget->{w} = $w;
3003	$widget->{h} = $h;	3138	$widget->{h} = $h;
3004	$widget->size_allocate ($w, $h);
3005	$widget->emit (size_allocate => $w, $h);	3139	$widget->emit (size_allocate => $w, $h);
3006	}	3140	}
3007	}	3141	}
3008		3142
3009	while ($self->{post_alloc_hook}) {	3143	while ($self->{post_alloc_hook}) {
…		…
3015	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3149	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016	glClear GL_COLOR_BUFFER_BIT;	3150	glClear GL_COLOR_BUFFER_BIT;
3017		3151
3018	glMatrixMode GL_PROJECTION;	3152	glMatrixMode GL_PROJECTION;
3019	glLoadIdentity;	3153	glLoadIdentity;
3020	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3154	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021	glMatrixMode GL_MODELVIEW;	3155	glMatrixMode GL_MODELVIEW;
3022	glLoadIdentity;	3156	glLoadIdentity;
3023		3157
3024	$self->_draw;	3158	$self->_draw;
3025	}	3159	}

Diff Legend

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