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

Diff Legend

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