ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.123 by root, Mon Apr 17 19:50:22 2006 UTC vs.
Revision 1.265 by root, Thu Jun 1 02:59:46 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
16our $TOOLTIP;
13our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
44sub check_tooltip {
45 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
52 $TOOLTIP->{owner} = $widget;
53
54 my $tip = $widget->{tooltip};
55
56 $tip = $tip->($widget) if CODE:: eq ref $tip;
57
58 $TOOLTIP->set_tooltip_from ($widget);
59 $TOOLTIP->show;
60 }
61
62 return;
63 }
64 }
65 }
66
67 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner};
69}
14 70
15# class methods for events 71# class methods for events
16sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 73 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS;
18} 75}
19 76
20sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 78 $FOCUS->emit (key_up => $_[0])
79 if $FOCUS;
22} 80}
23 81
24sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
25 my ($ev) = @_; 83 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
27 85
28 if (!$BUTTON_STATE) { 86 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 87 my $widget = $ROOT->find_widget ($x, $y);
30 88
31 $GRAB = $widget; 89 $GRAB = $widget;
32 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
33 }
34 91
92 check_tooltip;
93 }
94
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 96
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
98 if $GRAB;
38} 99}
39 100
40sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
41 my ($ev) = @_; 102 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
43 104
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 106
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 108
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
110 if $GRAB;
49 111
50 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 114 $grab->update if $grab;
53 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
116
117 check_tooltip;
54 } 118 }
55} 119}
56 120
57sub feed_sdl_motion_event { 121sub feed_sdl_motion_event {
58 my ($ev) = @_; 122 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 123 my ($x, $y) = ($ev->{x}, $ev->{y});
60 124
61 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 125 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 126
63 if ($widget != $HOVER) { 127 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 128 my $hover = $HOVER; $HOVER = $widget;
65 129
66 $hover->update if $hover && $hover->{can_hover}; 130 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 132
133 check_tooltip;
134 }
135
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER;
71} 138}
72 139
73# convert position array to integers 140# convert position array to integers
74sub harmonize { 141sub harmonize {
75 my ($vals) = @_; 142 my ($vals) = @_;
… …
81 $rem += $_ - $i; 148 $rem += $_ - $i;
82 $_ = $i; 149 $_ = $i;
83 } 150 }
84} 151}
85 152
153sub full_refresh {
154 # make a copy, otherwise for complains about freed values.
155 my @widgets = values %WIDGET;
156
157 $_->update
158 for @widgets;
159}
160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
169# call when resolution changes etc.
170sub rescale_widgets {
171 my ($sx, $sy) = @_;
172
173 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
188 }
189 }
190
191 reconfigure_widgets;
192}
193
86############################################################################# 194#############################################################################
87 195
88package CFClient::UI::Base; 196package CFClient::UI::Base;
89 197
90use strict; 198use strict;
91 199
92use SDL::OpenGL; 200use CFClient::OpenGL;
93 201
94sub new { 202sub new {
95 my $class = shift; 203 my $class = shift;
96 204
97 my $self = bless { 205 my $self = bless {
98 x => 0, 206 x => "center",
99 y => 0, 207 y => "center",
100 z => 0, 208 z => 0,
101 w => -1, 209 w => undef,
102 h => -1, 210 h => undef,
211 can_events => 1,
103 @_ 212 @_
104 }, $class; 213 }, $class;
105 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
106 for (keys %$self) { 217 for (keys %$self) {
107 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
108 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
109 } 220 }
110 } 221 }
111 222
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
234
112 $self 235 $self
113} 236}
114 237
238sub destroy {
239 my ($self) = @_;
240
241 $self->hide;
242 %$self = ();
243}
244
245sub show {
246 my ($self) = @_;
247
248 return if $self->{parent};
249
250 $CFClient::UI::ROOT->add ($self);
251}
252
253sub set_visible {
254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
266}
267
268sub set_invisible {
269 my ($self) = @_;
270
271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
276 delete $self->{visible};
277
278 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self;
280
281 CFClient::UI::check_tooltip
282 if $TOOLTIP->{owner} == $self;
283
284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
304}
305
306sub hide {
307 my ($self) = @_;
308
309 $self->set_invisible;
310
311 $self->{parent}->remove ($self)
312 if $self->{parent};
313}
314
115sub move { 315sub move_abs {
116 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
117 $self->{x} = int $x; 317
118 $self->{y} = int $y; 318 $self->{x} = List::Util::max 0, int $x;
319 $self->{y} = List::Util::max 0, int $y;
119 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
120}
121 321
122sub needs_redraw { 322 $self->update;
123 0 323}
324
325sub set_size {
326 my ($self, $w, $h) = @_;
327
328 $self->{force_w} = $w;
329 $self->{force_h} = $h;
330
331 $self->realloc;
124} 332}
125 333
126sub size_request { 334sub size_request {
127 require Carp; 335 require Carp;
128 Carp::confess "size_request is abtract"; 336 Carp::confess "size_request is abstract";
129} 337}
130 338
131sub _size_allocate { 339sub configure {
132 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
133 341
342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
345 $w = List::Util::min $w, int $h * $self->{aspect};
346 $h = List::Util::min $h, int $w / $self->{aspect};
347
348 # use alignment to adjust x, y
349
350 $x += int 0.5 * ($ow - $w);
351 $y += int 0.5 * ($oh - $h);
352 }
353
354 if ($self->{x} ne $x || $self->{y} ne $y) {
134 $self->{x} = $x; 355 $self->{x} = $x;
135 $self->{y} = $y; 356 $self->{y} = $y;
357 $self->update;
358 }
136 359
137 return unless $self->{w} != $w || $self->{h} != $h; 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible};
138 362
139 $self->{w} = $w; 363 $self->{alloc_w} = $w;
140 $self->{h} = $h; 364 $self->{alloc_h} = $h;
141 365
366 $self->{root}{size_alloc}{$self+0} = $self;
142 1 367 }
143} 368}
144 369
145sub size_allocate { 370sub size_allocate {
146 my ($self, $x, $y, $w, $h) = @_; 371 # nothing to be done
147
148 $self->_size_allocate ($x, $y, $w, $h);
149} 372}
150 373
151# return top left coordinates 374sub children {
152sub _topleft { 375}
376
377sub set_max_size {
153 my ($self, $x, $y) = @_; 378 my ($self, $w, $h) = @_;
154 379
155 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 380 delete $self->{max_w}; $self->{max_w} = $w if $w;
381 delete $self->{max_h}; $self->{max_h} = $h if $h;
382}
383
384sub set_tooltip {
385 my ($self, $tooltip) = @_;
386
387 $tooltip =~ s/^\s+//;
388 $tooltip =~ s/\s+$//;
389
390 return if $self->{tooltip} eq $tooltip;
391
392 $self->{tooltip} = $tooltip;
393
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip;
397 }
156} 398}
157 399
158# translate global coordinates to local coordinate system 400# translate global coordinates to local coordinate system
159sub coord2local { 401sub coord2local {
160 my ($self, $x, $y) = @_; 402 my ($self, $x, $y) = @_;
161 403
162 my ($X, $Y) = $self->_topleft; 404 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
163 ($x - $X, $y - $Y)
164} 405}
165 406
166# translate local coordinates to global coordinate system 407# translate local coordinates to global coordinate system
167sub coord2global { 408sub coord2global {
168 my ($self, $x, $y) = @_; 409 my ($self, $x, $y) = @_;
169 410
170 my ($X, $Y) = $self->_topleft; 411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
171 ($x + $X, $y + $Y)
172} 412}
173 413
174sub focus_in { 414sub focus_in {
175 my ($self) = @_; 415 my ($self) = @_;
176 416
177 return if $FOCUS == $self; 417 return if $FOCUS == $self;
178 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
179 419
180 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
181 421
182 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
183 423
184 $focus->update if $focus; 424 $focus->update if $focus;
185 $FOCUS->update; 425 $FOCUS->update;
186} 426}
187 427
… …
190 430
191 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
192 432
193 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
194 434
195 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
196 436
197 $focus->update if $focus; #? 437 $focus->update if $focus; #?
438
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
440 unless $FOCUS;
198} 441}
199 442
200sub mouse_motion { } 443sub mouse_motion { }
201sub button_up { } 444sub button_up { }
202sub key_down { } 445sub key_down { }
203sub key_up { } 446sub key_up { }
204 447
205sub button_down { 448sub button_down {
206 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
207 450
208 $self->focus_in; 451 $self->focus_in;
… …
211sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
212sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
213sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
214sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
215sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459
460sub find_widget {
461 my ($self, $x, $y) = @_;
462
463 return () unless $self->{can_events};
464
465 return $self
466 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
467 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
468
469 ()
470}
471
472sub set_parent {
473 my ($self, $parent) = @_;
474
475 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500}
501
502sub realloc {
503 my ($self) = @_;
504
505 if ($self->{visible}) {
506 return if $self->{root}{realloc}{$self+0};
507
508 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update;
510 } else {
511 delete $self->{req_w};
512 delete $self->{req_h};
513 }
514}
515
516sub update {
517 my ($self) = @_;
518
519 $self->{parent}->update
520 if $self->{parent};
521}
522
523sub reconfigure {
524 my ($self) = @_;
525
526 $self->realloc;
527 $self->update;
528}
216 529
217sub draw { 530sub draw {
218 my ($self) = @_; 531 my ($self) = @_;
219 532
220 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
236 glVertex $x + $self->{w}, $y + $self->{h}; 549 glVertex $x + $self->{w}, $y + $self->{h};
237 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
238 glEnd; 551 glEnd;
239 glDisable GL_BLEND; 552 glDisable GL_BLEND;
240 } 553 }
554
555 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix;
557 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
559 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1;
564 glEnd;
565 glPopMatrix;
566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567 }
241} 568}
242 569
243sub _draw { 570sub _draw {
244 my ($self) = @_; 571 my ($self) = @_;
245 572
246 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
247} 574}
248 575
249sub find_widget {
250 my ($self, $x, $y) = @_;
251
252 return $self
253 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
254 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
255
256 ()
257}
258
259sub set_parent {
260 my ($self, $parent) = @_;
261
262 Scalar::Util::weaken ($self->{parent} = $parent);
263}
264
265sub update {
266 my ($self) = @_;
267
268 $self->{parent}->update
269 if $self->{parent};
270}
271
272sub connect {
273 my ($self, $signal, $cb) = @_;
274
275 push @{ $self->{cb}{$signal} }, $cb;
276}
277
278sub emit {
279 my ($self, $signal, @args) = @_;
280
281 $_->($self, @args)
282 for @{$self->{cb}{$signal} || []};
283}
284
285sub DESTROY { 576sub DESTROY {
286 my ($self) = @_; 577 my ($self) = @_;
287 578
579 delete $WIDGET{$self+0};
288 #$self->deactivate; 580 #$self->deactivate;
289} 581}
290 582
291############################################################################# 583#############################################################################
292 584
293package CFClient::UI::DrawBG; 585package CFClient::UI::DrawBG;
294 586
295our @ISA = CFClient::UI::Base::; 587our @ISA = CFClient::UI::Base::;
296 588
297use strict; 589use strict;
298use SDL::OpenGL; 590use CFClient::OpenGL;
299 591
300sub new { 592sub new {
301 my $class = shift; 593 my $class = shift;
302 594
303 # range [value, low, high, page] 595 # range [value, low, high, page]
304 596
305 $class->SUPER::new ( 597 $class->SUPER::new (
306 bg => [0, 0, 0, 0.2], 598 #bg => [0, 0, 0, 0.2],
307 active_bg => [1, 1, 1, 0.5], 599 #active_bg => [1, 1, 1, 0.5],
308 @_ 600 @_
309 ) 601 )
310} 602}
311 603
312sub _draw { 604sub _draw {
313 my ($self) = @_; 605 my ($self) = @_;
314 606
607 my $color = $FOCUS == $self && $self->{active_bg}
608 ? $self->{active_bg}
609 : $self->{bg};
610
611 if ($color && (@$color < 4 || $color->[3])) {
315 my ($w, $h) = @$self{qw(w h)}; 612 my ($w, $h) = @$self{qw(w h)};
316 613
317 glEnable GL_BLEND; 614 glEnable GL_BLEND;
318 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
319 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 616 glColor @$color;
320 617
321 glBegin GL_QUADS; 618 glBegin GL_QUADS;
322 glVertex 0 , 0; 619 glVertex 0 , 0;
323 glVertex 0 , $h; 620 glVertex 0 , $h;
324 glVertex $w, $h; 621 glVertex $w, $h;
325 glVertex $w, 0; 622 glVertex $w, 0;
326 glEnd; 623 glEnd;
327 624
328 glDisable GL_BLEND; 625 glDisable GL_BLEND;
626 }
329} 627}
330 628
331############################################################################# 629#############################################################################
332 630
333package CFClient::UI::Empty; 631package CFClient::UI::Empty;
334
335our @ISA = CFClient::UI::Base::;
336
337sub size_request {
338 (0, 0)
339}
340
341sub draw { }
342
343#############################################################################
344
345package CFClient::UI::Container;
346 632
347our @ISA = CFClient::UI::Base::; 633our @ISA = CFClient::UI::Base::;
348 634
349sub new { 635sub new {
350 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
637 $class->SUPER::new (can_events => 0, %arg);
638}
639
640sub size_request {
641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
644}
645
646sub draw { }
647
648#############################################################################
649
650package CFClient::UI::Container;
651
652our @ISA = CFClient::UI::Base::;
653
654sub new {
655 my ($class, %arg) = @_;
351 656
352 my $children = delete $arg{children} || []; 657 my $children = delete $arg{children} || [];
353 658
354 my $self = $class->SUPER::new (children => [], %arg); 659 my $self = $class->SUPER::new (
660 children => [],
661 can_events => 0,
662 %arg,
663 );
355 $self->add ($_) for @$children; 664 $self->add ($_) for @$children;
356 665
357 $self 666 $self
358} 667}
359 668
360sub add { 669sub add {
361 my ($self, $child) = @_; 670 my ($self, @widgets) = @_;
362 671
363 $child->set_parent ($self); 672 $_->set_parent ($self)
673 for @widgets;
364 674
365 use sort 'stable'; 675 use sort 'stable';
366 676
367 $self->{children} = [ 677 $self->{children} = [
368 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
369 @{$self->{children}}, $child 679 @{$self->{children}}, @widgets
370 ]; 680 ];
371 681
372 $self->{w} = $self->{h} = -1; 682 $self->realloc;
373 $self->update; 683}
684
685sub children {
686 @{ $_[0]{children} }
374} 687}
375 688
376sub remove { 689sub remove {
377 my ($self, $widget) = @_; 690 my ($self, $child) = @_;
378 691
692 delete $child->{parent};
693 $child->hide;
694
379 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
380 696
381 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 697 $self->realloc;
698}
699
700sub clear {
701 my ($self) = @_;
702
703 my $children = delete $self->{children};
704 $self->{children} = [];
705
706 for (@$children) {
707 delete $_->{parent};
708 $_->hide;
709 }
710
711 $self->realloc;
382} 712}
383 713
384sub find_widget { 714sub find_widget {
385 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
386 716
… …
416 746
417 $class->SUPER::new (children => [$child], %arg) 747 $class->SUPER::new (children => [$child], %arg)
418} 748}
419 749
420sub add { 750sub add {
421 my ($self, $widget) = @_; 751 my ($self, $child) = @_;
422 752
423 $self->{children} = []; 753 $self->{children} = [];
424 754
425 $self->SUPER::add ($widget); 755 $self->SUPER::add ($child);
426} 756}
427 757
428sub remove { 758sub remove {
429 my ($self, $widget) = @_; 759 my ($self, $widget) = @_;
430 760
… …
439sub size_request { 769sub size_request {
440 $_[0]{children}[0]->size_request 770 $_[0]{children}[0]->size_request
441} 771}
442 772
443sub size_allocate { 773sub size_allocate {
444 my ($self, $x, $y, $w, $h) = @_; 774 my ($self, $w, $h) = @_;
445 775
446 $self->_size_allocate ($x, $y, $w, $h) or return;
447
448 $self->{children}[0]->size_allocate (0, 0, $w, $h); 776 $self->{children}[0]->configure (0, 0, $w, $h);
449} 777}
450 778
451############################################################################# 779#############################################################################
452 780
453package CFClient::UI::Window; 781package CFClient::UI::Window;
454 782
455our @ISA = CFClient::UI::Bin::; 783our @ISA = CFClient::UI::Bin::;
456 784
457use SDL::OpenGL; 785use CFClient::OpenGL;
458 786
459sub new { 787sub new {
460 my ($class, %arg) = @_; 788 my ($class, %arg) = @_;
461 789
462 my $self = $class->SUPER::new (%arg); 790 my $self = $class->SUPER::new (%arg);
463} 791}
464 792
465sub update { 793sub update {
466 my ($self) = @_; 794 my ($self) = @_;
467 795
468 # we want to do this delayed... 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
469 $self->render_chld;
470 $self->SUPER::update; 797 $self->SUPER::update;
471} 798}
472 799
800sub size_allocate {
801 my ($self, $w, $h) = @_;
802
803 $self->SUPER::size_allocate ($w, $h);
804 $self->update;
805}
806
807sub _render {
808 $_[0]{children}[0]->draw;
809}
810
473sub render_chld { 811sub render_child {
474 my ($self) = @_; 812 my ($self) = @_;
475 813
476 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
477 glClearColor 0, 0, 0, 1; 815 glClearColor 0, 0, 0, 0;
478 glClear GL_COLOR_BUFFER_BIT; 816 glClear GL_COLOR_BUFFER_BIT;
479 $self->child->draw; 817
818 $self->_render;
480 }; 819 };
481}
482
483sub size_allocate {
484 my ($self, $x, $y, $w, $h) = @_;
485
486 $self->_size_allocate ($x, $y, $w, $h) or return;
487
488 $self->child->size_allocate (0, 0, $w, $h);
489
490 $self->render_chld;
491} 820}
492 821
493sub _draw { 822sub _draw {
494 my ($self) = @_; 823 my ($self) = @_;
495 824
496 my ($w, $h) = ($self->w, $self->h); 825 my ($w, $h) = ($self->w, $self->h);
497 826
498 my $tex = $self->{texture} 827 my $tex = $self->{texture}
499 or return; 828 or return;
500 829
501 glEnable GL_BLEND;
502 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
503 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1;
505 833
506 $tex->draw_quad (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
507 835
508 glDisable GL_BLEND;
509 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
510} 837}
511 838
512############################################################################# 839#############################################################################
513 840
514package CFClient::UI::Frame; 841package CFClient::UI::ViewPort;
515 842
516our @ISA = CFClient::UI::Bin::; 843our @ISA = CFClient::UI::Window::;
517
518use SDL::OpenGL;
519
520sub size_request {
521 my ($self) = @_;
522 my $chld = $self->child
523 or return (0, 0);
524
525 $chld->move (2, 2);
526
527 map { $_ + 4 } $chld->size_request;
528}
529
530sub size_allocate {
531 my ($self, $x, $y, $w, $h) = @_;
532
533 $self->_size_allocate ($x, $y, $w, $h) or return;
534
535 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
536}
537
538sub _draw {
539 my ($self) = @_;
540
541 my $chld = $self->child;
542
543 my ($w, $h) = $chld->size_request;
544
545 glBegin GL_QUADS;
546 glColor 0, 0, 0;
547 glVertex 0 , 0;
548 glVertex 0 , $h + 4;
549 glVertex $w + 4 , $h + 4;
550 glVertex $w + 4 , 0;
551 glEnd;
552
553 $chld->draw;
554}
555
556#############################################################################
557
558package CFClient::UI::FancyFrame;
559
560our @ISA = CFClient::UI::Bin::;
561
562use SDL::OpenGL;
563
564my @tex =
565 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
566 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
567 844
568sub new { 845sub new {
569 my $class = shift; 846 my $class = shift;
570 847
571 # TODO: user_x, user_y, overwrite moveto?
572
573 $class->SUPER::new ( 848 $class->SUPER::new (
849 scroll_x => 0,
850 scroll_y => 1,
851 @_,
852 )
853}
854
855sub size_request {
856 my ($self) = @_;
857
858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
859
860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
864}
865
866sub size_allocate {
867 my ($self, $w, $h) = @_;
868
869 my $child = $self->child;
870
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873
874 $self->child->configure (0, 0, $w, $h);
875 $self->update;
876}
877
878sub set_offset {
879 my ($self, $x, $y) = @_;
880
881 $self->{view_x} = int $x;
882 $self->{view_y} = int $y;
883
884 $self->update;
885}
886
887# hmm, this does not work for topleft of $self... but we should not ask for that
888sub coord2local {
889 my ($self, $x, $y) = @_;
890
891 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
892}
893
894sub coord2global {
895 my ($self, $x, $y) = @_;
896
897 $x = List::Util::min $self->{w}, $x - $self->{view_x};
898 $y = List::Util::min $self->{h}, $y - $self->{view_y};
899
900 $self->SUPER::coord2global ($x, $y)
901}
902
903sub find_widget {
904 my ($self, $x, $y) = @_;
905
906 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
907 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
908 ) {
909 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
910 } else {
911 $self->CFClient::UI::Base::find_widget ($x, $y)
912 }
913}
914
915sub _render {
916 my ($self) = @_;
917
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919
920 $self->SUPER::_render;
921}
922
923#############################################################################
924
925package CFClient::UI::ScrolledWindow;
926
927our @ISA = CFClient::UI::HBox::;
928
929sub new {
930 my $class = shift;
931
932 my $self;
933
934 my $slider = new CFClient::UI::Slider
935 vertical => 1,
936 range => [0, 0, 1, 0.01], # HACK fix
937 on_changed => sub {
938 $self->{vp}->set_offset (0, $_[1]);
939 },
940 ;
941
942 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1),
944 slider => $slider,
945 @_,
946 );
947
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider});
951
952 $self
953}
954
955sub update {
956 my ($self) = @_;
957
958 $self->SUPER::update;
959
960 # todo: overwrite size_allocate of child
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963}
964
965sub size_allocate {
966 my ($self, $w, $h) = @_;
967
968 $self->SUPER::size_allocate ($w, $h);
969
970 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
972}
973
974#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll
976
977#############################################################################
978
979package CFClient::UI::Frame;
980
981our @ISA = CFClient::UI::Bin::;
982
983use CFClient::OpenGL;
984
985sub new {
986 my $class = shift;
987
988 $class->SUPER::new (
989 bg => undef,
990 @_,
991 )
992}
993
994sub _draw {
995 my ($self) = @_;
996
997 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)};
999
1000 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} };
1003
1004 glBegin GL_QUADS;
1005 glVertex 0 , 0;
1006 glVertex 0 , $h;
1007 glVertex $w, $h;
1008 glVertex $w, 0;
1009 glEnd;
1010
1011 glDisable GL_BLEND;
1012 }
1013
1014 $self->SUPER::_draw;
1015}
1016
1017#############################################################################
1018
1019package CFClient::UI::FancyFrame;
1020
1021our @ISA = CFClient::UI::Bin::;
1022
1023use CFClient::OpenGL;
1024
1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032
1033sub new {
1034 my $class = shift;
1035
1036 my $self = $class->SUPER::new (
574 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
575 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
576 border => int $::FONTSIZE * 0.8, 1039 border => 0.6,
1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
577 @_ 1043 @_
1044 );
1045
1046 $self->{title} &&= new CFClient::UI::Label
1047 align => 0,
1048 valign => 1,
1049 text => $self->{title},
1050 fontsize => $self->{border};
1051
1052 $self
1053}
1054
1055sub border {
1056 int $_[0]{border} * $::FONTSIZE
1057}
1058
1059sub size_request {
1060 my ($self) = @_;
1061
1062 my ($w, $h) = $self->SUPER::size_request;
1063
1064 (
1065 $w + $self->border * 2,
1066 $h + $self->border * 2,
578 ) 1067 )
579} 1068}
580 1069
581sub size_request {
582 my ($self) = @_;
583
584 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
585
586 my ($w, $h) = $self->SUPER::size_request;
587
588 (
589 $w + $self->{border} * 2,
590 $h + $self->{border} * 2,
591 )
592}
593
594sub size_allocate { 1070sub size_allocate {
595 my ($self, $x, $y, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
596 1072
597 $self->_size_allocate ($x, $y, $w, $h) or return;
598
599 $h -= List::Util::max 0, $self->{border} * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
600 $w -= List::Util::max 0, $self->{border} * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
601 1075
1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1077 if $self->{title};
1078
602 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
603} 1080}
604 1081
605sub button_down { 1082sub button_down {
606 my ($self, $ev, $x, $y) = @_; 1083 my ($self, $ev, $x, $y) = @_;
607 1084
608 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 1085 my ($w, $h) = @$self{qw(w h)};
609 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 1086 my $border = $self->border;
610 1087
1088 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
1089 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
1090
1091 if ($lr & $td) {
1092 my ($wx, $wy) = ($self->{x}, $self->{y});
611 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 1093 my ($ox, $oy) = ($ev->{x}, $ev->{y});
612 my ($bw, $bh) = ($self->{w}, $self->{h}); 1094 my ($bw, $bh) = ($self->{w}, $self->{h});
1095
1096 my $mx = $x < $border;
1097 my $my = $y < $border;
613 1098
614 $self->{motion} = sub { 1099 $self->{motion} = sub {
615 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
616 1101
617 ($x, $y) = ($ev->motion_x, $ev->motion_y); 1102 my $dx = $ev->{x} - $ox;
1103 my $dy = $ev->{y} - $oy;
618 1104
619 $self->{user_w} = $bw + $x - $ox; 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
620 $self->{user_h} = $bh + $y - $oy; 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107
621 $self->update; 1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
622 }; 1110 };
623 1111
624 } elsif ($x >= 0 && $x < $self->{w} 1112 } elsif ($lr ^ $td) {
625 && $y >= 0 && $y < $self->{border}) {
626
627 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
628 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
629 1115
630 $self->{motion} = sub { 1116 $self->{motion} = sub {
631 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
632 1118
633 ($x, $y) = ($ev->motion_x, $ev->motion_y); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
634 1120
635 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
636 $self->update;
637 }; 1122 };
638 } 1123 }
639} 1124}
640 1125
641sub button_up { 1126sub button_up {
… …
654 my ($self) = @_; 1139 my ($self) = @_;
655 1140
656 my ($w, $h ) = ($self->{w}, $self->{h}); 1141 my ($w, $h ) = ($self->{w}, $self->{h});
657 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
658 1143
659 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 1144 glEnable GL_TEXTURE_2D;
662 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
663 1146
1147 my $border = $self->border;
1148
664 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
665 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
666 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
667 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
668 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
669 1154
670 my $bg = $tex[0]; 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1156 glColor @{ $self->{bg} };
671 1157
672 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
673 my $rep_x = $cw / $bg->{w}; 1159 # solve this better(?)
674 my $rep_y = $ch / $bg->{h}; 1160 $bg->{s} = $cw / $bg->{w};
675 1161 $bg->{t} = $ch / $bg->{h};
676 glColor @{ $self->{bg} };
677
678 $bg->{s} = $rep_x;
679 $bg->{t} = $rep_y;
680 $bg->{wrap_mode} = 1;
681 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 }
682 1164
683 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
684 glDisable GL_BLEND; 1166
1167 $self->{title}->draw if $self->{title};
685 1168
686 $self->child->draw; 1169 $self->child->draw;
687} 1170}
688 1171
689############################################################################# 1172#############################################################################
… …
692 1175
693our @ISA = CFClient::UI::Base::; 1176our @ISA = CFClient::UI::Base::;
694 1177
695use List::Util qw(max sum); 1178use List::Util qw(max sum);
696 1179
697use SDL::OpenGL; 1180use CFClient::OpenGL;
698 1181
699sub new { 1182sub new {
700 my $class = shift; 1183 my $class = shift;
701 1184
702 $class->SUPER::new ( 1185 $class->SUPER::new (
703 col_expand => [], 1186 col_expand => [],
704 @_ 1187 @_,
705 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
706} 1193}
707 1194
708sub add { 1195sub add {
709 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
710 1197
711 $child->set_parent ($self); 1198 $child->set_parent ($self);
712 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
713 1200
714 $self->{w} = $self->{h} = -1; 1201 $self->realloc;
715 $self->update;
716} 1202}
717 1203
718# TODO: move to container class maybe? send childs a signal on removal? 1204# TODO: move to container class maybe? send children a signal on removal?
719sub clear { 1205sub clear {
720 my ($self) = @_; 1206 my ($self) = @_;
721 1207
1208 my @children = $self->children;
722 delete $self->{children}; 1209 delete $self->{children};
723 $self->update; 1210
1211 for (@children) {
1212 delete $_->{parent};
1213 $_->hide;
1214 }
1215
1216 $self->realloc;
724} 1217}
725 1218
726sub get_wh { 1219sub get_wh {
727 my ($self) = @_; 1220 my ($self) = @_;
728 1221
… …
733 or next; 1226 or next;
734 1227
735 for my $x (0 .. $#$row) { 1228 for my $x (0 .. $#$row) {
736 my $widget = $row->[$x] 1229 my $widget = $row->[$x]
737 or next; 1230 or next;
738 my ($w, $h) = $widget->size_request; 1231 my ($w, $h) = @$widget{qw(req_w req_h)};
739 1232
740 $w[$x] = max $w[$x], $w; 1233 $w[$x] = max $w[$x], $w;
741 $h[$y] = max $h[$y], $h; 1234 $h[$y] = max $h[$y], $h;
742 } 1235 }
743 } 1236 }
… …
755 (sum @$hs), 1248 (sum @$hs),
756 ) 1249 )
757} 1250}
758 1251
759sub size_allocate { 1252sub size_allocate {
760 my ($self, $x, $y, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
761
762 $self->_size_allocate ($x, $y, $w, $h) or return;
763 1254
764 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
765 1256
766 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
767 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
768 1259
769 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
770 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
771 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
772 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
789 1280
790 for my $c (0 .. $#$row) { 1281 for my $c (0 .. $#$row) {
791 my $col_w = $ws->[$c]; 1282 my $col_w = $ws->[$c];
792 1283
793 if (my $widget = $row->[$c]) { 1284 if (my $widget = $row->[$c]) {
794 $widget->size_allocate ($x, $y, $col_w, $row_h); 1285 $widget->configure ($x, $y, $col_w, $row_h);
795 } 1286 }
796 1287
797 $x += $col_w; 1288 $x += $col_w;
798 } 1289 }
799 1290
… …
826 } 1317 }
827} 1318}
828 1319
829############################################################################# 1320#############################################################################
830 1321
1322package CFClient::UI::Box;
1323
1324our @ISA = CFClient::UI::Container::;
1325
1326sub size_request {
1327 my ($self) = @_;
1328
1329 $self->{vertical}
1330 ? (
1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1333 )
1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1338}
1339
1340sub size_allocate {
1341 my ($self, $w, $h) = @_;
1342
1343 my $space = $self->{vertical} ? $h : $w;
1344 my $children = $self->{children};
1345
1346 my @req;
1347
1348 if ($self->{homogeneous}) {
1349 @req = ($space / (@$children || 1)) x @$children;
1350 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1352 my $req = List::Util::sum @req;
1353
1354 if ($req > $space) {
1355 # ah well, not enough space
1356 $_ *= $space / $req for @req;
1357 } else {
1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1363 for 0 .. $#$children;
1364 }
1365 }
1366
1367 CFClient::UI::harmonize \@req;
1368
1369 my $pos = 0;
1370 for (0 .. $#$children) {
1371 my $alloc = $req[$_];
1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1373
1374 $pos += $alloc;
1375 }
1376
1377 1
1378}
1379
1380#############################################################################
1381
831package CFClient::UI::HBox; 1382package CFClient::UI::HBox;
832 1383
833# TODO: wrap into common Box base class
834
835our @ISA = CFClient::UI::Container::; 1384our @ISA = CFClient::UI::Box::;
836 1385
837sub size_request { 1386sub new {
838 my ($self) = @_; 1387 my $class = shift;
839 1388
840 my @alloc = map [$_->size_request], @{$self->{children}}; 1389 $class->SUPER::new (
841 1390 vertical => 0,
842 ( 1391 @_,
843 (List::Util::sum map $_->[0], @alloc),
844 (List::Util::max map $_->[1], @alloc),
845 ) 1392 )
846} 1393}
847 1394
848sub size_allocate {
849 my ($self, $x, $y, $w, $h) = @_;
850
851 $self->_size_allocate ($x, $y, $w, $h);
852
853 ($h, $w) = ($w, $h);
854
855 my $children = $self->{children};
856
857 my @h = map +($_->size_request)[0], @$children;
858
859 my $req_h = List::Util::sum @h;
860
861 if ($req_h > $h) {
862 # ah well, not enough space
863 $_ *= $h / $req_h for @h;
864 } else {
865 my $exp = List::Util::sum map $_->{expand}, @$children;
866 $exp ||= 1;
867
868 for (0 .. $#$children) {
869 my $child = $children->[$_];
870
871 my $alloc_h = $h[$_];
872 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
873 $h[$_] = $alloc_h;
874 }
875 }
876
877 CFClient::UI::harmonize \@h;
878
879 my $y = 0;
880 for (0 .. $#$children) {
881 my $child = $children->[$_];
882 my $h = $h[$_];
883 $child->size_allocate ($y, 0, $h, $w);
884
885 $y += $h;
886 }
887}
888
889############################################################################# 1395#############################################################################
890 1396
891package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
892 1398
893# TODO: wrap into common Box base class
894
895our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
896 1400
897sub size_request { 1401sub new {
898 my ($self) = @_; 1402 my $class = shift;
899 1403
900 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
901 1405 vertical => 1,
902 ( 1406 @_,
903 (List::Util::max map $_->[0], @alloc),
904 (List::Util::sum map $_->[1], @alloc),
905 ) 1407 )
906} 1408}
907 1409
908sub size_allocate {
909 my ($self, $x, $y, $w, $h) = @_;
910
911 $self->_size_allocate ($x, $y, $w, $h);
912
913 my $children = $self->{children};
914
915 my @h = map +($_->size_request)[1], @$children;
916
917 my $req_h = List::Util::sum @h;
918
919 if ($req_h > $h) {
920 # ah well, not enough space
921 $_ *= $h / $req_h for @h;
922 } else {
923 my $exp = List::Util::sum map $_->{expand}, @$children;
924 $exp ||= 1;
925
926 for (0 .. $#$children) {
927 my $child = $children->[$_];
928
929 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
930 }
931 }
932
933 CFClient::UI::harmonize \@h;
934
935 my $y = 0;
936 for (0 .. $#$children) {
937 my $child = $children->[$_];
938 my $h = $h[$_];
939 $child->size_allocate (0, $y, $w, $h);
940
941 $y += $h;
942 }
943}
944
945############################################################################# 1410#############################################################################
946 1411
947package CFClient::UI::Label; 1412package CFClient::UI::Label;
948 1413
949our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
950 1415
951use SDL::OpenGL; 1416use CFClient::OpenGL;
952 1417
953sub new { 1418sub new {
954 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
955 1420
956 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
957 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
958 fontsize => $::FONTSIZE, 1423 #bg => none
959 text => "", 1424 #active_bg => none
1425 #font => default_font
1426 #text => initial text
1427 #markup => initial narkup
1428 #max_w => maximum pixel width
1429 ellipsise => 3, # end
1430 layout => (new CFClient::Layout),
1431 fontsize => 1,
960 align => -1, 1432 align => -1,
961 valign => -1, 1433 valign => -1,
962 padding => 2, 1434 padding_x => 2,
963 layout => new CFClient::Layout, 1435 padding_y => 2,
1436 can_events => 0,
964 %arg 1437 %arg
965 ); 1438 );
966 1439
967 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1440 if (exists $self->{template}) {
1441 my $layout = new CFClient::Layout;
1442 $layout->set_text (delete $self->{template});
1443 $self->{template} = $layout;
1444 }
968 1445
969 $self->set_text (delete $self->{text}) if exists $self->{text}; 1446 if (exists $self->{markup}) {
970 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1447 $self->set_markup (delete $self->{markup});
1448 } else {
1449 $self->set_text (delete $self->{text});
1450 }
971 1451
972 $self 1452 $self
973} 1453}
974 1454
975sub escape_text { 1455sub escape($) {
976 local $_ = $_[1]; 1456 local $_ = $_[0];
977 1457
978 s/&/&amp;/g; 1458 s/&/&amp;/g;
979 s/>/&gt;/g; 1459 s/>/&gt;/g;
980 s/</&lt;/g; 1460 s/</&lt;/g;
981 1461
982 $_[1] 1462 $_
1463}
1464
1465sub update {
1466 my ($self) = @_;
1467
1468 delete $self->{texture};
1469 $self->SUPER::update;
983} 1470}
984 1471
985sub set_text { 1472sub set_text {
986 my ($self, $text) = @_; 1473 my ($self, $text) = @_;
987 1474
1475 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text";
1477
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
988 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
989 1480
990 delete $self->{texture}; 1481 $self->realloc;
991 $self->update; 1482 $self->update;
992} 1483}
993 1484
994sub set_markup { 1485sub set_markup {
995 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
996 1487
1488 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup";
1490
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
997 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
998 1495
1496 $self->realloc;
1497 $self->update;
1498}
1499
1500sub size_request {
1501 my ($self) = @_;
1502
1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508
1509 my ($w, $h) = $self->{layout}->size;
1510
1511 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font};
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514
1515 my ($w2, $h2) = $self->{template}->size;
1516
1517 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2;
1519 }
1520
1521 ($w, $h)
1522}
1523
1524sub size_allocate {
1525 my ($self, $w, $h) = @_;
1526
1527 delete $self->{texture}
1528 ;#d#
1529}
1530
1531sub set_fontsize {
1532 my ($self, $fontsize) = @_;
1533
1534 $self->{fontsize} = $fontsize;
999 delete $self->{texture}; 1535 delete $self->{texture};
1000 $self->update;
1001}
1002 1536
1003sub size_request { 1537 $self->realloc;
1004 my ($self) = @_;
1005
1006 $self->{layout}->set_width;
1007 $self->{layout}->set_height ($self->{fontsize});
1008
1009 my ($w, $h) = $self->{layout}->size;
1010
1011 (
1012 $w + $self->{padding} * 2,
1013 $h + $self->{padding} * 2,
1014 )
1015}
1016
1017sub size_allocate {
1018 my ($self, $x, $y, $w, $h) = @_;
1019
1020 $self->_size_allocate ($x, $y, $w, $h) or return;
1021
1022 delete $self->{texture};
1023}
1024
1025sub update {
1026 my ($self) = @_;
1027
1028 delete $self->{texture};
1029 $self->SUPER::update;
1030} 1538}
1031 1539
1032sub _draw { 1540sub _draw {
1033 my ($self) = @_; 1541 my ($self) = @_;
1034 1542
1543 $self->SUPER::_draw; # draw background, if applicable
1544
1035 my $tex = $self->{texture} ||= do { 1545 my $tex = $self->{texture} ||= do {
1546 $self->{layout}->set_foreground (@{$self->{fg}});
1547 $self->{layout}->set_font ($self->{font}) if $self->{font};
1036 $self->{layout}->set_width ($self->{w}); 1548 $self->{layout}->set_width ($self->{w});
1037 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1549 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552
1038 new_from_layout CFClient::Texture $self->{layout} 1553 my $tex = new_from_layout CFClient::Texture $self->{layout};
1554
1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1557 : ($self->{w} - $tex->{w}) * 0.5);
1558
1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1561 : ($self->{h} - $tex->{h}) * 0.5);
1562
1563 $tex
1039 }; 1564 };
1040 1565
1041 glEnable GL_BLEND;
1042 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1043 glEnable GL_TEXTURE_2D; 1566 glEnable GL_TEXTURE_2D;
1044 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1045 1568
1569 if ($tex->{format} == GL_ALPHA) {
1046 glColor @{$self->{fg}}; 1570 glColor @{$self->{fg}};
1047
1048 $self->{ox} = int (
1049 $self->{align} < 0 ? $self->{padding}
1050 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1051 : ($self->{w} - $tex->{w}) * 0.5
1052 );
1053
1054 $self->{oy} = int (
1055 $self->{valign} < 0 ? $self->{padding}
1056 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1057 : ($self->{h} - $tex->{h}) * 0.5
1058 );
1059
1060 $tex->draw_quad ($self->{ox}, $self->{oy}); 1571 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1572 } else {
1573 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1574 }
1061 1575
1062 glDisable GL_TEXTURE_2D; 1576 glDisable GL_TEXTURE_2D;
1063 glDisable GL_BLEND;
1064} 1577}
1065 1578
1066############################################################################# 1579#############################################################################
1067 1580
1068package CFClient::UI::EntryBase; 1581package CFClient::UI::EntryBase;
1069 1582
1070our @ISA = CFClient::UI::Label::; 1583our @ISA = CFClient::UI::Label::;
1071 1584
1072use SDL; 1585use CFClient::OpenGL;
1073use SDL::OpenGL;
1074 1586
1075sub new { 1587sub new {
1076 my $class = shift; 1588 my $class = shift;
1077 1589
1078 $class->SUPER::new ( 1590 $class->SUPER::new (
1079 fg => [1, 1, 1], 1591 fg => [1, 1, 1],
1080 bg => [0, 0, 0, 0.2], 1592 bg => [0, 0, 0, 0.2],
1081 active_bg => [1, 1, 1, 0.5], 1593 active_bg => [1, 1, 1, 0.5],
1082 active_fg => [0, 0, 0], 1594 active_fg => [0, 0, 0],
1083 can_hover => 1, 1595 can_hover => 1,
1084 can_focus => 1, 1596 can_focus => 1,
1085 valign => 0, 1597 valign => 0,
1598 can_events => 1,
1599 #text => ...
1086 @_ 1600 @_
1087 ) 1601 )
1088} 1602}
1089 1603
1090sub _set_text { 1604sub _set_text {
… …
1092 1606
1093 delete $self->{cur_h}; 1607 delete $self->{cur_h};
1094 1608
1095 return if $self->{text} eq $text; 1609 return if $self->{text} eq $text;
1096 1610
1611 delete $self->{texture};
1612
1097 $self->{last_activity} = $::NOW; 1613 $self->{last_activity} = $::NOW;
1098 $self->{text} = $text; 1614 $self->{text} = $text;
1099 1615
1100 $text =~ s/./*/g if $self->{hidden}; 1616 $text =~ s/./*/g if $self->{hidden};
1101 $self->{layout}->set_text ("$text "); 1617 $self->{layout}->set_text ("$text ");
1102 1618
1103 $self->emit (changed => $self->{text}); 1619 $self->_emit (changed => $self->{text});
1620}
1621
1622sub set_text {
1623 my ($self, $text) = @_;
1624
1625 $self->{cursor} = length $text;
1626 $self->_set_text ($text);
1627
1628 $self->realloc;
1104} 1629}
1105 1630
1106sub get_text { 1631sub get_text {
1107 $_[0]{text} 1632 $_[0]{text}
1108} 1633}
… …
1113 my ($w, $h) = $self->SUPER::size_request; 1638 my ($w, $h) = $self->SUPER::size_request;
1114 1639
1115 ($w + 1, $h) # add 1 for cursor 1640 ($w + 1, $h) # add 1 for cursor
1116} 1641}
1117 1642
1118sub size_allocate {
1119 my ($self, $x, $y, $w, $h) = @_;
1120
1121 $self->SUPER::size_allocate ($x, $y, $w, $h);
1122
1123 $self->_set_text ($self->{text});
1124}
1125
1126sub set_text {
1127 my ($self, $text) = @_;
1128
1129 $self->{cursor} = length $text;
1130 $self->_set_text ($text);
1131 $self->update;
1132}
1133
1134sub key_down { 1643sub key_down {
1135 my ($self, $ev) = @_; 1644 my ($self, $ev) = @_;
1136 1645
1137 my $mod = $ev->key_mod; 1646 my $mod = $ev->{mod};
1138 my $sym = $ev->key_sym; 1647 my $sym = $ev->{sym};
1139
1140 my $uni = $ev->key_unicode; 1648 my $uni = $ev->{unicode};
1141 1649
1142 my $text = $self->get_text; 1650 my $text = $self->get_text;
1143 1651
1144 if ($sym == SDLK_BACKSPACE) { 1652 if ($uni == 8) {
1145 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1653 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1146 } elsif ($sym == SDLK_DELETE) { 1654 } elsif ($uni == 127) {
1147 substr $text, $self->{cursor}, 1, ""; 1655 substr $text, $self->{cursor}, 1, "";
1148 } elsif ($sym == SDLK_LEFT) { 1656 } elsif ($sym == CFClient::SDLK_LEFT) {
1149 --$self->{cursor} if $self->{cursor}; 1657 --$self->{cursor} if $self->{cursor};
1150 } elsif ($sym == SDLK_RIGHT) { 1658 } elsif ($sym == CFClient::SDLK_RIGHT) {
1151 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1659 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1152 } elsif ($sym == SDLK_HOME) { 1660 } elsif ($sym == CFClient::SDLK_HOME) {
1153 $self->{cursor} = 0; 1661 $self->{cursor} = 0;
1154 } elsif ($sym == SDLK_END) { 1662 } elsif ($sym == CFClient::SDLK_END) {
1155 $self->{cursor} = length $text; 1663 $self->{cursor} = length $text;
1156 } elsif ($sym == SDLK_ESCAPE) { 1664 } elsif ($uni == 27) {
1157 $self->emit ('escape'); 1665 $self->_emit ('escape');
1158 } elsif ($uni) { 1666 } elsif ($uni) {
1159 substr $text, $self->{cursor}++, 0, chr $uni; 1667 substr $text, $self->{cursor}++, 0, chr $uni;
1160 } 1668 }
1161 1669
1162 $self->_set_text ($text); 1670 $self->_set_text ($text);
1163 $self->update; 1671
1672 $self->realloc;
1164} 1673}
1165 1674
1166sub focus_in { 1675sub focus_in {
1167 my ($self) = @_; 1676 my ($self) = @_;
1168 1677
… …
1236 1745
1237package CFClient::UI::Entry; 1746package CFClient::UI::Entry;
1238 1747
1239our @ISA = CFClient::UI::EntryBase::; 1748our @ISA = CFClient::UI::EntryBase::;
1240 1749
1241use SDL; 1750use CFClient::OpenGL;
1242use SDL::OpenGL;
1243 1751
1244sub key_down { 1752sub key_down {
1245 my ($self, $ev) = @_; 1753 my ($self, $ev) = @_;
1246 1754
1247 my $sym = $ev->key_sym; 1755 my $sym = $ev->{sym};
1248 1756
1249 if ($sym == SDLK_RETURN) { 1757 if ($sym == 13) {
1758 unshift @{$self->{history}},
1759 my $txt = $self->get_text;
1760 $self->{history_pointer} = -1;
1761 $self->{history_saveback} = '';
1250 $self->emit (activate => $self->get_text); 1762 $self->_emit (activate => $txt);
1251 $self->update; 1763 $self->update;
1764
1765 } elsif ($sym == CFClient::SDLK_UP) {
1766 if ($self->{history_pointer} < 0) {
1767 $self->{history_saveback} = $self->get_text;
1768 }
1769 if (@{$self->{history} || []} > 0) {
1770 $self->{history_pointer}++;
1771 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1772 $self->{history_pointer} = @{$self->{history} || []} - 1;
1773 }
1774 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1775 }
1776
1777 } elsif ($sym == CFClient::SDLK_DOWN) {
1778 $self->{history_pointer}--;
1779 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1780
1781 if ($self->{history_pointer} >= 0) {
1782 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1783 } else {
1784 $self->set_text ($self->{history_saveback});
1785 }
1252 1786
1253 } else { 1787 } else {
1254 $self->SUPER::key_down ($ev); 1788 $self->SUPER::key_down ($ev);
1255 } 1789 }
1256 1790
… …
1260 1794
1261package CFClient::UI::Button; 1795package CFClient::UI::Button;
1262 1796
1263our @ISA = CFClient::UI::Label::; 1797our @ISA = CFClient::UI::Label::;
1264 1798
1265use SDL; 1799use CFClient::OpenGL;
1266use SDL::OpenGL;
1267 1800
1268my @tex = 1801my @tex =
1269 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1802 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1270 qw(b1_button_active.png); 1803 qw(b1_button_active.png);
1271 1804
1272sub new { 1805sub new {
1273 my $class = shift; 1806 my $class = shift;
1274 1807
1275 $class->SUPER::new ( 1808 $class->SUPER::new (
1276 padding => 4, 1809 padding_x => 4,
1810 padding_y => 4,
1811 fg => [1, 1, 1],
1812 active_fg => [0, 0, 1],
1813 can_hover => 1,
1814 align => 0,
1815 valign => 0,
1816 can_events => 1,
1817 @_
1818 )
1819}
1820
1821sub activate { }
1822
1823sub button_up {
1824 my ($self, $ev, $x, $y) = @_;
1825
1826 $self->emit ("activate")
1827 if $x >= 0 && $x < $self->{w}
1828 && $y >= 0 && $y < $self->{h};
1829}
1830
1831sub _draw {
1832 my ($self) = @_;
1833
1834 local $self->{fg} = $self->{fg};
1835
1836 if ($GRAB == $self) {
1837 $self->{fg} = $self->{active_fg};
1838 }
1839
1840 glEnable GL_TEXTURE_2D;
1841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1842 glColor 0, 0, 0, 1;
1843
1844 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1845
1846 glDisable GL_TEXTURE_2D;
1847
1848 $self->SUPER::_draw;
1849}
1850
1851#############################################################################
1852
1853package CFClient::UI::CheckBox;
1854
1855our @ISA = CFClient::UI::DrawBG::;
1856
1857my @tex =
1858 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1859 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1860
1861use CFClient::OpenGL;
1862
1863sub new {
1864 my $class = shift;
1865
1866 $class->SUPER::new (
1867 padding_x => 2,
1868 padding_y => 2,
1277 fg => [1, 1, 1], 1869 fg => [1, 1, 1],
1870 active_fg => [1, 1, 0],
1278 bg => [1, 1, 1, 0.2], 1871 bg => [0, 0, 0, 0.2],
1279 active_fg => [0, 0, 1], 1872 active_bg => [1, 1, 1, 0.5],
1873 state => 0,
1280 can_hover => 1, 1874 can_hover => 1,
1281 @_ 1875 @_
1282 ) 1876 )
1283} 1877}
1284 1878
1879sub size_request {
1880 my ($self) = @_;
1881
1882 (6) x 2
1883}
1884
1285sub button_up { 1885sub button_down {
1286 my ($self, $ev, $x, $y) = @_; 1886 my ($self, $ev, $x, $y) = @_;
1287 1887
1288 if ($x >= 0 && $x < $self->{w} 1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1289 && $y >= 0 && $y < $self->{h}) { 1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1290 $self->emit ("activate"); 1890 $self->{state} = !$self->{state};
1891 $self->_emit (changed => $self->{state});
1291 } 1892 }
1292} 1893}
1293 1894
1294sub _draw { 1895sub _draw {
1295 my ($self) = @_; 1896 my ($self) = @_;
1296 1897
1297 local $self->{fg} = $self->{fg}; 1898 $self->SUPER::_draw;
1298 1899
1299 if ($GRAB == $self) { 1900 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1300 $self->{fg} = $self->{active_fg}; 1901
1902 my ($w, $h) = @$self{qw(w h)};
1903
1904 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1905
1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1907
1908 my $tex = $self->{state} ? $tex[1] : $tex[0];
1909
1910 glEnable GL_TEXTURE_2D;
1911 $tex->draw_quad_alpha (0, 0, $s, $s);
1912 glDisable GL_TEXTURE_2D;
1913}
1914
1915#############################################################################
1916
1917package CFClient::UI::Image;
1918
1919our @ISA = CFClient::UI::Base::;
1920
1921use CFClient::OpenGL;
1922use Carp qw/confess/;
1923
1924our %loaded_images;
1925
1926sub new {
1927 my $class = shift;
1928
1929 my $self = $class->SUPER::new (can_events => 0, @_);
1930
1931 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1932
1933 $loaded_images{$self->{image}} ||=
1934 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1935
1936 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1937
1938 Scalar::Util::weaken $loaded_images{$self->{image}};
1939
1940 $self->{aspect} = $tex->{w} / $tex->{h};
1941
1942 $self
1943}
1944
1945sub size_request {
1946 my ($self) = @_;
1947
1948 ($self->{tex}->{w}, $self->{tex}->{h})
1949}
1950
1951sub _draw {
1952 my ($self) = @_;
1953
1954 my $tex = $self->{tex};
1955
1956 my ($w, $h) = ($self->{w}, $self->{h});
1957
1958 if ($self->{rot90}) {
1959 glRotate 90, 0, 0, 1;
1960 glTranslate 0, -$self->{w}, 0;
1961
1962 ($w, $h) = ($h, $w);
1301 } 1963 }
1964
1965 glEnable GL_TEXTURE_2D;
1966 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1967
1968 $tex->draw_quad_alpha (0, 0, $w, $h);
1969
1970 glDisable GL_TEXTURE_2D;
1971}
1972
1973#############################################################################
1974
1975package CFClient::UI::VGauge;
1976
1977our @ISA = CFClient::UI::Base::;
1978
1979use List::Util qw(min max);
1980
1981use CFClient::OpenGL;
1982
1983my %tex = (
1984 food => [
1985 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1986 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1987 ],
1988 grace => [
1989 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1990 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1991 ],
1992 hp => [
1993 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1994 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1995 ],
1996 mana => [
1997 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1998 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1999 ],
2000);
2001
2002# eg. VGauge->new (gauge => 'food'), default gauge: food
2003sub new {
2004 my $class = shift;
2005
2006 my $self = $class->SUPER::new (
2007 type => 'food',
2008 @_
2009 );
2010
2011 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
2012
2013 $self
2014}
2015
2016sub size_request {
2017 my ($self) = @_;
2018
2019 #my $tex = $tex{$self->{type}}[0];
2020 #@$tex{qw(w h)}
2021 (0, 0)
2022}
2023
2024sub set_max {
2025 my ($self, $max) = @_;
2026
2027 return if $self->{max_val} == $max;
2028
2029 $self->{max_val} = $max;
2030 $self->update;
2031}
2032
2033sub set_value {
2034 my ($self, $val, $max) = @_;
2035
2036 $self->set_max ($max)
2037 if defined $max;
2038
2039 return if $self->{val} == $val;
2040
2041 $self->{val} = $val;
2042 $self->update;
2043}
2044
2045sub _draw {
2046 my ($self) = @_;
2047
2048 my $tex = $tex{$self->{type}};
2049 my ($t1, $t2, $t3) = @$tex;
2050
2051 my ($w, $h) = ($self->{w}, $self->{h});
2052
2053 if ($self->{vertical}) {
2054 glRotate 90, 0, 0, 1;
2055 glTranslate 0, -$self->{w}, 0;
2056
2057 ($w, $h) = ($h, $w);
2058 }
2059
2060 my $ycut = $self->{val} / ($self->{max_val} || 1);
2061
2062 my $ycut1 = max 0, min 1, $ycut;
2063 my $ycut2 = max 0, min 1, $ycut - 1;
2064
2065 my $h1 = $self->{h} * (1 - $ycut1);
2066 my $h2 = $self->{h} * (1 - $ycut2);
1302 2067
1303 glEnable GL_BLEND; 2068 glEnable GL_BLEND;
1304 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2069 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1305 glEnable GL_TEXTURE_2D; 2070 glEnable GL_TEXTURE_2D;
1306 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1307 glColor 0, 0, 0, 1;
1308 2072
1309 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 2073 glBindTexture GL_TEXTURE_2D, $t1->{name};
2074 glBegin GL_QUADS;
2075 glTexCoord 0 , 0; glVertex 0 , 0;
2076 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
2077 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
2078 glTexCoord $t1->{s}, 0; glVertex $w, 0;
2079 glEnd;
1310 2080
2081 my $ycut1 = List::Util::min 1, $ycut;
2082 glBindTexture GL_TEXTURE_2D, $t2->{name};
2083 glBegin GL_QUADS;
2084 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
2085 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
2086 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
2087 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
2088 glEnd;
2089
2090 if ($t3) {
2091 glBindTexture GL_TEXTURE_2D, $t3->{name};
2092 glBegin GL_QUADS;
2093 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2094 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2095 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2096 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2097 glEnd;
2098 }
2099
2100 glDisable GL_BLEND;
1311 glDisable GL_TEXTURE_2D; 2101 glDisable GL_TEXTURE_2D;
1312 glDisable GL_BLEND;
1313
1314 $self->SUPER::_draw;
1315} 2102}
1316 2103
1317############################################################################# 2104#############################################################################
1318 2105
1319package CFClient::UI::CheckBox; 2106package CFClient::UI::Gauge;
1320 2107
1321our @ISA = CFClient::UI::DrawBG::; 2108our @ISA = CFClient::UI::VBox::;
1322
1323my @tex =
1324 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1325 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1326
1327use SDL;
1328use SDL::OpenGL;
1329 2109
1330sub new { 2110sub new {
1331 my $class = shift; 2111 my ($class, %arg) = @_;
1332 2112
1333 $class->SUPER::new ( 2113 my $self = $class->SUPER::new (
1334 padding => 2, 2114 tooltip => $arg{type},
1335 fg => [1, 1, 1],
1336 active_fg => [1, 1, 0],
1337 state => 0,
1338 can_hover => 1, 2115 can_hover => 1,
1339 @_ 2116 can_events => 1,
2117 %arg,
1340 ) 2118 );
1341}
1342 2119
1343sub size_request { 2120 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
2121 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2122 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
2123
2124 $self
2125}
2126
2127sub set_fontsize {
2128 my ($self, $fsize) = @_;
2129
2130 $self->{value}->set_fontsize ($fsize);
2131 $self->{max} ->set_fontsize ($fsize);
2132}
2133
2134sub set_max {
1344 my ($self) = @_; 2135 my ($self, $max) = @_;
1345 2136
1346 ($self->{padding} * 2 + 6) x 2 2137 $self->{gauge}->set_max ($max);
2138 $self->{max}->set_text ($max);
1347} 2139}
1348 2140
1349sub size_allocate { 2141sub set_value {
1350 my ($self, $x, $y, $w, $h) = @_;
1351
1352 $self->_size_allocate ($x, $y, $w, $h);
1353}
1354
1355sub button_down {
1356 my ($self, $ev, $x, $y) = @_; 2142 my ($self, $val, $max) = @_;
1357 2143
1358 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2144 $self->set_max ($max)
1359 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2145 if defined $max;
1360 $self->{state} = !$self->{state};
1361 $self->emit (changed => $self->{state});
1362 }
1363}
1364 2146
1365sub _draw { 2147 $self->{gauge}->set_value ($val, $max);
1366 my ($self) = @_; 2148 $self->{value}->set_text ($val);
1367
1368 $self->SUPER::_draw;
1369
1370 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1371
1372 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1373
1374 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1375
1376 glEnable GL_BLEND;
1377 glEnable GL_TEXTURE_2D;
1378 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1379
1380 my $tex = $self->{state} ? $tex[1] : $tex[0];
1381
1382 $tex->draw_quad (0, 0, $s, $s);
1383
1384 glDisable GL_TEXTURE_2D;
1385 glDisable GL_BLEND;
1386} 2149}
1387 2150
1388############################################################################# 2151#############################################################################
1389 2152
1390package CFClient::UI::Slider; 2153package CFClient::UI::Slider;
1391 2154
1392use strict; 2155use strict;
1393 2156
1394use SDL::OpenGL; 2157use CFClient::OpenGL;
1395 2158
1396our @ISA = CFClient::UI::DrawBG::; 2159our @ISA = CFClient::UI::DrawBG::;
1397 2160
1398my @tex = 2161my @tex =
1399 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2162 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1400 qw(s1_slider.png s1_slider_bg.png); 2163 qw(s1_slider.png s1_slider_bg.png);
1401 2164
1402sub new { 2165sub new {
1403 my $class = shift; 2166 my $class = shift;
1404 2167
1405 # range [value, low, high, page] 2168 # range [value, low, high, page, unit]
1406 2169
1407 # TODO: 0-width page 2170 # TODO: 0-width page
1408 # TODO: req_w/h are wrong with vertical 2171 # TODO: req_w/h are wrong with vertical
1409 # TODO: calculations are off 2172 # TODO: calculations are off
1410 my $self = $class->SUPER::new ( 2173 my $self = $class->SUPER::new (
1411 fg => [1, 1, 1], 2174 fg => [1, 1, 1],
1412 active_fg => [0, 0, 0], 2175 active_fg => [0, 0, 0],
2176 bg => [0, 0, 0, 0.2],
2177 active_bg => [1, 1, 1, 0.5],
1413 range => [0, 0, 100, 10], 2178 range => [0, 0, 100, 10, 0],
1414 req_w => 40, 2179 min_w => $::WIDTH / 80,
1415 req_h => 13, 2180 min_h => $::WIDTH / 80,
1416 vertical => 0, 2181 vertical => 0,
1417 can_hover => 1, 2182 can_hover => 1,
1418 inner_pad => 5, 2183 inner_pad => 0.02,
1419 @_ 2184 @_
1420 ); 2185 );
1421 2186
2187 $self->set_value ($self->{range}[0]);
2188 $self->update;
2189
1422 $self 2190 $self
1423} 2191}
1424 2192
2193sub changed { }
2194
2195sub set_range {
2196 my ($self, $range) = @_;
2197
2198 ($range, $self->{range}) = ($self->{range}, $range);
2199
2200 $self->update
2201 if "@$range" ne "@{$self->{range}}";
2202}
2203
2204sub set_value {
2205 my ($self, $value) = @_;
2206
2207 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2208
2209 $hi = $lo + 1 if $hi <= $lo;
2210
2211 $page = $hi - $lo if $page > $hi - $lo;
2212
2213 $value = $lo if $value < $lo;
2214 $value = $hi - $page if $value > $hi - $page;
2215
2216 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2217 if $unit;
2218
2219 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2220
2221 if ($value != $old_value) {
2222 $self->_emit (changed => $value);
2223 $self->update;
2224 }
2225}
2226
1425sub size_request { 2227sub size_request {
1426 my ($self) = @_; 2228 my ($self) = @_;
1427 2229
1428 my $w = $self->{req_w}; 2230 ($self->{req_w}, $self->{req_h})
1429 my $h = $self->{req_h};
1430
1431 $self->{vertical} ? ($h, $w) : ($w, $h)
1432} 2231}
1433 2232
1434sub button_down { 2233sub button_down {
1435 my ($self, $ev, $x, $y) = @_; 2234 my ($self, $ev, $x, $y) = @_;
1436 2235
1437 $self->SUPER::button_down ($ev, $x, $y); 2236 $self->SUPER::button_down ($ev, $x, $y);
2237
2238 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239
1438 $self->mouse_motion ($ev, $x, $y); 2240 $self->mouse_motion ($ev, $x, $y);
1439} 2241}
1440 2242
1441sub mouse_motion { 2243sub mouse_motion {
1442 my ($self, $ev, $x, $y) = @_; 2244 my ($self, $ev, $x, $y) = @_;
1443 2245
1444 if ($GRAB == $self) { 2246 if ($GRAB == $self) {
2247 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2248
2249 my (undef, $lo, $hi, $page) = @{$self->{range}};
2250
2251 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252
2253 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2254 }
2255}
2256
2257sub update {
2258 my ($self) = @_;
2259
2260 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2261 $self->set_value ($self->{range}[0]);
2262
1445 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2263 my ($value, $lo, $hi, $page) = @{$self->{range}};
2264 my $range = ($hi - $page - $lo) || 1e-100;
1446 2265
1447 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2266 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1448 2267
1449 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2268 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1450 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2269 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1451 2270
1452 $x -= $inner_pad_px; # substract the padding 2271 $value = ($value - $lo) / $range;
1453 $x = $x * ($hi - $lo) / $inner_w + $lo; 2272 $value = $value * $self->{scale} + $self->{offset};
1454 $x = $lo if $x < $lo;
1455 $x = $hi - $page if $x > $hi - $page;
1456 $self->{range}[0] = $x;
1457 2273
1458 $self->emit (changed => $x); 2274 $self->{knob_x} = $value - $knob_w * 0.5;
1459 $self->update; 2275 $self->{knob_w} = $knob_w;
1460 } 2276 });
1461}
1462 2277
1463# the inner_* stuff is for generating a padding for the slider handle, 2278 $self->SUPER::update;
1464# so that the handle doesn't leave the texture. This calculation isn't 100%
1465# correct propably, but it does the job for now
1466sub _calc_inner_pad_px {
1467 my ($self, $w) = @_;
1468 ($w / 100) * $self->{inner_pad} # % to pixels
1469} 2279}
1470 2280
1471sub _draw { 2281sub _draw {
1472 my ($self) = @_; 2282 my ($self) = @_;
1473 2283
1474 $self->SUPER::_draw (); 2284 $self->SUPER::_draw ();
1475 2285
1476 my ($w, $h) = @$self{qw(w h)}; 2286 glScale $self->{w}, $self->{h};
1477 2287
1478 if ($self->{vertical}) { 2288 if ($self->{vertical}) {
1479 # draw a vertical slider like a rotated horizontal slider 2289 # draw a vertical slider like a rotated horizontal slider
1480 2290
2291 glTranslate 1, 0, 0;
1481 glRotate 90, 0, 0, 1; 2292 glRotate 90, 0, 0, 1;
1482 glTranslate 0, -$self->{w}, 0;
1483
1484 ($w, $h) = ($h, $w);
1485 } 2293 }
1486 2294
1487 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2295 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1488 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2296 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1489 2297
1490 my ($value, $lo, $hi, $page) = @{$self->{range}};
1491
1492 $hi = $value + 1 if $lo == $hi;
1493
1494 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1495 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1496
1497 $page = int $page * $inner_w / ($hi - $lo);
1498 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1499
1500 $w -= $page;
1501 $page &= ~1;
1502 glTranslate $page * 0.5, 0, 0;
1503 $page ||= 2;
1504
1505 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1506 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1507
1508 glEnable GL_BLEND;
1509 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1510 glEnable GL_TEXTURE_2D; 2298 glEnable GL_TEXTURE_2D;
1511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1512 2300
1513 # draw background 2301 # draw background
1514 $tex[1]->draw_quad (0, 0, $w, $h); 2302 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1515 2303
1516 # draw handle 2304 # draw handle
1517 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2305 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1518 2306
1519 glDisable GL_BLEND;
1520 glDisable GL_TEXTURE_2D; 2307 glDisable GL_TEXTURE_2D;
1521} 2308}
1522 2309
1523############################################################################# 2310#############################################################################
1524 2311
2312package CFClient::UI::ValSlider;
2313
2314our @ISA = CFClient::UI::HBox::;
2315
2316sub new {
2317 my ($class, %arg) = @_;
2318
2319 my $range = delete $arg{range};
2320
2321 my $self = $class->SUPER::new (
2322 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2323 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2324 to_value => sub { shift },
2325 from_value => sub { shift },
2326 %arg,
2327 );
2328
2329 $self->{slider}->connect (changed => sub {
2330 my ($self, $value) = @_;
2331 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2332 $self->{parent}->emit (changed => $value);
2333 });
2334
2335# $self->{entry}->connect (changed => sub {
2336# my ($self, $value) = @_;
2337# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2338# $self->{parent}->emit (changed => $value);
2339# });
2340
2341 $self->add ($self->{slider}, $self->{entry});
2342
2343 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2344
2345 $self
2346}
2347
2348sub set_range { shift->{slider}->set_range (@_) }
2349sub set_value { shift->{slider}->set_value (@_) }
2350
2351#############################################################################
2352
1525package CFClient::UI::TextView; 2353package CFClient::UI::TextView;
1526 2354
1527our @ISA = CFClient::UI::HBox::; 2355our @ISA = CFClient::UI::HBox::;
1528 2356
1529use SDL::OpenGL; 2357use CFClient::OpenGL;
1530 2358
1531sub new { 2359sub new {
1532 my $class = shift; 2360 my $class = shift;
1533 2361
1534 my $self = $class->SUPER::new ( 2362 my $self = $class->SUPER::new (
1535 req_w => $::WIDTH / 6, 2363 fontsize => 1,
1536 req_h => $::HEIGHT / 6, 2364 can_events => 0,
1537 fontsize => $::FONTSIZE, 2365 #font => default_font
1538 @_, 2366 @_,
1539 2367
1540 layout => (new CFClient::Layout), 2368 layout => (new CFClient::Layout 1),
1541 par => [], 2369 par => [],
1542 height => 0, 2370 height => 0,
1543 children => [ 2371 children => [
1544 (new CFClient::UI::Empty expand => 1), 2372 (new CFClient::UI::Empty expand => 1),
1545 (new CFClient::UI::Slider vertical => 1), 2373 (new CFClient::UI::Slider vertical => 1),
1546 ], 2374 ],
1547 ); 2375 );
1548 2376
1549 $self->{children}[1]->connect (changed => sub { 2377 $self->{children}[1]->connect (changed => sub { $self->update });
1550 $self->update;
1551 });
1552 2378
1553 $self 2379 $self
1554} 2380}
1555 2381
1556sub set_fontsize { 2382sub set_fontsize {
… …
1558 2384
1559 $self->{fontsize} = $fontsize; 2385 $self->{fontsize} = $fontsize;
1560 $self->reflow; 2386 $self->reflow;
1561} 2387}
1562 2388
2389sub size_allocate {
2390 my ($self, $w, $h) = @_;
2391
2392 $self->SUPER::size_allocate ($w, $h);
2393
2394 $self->{layout}->set_font ($self->{font}) if $self->{font};
2395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2396 $self->{layout}->set_width ($self->{children}[0]{w});
2397
2398 $self->reflow;
2399}
2400
1563sub text_height { 2401sub text_size {
1564 my ($self, $text) = @_; 2402 my ($self, $text, $indent) = @_;
1565 2403
1566 my $layout = $self->{layout}; 2404 my $layout = $self->{layout};
1567 2405
1568 $layout->set_height ($self->{fontsize}); 2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1569 $layout->set_width ($self->{w}); 2407 $layout->set_width ($self->{children}[0]{w} - $indent);
1570 $layout->set_text ($text); 2408 $layout->set_markup ($text);
1571 2409
1572 ($layout->size)[1] 2410 $layout->size
1573} 2411}
1574 2412
1575sub reflow { 2413sub reflow {
1576 my ($self) = @_; 2414 my ($self) = @_;
1577 2415
1578 $self->{need_reflow}++; 2416 $self->{need_reflow}++;
1579 $self->update; 2417 $self->update;
1580} 2418}
1581 2419
1582sub size_request { 2420sub set_offset {
1583 my ($self) = @_; 2421 my ($self, $offset) = @_;
1584 2422
1585 ($self->{req_w}, $self->{req_h}) 2423 # todo: base offset on lines or so, not on pixels
2424 $self->{children}[1]->set_value ($offset);
1586} 2425}
1587 2426
1588sub size_allocate { 2427sub clear {
1589 my ($self, $x, $y, $w, $h) = @_; 2428 my ($self) = @_;
1590 2429
1591 $self->SUPER::size_allocate ($x, $y, $w, $h); 2430 $self->{par} = [];
1592 2431 $self->{height} = 0;
1593 $self->{layout}->set_height ($self->{fontsize}); 2432 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1594 $self->{layout}->set_width ($self->{w});
1595
1596 $self->reflow;
1597} 2433}
1598 2434
1599sub add_paragraph { 2435sub add_paragraph {
1600 my ($self, $color, $text) = @_; 2436 my ($self, $color, $text, $indent) = @_;
1601 2437
1602 #TODO: intelligently "reformat" paragraph 2438 for my $line (split /\n/, $text) {
1603 2439 my ($w, $h) = $self->text_size ($line);
1604 my $height = $self->text_height ($text);
1605
1606 $self->{height} += $height; 2440 $self->{height} += $h;
2441 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2442 }
1607 2443
1608 push @{$self->{par}}, [$height, $color, $text];
1609
1610 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2444 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1611 $self->{children}[1]->update;
1612} 2445}
1613 2446
1614sub update { 2447sub update {
1615 my ($self) = @_; 2448 my ($self) = @_;
1616 2449
… …
1618 2451
1619 return unless $self->{h} > 0; 2452 return unless $self->{h} > 0;
1620 2453
1621 delete $self->{texture}; 2454 delete $self->{texture};
1622 2455
1623 $ROOT->on_refresh ($self, sub { 2456 $ROOT->on_post_alloc ($self, sub {
2457 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2458
1624 if (delete $self->{need_reflow}) { 2459 if (delete $self->{need_reflow}) {
1625 my $height = 0; 2460 my $height = 0;
1626 2461
1627 $height += $_->[0] = $self->text_height ($_->[2]) 2462 my $layout = $self->{layout};
2463
2464 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2465
1628 for @{$self->{par}}; 2466 for (@{$self->{par}}) {
2467 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2468 $layout->set_width ($W - $_->[3]);
2469 $layout->set_markup ($_->[4]);
2470 my ($w, $h) = $layout->size;
2471 $_->[0] = $w + $_->[3];
2472 $_->[1] = $h;
2473 }
2474
2475 $height += $_->[1];
2476 }
1629 2477
1630 $self->{height} = $height; 2478 $self->{height} = $height;
1631 2479
1632 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2480 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1633 2481
1634 delete $self->{texture}; 2482 delete $self->{texture};
1635 } 2483 }
1636 2484
1637 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2485 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1638 glClearColor 0, 0, 0, 1; 2486 glClearColor 0.5, 0.5, 0.5, 0;
1639 glClear GL_COLOR_BUFFER_BIT; 2487 glClear GL_COLOR_BUFFER_BIT;
1640 2488
2489 my $top = int $self->{children}[1]{range}[0];
2490
2491 my $y0 = $top;
2492 my $y1 = $top + $H;
2493
2494 my $y = 0;
2495
2496 my $layout = $self->{layout};
2497
2498 $layout->set_font ($self->{font}) if $self->{font};
2499
1641 glEnable GL_BLEND; 2500 glEnable GL_BLEND;
2501 #TODO# not correct in windows where rgba is forced off
1642 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2502 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1643 glEnable GL_TEXTURE_2D;
1644 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1645
1646 my $top = int $self->{children}[1]{range}[0];
1647
1648 my $y0 = $top;
1649 my $y1 = $top + $self->{h};
1650
1651 my $y = 0;
1652
1653 my $layout = $self->{layout};
1654 2503
1655 for my $par (@{$self->{par}}) { 2504 for my $par (@{$self->{par}}) {
1656 my $h = $par->[0]; 2505 my $h = $par->[1];
1657 2506
1658 if ($y0 < $y + $h && $y < $y1) { 2507 if ($y0 < $y + $h && $y < $y1) {
2508 $layout->set_foreground (@{ $par->[2] });
2509 $layout->set_width ($W - $par->[3]);
1659 $layout->set_text ($par->[2]); 2510 $layout->set_markup ($par->[4]);
1660 2511
1661 glColor @{ $par->[1] }; 2512 my ($w, $h, $data, $format, $internalformat) = $layout->render;
1662 my ($W, $H) = $layout->size; 2513
1663 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2514 glRasterPos $par->[3], $y - $y0;
2515 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
1664 } 2516 }
1665 2517
1666 $y += $h; 2518 $y += $h;
1667 } 2519 }
1668 2520
1669 glDisable GL_TEXTURE_2D;
1670 glDisable GL_BLEND; 2521 glDisable GL_BLEND;
1671 }; 2522 };
1672 }); 2523 });
1673} 2524}
1674 2525
1675sub _draw { 2526sub _draw {
1676 my ($self) = @_; 2527 my ($self) = @_;
1677 2528
1678 if ($self->{texture}) {
1679 glEnable GL_TEXTURE_2D; 2529 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2531 glColor 1, 1, 1, 1;
1681 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2532 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1682 glDisable GL_TEXTURE_2D; 2533 glDisable GL_TEXTURE_2D;
1683 }
1684 2534
1685 $self->{children}[1]->draw; 2535 $self->{children}[1]->draw;
1686 2536
1687} 2537}
1688 2538
1689############################################################################# 2539#############################################################################
1690 2540
1691package CFClient::UI::MapWidget;
1692
1693use strict;
1694
1695use List::Util qw(min max);
1696
1697use SDL;
1698use SDL::OpenGL;
1699
1700our @ISA = CFClient::UI::Base::;
1701
1702sub new {
1703 my $class = shift;
1704
1705 $class->SUPER::new (
1706 z => -1,
1707 can_focus => 1,
1708 list => (glGenLists 1),
1709 @_
1710 )
1711}
1712
1713sub key_down {
1714 print "MAPKEYDOWN\n";
1715}
1716
1717sub key_up {
1718}
1719
1720sub button_down {
1721 my ($self, $ev, $x, $y) = @_;
1722
1723 $self->focus_in;
1724
1725 if ($ev->button == 2) {
1726 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1727 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1728
1729 $self->{motion} = sub {
1730 my ($ev, $x, $y) = @_;
1731
1732 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1733
1734 $::CFG->{map_shift_x} = $bw + $x - $ox;
1735 $::CFG->{map_shift_y} = $bh + $y - $oy;
1736
1737 $self->update;
1738 };
1739 }
1740}
1741
1742sub button_up {
1743 my ($self, $ev, $x, $y) = @_;
1744
1745 delete $self->{motion};
1746}
1747
1748sub mouse_motion {
1749 my ($self, $ev, $x, $y) = @_;
1750
1751 $self->{motion}->($ev, $x, $y) if $self->{motion};
1752}
1753
1754sub size_request {
1755 (
1756 1 + 32 * int $::WIDTH / 32,
1757 1 + 32 * int $::HEIGHT / 32,
1758 )
1759}
1760
1761sub update {
1762 my ($self) = @_;
1763
1764 $self->{need_update} = 1;
1765 $self->SUPER::update;
1766}
1767
1768sub draw {
1769 my ($self) = @_;
1770
1771 if (delete $self->{need_update}) {
1772 glNewList $self->{list}, GL_COMPILE;
1773
1774 if ($::MAP) {
1775 my $sw = int $::WIDTH / 32;
1776 my $sh = int $::HEIGHT / 32;
1777
1778 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1779 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1780
1781 glTranslate $sx0 - 32, $sy0 - 32, 0;
1782
1783 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1784
1785 if ($::CFG->{fow_enable}) {
1786 if ($::CFG->{fow_smooth}) { # smooth fog of war
1787 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1788 glConvolutionFilter2D
1789 GL_CONVOLUTION_2D,
1790 GL_ALPHA,
1791 3, 3,
1792 GL_ALPHA, GL_FLOAT,
1793 pack "f*",
1794 0.1, 0.1, 0.1,
1795 0.1, 0.2, 0.1,
1796 0.1, 0.1, 0.1,
1797 ;
1798 glEnable GL_CONVOLUTION_2D;
1799 }
1800
1801 $self->{fow_texture} = new CFClient::Texture
1802 w => $w,
1803 h => $h,
1804 data => $data,
1805 internalformat => GL_ALPHA,
1806 format => GL_ALPHA;
1807
1808 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1809
1810 glEnable GL_BLEND;
1811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1812 glEnable GL_TEXTURE_2D;
1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1814
1815 glColor +($::CFG->{fow_intensity}) x 3, 1;
1816 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1817
1818 glDisable GL_TEXTURE_2D;
1819 glDisable GL_BLEND;
1820 }
1821
1822 # HACK BEGIN
1823 {
1824 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1825 my ($w, $h) = (250, 250);
1826
1827 glEnable GL_BLEND;
1828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1829 glEnable GL_TEXTURE_2D;
1830 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1831
1832 $self->{mapmap_texture} =
1833 new CFClient::Texture
1834 w => $w,
1835 h => $h,
1836 data => $::MAP->mapmap ($w, $h),
1837 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1838
1839 $self->{mapmap_texture}->draw_quad (100, 100);
1840
1841 glDisable GL_TEXTURE_2D;
1842 glDisable GL_BLEND;
1843 }
1844 # HACK END
1845 }
1846
1847 glEndList;
1848 }
1849
1850 glPushMatrix;
1851 glCallList $self->{list};
1852 glPopMatrix;
1853
1854 if ($FOCUS != $self) {
1855 glColor 64/255, 64/255, 64/255;
1856 glLogicOp GL_AND;
1857 glEnable GL_COLOR_LOGIC_OP;
1858 glBegin GL_QUADS;
1859 glVertex 0, 0;
1860 glVertex 0, $::HEIGHT;
1861 glVertex $::WIDTH, $::HEIGHT;
1862 glVertex $::WIDTH, 0;
1863 glEnd;
1864 glDisable GL_COLOR_LOGIC_OP;
1865 }
1866}
1867
1868my %DIR = (
1869 SDLK_KP8, [1, "north"],
1870 SDLK_KP9, [2, "northeast"],
1871 SDLK_KP6, [3, "east"],
1872 SDLK_KP3, [4, "southeast"],
1873 SDLK_KP2, [5, "south"],
1874 SDLK_KP1, [6, "southwest"],
1875 SDLK_KP4, [7, "west"],
1876 SDLK_KP7, [8, "northwest"],
1877
1878 SDLK_UP, [1, "north"],
1879 SDLK_RIGHT, [3, "east"],
1880 SDLK_DOWN, [5, "south"],
1881 SDLK_LEFT, [7, "west"],
1882);
1883
1884sub key_down {
1885 my ($self, $ev) = @_;
1886
1887 my $mod = $ev->key_mod;
1888 my $sym = $ev->key_sym;
1889
1890 if ($sym == SDLK_KP5) {
1891 $::CONN->user_send ("stay fire");
1892 } elsif ($sym == SDLK_a) {
1893 $::CONN->user_send ("apply");
1894 } elsif ($sym == SDLK_QUOTE) {
1895 $self->emit ('activate_console');
1896 } elsif ($sym == SDLK_SLASH) {
1897 $self->emit ('activate_console' => '/');
1898 } elsif (exists $DIR{$sym}) {
1899 if ($mod & KMOD_SHIFT) {
1900 $self->{shft}++;
1901 $::CONN->user_send ("fire $DIR{$sym}[0]");
1902 } elsif ($mod & KMOD_CTRL) {
1903 $self->{ctrl}++;
1904 $::CONN->user_send ("run $DIR{$sym}[0]");
1905 } else {
1906 $::CONN->user_send ("$DIR{$sym}[1]");
1907 }
1908 }
1909}
1910
1911sub key_up {
1912 my ($self, $ev) = @_;
1913
1914 my $mod = $ev->key_mod;
1915 my $sym = $ev->key_sym;
1916
1917 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1918 $::CONN->user_send ("fire_stop");
1919 }
1920 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1921 $::CONN->user_send ("run_stop");
1922 }
1923}
1924
1925#############################################################################
1926
1927package CFClient::UI::Animator; 2541package CFClient::UI::Animator;
1928 2542
1929use SDL::OpenGL; 2543use CFClient::OpenGL;
1930 2544
1931our @ISA = CFClient::UI::Bin::; 2545our @ISA = CFClient::UI::Bin::;
1932 2546
1933sub moveto { 2547sub moveto {
1934 my ($self, $x, $y) = @_; 2548 my ($self, $x, $y) = @_;
… …
1972 2586
1973sub new { 2587sub new {
1974 my $class = shift; 2588 my $class = shift;
1975 2589
1976 my $self = $class->SUPER::new ( 2590 my $self = $class->SUPER::new (
1977 state => 0, 2591 state => 0,
1978 connect_activate => \&toggle_flopper, 2592 on_activate => \&toggle_flopper,
1979 @_ 2593 @_
1980 ); 2594 );
1981 2595
1982 if ($self->{state}) {
1983 $self->{state} = 0;
1984 $self->toggle_flopper;
1985 }
1986
1987 $self 2596 $self
1988} 2597}
1989 2598
1990sub toggle_flopper { 2599sub toggle_flopper {
1991 my ($self) = @_; 2600 my ($self) = @_;
1992 2601
1993 # TODO: use animation 2602 $self->{other}->toggle_visibility;
1994 if ($self->{state} = !$self->{state}) { 2603}
1995 $CFClient::UI::ROOT->add ($self->{other}); 2604
1996 $self->{other}->move ($self->coord2global (0, $self->{h})); 2605#############################################################################
2606
2607package CFClient::UI::Tooltip;
2608
2609our @ISA = CFClient::UI::Bin::;
2610
2611use CFClient::OpenGL;
2612
2613sub new {
2614 my $class = shift;
2615
2616 $class->SUPER::new (
2617 @_,
2618 can_events => 0,
2619 )
2620}
2621
2622sub set_tooltip_from {
2623 my ($self, $widget) = @_;
2624
2625 my $tooltip = $widget->{tooltip};
2626
2627 if ($ENV{CFPLUS_DEBUG} & 2) {
2628 $tooltip .= "\n\n" . (ref $widget) . "\n"
2629 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2630 . "req $widget->{req_w} $widget->{req_h}\n"
2631 . "visible $widget->{visible}";
2632 }
2633
2634 $self->add (new CFClient::UI::Label
2635 markup => $tooltip,
2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2637 fontsize => 0.8,
2638 fg => [0, 0, 0, 1],
2639 ellipsise => 0,
2640 font => ($widget->{tooltip_font} || $::FONT_PROP),
2641 );
2642}
2643
2644sub size_request {
2645 my ($self) = @_;
2646
2647 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2648
2649 ($w + 4, $h + 4)
2650}
2651
2652sub size_allocate {
2653 my ($self, $w, $h) = @_;
2654
2655 $self->SUPER::size_allocate ($w - 4, $h - 4);
2656}
2657
2658sub visibility_change {
2659 my ($self, $visible) = @_;
2660
2661 return unless $visible;
2662
2663 $self->{root}->on_post_alloc ("move_$self" => sub {
2664 my $widget = $self->{owner}
2665 or return;
2666
2667 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2668
2669 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2670 if $x + $self->{w} > $::WIDTH;
2671
2672 $self->move_abs ($x, $y);
2673 });
2674}
2675
2676sub _draw {
2677 my ($self) = @_;
2678
2679 glTranslate 0.375, 0.375;
2680
2681 my ($w, $h) = @$self{qw(w h)};
2682
2683 glColor 1, 0.8, 0.4;
2684 glBegin GL_QUADS;
2685 glVertex 0 , 0;
2686 glVertex 0 , $h;
2687 glVertex $w, $h;
2688 glVertex $w, 0;
2689 glEnd;
2690
2691 glColor 0, 0, 0;
2692 glBegin GL_LINE_LOOP;
2693 glVertex 0 , 0;
2694 glVertex 0 , $h;
2695 glVertex $w, $h;
2696 glVertex $w, 0;
2697 glEnd;
2698
2699 glTranslate 2 - 0.375, 2 - 0.375;
2700
2701 $self->SUPER::_draw;
2702}
2703
2704#############################################################################
2705
2706package CFClient::UI::Face;
2707
2708our @ISA = CFClient::UI::Base::;
2709
2710use CFClient::OpenGL;
2711
2712sub new {
2713 my $class = shift;
2714
2715 my $self = $class->SUPER::new (
2716 aspect => 1,
2717 can_events => 0,
2718 @_,
2719 );
2720
2721 if ($self->{anim} && $self->{animspeed}) {
2722 Scalar::Util::weaken (my $widget = $self);
2723
2724 $self->{timer} = Event->timer (
2725 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2726 hard => 1,
2727 interval => $self->{animspeed},
2728 cb => sub {
2729 ++$widget->{frame};
2730 $widget->update;
2731 },
2732 );
2733 }
2734
2735 $self
2736}
2737
2738sub size_request {
2739 (32, 8)
2740}
2741
2742sub update {
2743 my ($self) = @_;
2744
2745 return unless $self->{visible};
2746
2747 $self->SUPER::update;
2748}
2749
2750sub _draw {
2751 my ($self) = @_;
2752
2753 return unless $::CONN;
2754
2755 my $face;
2756
2757 if ($self->{frame}) {
2758 my $anim = $::CONN->{anim}[$self->{anim}];
2759
2760 $face = $anim->[ $self->{frame} % @$anim ]
2761 if $anim && @$anim;
2762 }
2763
2764 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2765
2766 if ($tex) {
2767 glEnable GL_TEXTURE_2D;
2768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2769 glColor 1, 1, 1, 1;
2770 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2771 glDisable GL_TEXTURE_2D;
2772 }
2773}
2774
2775sub DESTROY {
2776 my ($self) = @_;
2777
2778 $self->{timer}->cancel
2779 if $self->{timer};
2780
2781 $self->SUPER::DESTROY;
2782}
2783
2784#############################################################################
2785
2786package CFClient::UI::Menu;
2787
2788our @ISA = CFClient::UI::FancyFrame::;
2789
2790use CFClient::OpenGL;
2791
2792sub new {
2793 my $class = shift;
2794
2795 my $self = $class->SUPER::new (
2796 items => [],
2797 z => 100,
2798 @_,
2799 );
2800
2801 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2802
2803 for my $item (@{ $self->{items} }) {
2804 my ($widget, $cb) = @$item;
2805
2806 # handle various types of items, only text for now
2807 if (!ref $widget) {
2808 $widget = new CFClient::UI::Label
2809 can_hover => 1,
2810 can_events => 1,
2811 text => $widget;
2812 }
2813
2814 $self->{item}{$widget} = $item;
2815
2816 $self->{vbox}->add ($widget);
2817 }
2818
2819 $self
2820}
2821
2822# popup given the event (must be a mouse button down event currently)
2823sub popup {
2824 my ($self, $ev) = @_;
2825
2826 $self->_emit ("popdown");
2827
2828 # maybe save $GRAB? must be careful about events...
2829 $GRAB = $self;
2830 $self->{button} = $ev->{button};
2831
2832 $self->show;
2833 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2834}
2835
2836sub mouse_motion {
2837 my ($self, $ev, $x, $y) = @_;
2838
2839 # TODO: should use vbox->find_widget or so
2840 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2841 $self->{hover} = $self->{item}{$HOVER};
2842}
2843
2844sub button_up {
2845 my ($self, $ev, $x, $y) = @_;
2846
2847 if ($ev->{button} == $self->{button}) {
2848 undef $GRAB;
2849 $self->hide;
2850
1997 $self->emit ("open"); 2851 $self->_emit ("popdown");
2852 $self->{hover}[1]->() if $self->{hover};
2853 }
2854}
2855
2856#############################################################################
2857
2858package CFClient::UI::Statusbox;
2859
2860our @ISA = CFClient::UI::VBox::;
2861
2862sub new {
2863 my $class = shift;
2864
2865 $class->SUPER::new (
2866 fontsize => 0.8,
2867 @_,
2868 )
2869}
2870
2871sub reorder {
2872 my ($self) = @_;
2873 my $NOW = time;
2874
2875 while (my ($k, $v) = each %{ $self->{item} }) {
2876 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2877 }
2878
2879 my @widgets;
2880
2881 my @items = sort {
2882 $a->{pri} <=> $b->{pri}
2883 or $b->{id} <=> $a->{id}
2884 } values %{ $self->{item} };
2885
2886 my $count = 10 + 1;
2887 for my $item (@items) {
2888 last unless --$count;
2889
2890 push @widgets, $item->{label} ||= do {
2891 # TODO: doesn't handle markup well (read as: at all)
2892 my $short = $item->{count} > 1
2893 ? "<b>$item->{count} ×</b> $item->{text}"
2894 : $item->{text};
2895
2896 for ($short) {
2897 s/^\s+//;
2898 s/\s+/ /g;
2899 }
2900
2901 new CFClient::UI::Label
2902 markup => $short,
2903 tooltip => $item->{tooltip},
2904 tooltip_font => $::FONT_PROP,
2905 tooltip_width => 0.67,
2906 fontsize => $item->{fontsize} || $self->{fontsize},
2907 max_w => $::WIDTH * 0.44,
2908 fg => $item->{fg},
2909 can_events => 1,
2910 can_hover => 1
2911 };
2912 }
2913
2914 $self->clear;
2915 $self->SUPER::add (reverse @widgets);
2916}
2917
2918sub add {
2919 my ($self, $text, %arg) = @_;
2920
2921 $text =~ s/^\s+//;
2922 $text =~ s/\s+$//;
2923
2924 return unless $text;
2925
2926 my $timeout = time + ((delete $arg{timeout}) || 60);
2927
2928 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2929
2930 if (my $item = $self->{item}{$group}) {
2931 if ($item->{text} eq $text) {
2932 $item->{count}++;
2933 } else {
2934 $item->{count} = 1;
2935 $item->{text} = $item->{tooltip} = $text;
2936 }
2937 $item->{id} = ++$self->{id};
2938 $item->{timeout} = $timeout;
2939 delete $item->{label};
1998 } else { 2940 } else {
1999 $CFClient::UI::ROOT->remove ($self->{other}); 2941 $self->{item}{$group} = {
2000 $self->emit ("close"); 2942 id => ++$self->{id},
2943 text => $text,
2944 timeout => $timeout,
2945 tooltip => $text,
2946 fg => [0.8, 0.8, 0.8, 0.8],
2947 pri => 0,
2948 count => 1,
2949 %arg,
2950 };
2001 } 2951 }
2002 2952
2003 $self->emit (changed => $self->{state}); 2953 $self->reorder;
2954}
2955
2956sub reconfigure {
2957 my ($self) = @_;
2958
2959 delete $_->{label}
2960 for values %{ $self->{item} || {} };
2961
2962 $self->reorder;
2963 $self->SUPER::reconfigure;
2004} 2964}
2005 2965
2006############################################################################# 2966#############################################################################
2007 2967
2968package CFClient::UI::Inventory;
2969
2970our @ISA = CFClient::UI::ScrolledWindow::;
2971
2972sub new {
2973 my $class = shift;
2974
2975 my $self = $class->SUPER::new (
2976 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2977 @_,
2978 );
2979
2980 $self
2981}
2982
2983sub set_items {
2984 my ($self, $items) = @_;
2985
2986 $self->{scrolled}->clear;
2987 return unless $items;
2988
2989 my @items = sort {
2990 ($a->{type} <=> $b->{type})
2991 or ($a->{name} cmp $b->{name})
2992 } @$items;
2993
2994 $self->{real_items} = \@items;
2995
2996 my $row = 0;
2997 for my $item (@items) {
2998 CFClient::Item::update_widgets $item;
2999
3000 $self->{scrolled}->add (0, $row, $item->{face_widget});
3001 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3002 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3003
3004 $row++;
3005 }
3006}
3007
3008#############################################################################
3009
3010package CFClient::UI::BindEditor;
3011
3012our @ISA = CFClient::UI::FancyFrame::;
3013
3014sub new {
3015 my $class = shift;
3016
3017 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3018
3019 $self->add (my $vb = new CFClient::UI::VBox);
3020
3021
3022 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3023 text => "start recording",
3024 tooltip => "Start/Stops recording of actions."
3025 ."All subsequent actions after the recording started will be captured."
3026 ."The actions are displayed after the record was stopped."
3027 ."To bind the action you have to click on the 'Bind' button",
3028 on_activate => sub {
3029 unless ($self->{recording}) {
3030 $self->start;
3031 } else {
3032 $self->stop;
3033 }
3034 });
3035
3036 $vb->add (new CFClient::UI::Label text => "Actions:");
3037 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3038
3039 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3040 $vb->add (my $hb = new CFClient::UI::HBox);
3041 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3042 $hb->add (new CFClient::UI::Button
3043 text => "bind",
3044 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3045 on_activate => sub {
3046 $self->ask_for_bind;
3047 });
3048
3049 $vb->add (my $hb = new CFClient::UI::HBox);
3050 $hb->add (new CFClient::UI::Button
3051 text => "ok",
3052 expand => 1,
3053 tooltip => "This closes the binding editor and saves the binding",
3054 on_activate => sub {
3055 $self->hide;
3056 $self->commit;
3057 });
3058
3059 $hb->add (new CFClient::UI::Button
3060 text => "cancel",
3061 expand => 1,
3062 tooltip => "This closes the binding editor without saving",
3063 on_activate => sub {
3064 $self->hide;
3065 $self->{binding_cancel}->()
3066 if $self->{binding_cancel};
3067 });
3068
3069 $self->update_binding_widgets;
3070
3071 $self
3072}
3073
3074sub commit {
3075 my ($self) = @_;
3076 my ($mod, $sym, $cmds) = $self->get_binding;
3077 if ($sym != 0 && @$cmds > 0) {
3078 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3079 ."'. Don't forget 'Save Config'!");
3080 $self->{binding_change}->($mod, $sym, $cmds)
3081 if $self->{binding_change};
3082 } else {
3083 $::STATUSBOX->add ("No action bound, no key or action specified!");
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 }
3087}
3088
3089sub start {
3090 my ($self) = @_;
3091
3092 $self->{rec_btn}->set_text ("stop recording");
3093 $self->{recording} = 1;
3094 $self->clear_command_list;
3095 $::CONN->start_record if $::CONN;
3096}
3097
3098sub stop {
3099 my ($self) = @_;
3100
3101 $self->{rec_btn}->set_text ("start recording");
3102 $self->{recording} = 0;
3103
3104 my $rec;
3105 $rec = $::CONN->stop_record if $::CONN;
3106 return unless ref $rec eq 'ARRAY';
3107 $self->set_command_list ($rec);
3108}
3109
3110# if $commit is true, the binding will be set after the user entered a key combo
3111sub ask_for_bind {
3112 my ($self, $commit) = @_;
3113
3114 CFClient::Binder::open_binding_dialog (sub {
3115 my ($mod, $sym) = @_;
3116 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3117 $self->update_binding_widgets;
3118 $self->commit if $commit;
3119 });
3120}
3121
3122# $mod and $sym are the modifiers and key symbol
3123# $cmds is a array ref of strings (the commands)
3124# $cb is the callback that is executed on OK
3125# $ccb is the callback that is executed on CANCEL and
3126# when the binding was unsuccessful on OK
3127sub set_binding {
3128 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3129
3130 $self->clear_command_list;
3131 $self->{recording} = 0;
3132 $self->{rec_btn}->set_text ("start recording");
3133
3134 $self->{binding} = [$mod, $sym];
3135 $self->{commands} = $cmds;
3136
3137 $self->{binding_change} = $cb;
3138 $self->{binding_cancel} = $ccb;
3139
3140 $self->update_binding_widgets;
3141}
3142
3143# this is a shortcut method that asks for a binding
3144# and then just binds it.
3145sub do_quick_binding {
3146 my ($self, $cmds) = @_;
3147 $self->set_binding (undef, undef, $cmds, sub {
3148 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3149 });
3150 $self->ask_for_bind (1);
3151}
3152
3153sub update_binding_widgets {
3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3157 $self->set_command_list ($cmds);
3158}
3159
3160sub get_binding {
3161 my ($self) = @_;
3162 return (
3163 $self->{binding}->[0],
3164 $self->{binding}->[1],
3165 [ grep { defined $_ } @{$self->{commands}} ]
3166 );
3167}
3168
3169sub clear_command_list {
3170 my ($self) = @_;
3171 $self->{cmdbox}->clear ();
3172}
3173
3174sub set_command_list {
3175 my ($self, $cmds) = @_;
3176
3177 $self->{cmdbox}->clear ();
3178 $self->{commands} = $cmds;
3179
3180 my $idx = 0;
3181
3182 for (@$cmds) {
3183 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3184
3185 my $i = $idx;
3186 $hb->add (new CFClient::UI::Label text => $_);
3187 $hb->add (new CFClient::UI::Button
3188 text => "delete",
3189 tooltip => "Deletes the action from the record",
3190 on_activate => sub {
3191 $self->{cmdbox}->remove ($hb);
3192 $cmds->[$i] = undef;
3193 });
3194
3195
3196 $idx++
3197 }
3198}
3199
3200#############################################################################
3201
3202package CFClient::UI::SpellList;
3203
3204our @ISA = CFClient::UI::FancyFrame::;
3205
3206sub new {
3207 my $class = shift;
3208
3209 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3210
3211 $self->add (new CFClient::UI::ScrolledWindow
3212 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3213
3214 $self;
3215}
3216
3217# XXX: Do sorting? Argl...
3218sub add_spell {
3219 my ($self, $spell) = @_;
3220 $self->{spells}->{$spell->{name}} = $spell;
3221
3222 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3223 face => $spell->{face},
3224 can_hover => 1,
3225 can_events => 1,
3226 tooltip => $spell->{message});
3227
3228 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3229 text => $spell->{name},
3230 can_hover => 1,
3231 can_events => 1,
3232 tooltip => $spell->{message},
3233 expand => 1);
3234
3235 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3236 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3237 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3238 expand => 1);
3239
3240 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3241 text => "bind to key",
3242 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3243}
3244
3245sub rebuild_spell_list {
3246 my ($self) = @_;
3247 $self->{tbl_idx} = 0;
3248 $self->add_spell ($_) for values %{$self->{spells}};
3249}
3250
3251sub remove_spell {
3252 my ($self, $spell) = @_;
3253 delete $self->{spells}->{$spell->{name}};
3254 $self->rebuild_spell_list;
3255}
3256
3257#############################################################################
3258
2008package CFClient::UI::Root; 3259package CFClient::UI::Root;
2009 3260
2010our @ISA = CFClient::UI::Container::; 3261our @ISA = CFClient::UI::Container::;
2011 3262
2012use SDL::OpenGL; 3263use CFClient::OpenGL;
3264
3265sub new {
3266 my $class = shift;
3267
3268 my $self = $class->SUPER::new (
3269 visible => 1,
3270 @_,
3271 );
3272
3273 Scalar::Util::weaken ($self->{root} = $self);
3274
3275 $self
3276}
2013 3277
2014sub size_request { 3278sub size_request {
2015 ($::WIDTH, $::HEIGHT) 3279 my ($self) = @_;
3280
3281 ($self->{w}, $self->{h})
3282}
3283
3284sub _to_pixel {
3285 my ($coord, $size, $max) = @_;
3286
3287 $coord =
3288 $coord eq "center" ? ($max - $size) * 0.5
3289 : $coord eq "max" ? $max
3290 : $coord;
3291
3292 $coord = 0 if $coord < 0;
3293 $coord = $max - $size if $coord > $max - $size;
3294
3295 int $coord + 0.5
2016} 3296}
2017 3297
2018sub size_allocate { 3298sub size_allocate {
2019 my ($self, $x, $y, $w, $h) = @_; 3299 my ($self, $w, $h) = @_;
2020 3300
2021 $self->_size_allocate ($x, $y, $w, $h); 3301 for my $child ($self->children) {
3302 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2022 3303
2023 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 3304 $X = $child->{force_x} if exists $child->{force_x};
2024 for @{$self->{children}}; 3305 $Y = $child->{force_y} if exists $child->{force_y};
2025}
2026 3306
2027sub _topleft { 3307 $X = _to_pixel $X, $W, $self->{w};
3308 $Y = _to_pixel $Y, $H, $self->{h};
3309
3310 $child->configure ($X, $Y, $W, $H);
3311 }
3312}
3313
3314sub coord2local {
2028 my ($self, $x, $y) = @_; 3315 my ($self, $x, $y) = @_;
2029 3316
2030 ($x, $y) 3317 ($x, $y)
2031} 3318}
2032 3319
3320sub coord2global {
3321 my ($self, $x, $y) = @_;
3322
3323 ($x, $y)
3324}
3325
2033sub update { 3326sub update {
2034 my ($self) = @_; 3327 my ($self) = @_;
2035 3328
2036 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 3329 $::WANT_REFRESH++;
2037 ::refresh ();
2038} 3330}
2039 3331
2040sub add { 3332sub add {
2041 my ($self, $widget) = @_; 3333 my ($self, @children) = @_;
2042 3334
3335 $_->{is_toplevel} = 1
3336 for @children;
3337
2043 $self->SUPER::add ($widget); 3338 $self->SUPER::add (@children);
3339}
2044 3340
2045 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request); 3341sub remove {
3342 my ($self, @children) = @_;
3343
3344 $self->SUPER::remove (@children);
3345
3346 delete $self->{is_toplevel}
3347 for @children;
3348
3349 while (@children) {
3350 my $w = pop @children;
3351 push @children, $w->children;
3352 $w->set_invisible;
3353 }
2046} 3354}
2047 3355
2048sub on_refresh { 3356sub on_refresh {
2049 my ($self, $id, $cb) = @_; 3357 my ($self, $id, $cb) = @_;
2050 3358
2051 $self->{refresh_hook}{$id} = $cb; 3359 $self->{refresh_hook}{$id} = $cb;
2052} 3360}
2053 3361
3362sub on_post_alloc {
3363 my ($self, $id, $cb) = @_;
3364
3365 $self->{post_alloc_hook}{$id} = $cb;
3366}
3367
2054sub draw { 3368sub draw {
2055 my ($self) = @_; 3369 my ($self) = @_;
2056 3370
2057 while (my $rcb = delete $self->{refresh_hook}) { 3371 while ($self->{refresh_hook}) {
2058 $_->() for values %$rcb; 3372 $_->()
3373 for values %{delete $self->{refresh_hook}};
2059 } 3374 }
3375
3376 if ($self->{realloc}) {
3377 my @queue;
3378
3379 while () {
3380 if ($self->{realloc}) {
3381 #TODO use array-of-depth approach
3382
3383 use sort 'stable';
3384
3385 @queue = sort { $a->{visible} <=> $b->{visible} }
3386 @queue, values %{delete $self->{realloc}};
3387 }
3388
3389 my $widget = pop @queue || last;
3390
3391 $widget->{visible} or last; # do not resize invisible widgets
3392
3393 my ($w, $h) = $widget->size_request;
3394
3395 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3396 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3397
3398 $w = $widget->{force_w} if exists $widget->{force_w};
3399 $h = $widget->{force_h} if exists $widget->{force_h};
3400
3401 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3402 || delete $widget->{force_realloc}) {
3403 $widget->{req_w} = $w;
3404 $widget->{req_h} = $h;
3405
3406 $self->{size_alloc}{$widget+0} = $widget;
3407
3408 if (my $parent = $widget->{parent}) {
3409 $self->{realloc}{$parent+0} = $parent;
3410 #unshift @queue, $parent;
3411 $parent->{force_size_alloc} = 1;
3412 $self->{size_alloc}{$parent+0} = $parent;
3413 }
3414 }
3415
3416 delete $self->{realloc}{$widget+0};
3417 }
3418 }
3419
3420 while (my $size_alloc = delete $self->{size_alloc}) {
3421 my @queue = sort { $b->{visible} <=> $a->{visible} }
3422 values %$size_alloc;
3423
3424 while () {
3425 my $widget = pop @queue || last;
3426
3427 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3428
3429 $w = 0 if $w < 0;
3430 $h = 0 if $h < 0;
3431
3432 $w = int $w + 0.5;
3433 $h = int $h + 0.5;
3434
3435 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3436 $widget->{w} = $w;
3437 $widget->{h} = $h;
3438
3439 $widget->emit (size_allocate => $w, $h);
3440 }
3441 }
3442 }
3443
3444 while ($self->{post_alloc_hook}) {
3445 $_->()
3446 for values %{delete $self->{post_alloc_hook}};
3447 }
3448
2060 3449
2061 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3450 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2062 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3451 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2063 glClear GL_COLOR_BUFFER_BIT; 3452 glClear GL_COLOR_BUFFER_BIT;
2064 3453
2065 glMatrixMode GL_PROJECTION; 3454 glMatrixMode GL_PROJECTION;
2066 glLoadIdentity; 3455 glLoadIdentity;
2067 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3456 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2068 glMatrixMode GL_MODELVIEW; 3457 glMatrixMode GL_MODELVIEW;
2069 glLoadIdentity; 3458 glLoadIdentity;
2070 3459
2071 $self->_draw; 3460 $self->_draw;
2072} 3461}
… …
2074############################################################################# 3463#############################################################################
2075 3464
2076package CFClient::UI; 3465package CFClient::UI;
2077 3466
2078$ROOT = new CFClient::UI::Root; 3467$ROOT = new CFClient::UI::Root;
3468$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2079 3469
20801 34701
2081 3471

Diff Legend

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