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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines