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.244 by root, Sat May 27 21:06:09 2006 UTC vs.
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC

… …
17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
29 } 27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
30 31
31 return $LAYOUT; 32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
32} 36}
33 37
34sub set_layout { 38sub set_layout {
35 my ($layout) = @_; 39 my ($layout) = @_;
40
36 $LAYOUT = $layout; 41 $LAYOUT = $layout;
37} 42}
38 43
39sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
40 if (!$GRAB) { 47 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
45 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
46 54
47 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
48 56
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 58
51 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 60 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 61 }
63 62
64 return; 63 return;
65 } 64 }
66 } 65 }
… …
172sub rescale_widgets { 171sub rescale_widgets {
173 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
174 173
175 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
185 } 189 }
186 } 190 }
187 191
188 reconfigure_widgets; 192 reconfigure_widgets;
189} 193}
… …
198 202
199sub new { 203sub new {
200 my $class = shift; 204 my $class = shift;
201 205
202 my $self = bless { 206 my $self = bless {
203 x => 0, 207 x => "center",
204 y => 0, 208 y => "center",
205 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
206 can_events => 1, 212 can_events => 1,
207 @_ 213 @_
208 }, $class; 214 }, $class;
215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209 217
210 for (keys %$self) { 218 for (keys %$self) {
211 if (/^on_(.*)$/) { 219 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
213 } 221 }
214 } 222 }
215 223
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
223 } 234 }
224 235
225 $self 236 $self
226} 237}
227 238
… …
232 %$self = (); 243 %$self = ();
233} 244}
234 245
235sub show { 246sub show {
236 my ($self) = @_; 247 my ($self) = @_;
248
237 return if $self->{parent}; 249 return if $self->{parent};
238 250
239 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
240} 252}
241 253
242sub show_centered { 254sub set_visible {
243 my ($self) = @_; 255 my ($self) = @_;
256
244 return if $self->{parent}; 257 return if $self->{visible};
245 258
246 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
247 261
248 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
249 "centered $self" => sub { 263
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
251 }, 265
252 ); 266 $_->set_visible for $self->children;
253} 267}
254 268
255sub set_invisible { 269sub set_invisible {
256 my ($self) = @_; 270 my ($self) = @_;
257 271
258 return unless $self->{visible}; 272 return unless $self->{visible};
259 273
260 # broken show/hide model 274 $_->set_invisible for $self->children;
261 275
262 delete $self->{root}; 276 delete $self->{root};
263 delete $self->{visible}; 277 delete $self->{visible};
264 278
265 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
266 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
267 281
268 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
269 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
270 284
271 $self->focus_out; 285 $self->focus_out;
272 286
273 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
274} 305}
275 306
276sub hide { 307sub hide {
277 my ($self) = @_; 308 my ($self) = @_;
278 309
… …
280 311
281 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
282 if $self->{parent}; 313 if $self->{parent};
283} 314}
284 315
285sub move { 316sub move_abs {
286 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
287 318
288 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
289 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
290 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
291 322
292 $self->update; 323 $self->update;
293} 324}
294 325
295sub set_size { 326sub set_size {
296 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
297 328
298 $self->{user_w} = $w; 329 $self->{force_w} = $w;
299 $self->{user_h} = $h; 330 $self->{force_h} = $h;
300 331
301 $self->check_size; 332 $self->realloc;
302} 333}
303 334
304sub size_request { 335sub size_request {
305 require Carp; 336 require Carp;
306 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
308 339
309sub configure { 340sub configure {
310 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
311 342
312 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
313 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
314 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
315 348
316 # use alignment to adjust x, y 349 # use alignment to adjust x, y
317 350
318 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
319 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
320
321 ($w, $h) = ($w2, $h2);
322 } 353 }
323 354
324 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
325 $self->{x} = $x; 356 $self->{x} = $x;
326 $self->{y} = $y; 357 $self->{y} = $y;
327 $self->update; 358 $self->update;
328 } 359 }
329 360
330 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
331 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
332 } 368 }
333} 369}
334 370
335sub size_allocate { 371sub size_allocate {
336 # nothing to be done 372 # nothing to be done
337} 373}
338 374
339sub reconfigure {
340 my ($self) = @_;
341
342 $self->check_size (1);
343 $self->update;
344}
345
346sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
347} 381}
348 382
349sub set_max_size { 383sub set_max_size {
350 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
351 385
… …
410 444
411 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
412 unless $FOCUS; 446 unless $FOCUS;
413} 447}
414 448
415sub mouse_motion { } 449sub mouse_motion { 0 }
416sub button_up { } 450sub button_up { 0 }
417sub key_down { } 451sub key_down { 0 }
418sub key_up { } 452sub key_up { 0 }
419 453
420sub button_down { 454sub button_down {
421 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
422 456
423 $self->focus_in; 457 $self->focus_in;
424}
425 458
426sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
427sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
428sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
429sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
430sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
431 535
432sub draw { 536sub draw {
433 my ($self) = @_; 537 my ($self) = @_;
434 538
435 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
436 550
437 glPushMatrix; 551 glPushMatrix;
438 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
439 $self->_draw;
440 glPopMatrix;
441 553
442 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
443 my ($x, $y) = @$self{qw(x y)};
444
445 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
446 glEnable GL_BLEND; 556 glEnable GL_BLEND;
447 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
448 glBegin GL_QUADS; 558 glBegin GL_QUADS;
449 glVertex $x , $y; 559 glVertex 0 , 0;
450 glVertex $x + $self->{w}, $y; 560 glVertex $self->{w}, 0;
451 glVertex $x + $self->{w}, $y + $self->{h}; 561 glVertex $self->{w}, $self->{h};
452 glVertex $x , $y + $self->{h}; 562 glVertex 0 , $self->{h};
453 glEnd; 563 glEnd;
454 glDisable GL_BLEND; 564 glDisable GL_BLEND;
455 } 565 }
456 566
457 if ($ENV{PCLIENT_DEBUG}) { 567 if ($ENV{CFPLUS_DEBUG} & 1) {
458 glPushMatrix; 568 glPushMatrix;
459 glColor 1, 1, 0, 1; 569 glColor 1, 1, 0, 1;
460 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 570 glTranslate 0.375, 0.375;
461 glBegin GL_LINE_LOOP; 571 glBegin GL_LINE_LOOP;
462 glVertex 0 , 0; 572 glVertex 0 , 0;
463 glVertex $self->{w} - 1, 0; 573 glVertex $self->{w} - 1, 0;
464 glVertex $self->{w} - 1, $self->{h} - 1; 574 glVertex $self->{w} - 1, $self->{h} - 1;
465 glVertex 0 , $self->{h} - 1; 575 glVertex 0 , $self->{h} - 1;
466 glEnd; 576 glEnd;
467 glPopMatrix; 577 glPopMatrix;
468 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
469 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
470} 583}
471 584
472sub _draw { 585sub _draw {
473 my ($self) = @_; 586 my ($self) = @_;
474 587
475 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
476}
477
478sub find_widget {
479 my ($self, $x, $y) = @_;
480
481 return () unless $self->{can_events};
482
483 return $self
484 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
485 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
486
487 ()
488}
489
490sub set_parent {
491 my ($self, $parent) = @_;
492
493 Scalar::Util::weaken ($self->{parent} = $parent);
494
495 if ($parent->{visible} || 1) {
496 $self->{root} = $parent->{root};
497 $self->{visible} = $parent->{visible} + 1;
498
499 $self->emit (visibility_change => 1)
500 unless $self->{parent}{visible};
501 }
502
503 # TODO: req_w _does_change after ->reconfigure
504 $self->check_size
505 unless exists $self->{req_w};
506
507 $self->show;
508}
509
510sub check_size {
511 my ($self, $forced) = @_;
512
513 $self->{force_alloc} = 1 if $forced;
514 $CFClient::UI::ROOT->{check_size}{$self} = $self;
515}
516
517sub update {
518 my ($self) = @_;
519
520 $self->{parent}->update
521 if $self->{parent};
522}
523
524sub connect {
525 my ($self, $signal, $cb) = @_;
526
527 push @{ $self->{signal_cb}{$signal} }, $cb;
528}
529
530sub _emit {
531 my ($self, $signal, @args) = @_;
532
533 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
534}
535
536sub emit {
537 my ($self, $signal, @args) = @_;
538
539 $self->_emit ($signal, @args)
540 || $self->$signal (@args);
541}
542
543sub visibility_change {
544 #my ($self, $visible) = @_;
545} 589}
546 590
547sub DESTROY { 591sub DESTROY {
548 my ($self) = @_; 592 my ($self) = @_;
549 593
… …
581 625
582 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
583 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
584 628
585 glEnable GL_BLEND; 629 glEnable GL_BLEND;
586 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
587 glColor @$color; 631 glColor_premultiply @$color;
588 632
589 glBegin GL_QUADS; 633 glBegin GL_QUADS;
590 glVertex 0 , 0; 634 glVertex 0 , 0;
591 glVertex 0 , $h; 635 glVertex 0 , $h;
592 glVertex $w, $h; 636 glVertex $w, $h;
… …
607 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
608 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
609} 653}
610 654
611sub size_request { 655sub size_request {
612 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
613} 659}
614 660
615sub draw { } 661sub draw { }
616 662
617############################################################################# 663#############################################################################
… …
621our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
622 668
623sub new { 669sub new {
624 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
625 671
626 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
627 673
628 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
629 children => [], 675 children => [],
630 can_events => 0, 676 can_events => 0,
631 %arg, 677 %arg,
632 ); 678 );
679
633 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
634 682
635 $self 683 $self
636} 684}
637 685
638sub add { 686sub add {
… …
646 $self->{children} = [ 694 $self->{children} = [
647 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
648 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
649 ]; 697 ];
650 698
651 $self->check_size (1); 699 $self->realloc;
652 $self->update;
653} 700}
654 701
655sub children { 702sub children {
656 @{ $_[0]{children} } 703 @{ $_[0]{children} }
657} 704}
… …
662 delete $child->{parent}; 709 delete $child->{parent};
663 $child->hide; 710 $child->hide;
664 711
665 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
666 713
667 $self->check_size (1); 714 $self->realloc;
668 $self->update;
669} 715}
670 716
671sub clear { 717sub clear {
672 my ($self) = @_; 718 my ($self) = @_;
673 719
… …
677 for (@$children) { 723 for (@$children) {
678 delete $_->{parent}; 724 delete $_->{parent};
679 $_->hide; 725 $_->hide;
680 } 726 }
681 727
682 $self->check_size; 728 $self->realloc;
683 $self->update;
684} 729}
685 730
686sub find_widget { 731sub find_widget {
687 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
688 733
689 $x -= $self->{x}; 734 $x -= $self->{x};
690 $y -= $self->{y}; 735 $y -= $self->{y};
691 736
692 my $res; 737 my $res;
693 738
694 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
695 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
696 and return $res; 741 and return $res;
697 } 742 }
698 743
699 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
748 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
749} 794}
750 795
751############################################################################# 796#############################################################################
752 797
798# back-buffered drawing area
799
753package CFClient::UI::Window; 800package CFClient::UI::Window;
754 801
755our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
756 803
757use CFClient::OpenGL; 804use CFClient::OpenGL;
… …
775 $self->SUPER::size_allocate ($w, $h); 822 $self->SUPER::size_allocate ($w, $h);
776 $self->update; 823 $self->update;
777} 824}
778 825
779sub _render { 826sub _render {
827 my ($self) = @_;
828
780 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
781} 830}
782 831
783sub render_child { 832sub render_child {
784 my ($self) = @_; 833 my ($self) = @_;
785 834
786 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
787 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
788 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
789 838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
790 $self->_render; 846 $self->_render;
791 }; 847 };
792} 848}
793 849
794sub _draw { 850sub _draw {
795 my ($self) = @_; 851 my ($self) = @_;
796 852
797 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
798 854
799 my $tex = $self->{texture} 855 my $tex = $self->{texture}
800 or return; 856 or return;
801 857
802 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
804 glColor 1, 1, 1, 1; 860 glColor 0, 0, 0, 1;
805 861
806 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
807 863
808 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
809} 865}
… …
825} 881}
826 882
827sub size_request { 883sub size_request {
828 my ($self) = @_; 884 my ($self) = @_;
829 885
830 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
831 887
832 @$self{qw(child_w child_h)} 888 $w = 10 if $self->{scroll_x};
889 $h = 10 if $self->{scroll_y};
890
891 ($w, $h)
833} 892}
834 893
835sub size_allocate { 894sub size_allocate {
836 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
837 896
897 my $child = $self->child;
898
838 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
839 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
840 901
841 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
842 $self->update; 903 $self->update;
843} 904}
844 905
… …
880} 941}
881 942
882sub _render { 943sub _render {
883 my ($self) = @_; 944 my ($self) = @_;
884 945
946 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
947 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
948
885 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 949 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
886 950
887 $self->SUPER::_render; 951 $self->SUPER::_render;
888} 952}
889 953
… …
892package CFClient::UI::ScrolledWindow; 956package CFClient::UI::ScrolledWindow;
893 957
894our @ISA = CFClient::UI::HBox::; 958our @ISA = CFClient::UI::HBox::;
895 959
896sub new { 960sub new {
897 my $class = shift; 961 my ($class, %arg) = @_;
962
963 my $child = delete $arg{child};
898 964
899 my $self; 965 my $self;
900 966
901 my $slider = new CFClient::UI::Slider 967 my $slider = new CFClient::UI::Slider
902 vertical => 1, 968 vertical => 1,
… …
907 ; 973 ;
908 974
909 $self = $class->SUPER::new ( 975 $self = $class->SUPER::new (
910 vp => (new CFClient::UI::ViewPort expand => 1), 976 vp => (new CFClient::UI::ViewPort expand => 1),
911 slider => $slider, 977 slider => $slider,
912 @_, 978 %arg,
913 ); 979 );
914 980
915 $self->{vp}->add ($self->{scrolled});
916 $self->add ($self->{vp});
917 $self->add ($self->{slider}); 981 $self->SUPER::add ($self->{vp}, $self->{slider});
982 $self->add ($child) if $child;
918 983
919 $self 984 $self
985}
986
987sub add {
988 my ($self, $widget) = @_;
989
990 $self->{vp}->add ($self->{child} = $widget);
920} 991}
921 992
922sub update { 993sub update {
923 my ($self) = @_; 994 my ($self) = @_;
924 995
… …
963 1034
964 if ($self->{bg}) { 1035 if ($self->{bg}) {
965 my ($w, $h) = @$self{qw(w h)}; 1036 my ($w, $h) = @$self{qw(w h)};
966 1037
967 glEnable GL_BLEND; 1038 glEnable GL_BLEND;
968 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1039 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
969 glColor @{ $self->{bg} }; 1040 glColor_premultiply @{ $self->{bg} };
970 1041
971 glBegin GL_QUADS; 1042 glBegin GL_QUADS;
972 glVertex 0 , 0; 1043 glVertex 0 , 0;
973 glVertex 0 , $h; 1044 glVertex 0 , $h;
974 glVertex $w, $h; 1045 glVertex $w, $h;
… …
987 1058
988our @ISA = CFClient::UI::Bin::; 1059our @ISA = CFClient::UI::Bin::;
989 1060
990use CFClient::OpenGL; 1061use CFClient::OpenGL;
991 1062
992my @tex = 1063my $bg =
1064 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1065 mipmap => 1, wrap => 1;
1066
1067my @border =
993 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
994 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1069 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
995 1070
996sub new { 1071sub new {
997 my $class = shift; 1072 my ($class, %arg) = @_;
998 1073
999 # TODO: user_x, user_y, overwrite moveto? 1074 my $title = delete $arg{title};
1000 1075
1001 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
1002 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
1003 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
1004 border => 0.6, 1079 border => 0.6,
1005 is_toplevel => 1,
1006 can_events => 1, 1080 can_events => 1,
1007 @_ 1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
1008 ); 1084 );
1009 1085
1010 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title} = new CFClient::UI::Label
1011 align => 0, 1087 align => 0,
1012 valign => 1, 1088 valign => 1,
1013 text => $self->{title}, 1089 text => $title,
1014 fontsize => $self->{border}; 1090 fontsize => $self->{border}
1091 if defined $title;
1015 1092
1016 $self 1093 $self
1094}
1095
1096sub add {
1097 my ($self, @widgets) = @_;
1098
1099 $self->SUPER::add (@widgets);
1100 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1017} 1101}
1018 1102
1019sub border { 1103sub border {
1020 int $_[0]{border} * $::FONTSIZE 1104 int $_[0]{border} * $::FONTSIZE
1021} 1105}
1022 1106
1023sub size_request { 1107sub size_request {
1024 my ($self) = @_; 1108 my ($self) = @_;
1109
1110 $self->{title}->size_request
1111 if $self->{title};
1025 1112
1026 my ($w, $h) = $self->SUPER::size_request; 1113 my ($w, $h) = $self->SUPER::size_request;
1027 1114
1028 ( 1115 (
1029 $w + $self->border * 2, 1116 $w + $self->border * 2,
… …
1032} 1119}
1033 1120
1034sub size_allocate { 1121sub size_allocate {
1035 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
1036 1123
1124 if ($self->{title}) {
1125 $self->{title}{w} = $w;
1126 $self->{title}{h} = $h;
1127 $self->{title}->size_allocate ($w, $h);
1128 }
1129
1130 my $border = $self->border;
1131
1037 $h -= List::Util::max 0, $self->border * 2; 1132 $h -= List::Util::max 0, $border * 2;
1038 $w -= List::Util::max 0, $self->border * 2; 1133 $w -= List::Util::max 0, $border * 2;
1039 1134
1040 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1041 if $self->{title};
1042
1043 $self->child->configure ($self->border, $self->border, $w, $h); 1135 $self->child->configure ($border, $border, $w, $h);
1044} 1136}
1045 1137
1046sub button_down { 1138sub button_down {
1047 my ($self, $ev, $x, $y) = @_; 1139 my ($self, $ev, $x, $y) = @_;
1048 1140
… …
1064 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
1065 1157
1066 my $dx = $ev->{x} - $ox; 1158 my $dx = $ev->{x} - $ox;
1067 my $dy = $ev->{y} - $oy; 1159 my $dy = $ev->{y} - $oy;
1068 1160
1069 $self->{user_x} = $wx + $dx * $mx;
1070 $self->{user_y} = $wy + $dy * $my;
1071 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1161 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1072 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1162 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1073 $self->move ($self->{user_x}, $self->{user_y}); 1163
1074 $self->check_size; 1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 $self->realloc;
1075 }; 1166 };
1076 1167
1077 } elsif ($lr ^ $td) { 1168 } elsif ($lr ^ $td) {
1078 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1169 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1079 my ($bx, $by) = ($self->{x}, $self->{y}); 1170 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1081 $self->{motion} = sub { 1172 $self->{motion} = sub {
1082 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
1083 1174
1084 ($x, $y) = ($ev->{x}, $ev->{y}); 1175 ($x, $y) = ($ev->{x}, $ev->{y});
1085 1176
1086 $self->{user_x} = $bx + $x - $ox; 1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1087 $self->{user_y} = $by + $y - $oy; 1178 # HACK: the next line is required to enforce placement
1088 $self->move ($self->{user_x}, $self->{user_y}); 1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1089 $self->update;
1090 }; 1180 };
1181 } else {
1182 return 0;
1183 }
1184
1091 } 1185 1
1092} 1186}
1093 1187
1094sub button_up { 1188sub button_up {
1095 my ($self, $ev, $x, $y) = @_; 1189 my ($self, $ev, $x, $y) = @_;
1096 1190
1097 delete $self->{motion}; 1191 !!delete $self->{motion}
1098} 1192}
1099 1193
1100sub mouse_motion { 1194sub mouse_motion {
1101 my ($self, $ev, $x, $y) = @_; 1195 my ($self, $ev, $x, $y) = @_;
1102 1196
1103 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1197 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198
1199 !!$self->{motion}
1104} 1200}
1105 1201
1106sub _draw { 1202sub _draw {
1107 my ($self) = @_; 1203 my ($self) = @_;
1108 1204
1205 my $child = $self->{children}[0];
1206
1109 my ($w, $h ) = ($self->{w}, $self->{h}); 1207 my ($w, $h ) = ($self->{w}, $self->{h});
1110 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1208 my ($cw, $ch) = ($child->{w}, $child->{h});
1111 1209
1112 glEnable GL_TEXTURE_2D; 1210 glEnable GL_TEXTURE_2D;
1113 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1114 1212
1115 my $border = $self->border; 1213 my $border = $self->border;
1116 1214
1117 glColor @{ $self->{border_bg} }; 1215 glColor @{ $self->{border_bg} };
1118 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1216 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1119 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1217 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1120 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1218 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1121 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1219 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1122 1220
1123 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1221 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1124 my $bg = $tex[0]; 1222 glColor @{ $self->{bg} };
1125 1223
1126 # TODO: repeat texture not scale 1224 # TODO: repeat texture not scale
1225 # solve this better(?)
1127 my $rep_x = $cw / $bg->{w}; 1226 $bg->{s} = $cw / $bg->{w};
1128 my $rep_y = $ch / $bg->{h}; 1227 $bg->{t} = $ch / $bg->{h};
1129
1130 glColor @{ $self->{bg} };
1131
1132 $bg->{s} = $rep_x;
1133 $bg->{t} = $rep_y;
1134 $bg->{wrap_mode} = 1;
1135 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1228 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1136 } 1229 }
1137 1230
1138 glDisable GL_TEXTURE_2D; 1231 glDisable GL_TEXTURE_2D;
1139 1232
1140 $self->{title}->draw if $self->{title};
1141
1142 $self->child->draw; 1233 $child->draw;
1234
1235 if ($self->{title}) {
1236 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw;
1238 }
1143} 1239}
1144 1240
1145############################################################################# 1241#############################################################################
1146 1242
1147package CFClient::UI::Table; 1243package CFClient::UI::Table;
… …
1169 my ($self, $x, $y, $child) = @_; 1265 my ($self, $x, $y, $child) = @_;
1170 1266
1171 $child->set_parent ($self); 1267 $child->set_parent ($self);
1172 $self->{children}[$y][$x] = $child; 1268 $self->{children}[$y][$x] = $child;
1173 1269
1174 $self->check_size (1); 1270 $self->realloc;
1175} 1271}
1176 1272
1177# TODO: move to container class maybe? send children a signal on removal? 1273# TODO: move to container class maybe? send children a signal on removal?
1178sub clear { 1274sub clear {
1179 my ($self) = @_; 1275 my ($self) = @_;
… …
1184 for (@children) { 1280 for (@children) {
1185 delete $_->{parent}; 1281 delete $_->{parent};
1186 $_->hide; 1282 $_->hide;
1187 } 1283 }
1188 1284
1189 $self->check_size (1); 1285 $self->realloc;
1190 $self->update;
1191} 1286}
1192 1287
1193sub get_wh { 1288sub get_wh {
1194 my ($self) = @_; 1289 my ($self) = @_;
1195 1290
… …
1291 } 1386 }
1292} 1387}
1293 1388
1294############################################################################# 1389#############################################################################
1295 1390
1296package CFClient::UI::HBox; 1391package CFClient::UI::Box;
1297
1298# TODO: wrap into common Box base class
1299 1392
1300our @ISA = CFClient::UI::Container::; 1393our @ISA = CFClient::UI::Container::;
1301 1394
1302sub size_request { 1395sub size_request {
1303 my ($self) = @_; 1396 my ($self) = @_;
1304 1397
1305 my @alloc = map [$_->size_request], @{$self->{children}}; 1398 $self->{vertical}
1306 1399 ? (
1307 ( 1400 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1308 (List::Util::sum map $_->[0], @alloc), 1401 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1309 (List::Util::max map $_->[1], @alloc), 1402 )
1310 ) 1403 : (
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 )
1311} 1407}
1312 1408
1313sub size_allocate { 1409sub size_allocate {
1314 my ($self, $w, $h) = @_; 1410 my ($self, $w, $h) = @_;
1315 1411
1316 ($h, $w) = ($w, $h); 1412 my $space = $self->{vertical} ? $h : $w;
1317
1318 my $children = $self->{children}; 1413 my $children = $self->{children};
1319 1414
1320 my @h = map $_->{req_w}, @$children; 1415 my @req;
1321 1416
1322 my $req_h = List::Util::sum @h; 1417 if ($self->{homogeneous}) {
1323 1418 @req = ($space / (@$children || 1)) x @$children;
1324 if ($req_h > $h) {
1325 # ah well, not enough space
1326 $_ *= $h / $req_h for @h;
1327 } else { 1419 } else {
1420 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1421 my $req = List::Util::sum @req;
1422
1423 if ($req > $space) {
1424 # ah well, not enough space
1425 $_ *= $space / $req for @req;
1426 } else {
1328 my $exp = List::Util::sum map $_->{expand}, @$children; 1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1329 $exp ||= 1;
1330 1428
1429 $space = ($space - $req) / $expand; # remaining space to give away
1430
1431 $req[$_] += $space * $children->[$_]{expand}
1331 for (0 .. $#$children) { 1432 for 0 .. $#$children;
1332 my $child = $children->[$_];
1333
1334 my $alloc_h = $h[$_];
1335 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1336 $h[$_] = $alloc_h;
1337 } 1433 }
1338 } 1434 }
1339 1435
1340 CFClient::UI::harmonize \@h; 1436 CFClient::UI::harmonize \@req;
1341 1437
1342 my $y = 0; 1438 my $pos = 0;
1343 for (0 .. $#$children) { 1439 for (0 .. $#$children) {
1344 my $child = $children->[$_];
1345 my $h = $h[$_]; 1440 my $alloc = $req[$_];
1346 $child->configure ($y, 0, $h, $w); 1441 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1347 1442
1348 $y += $h; 1443 $pos += $alloc;
1349 } 1444 }
1350 1445
1351 1 1446 1
1352} 1447}
1353 1448
1354############################################################################# 1449#############################################################################
1355 1450
1451package CFClient::UI::HBox;
1452
1453our @ISA = CFClient::UI::Box::;
1454
1455sub new {
1456 my $class = shift;
1457
1458 $class->SUPER::new (
1459 vertical => 0,
1460 @_,
1461 )
1462}
1463
1464#############################################################################
1465
1356package CFClient::UI::VBox; 1466package CFClient::UI::VBox;
1357 1467
1358# TODO: wrap into common Box base class
1359
1360our @ISA = CFClient::UI::Container::; 1468our @ISA = CFClient::UI::Box::;
1361 1469
1362sub size_request { 1470sub new {
1363 my ($self) = @_; 1471 my $class = shift;
1364 1472
1365 my @alloc = map [$_->size_request], @{$self->{children}}; 1473 $class->SUPER::new (
1366 1474 vertical => 1,
1367 ( 1475 @_,
1368 (List::Util::max map $_->[0], @alloc),
1369 (List::Util::sum map $_->[1], @alloc),
1370 ) 1476 )
1371}
1372
1373sub size_allocate {
1374 my ($self, $w, $h) = @_;
1375
1376 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1377
1378 my $children = $self->{children};
1379
1380 my @h = map $_->{req_h}, @$children;
1381
1382 my $req_h = List::Util::sum @h;
1383
1384 if ($req_h > $h) {
1385 # ah well, not enough space
1386 $_ *= $h / $req_h for @h;
1387 } else {
1388 my $exp = List::Util::sum map $_->{expand}, @$children;
1389 $exp ||= 1;
1390
1391 for (0 .. $#$children) {
1392 my $child = $children->[$_];
1393
1394 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1395 }
1396 }
1397
1398 CFClient::UI::harmonize \@h;
1399
1400 my $y = 0;
1401 for (0 .. $#$children) {
1402 my $child = $children->[$_];
1403 my $h = $h[$_];
1404 $child->configure (0, $y, $w, $h);
1405
1406 $y += $h;
1407 }
1408
1409 1
1410} 1477}
1411 1478
1412############################################################################# 1479#############################################################################
1413 1480
1414package CFClient::UI::Label; 1481package CFClient::UI::Label;
… …
1431 ellipsise => 3, # end 1498 ellipsise => 3, # end
1432 layout => (new CFClient::Layout), 1499 layout => (new CFClient::Layout),
1433 fontsize => 1, 1500 fontsize => 1,
1434 align => -1, 1501 align => -1,
1435 valign => -1, 1502 valign => -1,
1436 padding => 2, 1503 padding_x => 2,
1504 padding_y => 2,
1437 can_events => 0, 1505 can_events => 0,
1438 %arg 1506 %arg
1439 ); 1507 );
1440 1508
1441 if (exists $self->{template}) { 1509 if (exists $self->{template}) {
… …
1477 $self->{text} = "T$text"; 1545 $self->{text} = "T$text";
1478 1546
1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1480 $self->{layout}->set_text ($text); 1548 $self->{layout}->set_text ($text);
1481 1549
1550 $self->realloc;
1482 $self->update; 1551 $self->update;
1483 $self->check_size;
1484} 1552}
1485 1553
1486sub set_markup { 1554sub set_markup {
1487 my ($self, $markup) = @_; 1555 my ($self, $markup) = @_;
1488 1556
… …
1492 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1560 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493 1561
1494 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1562 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1495 $self->{layout}->set_markup ($markup); 1563 $self->{layout}->set_markup ($markup);
1496 1564
1565 $self->realloc;
1497 $self->update; 1566 $self->update;
1498 $self->check_size;
1499} 1567}
1500 1568
1501sub size_request { 1569sub size_request {
1502 my ($self) = @_; 1570 my ($self) = @_;
1503 1571
… …
1517 1585
1518 $w = List::Util::max $w, $w2; 1586 $w = List::Util::max $w, $w2;
1519 $h = List::Util::max $h, $h2; 1587 $h = List::Util::max $h, $h2;
1520 } 1588 }
1521 1589
1522 ( 1590 ($w, $h)
1523 $w + $self->{padding} * 2,
1524 $h + $self->{padding} * 2,
1525 )
1526} 1591}
1527 1592
1528sub size_allocate { 1593sub size_allocate {
1529 my ($self, $w, $h) = @_; 1594 my ($self, $w, $h) = @_;
1530 1595
1596 delete $self->{ox};
1597
1531 delete $self->{texture}; 1598 delete $self->{texture}
1599 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1532} 1600}
1533 1601
1534sub set_fontsize { 1602sub set_fontsize {
1535 my ($self, $fontsize) = @_; 1603 my ($self, $fontsize) = @_;
1536 1604
1537 $self->{fontsize} = $fontsize; 1605 $self->{fontsize} = $fontsize;
1538 delete $self->{texture}; 1606 delete $self->{texture};
1539 1607
1540 $self->update; 1608 $self->realloc;
1541 $self->check_size;
1542} 1609}
1543 1610
1544sub _draw { 1611sub _draw {
1545 my ($self) = @_; 1612 my ($self) = @_;
1546 1613
… …
1552 $self->{layout}->set_width ($self->{w}); 1619 $self->{layout}->set_width ($self->{w});
1553 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1620 $self->{layout}->set_ellipsise ($self->{ellipsise});
1554 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1621 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1555 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1556 1623
1557 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1624 new_from_layout CFClient::Texture $self->{layout}
1625 };
1558 1626
1627 unless (exists $self->{ox}) {
1559 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1560 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1561 : ($self->{w} - $tex->{w}) * 0.5); 1630 : ($self->{w} - $tex->{w}) * 0.5);
1562 1631
1563 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1564 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1565 : ($self->{h} - $tex->{h}) * 0.5); 1634 : ($self->{h} - $tex->{h}) * 0.5);
1566
1567 $tex
1568 }; 1635 };
1569 1636
1570 glEnable GL_TEXTURE_2D; 1637 glEnable GL_TEXTURE_2D;
1571 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1572 1639
1640 glColor_premultiply @{$self->{fg}}
1573 if ($tex->{format} == GL_ALPHA) { 1641 if $tex->{format} == GL_ALPHA;
1574 glColor @{$self->{fg}}; 1642
1575 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1576 } else {
1577 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1578 }
1579 1644
1580 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1581} 1646}
1582 1647
1583############################################################################# 1648#############################################################################
… …
1610 1675
1611 delete $self->{cur_h}; 1676 delete $self->{cur_h};
1612 1677
1613 return if $self->{text} eq $text; 1678 return if $self->{text} eq $text;
1614 1679
1615 delete $self->{texture};
1616
1617 $self->{last_activity} = $::NOW; 1680 $self->{last_activity} = $::NOW;
1618 $self->{text} = $text; 1681 $self->{text} = $text;
1619 1682
1620 $text =~ s/./*/g if $self->{hidden}; 1683 $text =~ s/./*/g if $self->{hidden};
1621 $self->{layout}->set_text ("$text "); 1684 $self->{layout}->set_text ("$text ");
1622 1685
1623 $self->_emit (changed => $self->{text}); 1686 $self->_emit (changed => $self->{text});
1687 $self->update;
1624} 1688}
1625 1689
1626sub set_text { 1690sub set_text {
1627 my ($self, $text) = @_; 1691 my ($self, $text) = @_;
1628 1692
1629 $self->{cursor} = length $text; 1693 $self->{cursor} = length $text;
1630 $self->_set_text ($text); 1694 $self->_set_text ($text);
1631 $self->update; 1695
1632 $self->check_size; 1696 $self->realloc;
1633} 1697}
1634 1698
1635sub get_text { 1699sub get_text {
1636 $_[0]{text} 1700 $_[0]{text}
1637} 1701}
… …
1667 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1668 } elsif ($uni == 27) { 1732 } elsif ($uni == 27) {
1669 $self->_emit ('escape'); 1733 $self->_emit ('escape');
1670 } elsif ($uni) { 1734 } elsif ($uni) {
1671 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1672 } 1738 }
1673 1739
1674 $self->_set_text ($text); 1740 $self->_set_text ($text);
1675 $self->update; 1741
1676 $self->check_size; 1742 $self->realloc;
1743
1744 1
1677} 1745}
1678 1746
1679sub focus_in { 1747sub focus_in {
1680 my ($self) = @_; 1748 my ($self) = @_;
1681 1749
… …
1696 utf8::encode $text; 1764 utf8::encode $text;
1697 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1698 1766
1699 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1700 $self->update; 1768 $self->update;
1769
1770 1
1701} 1771}
1702 1772
1703sub mouse_motion { 1773sub mouse_motion {
1704 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1705# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776
1777 0
1706} 1778}
1707 1779
1708sub _draw { 1780sub _draw {
1709 my ($self) = @_; 1781 my ($self) = @_;
1710 1782
1711 local $self->{fg} = $self->{fg}; 1783 local $self->{fg} = $self->{fg};
1712 1784
1713 if ($FOCUS == $self) { 1785 if ($FOCUS == $self) {
1714 glColor @{$self->{active_bg}}; 1786 glColor_premultiply @{$self->{active_bg}};
1715 $self->{fg} = $self->{active_fg}; 1787 $self->{fg} = $self->{active_fg};
1716 } else { 1788 } else {
1717 glColor @{$self->{bg}}; 1789 glColor_premultiply @{$self->{bg}};
1718 } 1790 }
1719 1791
1720 glEnable GL_BLEND; 1792 glEnable GL_BLEND;
1721 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1793 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1722 glBegin GL_QUADS; 1794 glBegin GL_QUADS;
1723 glVertex 0 , 0; 1795 glVertex 0 , 0;
1724 glVertex 0 , $self->{h}; 1796 glVertex 0 , $self->{h};
1725 glVertex $self->{w}, $self->{h}; 1797 glVertex $self->{w}, $self->{h};
1726 glVertex $self->{w}, 0; 1798 glVertex $self->{w}, 0;
… …
1787 } else { 1859 } else {
1788 $self->set_text ($self->{history_saveback}); 1860 $self->set_text ($self->{history_saveback});
1789 } 1861 }
1790 1862
1791 } else { 1863 } else {
1792 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1793 } 1867 1
1794
1795} 1868}
1796 1869
1797############################################################################# 1870#############################################################################
1798 1871
1799package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1808 1881
1809sub new { 1882sub new {
1810 my $class = shift; 1883 my $class = shift;
1811 1884
1812 $class->SUPER::new ( 1885 $class->SUPER::new (
1813 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1814 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1815 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1816 can_hover => 1, 1890 can_hover => 1,
1817 align => 0, 1891 align => 0,
1818 valign => 0, 1892 valign => 0,
… …
1827 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1828 1902
1829 $self->emit ("activate") 1903 $self->emit ("activate")
1830 if $x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1831 && $y >= 0 && $y < $self->{h}; 1905 && $y >= 0 && $y < $self->{h};
1906
1907 1
1832} 1908}
1833 1909
1834sub _draw { 1910sub _draw {
1835 my ($self) = @_; 1911 my ($self) = @_;
1836 1912
1837 local $self->{fg} = $self->{fg}; 1913 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1838
1839 if ($GRAB == $self) {
1840 $self->{fg} = $self->{active_fg};
1841 }
1842 1914
1843 glEnable GL_TEXTURE_2D; 1915 glEnable GL_TEXTURE_2D;
1844 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1845 glColor 0, 0, 0, 1; 1917 glColor 0, 0, 0, 1;
1846 1918
… …
1865 1937
1866sub new { 1938sub new {
1867 my $class = shift; 1939 my $class = shift;
1868 1940
1869 $class->SUPER::new ( 1941 $class->SUPER::new (
1870 padding => 2, 1942 padding_x => 2,
1943 padding_y => 2,
1871 fg => [1, 1, 1], 1944 fg => [1, 1, 1],
1872 active_fg => [1, 1, 0], 1945 active_fg => [1, 1, 0],
1873 bg => [0, 0, 0, 0.2], 1946 bg => [0, 0, 0, 0.2],
1874 active_bg => [1, 1, 1, 0.5], 1947 active_bg => [1, 1, 1, 0.5],
1875 state => 0, 1948 state => 0,
… …
1879} 1952}
1880 1953
1881sub size_request { 1954sub size_request {
1882 my ($self) = @_; 1955 my ($self) = @_;
1883 1956
1884 ($self->{padding} * 2 + 6) x 2 1957 (6) x 2
1885} 1958}
1886 1959
1887sub button_down { 1960sub button_down {
1888 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1889 1962
1890 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1891 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1892 $self->{state} = !$self->{state}; 1965 $self->{state} = !$self->{state};
1893 $self->_emit (changed => $self->{state}); 1966 $self->_emit (changed => $self->{state});
1967 } else {
1968 return 0
1969 }
1970
1894 } 1971 1
1895} 1972}
1896 1973
1897sub _draw { 1974sub _draw {
1898 my ($self) = @_; 1975 my ($self) = @_;
1899 1976
1900 $self->SUPER::_draw; 1977 $self->SUPER::_draw;
1901 1978
1902 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1979 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1903 1980
1904 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1981 my ($w, $h) = @$self{qw(w h)};
1982
1983 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1905 1984
1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1985 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1907 1986
1908 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1987 my $tex = $self->{state} ? $tex[1] : $tex[0];
1909 1988
… …
2064 2143
2065 my $h1 = $self->{h} * (1 - $ycut1); 2144 my $h1 = $self->{h} * (1 - $ycut1);
2066 my $h2 = $self->{h} * (1 - $ycut2); 2145 my $h2 = $self->{h} * (1 - $ycut2);
2067 2146
2068 glEnable GL_BLEND; 2147 glEnable GL_BLEND;
2069 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2148 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2149 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2070 glEnable GL_TEXTURE_2D; 2150 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072 2152
2073 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2153 glBindTexture GL_TEXTURE_2D, $t1->{name};
2074 glBegin GL_QUADS; 2154 glBegin GL_QUADS;
… …
2174 fg => [1, 1, 1], 2254 fg => [1, 1, 1],
2175 active_fg => [0, 0, 0], 2255 active_fg => [0, 0, 0],
2176 bg => [0, 0, 0, 0.2], 2256 bg => [0, 0, 0, 0.2],
2177 active_bg => [1, 1, 1, 0.5], 2257 active_bg => [1, 1, 1, 0.5],
2178 range => [0, 0, 100, 10, 0], 2258 range => [0, 0, 100, 10, 0],
2179 req_w => $::WIDTH / 80, 2259 min_w => $::WIDTH / 80,
2180 req_h => $::WIDTH / 80, 2260 min_h => $::WIDTH / 80,
2181 vertical => 0, 2261 vertical => 0,
2182 can_hover => 1, 2262 can_hover => 1,
2183 inner_pad => 0.02, 2263 inner_pad => 0.02,
2184 @_ 2264 @_
2185 ); 2265 );
… …
2188 $self->update; 2268 $self->update;
2189 2269
2190 $self 2270 $self
2191} 2271}
2192 2272
2273sub changed { }
2274
2193sub set_range { 2275sub set_range {
2194 my ($self, $range) = @_; 2276 my ($self, $range) = @_;
2195 2277
2196 ($range, $self->{range}) = ($self->{range}, $range); 2278 ($range, $self->{range}) = ($self->{range}, $range);
2197 2279
… …
2223} 2305}
2224 2306
2225sub size_request { 2307sub size_request {
2226 my ($self) = @_; 2308 my ($self) = @_;
2227 2309
2228 my $w = $self->{req_w}; 2310 ($self->{req_w}, $self->{req_h})
2229 my $h = $self->{req_h};
2230
2231 $self->{vertical} ? ($h, $w) : ($w, $h)
2232} 2311}
2233 2312
2234sub button_down { 2313sub button_down {
2235 my ($self, $ev, $x, $y) = @_; 2314 my ($self, $ev, $x, $y) = @_;
2236 2315
2237 $self->SUPER::button_down ($ev, $x, $y); 2316 $self->SUPER::button_down ($ev, $x, $y);
2238 2317
2239 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2318 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240 2319
2241 $self->mouse_motion ($ev, $x, $y); 2320 $self->mouse_motion ($ev, $x, $y)
2242} 2321}
2243 2322
2244sub mouse_motion { 2323sub mouse_motion {
2245 my ($self, $ev, $x, $y) = @_; 2324 my ($self, $ev, $x, $y) = @_;
2246 2325
… …
2250 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2329 my (undef, $lo, $hi, $page) = @{$self->{range}};
2251 2330
2252 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2331 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253 2332
2254 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2333 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2334 } else {
2335 return 0;
2336 }
2337
2255 } 2338 1
2256} 2339}
2257 2340
2258sub update { 2341sub update {
2259 my ($self) = @_; 2342 my ($self) = @_;
2260 2343
2261 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2344 delete $self->{knob_w};
2345 $self->SUPER::update;
2346}
2347
2348sub _draw {
2349 my ($self) = @_;
2350
2351 unless ($self->{knob_w}) {
2262 $self->set_value ($self->{range}[0]); 2352 $self->set_value ($self->{range}[0]);
2263 2353
2264 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2354 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100; 2355 my $range = ($hi - $page - $lo) || 1e-100;
2266 2356
… …
2272 $value = ($value - $lo) / $range; 2362 $value = ($value - $lo) / $range;
2273 $value = $value * $self->{scale} + $self->{offset}; 2363 $value = $value * $self->{scale} + $self->{offset};
2274 2364
2275 $self->{knob_x} = $value - $knob_w * 0.5; 2365 $self->{knob_x} = $value - $knob_w * 0.5;
2276 $self->{knob_w} = $knob_w; 2366 $self->{knob_w} = $knob_w;
2277 }); 2367 }
2278
2279 $self->SUPER::update;
2280}
2281
2282sub _draw {
2283 my ($self) = @_;
2284 2368
2285 $self->SUPER::_draw (); 2369 $self->SUPER::_draw ();
2286 2370
2287 glScale $self->{w}, $self->{h}; 2371 glScale $self->{w}, $self->{h};
2288 2372
… …
2482 2566
2483 delete $self->{texture}; 2567 delete $self->{texture};
2484 } 2568 }
2485 2569
2486 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2487 glClearColor 0.5, 0.5, 0.5, 0; 2571 glClearColor 0, 0, 0, 0;
2488 glClear GL_COLOR_BUFFER_BIT; 2572 glClear GL_COLOR_BUFFER_BIT;
2489 2573
2490 my $top = int $self->{children}[1]{range}[0]; 2574 my $top = int $self->{children}[1]{range}[0];
2491 2575
2492 my $y0 = $top; 2576 my $y0 = $top;
… …
2527sub _draw { 2611sub _draw {
2528 my ($self) = @_; 2612 my ($self) = @_;
2529 2613
2530 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532 glColor 1, 1, 1, 1; 2616 glColor 0, 0, 0, 1;
2533 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2617 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2534 glDisable GL_TEXTURE_2D; 2618 glDisable GL_TEXTURE_2D;
2535 2619
2536 $self->{children}[1]->draw; 2620 $self->{children}[1]->draw;
2537 2621
2538} 2622}
… …
2592 state => 0, 2676 state => 0,
2593 on_activate => \&toggle_flopper, 2677 on_activate => \&toggle_flopper,
2594 @_ 2678 @_
2595 ); 2679 );
2596 2680
2597 if ($self->{state}) {
2598 $self->{state} = 0;
2599 $self->toggle_flopper;
2600 }
2601
2602 $self 2681 $self
2603} 2682}
2604 2683
2605sub toggle_flopper { 2684sub toggle_flopper {
2606 my ($self) = @_; 2685 my ($self) = @_;
2607 2686
2608 # TODO: use animation 2687 $self->{other}->toggle_visibility;
2609 if ($self->{state} = !$self->{state}) {
2610 $CFClient::UI::ROOT->add ($self->{other});
2611 $self->{other}->move ($self->coord2global (0, $self->{h}));
2612 $self->_emit ("open");
2613 } else {
2614 $CFClient::UI::ROOT->remove ($self->{other});
2615 $self->_emit ("close");
2616 }
2617
2618 $self->_emit (changed => $self->{state});
2619} 2688}
2620 2689
2621############################################################################# 2690#############################################################################
2622 2691
2623package CFClient::UI::Tooltip; 2692package CFClient::UI::Tooltip;
… …
2636} 2705}
2637 2706
2638sub set_tooltip_from { 2707sub set_tooltip_from {
2639 my ($self, $widget) = @_; 2708 my ($self, $widget) = @_;
2640 2709
2710 my $tooltip = $widget->{tooltip};
2711
2712 if ($ENV{CFPLUS_DEBUG} & 2) {
2713 $tooltip .= "\n\n" . (ref $widget) . "\n"
2714 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2715 . "req $widget->{req_w} $widget->{req_h}\n"
2716 . "visible $widget->{visible}";
2717 }
2718
2641 $self->add (new CFClient::UI::Label 2719 $self->add (new CFClient::UI::Label
2642 markup => $widget->{tooltip}, 2720 markup => $tooltip,
2643 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2644 fontsize => 0.8, 2722 fontsize => 0.8,
2645 fg => [0, 0, 0, 1], 2723 fg => [0, 0, 0, 1],
2646 ellipsise => 0, 2724 ellipsise => 0,
2647 font => ($widget->{tooltip_font} || $::FONT_PROP), 2725 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2658 2736
2659sub size_allocate { 2737sub size_allocate {
2660 my ($self, $w, $h) = @_; 2738 my ($self, $w, $h) = @_;
2661 2739
2662 $self->SUPER::size_allocate ($w - 4, $h - 4); 2740 $self->SUPER::size_allocate ($w - 4, $h - 4);
2741}
2742
2743sub visibility_change {
2744 my ($self, $visible) = @_;
2745
2746 return unless $visible;
2747
2748 $self->{root}->on_post_alloc ("move_$self" => sub {
2749 my $widget = $self->{owner}
2750 or return;
2751
2752 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2753
2754 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2755 if $x + $self->{w} > $::WIDTH;
2756
2757 $self->move_abs ($x, $y);
2758 });
2663} 2759}
2664 2760
2665sub _draw { 2761sub _draw {
2666 my ($self) = @_; 2762 my ($self) = @_;
2667 2763
… …
2684 glVertex $w, $h; 2780 glVertex $w, $h;
2685 glVertex $w, 0; 2781 glVertex $w, 0;
2686 glEnd; 2782 glEnd;
2687 2783
2688 glTranslate 2 - 0.375, 2 - 0.375; 2784 glTranslate 2 - 0.375, 2 - 0.375;
2785
2689 $self->SUPER::_draw; 2786 $self->SUPER::_draw;
2690} 2787}
2691 2788
2692############################################################################# 2789#############################################################################
2693 2790
… …
2752 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2849 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2753 2850
2754 if ($tex) { 2851 if ($tex) {
2755 glEnable GL_TEXTURE_2D; 2852 glEnable GL_TEXTURE_2D;
2756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2757 glColor 1, 1, 1, 1; 2854 glColor 0, 0, 0, 1;
2758 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2759 glDisable GL_TEXTURE_2D; 2856 glDisable GL_TEXTURE_2D;
2760 } 2857 }
2761} 2858}
2762 2859
… …
2769 $self->SUPER::DESTROY; 2866 $self->SUPER::DESTROY;
2770} 2867}
2771 2868
2772############################################################################# 2869#############################################################################
2773 2870
2774package CFClient::UI::Inventory; 2871package CFClient::UI::Buttonbar;
2775 2872
2776our @ISA = CFClient::UI::ScrolledWindow::; 2873our @ISA = CFClient::UI::HBox::;
2777 2874
2778sub new { 2875# TODO: should actualyl wrap buttons and other goodies.
2779 my $class = shift;
2780
2781 my $self = $class->SUPER::new (
2782 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2783 @_,
2784 );
2785
2786 $self
2787}
2788
2789sub set_items {
2790 my ($self, $items) = @_;
2791
2792 $self->{scrolled}->clear;
2793 return unless $items;
2794
2795 my @items = sort {
2796 ($a->{type} <=> $b->{type})
2797 or ($a->{name} cmp $b->{name})
2798 } @$items;
2799
2800 $self->{real_items} = \@items;
2801
2802 my $row = 0;
2803 for my $item (@items) {
2804 CFClient::Item::update_widgets $item;
2805
2806 $self->{scrolled}->add (0, $row, $item->{face_widget});
2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2808 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2809
2810 $row++;
2811 }
2812}
2813
2814sub size_request {
2815 my ($self) = @_;
2816 ($self->{req_w}, $self->{req_h});
2817}
2818 2876
2819############################################################################# 2877#############################################################################
2820 2878
2821package CFClient::UI::Menu; 2879package CFClient::UI::Menu;
2822 2880
… …
2863 # maybe save $GRAB? must be careful about events... 2921 # maybe save $GRAB? must be careful about events...
2864 $GRAB = $self; 2922 $GRAB = $self;
2865 $self->{button} = $ev->{button}; 2923 $self->{button} = $ev->{button};
2866 2924
2867 $self->show; 2925 $self->show;
2868 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2926 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2869} 2927}
2870 2928
2871sub mouse_motion { 2929sub mouse_motion {
2872 my ($self, $ev, $x, $y) = @_; 2930 my ($self, $ev, $x, $y) = @_;
2873 2931
2874 # TODO: should use vbox->find_widget or so 2932 # TODO: should use vbox->find_widget or so
2875 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2876 $self->{hover} = $self->{item}{$HOVER}; 2934 $self->{hover} = $self->{item}{$HOVER};
2935
2936 0
2877} 2937}
2878 2938
2879sub button_up { 2939sub button_up {
2880 my ($self, $ev, $x, $y) = @_; 2940 my ($self, $ev, $x, $y) = @_;
2881 2941
… …
2883 undef $GRAB; 2943 undef $GRAB;
2884 $self->hide; 2944 $self->hide;
2885 2945
2886 $self->_emit ("popdown"); 2946 $self->_emit ("popdown");
2887 $self->{hover}[1]->() if $self->{hover}; 2947 $self->{hover}[1]->() if $self->{hover};
2948 } else {
2949 return 0
2950 }
2951
2952 1
2953}
2954
2955#############################################################################
2956
2957package CFClient::UI::Multiplexer;
2958
2959our @ISA = CFClient::UI::Container::;
2960
2961sub new {
2962 my $class = shift;
2963
2964 my $self = $class->SUPER::new (
2965 @_,
2966 );
2967
2968 $self->{current} = $self->{children}[0]
2969 if @{ $self->{children} };
2970
2971 $self
2972}
2973
2974sub add {
2975 my ($self, @widgets) = @_;
2976
2977 $self->SUPER::add (@widgets);
2978
2979 $self->{current} = $self->{children}[0]
2980 if @{ $self->{children} };
2981}
2982
2983sub set_current_page {
2984 my ($self, $page_or_widget) = @_;
2985
2986 my $widget = ref $page_or_widget
2987 ? $page_or_widget
2988 : $self->{children}[$page_or_widget];
2989
2990 $self->{current} = $widget;
2991 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2992
2993 $self->_emit (page_changed => $self->{current});
2994
2995 $self->realloc;
2996}
2997
2998sub visible_children {
2999 $_[0]{current}
3000}
3001
3002sub size_request {
3003 my ($self) = @_;
3004
3005 $self->{current}->size_request
3006}
3007
3008sub size_allocate {
3009 my ($self, $w, $h) = @_;
3010
3011 $self->{current}->configure (0, 0, $w, $h);
3012}
3013
3014sub _draw {
3015 my ($self) = @_;
3016
3017 $self->{current}->draw;
3018}
3019
3020#############################################################################
3021
3022package CFClient::UI::Notebook;
3023
3024our @ISA = CFClient::UI::VBox::;
3025
3026sub new {
3027 my $class = shift;
3028
3029 my $self = $class->SUPER::new (
3030 buttonbar => (new CFClient::UI::Buttonbar),
3031 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3032 # filter => # will be put between multiplexer and $self
3033 @_,
3034 );
2888 } 3035
3036 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3037 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3038
3039 $self
3040}
3041
3042sub add {
3043 my ($self, $title, $widget, $tooltip) = @_;
3044
3045 Scalar::Util::weaken $self;
3046
3047 $self->{buttonbar}->add (new CFClient::UI::Button
3048 markup => $title,
3049 tooltip => $tooltip,
3050 on_activate => sub { $self->set_current_page ($widget) },
3051 );
3052
3053 $self->{multiplexer}->add ($widget);
3054}
3055
3056sub set_current_page {
3057 my ($self, $page) = @_;
3058
3059 $self->{multiplexer}->set_current_page ($page);
3060 $self->_emit (page_changed => $self->{multiplexer}{current});
2889} 3061}
2890 3062
2891############################################################################# 3063#############################################################################
2892 3064
2893package CFClient::UI::Statusbox; 3065package CFClient::UI::Statusbox;
… …
2998 $self->SUPER::reconfigure; 3170 $self->SUPER::reconfigure;
2999} 3171}
3000 3172
3001############################################################################# 3173#############################################################################
3002 3174
3003package CFClient::UI::Root; 3175package CFClient::UI::Inventory;
3004 3176
3005our @ISA = CFClient::UI::Container::; 3177our @ISA = CFClient::UI::ScrolledWindow::;
3006
3007use CFClient::OpenGL;
3008 3178
3009sub new { 3179sub new {
3010 my $class = shift; 3180 my $class = shift;
3011 3181
3012 $class->SUPER::new ( 3182 my $self = $class->SUPER::new (
3183 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3184 @_,
3185 );
3186
3187 $self
3188}
3189
3190sub set_items {
3191 my ($self, $items) = @_;
3192
3193 $self->{child}->clear;
3194 return unless $items;
3195
3196 my @items = sort {
3197 ($a->{type} <=> $b->{type})
3198 or ($a->{name} cmp $b->{name})
3199 } @$items;
3200
3201 $self->{real_items} = \@items;
3202
3203 my $row = 0;
3204 for my $item (@items) {
3205 CFClient::Item::update_widgets $item;
3206
3207 $self->{child}->add (0, $row, $item->{face_widget});
3208 $self->{child}->add (1, $row, $item->{desc_widget});
3209 $self->{child}->add (2, $row, $item->{weight_widget});
3210
3211 $row++;
3212 }
3213}
3214
3215#############################################################################
3216
3217package CFClient::UI::BindEditor;
3218
3219our @ISA = CFClient::UI::FancyFrame::;
3220
3221sub new {
3222 my $class = shift;
3223
3224 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3225
3226 $self->add (my $vb = new CFClient::UI::VBox);
3227
3228
3229 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3230 text => "start recording",
3231 tooltip => "Start/Stops recording of actions."
3232 ."All subsequent actions after the recording started will be captured."
3233 ."The actions are displayed after the record was stopped."
3234 ."To bind the action you have to click on the 'Bind' button",
3235 on_activate => sub {
3236 unless ($self->{recording}) {
3237 $self->start;
3238 } else {
3239 $self->stop;
3240 }
3241 });
3242
3243 $vb->add (new CFClient::UI::Label text => "Actions:");
3244 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3245
3246 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3247 $vb->add (my $hb = new CFClient::UI::HBox);
3248 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3249 $hb->add (new CFClient::UI::Button
3250 text => "bind",
3251 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3252 on_activate => sub {
3253 $self->ask_for_bind;
3254 });
3255
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add (new CFClient::UI::Button
3258 text => "ok",
3259 expand => 1,
3260 tooltip => "This closes the binding editor and saves the binding",
3261 on_activate => sub {
3262 $self->hide;
3263 $self->commit;
3264 });
3265
3266 $hb->add (new CFClient::UI::Button
3267 text => "cancel",
3268 expand => 1,
3269 tooltip => "This closes the binding editor without saving",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->{binding_cancel}->()
3273 if $self->{binding_cancel};
3274 });
3275
3276 $self->update_binding_widgets;
3277
3278 $self
3279}
3280
3281sub commit {
3282 my ($self) = @_;
3283 my ($mod, $sym, $cmds) = $self->get_binding;
3284 if ($sym != 0 && @$cmds > 0) {
3285 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3286 ."'. Don't forget 'Save Config'!");
3287 $self->{binding_change}->($mod, $sym, $cmds)
3288 if $self->{binding_change};
3289 } else {
3290 $::STATUSBOX->add ("No action bound, no key or action specified!");
3291 $self->{binding_cancel}->()
3292 if $self->{binding_cancel};
3293 }
3294}
3295
3296sub start {
3297 my ($self) = @_;
3298
3299 $self->{rec_btn}->set_text ("stop recording");
3300 $self->{recording} = 1;
3301 $self->clear_command_list;
3302 $::CONN->start_record if $::CONN;
3303}
3304
3305sub stop {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("start recording");
3309 $self->{recording} = 0;
3310
3311 my $rec;
3312 $rec = $::CONN->stop_record if $::CONN;
3313 return unless ref $rec eq 'ARRAY';
3314 $self->set_command_list ($rec);
3315}
3316
3317
3318sub ask_for_bind_and_commit {
3319 my ($self) = @_;
3320 $self->ask_for_bind (1);
3321}
3322
3323sub ask_for_bind {
3324 my ($self, $commit) = @_;
3325
3326 CFClient::Binder::open_binding_dialog (sub {
3327 my ($mod, $sym) = @_;
3328 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3329 $self->update_binding_widgets;
3330 $self->commit if $commit;
3331 });
3332}
3333
3334# $mod and $sym are the modifiers and key symbol
3335# $cmds is a array ref of strings (the commands)
3336# $cb is the callback that is executed on OK
3337# $ccb is the callback that is executed on CANCEL and
3338# when the binding was unsuccessful on OK
3339sub set_binding {
3340 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3341
3342 $self->clear_command_list;
3343 $self->{recording} = 0;
3344 $self->{rec_btn}->set_text ("start recording");
3345
3346 $self->{binding} = [$mod, $sym];
3347 $self->{commands} = $cmds;
3348
3349 $self->{binding_change} = $cb;
3350 $self->{binding_cancel} = $ccb;
3351
3352 $self->update_binding_widgets;
3353}
3354
3355# this is a shortcut method that asks for a binding
3356# and then just binds it.
3357sub do_quick_binding {
3358 my ($self, $cmds) = @_;
3359 $self->set_binding (undef, undef, $cmds, sub {
3360 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3361 });
3362 $self->ask_for_bind (1);
3363}
3364
3365sub update_binding_widgets {
3366 my ($self) = @_;
3367 my ($mod, $sym, $cmds) = $self->get_binding;
3368 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3369 $self->set_command_list ($cmds);
3370}
3371
3372sub get_binding {
3373 my ($self) = @_;
3374 return (
3375 $self->{binding}->[0],
3376 $self->{binding}->[1],
3377 [ grep { defined $_ } @{$self->{commands}} ]
3378 );
3379}
3380
3381sub clear_command_list {
3382 my ($self) = @_;
3383 $self->{cmdbox}->clear ();
3384}
3385
3386sub set_command_list {
3387 my ($self, $cmds) = @_;
3388
3389 $self->{cmdbox}->clear ();
3390 $self->{commands} = $cmds;
3391
3392 my $idx = 0;
3393
3394 for (@$cmds) {
3395 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3396
3397 my $i = $idx;
3398 $hb->add (new CFClient::UI::Label text => $_);
3399 $hb->add (new CFClient::UI::Button
3400 text => "delete",
3401 tooltip => "Deletes the action from the record",
3402 on_activate => sub {
3403 $self->{cmdbox}->remove ($hb);
3404 $cmds->[$i] = undef;
3405 });
3406
3407
3408 $idx++
3409 }
3410}
3411
3412#############################################################################
3413
3414package CFClient::UI::SpellList;
3415
3416our @ISA = CFClient::UI::Table::;
3417
3418sub new {
3419 my $class = shift;
3420
3421 my $self = $class->SUPER::new (
3422 binding => [],
3423 commands => [],
3424 @_,
3425 )
3426}
3427
3428# XXX: Do sorting? Argl...
3429sub add_spell {
3430 my ($self, $spell) = @_;
3431 $self->{spells}->{$spell->{name}} = $spell;
3432
3433 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3434 face => $spell->{face},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message});
3438
3439 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3440 text => $spell->{name},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message},
3444 expand => 1);
3445
3446 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3447 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3448 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3449 expand => 1);
3450
3451 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3452 text => "bind to key",
3453 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3454}
3455
3456sub rebuild_spell_list {
3457 my ($self) = @_;
3458 $self->{tbl_idx} = 0;
3459 $self->add_spell ($_) for values %{$self->{spells}};
3460}
3461
3462sub remove_spell {
3463 my ($self, $spell) = @_;
3464 delete $self->{spells}->{$spell->{name}};
3465 $self->rebuild_spell_list;
3466}
3467
3468#############################################################################
3469
3470package CFClient::UI::Root;
3471
3472our @ISA = CFClient::UI::Container::;
3473
3474use CFClient::OpenGL;
3475
3476sub new {
3477 my $class = shift;
3478
3479 my $self = $class->SUPER::new (
3013 visible => 1, 3480 visible => 1,
3014 @_, 3481 @_,
3015 ) 3482 );
3016}
3017 3483
3018sub configure { 3484 Scalar::Util::weaken ($self->{root} = $self);
3019 my ($self, $x, $y, $w, $h) = @_;
3020 3485
3021 $self->{w} = $w; 3486 $self
3022 $self->{h} = $h;
3023}
3024
3025sub check_size {
3026 my ($self) = @_;
3027
3028 $self->size_allocate ($self->{w}, $self->{h})
3029 if $self->{w};
3030} 3487}
3031 3488
3032sub size_request { 3489sub size_request {
3033 my ($self) = @_; 3490 my ($self) = @_;
3034 3491
3035 ($self->{w}, $self->{h}) 3492 ($self->{w}, $self->{h})
3493}
3494
3495sub _to_pixel {
3496 my ($coord, $size, $max) = @_;
3497
3498 $coord =
3499 $coord eq "center" ? ($max - $size) * 0.5
3500 : $coord eq "max" ? $max
3501 : $coord;
3502
3503 $coord = 0 if $coord < 0;
3504 $coord = $max - $size if $coord > $max - $size;
3505
3506 int $coord + 0.5
3036} 3507}
3037 3508
3038sub size_allocate { 3509sub size_allocate {
3039 my ($self, $w, $h) = @_; 3510 my ($self, $w, $h) = @_;
3040 3511
3041 for my $child ($self->children) { 3512 for my $child ($self->children) {
3042 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3513 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3043 3514
3044 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3515 $X = $child->{force_x} if exists $child->{force_x};
3045 if exists $child->{req_x}; 3516 $Y = $child->{force_y} if exists $child->{force_y};
3046 3517
3047 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3518 $X = _to_pixel $X, $W, $self->{w};
3048 if exists $child->{req_y}; 3519 $Y = _to_pixel $Y, $H, $self->{h};
3049
3050 $X = $self->{user_x} if exists $self->{user_x};
3051 $Y = $self->{user_y} if exists $self->{user_y};
3052
3053 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3054 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3055 3520
3056 $child->configure ($X, $Y, $W, $H); 3521 $child->configure ($X, $Y, $W, $H);
3057 } 3522 }
3058} 3523}
3059 3524
… …
3070} 3535}
3071 3536
3072sub update { 3537sub update {
3073 my ($self) = @_; 3538 my ($self) = @_;
3074 3539
3075 $self->check_size;
3076 $::WANT_REFRESH++; 3540 $::WANT_REFRESH++;
3077} 3541}
3078 3542
3079sub add { 3543sub add {
3080 my ($self, @children) = @_; 3544 my ($self, @children) = @_;
3081 3545
3082 for (my @widgets = @children; my $w = pop @widgets; ) {
3083 push @widgets, $w->children;
3084 $w->{root} = $self;
3085 $w->{visible} = $self->{visible} + 1;
3086 }
3087
3088 for my $child (@children) {
3089 $child->{is_toplevel} = 1; 3546 $_->{is_toplevel} = 1
3090 3547 for @children;
3091 # integerise window positions
3092 $child->{x} = int $child->{x};
3093 $child->{y} = int $child->{y};
3094 }
3095 3548
3096 $self->SUPER::add (@children); 3549 $self->SUPER::add (@children);
3097} 3550}
3098 3551
3099sub remove { 3552sub remove {
3100 my ($self, @children) = @_; 3553 my ($self, @children) = @_;
3101 3554
3102 $self->SUPER::remove (@children); 3555 $self->SUPER::remove (@children);
3556
3557 delete $self->{is_toplevel}
3558 for @children;
3103 3559
3104 while (@children) { 3560 while (@children) {
3105 my $w = pop @children; 3561 my $w = pop @children;
3106 push @children, $w->children; 3562 push @children, $w->children;
3107 $w->set_invisible; 3563 $w->set_invisible;
… …
3126 while ($self->{refresh_hook}) { 3582 while ($self->{refresh_hook}) {
3127 $_->() 3583 $_->()
3128 for values %{delete $self->{refresh_hook}}; 3584 for values %{delete $self->{refresh_hook}};
3129 } 3585 }
3130 3586
3131 if ($self->{check_size}) { 3587 if ($self->{realloc}) {
3588 my %queue;
3132 my @queue; 3589 my @queue;
3590 my $widget;
3133 3591
3134 for (;;) { 3592 outer:
3135 if ($self->{check_size}) { 3593 while () {
3136 #TODO use array-of-depth approach 3594 if (my $realloc = delete $self->{realloc}) {
3595 for $widget (values %$realloc) {
3596 $widget->{visible} or next; # do not resize invisible widgets
3137 3597
3138 @queue = sort { $a->{visible} <=> $b->{visible} } 3598 $queue{$widget+0}++ and next; # duplicates are common
3139 @queue, values %{delete $self->{check_size}}; 3599
3600 push @{ $queue[$widget->{visible}] }, $widget;
3601 }
3140 } 3602 }
3141 3603
3604 while () {
3605 @queue or last outer;
3606
3142 my $widget = pop @queue || last; 3607 $widget = pop @{ $queue[-1] || [] }
3143 3608 and last;
3144 defined $widget->{visible} or last; # do not resize invisible widgets
3145
3146 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3147 ? @$widget{qw(user_w user_h)}
3148 : $widget->size_request;
3149
3150 if (delete $widget->{force_alloc}
3151 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3152 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3153 3609
3610 pop @queue;
3611 }
3612
3613 delete $queue{$widget+0};
3614
3615 my ($w, $h) = $widget->size_request;
3616
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3619
3620 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h};
3622
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3624 || delete $widget->{force_realloc}) {
3154 $widget->{req_w} = $w; 3625 $widget->{req_w} = $w;
3155 $widget->{req_h} = $h; 3626 $widget->{req_h} = $h;
3156 3627
3157 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3628 $self->{size_alloc}{$widget+0} = $widget;
3158 3629
3159 $widget->{parent}->check_size
3160 if $widget->{parent}; 3630 if (my $parent = $widget->{parent}) {
3631 $self->{realloc}{$parent+0} = $parent
3632 unless $queue{$parent+0};
3633
3634 $parent->{force_size_alloc} = 1;
3635 $self->{size_alloc}{$parent+0} = $parent;
3636 }
3161 } 3637 }
3638
3639 delete $self->{realloc}{$widget+0};
3162 } 3640 }
3163 } 3641 }
3164 3642
3165 while ($self->{size_alloc}) { 3643 while (my $size_alloc = delete $self->{size_alloc}) {
3166 for (values %{delete $self->{size_alloc}}) { 3644 my @queue = sort { $b->{visible} <=> $a->{visible} }
3167 my ($widget, $w, $h) = @$_; 3645 values %$size_alloc;
3646
3647 while () {
3648 my $widget = pop @queue || last;
3649
3650 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3168 3651
3169 $w = 0 if $w < 0; 3652 $w = 0 if $w < 0;
3170 $h = 0 if $h < 0; 3653 $h = 0 if $h < 0;
3171 3654
3655 $w = int $w + 0.5;
3656 $h = int $h + 0.5;
3657
3658 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3659 $widget->{old_w} = $widget->{w};
3660 $widget->{old_h} = $widget->{h};
3661
3172 $widget->{w} = $w; 3662 $widget->{w} = $w;
3173 $widget->{h} = $h; 3663 $widget->{h} = $h;
3664
3174 $widget->emit (size_allocate => $w, $h); 3665 $widget->emit (size_allocate => $w, $h);
3666 }
3175 } 3667 }
3176 } 3668 }
3177 3669
3178 while ($self->{post_alloc_hook}) { 3670 while ($self->{post_alloc_hook}) {
3179 $_->() 3671 $_->()
3180 for values %{delete $self->{post_alloc_hook}}; 3672 for values %{delete $self->{post_alloc_hook}};
3181 } 3673 }
3674
3182 3675
3183 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3676 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3184 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3677 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3185 glClear GL_COLOR_BUFFER_BIT; 3678 glClear GL_COLOR_BUFFER_BIT;
3186 3679
… …
3188 glLoadIdentity; 3681 glLoadIdentity;
3189 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3682 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3190 glMatrixMode GL_MODELVIEW; 3683 glMatrixMode GL_MODELVIEW;
3191 glLoadIdentity; 3684 glLoadIdentity;
3192 3685
3686 {
3687 package CFClient::UI::Base;
3688
3689 ($draw_x, $draw_y, $draw_w, $draw_h) =
3690 (0, 0, $self->{w}, $self->{h});
3691 }
3692
3193 $self->_draw; 3693 $self->_draw;
3194} 3694}
3195 3695
3196############################################################################# 3696#############################################################################
3197 3697

Diff Legend

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