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.250 by root, Sun May 28 02:31:03 2006 UTC vs.
Revision 1.282 by root, Mon Jun 5 02:25:10 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->{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.]+$/;
181 $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};
182 $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};
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
183 } 189 }
184 } 190 }
185 191
186 reconfigure_widgets; 192 reconfigure_widgets;
187} 193}
… …
196 202
197sub new { 203sub new {
198 my $class = shift; 204 my $class = shift;
199 205
200 my $self = bless { 206 my $self = bless {
201 x => 0, 207 x => "center",
202 y => 0, 208 y => "center",
203 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
204 can_events => 1, 212 can_events => 1,
205 @_ 213 @_
206 }, $class; 214 }, $class;
215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207 217
208 for (keys %$self) { 218 for (keys %$self) {
209 if (/^on_(.*)$/) { 219 if (/^on_(.*)$/) {
210 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
211 } 221 }
212 } 222 }
213 223
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH; 225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218 $self->{req_y} = $layout->{y} * $::HEIGHT; 226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220 $self->{def_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};
221 } 234 }
222 235
223 $self 236 $self
224} 237}
225 238
… …
236 return if $self->{parent}; 249 return if $self->{parent};
237 250
238 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
239} 252}
240 253
241sub center {
242 my ($self) = @_;
243
244 $CFClient::UI::ROOT->on_post_alloc (
245 "center_$self" => sub {
246 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
247 },
248 );
249
250 $self->update;
251}
252
253sub set_visible { 254sub set_visible {
254 my ($self) = @_; 255 my ($self) = @_;
255 256
256 return if $self->{visible}; 257 return if $self->{visible};
257 258
258 $self->{root} = $self->{parent}{root}; 259 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1; 260 $self->{visible} = $self->{parent}{visible} + 1;
260 261
261 $self->emit (visibility_change => 1); 262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
262} 267}
263 268
264sub set_invisible { 269sub set_invisible {
265 my ($self) = @_; 270 my ($self) = @_;
266 271
267 return unless $self->{visible}; 272 return unless $self->{visible};
268 273
269 # broken show/hide model 274 $_->set_invisible for $self->children;
270 275
271 delete $self->{root}; 276 delete $self->{root};
272 delete $self->{visible}; 277 delete $self->{visible};
273 278
274 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
275 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
276 281
277 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
278 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
279 284
280 $self->focus_out; 285 $self->focus_out;
281 286
282 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
283} 288}
… …
306 311
307 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
308 if $self->{parent}; 313 if $self->{parent};
309} 314}
310 315
311sub move { 316sub move_abs {
312 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
313 318
314 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
315 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
316 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
317 322
318 $self->update; 323 $self->update;
319} 324}
320 325
321sub set_size { 326sub set_size {
322 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
323 328
324 $self->{def_w} = $w; 329 $self->{force_w} = $w;
325 $self->{def_h} = $h; 330 $self->{force_h} = $h;
326 331
327 $self->check_size; 332 $self->realloc;
328} 333}
329 334
330sub size_request { 335sub size_request {
331 require Carp; 336 require Carp;
332 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
334 339
335sub configure { 340sub configure {
336 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
337 342
338 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
339 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
340 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
341 348
342 # use alignment to adjust x, y 349 # use alignment to adjust x, y
343 350
344 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
345 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
346
347 ($w, $h) = ($w2, $h2);
348 } 353 }
349 354
350 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
351 $self->{x} = $x; 356 $self->{x} = $x;
352 $self->{y} = $y; 357 $self->{y} = $y;
353 $self->update; 358 $self->update;
354 } 359 }
355 360
356 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
357 $CFClient::UI::ROOT->{size_alloc}{$self+0} = [$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;
358 } 368 }
359} 369}
360 370
361sub size_allocate { 371sub size_allocate {
362 # nothing to be done 372 # nothing to be done
363} 373}
364 374
365sub reconfigure {
366 my ($self) = @_;
367
368 $self->check_size (1);
369 $self->update;
370}
371
372sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
373} 381}
374 382
375sub set_max_size { 383sub set_max_size {
376 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
377 385
378 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
379 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
380} 390}
381 391
382sub set_tooltip { 392sub set_tooltip {
383 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
384 394
… …
436 446
437 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
438 unless $FOCUS; 448 unless $FOCUS;
439} 449}
440 450
441sub mouse_motion { } 451sub mouse_motion { 0 }
442sub button_up { } 452sub button_up { 0 }
443sub key_down { } 453sub key_down { 0 }
444sub key_up { } 454sub key_up { 0 }
445 455
446sub button_down { 456sub button_down {
447 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
448 458
449 $self->focus_in; 459 $self->focus_in;
450}
451 460
452sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
453sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
454sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 463
455sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 464sub find_widget {
456sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 465 my ($self, $x, $y) = @_;
466
467 return () unless $self->{can_events};
468
469 return $self
470 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
471 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
472
473 ()
474}
475
476sub set_parent {
477 my ($self, $parent) = @_;
478
479 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible};
481}
482
483sub connect {
484 my ($self, $signal, $cb) = @_;
485
486 push @{ $self->{signal_cb}{$signal} }, $cb;
487}
488
489sub _emit {
490 my ($self, $signal, @args) = @_;
491
492 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493}
494
495sub emit {
496 my ($self, $signal, @args) = @_;
497
498 $self->_emit ($signal, @args)
499 || $self->$signal (@args);
500}
501
502sub visibility_change {
503 #my ($self, $visible) = @_;
504}
505
506sub realloc {
507 my ($self) = @_;
508
509 if ($self->{visible}) {
510 return if $self->{root}{realloc}{$self+0};
511
512 $self->{root}{realloc}{$self+0} = $self;
513 $self->{root}->update;
514 } else {
515 delete $self->{req_w};
516 delete $self->{req_h};
517 }
518}
519
520sub update {
521 my ($self) = @_;
522
523 $self->{parent}->update
524 if $self->{parent};
525}
526
527sub reconfigure {
528 my ($self) = @_;
529
530 $self->realloc;
531 $self->update;
532}
533
534# using global variables seems a bit hacky, but passing through all drawing
535# functions seems pointless.
536our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
457 537
458sub draw { 538sub draw {
459 my ($self) = @_; 539 my ($self) = @_;
460 540
461 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
542
543 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548
549 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
462 552
463 glPushMatrix; 553 glPushMatrix;
464 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
465 $self->_draw;
466 glPopMatrix;
467 555
468 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
469 my ($x, $y) = @$self{qw(x y)};
470
471 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
472 glEnable GL_BLEND; 558 glEnable GL_BLEND;
473 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
474 glBegin GL_QUADS; 560 glBegin GL_QUADS;
475 glVertex $x , $y; 561 glVertex 0 , 0;
476 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
477 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
478 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
479 glEnd; 565 glEnd;
480 glDisable GL_BLEND; 566 glDisable GL_BLEND;
481 } 567 }
482 568
483 if ($ENV{PCLIENT_DEBUG}) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
484 glPushMatrix; 570 glPushMatrix;
485 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
486 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
487 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
488 glVertex 0 , 0; 574 glVertex 0 , 0;
489 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
490 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
491 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
492 glEnd; 578 glEnd;
493 glPopMatrix; 579 glPopMatrix;
494 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
495 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
496} 585}
497 586
498sub _draw { 587sub _draw {
499 my ($self) = @_; 588 my ($self) = @_;
500 589
501 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
502}
503
504sub find_widget {
505 my ($self, $x, $y) = @_;
506
507 return () unless $self->{can_events};
508
509 return $self
510 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
511 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
512
513 ()
514}
515
516sub set_parent {
517 my ($self, $parent) = @_;
518
519 Scalar::Util::weaken ($self->{parent} = $parent);
520
521 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
522
523 $self->check_size;
524}
525
526sub check_size {
527 my ($self, $forced) = @_;
528
529 $self->{force_alloc} = 1 if $forced;
530 $CFClient::UI::ROOT->{check_size}{$self} = $self;
531}
532
533sub update {
534 my ($self) = @_;
535
536 $self->{parent}->update
537 if $self->{parent};
538}
539
540sub connect {
541 my ($self, $signal, $cb) = @_;
542
543 push @{ $self->{signal_cb}{$signal} }, $cb;
544}
545
546sub _emit {
547 my ($self, $signal, @args) = @_;
548
549 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
550}
551
552sub emit {
553 my ($self, $signal, @args) = @_;
554
555 $self->_emit ($signal, @args)
556 || $self->$signal (@args);
557}
558
559sub visibility_change {
560 #my ($self, $visible) = @_;
561} 591}
562 592
563sub DESTROY { 593sub DESTROY {
564 my ($self) = @_; 594 my ($self) = @_;
565 595
… …
597 627
598 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
599 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
600 630
601 glEnable GL_BLEND; 631 glEnable GL_BLEND;
602 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
603 glColor @$color; 633 glColor_premultiply @$color;
604 634
605 glBegin GL_QUADS; 635 glBegin GL_QUADS;
606 glVertex 0 , 0; 636 glVertex 0 , 0;
607 glVertex 0 , $h; 637 glVertex 0 , $h;
608 glVertex $w, $h; 638 glVertex $w, $h;
… …
623 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
624 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
625} 655}
626 656
627sub size_request { 657sub size_request {
628 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
629} 661}
630 662
631sub draw { } 663sub draw { }
632 664
633############################################################################# 665#############################################################################
… …
637our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
638 670
639sub new { 671sub new {
640 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
641 673
642 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
643 675
644 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
645 children => [], 677 children => [],
646 can_events => 0, 678 can_events => 0,
647 %arg, 679 %arg,
648 ); 680 );
681
649 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
650 684
651 $self 685 $self
652} 686}
653 687
654sub add { 688sub add {
… …
662 $self->{children} = [ 696 $self->{children} = [
663 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
664 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
665 ]; 699 ];
666 700
667 $self->check_size (1); 701 $self->realloc;
668 $self->update;
669} 702}
670 703
671sub children { 704sub children {
672 @{ $_[0]{children} } 705 @{ $_[0]{children} }
673} 706}
… …
678 delete $child->{parent}; 711 delete $child->{parent};
679 $child->hide; 712 $child->hide;
680 713
681 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
682 715
683 $self->check_size (1); 716 $self->realloc;
684 $self->update;
685} 717}
686 718
687sub clear { 719sub clear {
688 my ($self) = @_; 720 my ($self) = @_;
689 721
… …
693 for (@$children) { 725 for (@$children) {
694 delete $_->{parent}; 726 delete $_->{parent};
695 $_->hide; 727 $_->hide;
696 } 728 }
697 729
698 $self->check_size; 730 $self->realloc;
699 $self->update;
700} 731}
701 732
702sub find_widget { 733sub find_widget {
703 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
704 735
705 $x -= $self->{x}; 736 $x -= $self->{x};
706 $y -= $self->{y}; 737 $y -= $self->{y};
707 738
708 my $res; 739 my $res;
709 740
710 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
711 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
712 and return $res; 743 and return $res;
713 } 744 }
714 745
715 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
764 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
765} 796}
766 797
767############################################################################# 798#############################################################################
768 799
800# back-buffered drawing area
801
769package CFClient::UI::Window; 802package CFClient::UI::Window;
770 803
771our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
772 805
773use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
791 $self->SUPER::size_allocate ($w, $h); 824 $self->SUPER::size_allocate ($w, $h);
792 $self->update; 825 $self->update;
793} 826}
794 827
795sub _render { 828sub _render {
829 my ($self) = @_;
830
796 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
797} 832}
798 833
799sub render_child { 834sub render_child {
800 my ($self) = @_; 835 my ($self) = @_;
801 836
802 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
803 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
804 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
805 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
806 $self->_render; 848 $self->_render;
807 }; 849 };
808} 850}
809 851
810sub _draw { 852sub _draw {
811 my ($self) = @_; 853 my ($self) = @_;
812 854
813 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
814 856
815 my $tex = $self->{texture} 857 my $tex = $self->{texture}
816 or return; 858 or return;
817 859
818 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
820 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
821 863
822 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
823 865
824 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
825} 867}
… …
841} 883}
842 884
843sub size_request { 885sub size_request {
844 my ($self) = @_; 886 my ($self) = @_;
845 887
846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
847 889
848 $w = 10 if $self->{scroll_x}; 890 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
850 892
851 ($w, $h) 893 ($w, $h)
852} 894}
853 895
854sub size_allocate { 896sub size_allocate {
855 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
856 898
899 my $child = $self->child;
900
857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859 903
860 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
861 $self->update; 905 $self->update;
862} 906}
863 907
… …
899} 943}
900 944
901sub _render { 945sub _render {
902 my ($self) = @_; 946 my ($self) = @_;
903 947
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
950
904 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905 952
906 $self->SUPER::_render; 953 $self->SUPER::_render;
907} 954}
908 955
… …
911package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
912 959
913our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
914 961
915sub new { 962sub new {
916 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
917 966
918 my $self; 967 my $self;
919 968
920 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
921 vertical => 1, 970 vertical => 1,
… …
926 ; 975 ;
927 976
928 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
929 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
930 slider => $slider, 979 slider => $slider,
931 @_, 980 %arg,
932 ); 981 );
933 982
934 $self->{vp}->add ($self->{scrolled});
935 $self->add ($self->{vp});
936 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
937 985
938 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
939} 993}
940 994
941sub update { 995sub update {
942 my ($self) = @_; 996 my ($self) = @_;
943 997
… …
982 1036
983 if ($self->{bg}) { 1037 if ($self->{bg}) {
984 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
985 1039
986 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
988 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
989 1043
990 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
991 glVertex 0 , 0; 1045 glVertex 0 , 0;
992 glVertex 0 , $h; 1046 glVertex 0 , $h;
993 glVertex $w, $h; 1047 glVertex $w, $h;
… …
1006 1060
1007our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
1008 1062
1009use CFClient::OpenGL; 1063use CFClient::OpenGL;
1010 1064
1011my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1013 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1014 1072
1015sub new { 1073sub new {
1016 my $class = shift; 1074 my ($class, %arg) = @_;
1075
1076 my $title = delete $arg{title};
1017 1077
1018 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1019 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1020 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1021 border => 0.6, 1081 border => 0.6,
1022 is_toplevel => 1,
1023 can_events => 1, 1082 can_events => 1,
1024 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
1025 ); 1086 );
1026 1087
1027 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
1028 align => 0, 1089 align => 0,
1029 valign => 1, 1090 valign => 1,
1030 text => $self->{title}, 1091 text => $title,
1031 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
1032 1094
1033 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1034} 1103}
1035 1104
1036sub border { 1105sub border {
1037 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1038} 1107}
1039 1108
1040sub size_request { 1109sub size_request {
1041 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
1042 1114
1043 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1044 1116
1045 ( 1117 (
1046 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
1049} 1121}
1050 1122
1051sub size_allocate { 1123sub size_allocate {
1052 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1053 1125
1126 if ($self->{title}) {
1127 $self->{title}{w} = $w;
1128 $self->{title}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h);
1130 }
1131
1132 my $border = $self->border;
1133
1054 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
1055 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
1056 1136
1057 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1058 if $self->{title};
1059
1060 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1061} 1138}
1062 1139
1063sub button_down { 1140sub button_down {
1064 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1065 1142
… …
1081 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1082 1159
1083 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1084 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1085 1162
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1090 $self->move ($self->{user_x}, $self->{user_y}); 1165
1091 $self->check_size; 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 $self->realloc;
1092 }; 1168 };
1093 1169
1094 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1095 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1096 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1098 $self->{motion} = sub { 1174 $self->{motion} = sub {
1099 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1100 1176
1101 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1102 1178
1103 $self->{user_x} = $bx + $x - $ox; 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1104 $self->{user_y} = $by + $y - $oy; 1180 # HACK: the next line is required to enforce placement
1105 1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1106 $self->move ($self->{user_x}, $self->{user_y});
1107 $self->update;
1108 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1109 } 1187 1
1110} 1188}
1111 1189
1112sub button_up { 1190sub button_up {
1113 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1114 1192
1115 delete $self->{motion}; 1193 !!delete $self->{motion}
1116} 1194}
1117 1195
1118sub mouse_motion { 1196sub mouse_motion {
1119 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1120 1198
1121 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1122} 1202}
1123 1203
1124sub _draw { 1204sub _draw {
1125 my ($self) = @_; 1205 my ($self) = @_;
1126 1206
1207 my $child = $self->{children}[0];
1208
1127 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1128 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1129 1211
1130 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1132 1214
1133 my $border = $self->border; 1215 my $border = $self->border;
1134 1216
1135 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1136 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1137 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1138 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1139 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1140 1222
1141 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1142 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1143 1225
1144 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1145 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1146 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1147
1148 glColor @{ $self->{bg} };
1149
1150 $bg->{s} = $rep_x;
1151 $bg->{t} = $rep_y;
1152 $bg->{wrap_mode} = 1;
1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154 } 1231 }
1155 1232
1156 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1157 1234
1158 $self->{title}->draw if $self->{title};
1159
1160 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1161} 1241}
1162 1242
1163############################################################################# 1243#############################################################################
1164 1244
1165package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1187 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1188 1268
1189 $child->set_parent ($self); 1269 $child->set_parent ($self);
1190 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1191 1271
1192 $self->check_size (1); 1272 $self->realloc;
1193} 1273}
1194 1274
1195# TODO: move to container class maybe? send children a signal on removal? 1275# TODO: move to container class maybe? send children a signal on removal?
1196sub clear { 1276sub clear {
1197 my ($self) = @_; 1277 my ($self) = @_;
… …
1202 for (@children) { 1282 for (@children) {
1203 delete $_->{parent}; 1283 delete $_->{parent};
1204 $_->hide; 1284 $_->hide;
1205 } 1285 }
1206 1286
1207 $self->check_size (1); 1287 $self->realloc;
1208 $self->update;
1209} 1288}
1210 1289
1211sub get_wh { 1290sub get_wh {
1212 my ($self) = @_; 1291 my ($self) = @_;
1213 1292
… …
1421 ellipsise => 3, # end 1500 ellipsise => 3, # end
1422 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1423 fontsize => 1, 1502 fontsize => 1,
1424 align => -1, 1503 align => -1,
1425 valign => -1, 1504 valign => -1,
1426 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1427 can_events => 0, 1507 can_events => 0,
1428 %arg 1508 %arg
1429 ); 1509 );
1430 1510
1431 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1458 1538
1459 delete $self->{texture}; 1539 delete $self->{texture};
1460 $self->SUPER::update; 1540 $self->SUPER::update;
1461} 1541}
1462 1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 delete $self->{req_h};
1548 $self->SUPER::realloc;
1549}
1550
1463sub set_text { 1551sub set_text {
1464 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1465 1553
1466 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1467 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1468 1556
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1471 1559
1560 $self->realloc;
1472 $self->update; 1561 $self->update;
1473 $self->check_size;
1474} 1562}
1475 1563
1476sub set_markup { 1564sub set_markup {
1477 my ($self, $markup) = @_; 1565 my ($self, $markup) = @_;
1478 1566
… …
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1570 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1571
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1573 $self->{layout}->set_markup ($markup);
1486 1574
1575 $self->realloc;
1487 $self->update; 1576 $self->update;
1488 $self->check_size;
1489} 1577}
1490 1578
1491sub size_request { 1579sub size_request {
1492 my ($self) = @_; 1580 my ($self) = @_;
1493 1581
1582 if (exists $self->{req_h}) {
1583 @$self{qw(req_w req_h)}
1584 } else {
1494 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1495 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1496 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1497 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1499 1590
1500 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1501 1592
1502 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1503 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1504 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1596
1506 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1507 1598
1508 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1509 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1510 } 1601 }
1511 1602
1603 ($w, $h)
1512 ( 1604 }
1513 $w + $self->{padding} * 2,
1514 $h + $self->{padding} * 2,
1515 )
1516} 1605}
1517 1606
1518sub size_allocate { 1607sub size_allocate {
1519 my ($self, $w, $h) = @_; 1608 my ($self, $w, $h) = @_;
1520 1609
1610 delete $self->{ox};
1611
1521 delete $self->{texture}; 1612 delete $self->{texture}
1613 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522} 1614}
1523 1615
1524sub set_fontsize { 1616sub set_fontsize {
1525 my ($self, $fontsize) = @_; 1617 my ($self, $fontsize) = @_;
1526 1618
1527 $self->{fontsize} = $fontsize; 1619 $self->{fontsize} = $fontsize;
1528 delete $self->{texture}; 1620 delete $self->{texture};
1529 1621
1530 $self->update; 1622 $self->realloc;
1531 $self->check_size;
1532} 1623}
1533 1624
1534sub _draw { 1625sub _draw {
1535 my ($self) = @_; 1626 my ($self) = @_;
1536 1627
… …
1542 $self->{layout}->set_width ($self->{w}); 1633 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1634 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1635 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1636 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546 1637
1547 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1638 new_from_layout CFClient::Texture $self->{layout}
1639 };
1548 1640
1641 unless (exists $self->{ox}) {
1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1642 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1643 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551 : ($self->{w} - $tex->{w}) * 0.5); 1644 : ($self->{w} - $tex->{w}) * 0.5);
1552 1645
1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1646 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1647 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555 : ($self->{h} - $tex->{h}) * 0.5); 1648 : ($self->{h} - $tex->{h}) * 0.5);
1556
1557 $tex
1558 }; 1649 };
1559 1650
1560 glEnable GL_TEXTURE_2D; 1651 glEnable GL_TEXTURE_2D;
1561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1562 1653
1654 glColor_premultiply @{$self->{fg}}
1563 if ($tex->{format} == GL_ALPHA) { 1655 if $tex->{format} == GL_ALPHA;
1564 glColor @{$self->{fg}}; 1656
1565 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1566 } else {
1567 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1657 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1568 }
1569 1658
1570 glDisable GL_TEXTURE_2D; 1659 glDisable GL_TEXTURE_2D;
1571} 1660}
1572 1661
1573############################################################################# 1662#############################################################################
… …
1600 1689
1601 delete $self->{cur_h}; 1690 delete $self->{cur_h};
1602 1691
1603 return if $self->{text} eq $text; 1692 return if $self->{text} eq $text;
1604 1693
1605 delete $self->{texture};
1606
1607 $self->{last_activity} = $::NOW; 1694 $self->{last_activity} = $::NOW;
1608 $self->{text} = $text; 1695 $self->{text} = $text;
1609 1696
1610 $text =~ s/./*/g if $self->{hidden}; 1697 $text =~ s/./*/g if $self->{hidden};
1611 $self->{layout}->set_text ("$text "); 1698 $self->{layout}->set_text ("$text ");
1612 1699
1613 $self->_emit (changed => $self->{text}); 1700 $self->_emit (changed => $self->{text});
1701 $self->update;
1614} 1702}
1615 1703
1616sub set_text { 1704sub set_text {
1617 my ($self, $text) = @_; 1705 my ($self, $text) = @_;
1618 1706
1619 $self->{cursor} = length $text; 1707 $self->{cursor} = length $text;
1620 $self->_set_text ($text); 1708 $self->_set_text ($text);
1621 $self->update; 1709
1622 $self->check_size; 1710 $self->realloc;
1623} 1711}
1624 1712
1625sub get_text { 1713sub get_text {
1626 $_[0]{text} 1714 $_[0]{text}
1627} 1715}
… …
1657 $self->{cursor} = length $text; 1745 $self->{cursor} = length $text;
1658 } elsif ($uni == 27) { 1746 } elsif ($uni == 27) {
1659 $self->_emit ('escape'); 1747 $self->_emit ('escape');
1660 } elsif ($uni) { 1748 } elsif ($uni) {
1661 substr $text, $self->{cursor}++, 0, chr $uni; 1749 substr $text, $self->{cursor}++, 0, chr $uni;
1750 } else {
1751 return 0;
1662 } 1752 }
1663 1753
1664 $self->_set_text ($text); 1754 $self->_set_text ($text);
1665 $self->update; 1755
1666 $self->check_size; 1756 $self->realloc;
1757
1758 1
1667} 1759}
1668 1760
1669sub focus_in { 1761sub focus_in {
1670 my ($self) = @_; 1762 my ($self) = @_;
1671 1763
… …
1686 utf8::encode $text; 1778 utf8::encode $text;
1687 $self->{cursor} = length substr $text, 0, $idx; 1779 $self->{cursor} = length substr $text, 0, $idx;
1688 1780
1689 $self->_set_text ($self->{text}); 1781 $self->_set_text ($self->{text});
1690 $self->update; 1782 $self->update;
1783
1784 1
1691} 1785}
1692 1786
1693sub mouse_motion { 1787sub mouse_motion {
1694 my ($self, $ev, $x, $y) = @_; 1788 my ($self, $ev, $x, $y) = @_;
1695# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1789# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1790
1791 0
1696} 1792}
1697 1793
1698sub _draw { 1794sub _draw {
1699 my ($self) = @_; 1795 my ($self) = @_;
1700 1796
1701 local $self->{fg} = $self->{fg}; 1797 local $self->{fg} = $self->{fg};
1702 1798
1703 if ($FOCUS == $self) { 1799 if ($FOCUS == $self) {
1704 glColor @{$self->{active_bg}}; 1800 glColor_premultiply @{$self->{active_bg}};
1705 $self->{fg} = $self->{active_fg}; 1801 $self->{fg} = $self->{active_fg};
1706 } else { 1802 } else {
1707 glColor @{$self->{bg}}; 1803 glColor_premultiply @{$self->{bg}};
1708 } 1804 }
1709 1805
1710 glEnable GL_BLEND; 1806 glEnable GL_BLEND;
1711 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1807 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1712 glBegin GL_QUADS; 1808 glBegin GL_QUADS;
1713 glVertex 0 , 0; 1809 glVertex 0 , 0;
1714 glVertex 0 , $self->{h}; 1810 glVertex 0 , $self->{h};
1715 glVertex $self->{w}, $self->{h}; 1811 glVertex $self->{w}, $self->{h};
1716 glVertex $self->{w}, 0; 1812 glVertex $self->{w}, 0;
… …
1777 } else { 1873 } else {
1778 $self->set_text ($self->{history_saveback}); 1874 $self->set_text ($self->{history_saveback});
1779 } 1875 }
1780 1876
1781 } else { 1877 } else {
1782 $self->SUPER::key_down ($ev); 1878 return $self->SUPER::key_down ($ev)
1879 }
1880
1783 } 1881 1
1784
1785} 1882}
1786 1883
1787############################################################################# 1884#############################################################################
1788 1885
1789package CFClient::UI::Button; 1886package CFClient::UI::Button;
… …
1798 1895
1799sub new { 1896sub new {
1800 my $class = shift; 1897 my $class = shift;
1801 1898
1802 $class->SUPER::new ( 1899 $class->SUPER::new (
1803 padding => 4, 1900 padding_x => 4,
1901 padding_y => 4,
1804 fg => [1, 1, 1], 1902 fg => [1, 1, 1],
1805 active_fg => [0, 0, 1], 1903 active_fg => [0, 0, 1],
1806 can_hover => 1, 1904 can_hover => 1,
1807 align => 0, 1905 align => 0,
1808 valign => 0, 1906 valign => 0,
… …
1817 my ($self, $ev, $x, $y) = @_; 1915 my ($self, $ev, $x, $y) = @_;
1818 1916
1819 $self->emit ("activate") 1917 $self->emit ("activate")
1820 if $x >= 0 && $x < $self->{w} 1918 if $x >= 0 && $x < $self->{w}
1821 && $y >= 0 && $y < $self->{h}; 1919 && $y >= 0 && $y < $self->{h};
1920
1921 1
1822} 1922}
1823 1923
1824sub _draw { 1924sub _draw {
1825 my ($self) = @_; 1925 my ($self) = @_;
1826 1926
1827 local $self->{fg} = $self->{fg}; 1927 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1828
1829 if ($GRAB == $self) {
1830 $self->{fg} = $self->{active_fg};
1831 }
1832 1928
1833 glEnable GL_TEXTURE_2D; 1929 glEnable GL_TEXTURE_2D;
1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1930 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1835 glColor 0, 0, 0, 1; 1931 glColor 0, 0, 0, 1;
1836 1932
… …
1855 1951
1856sub new { 1952sub new {
1857 my $class = shift; 1953 my $class = shift;
1858 1954
1859 $class->SUPER::new ( 1955 $class->SUPER::new (
1860 padding => 2, 1956 padding_x => 2,
1957 padding_y => 2,
1861 fg => [1, 1, 1], 1958 fg => [1, 1, 1],
1862 active_fg => [1, 1, 0], 1959 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2], 1960 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5], 1961 active_bg => [1, 1, 1, 0.5],
1865 state => 0, 1962 state => 0,
… …
1869} 1966}
1870 1967
1871sub size_request { 1968sub size_request {
1872 my ($self) = @_; 1969 my ($self) = @_;
1873 1970
1874 ($self->{padding} * 2 + 6) x 2 1971 (6) x 2
1875} 1972}
1876 1973
1877sub button_down { 1974sub button_down {
1878 my ($self, $ev, $x, $y) = @_; 1975 my ($self, $ev, $x, $y) = @_;
1879 1976
1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1977 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1978 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882 $self->{state} = !$self->{state}; 1979 $self->{state} = !$self->{state};
1883 $self->_emit (changed => $self->{state}); 1980 $self->_emit (changed => $self->{state});
1981 } else {
1982 return 0
1983 }
1984
1884 } 1985 1
1885} 1986}
1886 1987
1887sub _draw { 1988sub _draw {
1888 my ($self) = @_; 1989 my ($self) = @_;
1889 1990
1890 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1891 1992
1892 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1993 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893 1994
1894 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1995 my ($w, $h) = @$self{qw(w h)};
1996
1997 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895 1998
1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1999 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897 2000
1898 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2001 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899 2002
… …
2054 2157
2055 my $h1 = $self->{h} * (1 - $ycut1); 2158 my $h1 = $self->{h} * (1 - $ycut1);
2056 my $h2 = $self->{h} * (1 - $ycut2); 2159 my $h2 = $self->{h} * (1 - $ycut2);
2057 2160
2058 glEnable GL_BLEND; 2161 glEnable GL_BLEND;
2059 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2162 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2163 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2060 glEnable GL_TEXTURE_2D; 2164 glEnable GL_TEXTURE_2D;
2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2165 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062 2166
2063 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2167 glBindTexture GL_TEXTURE_2D, $t1->{name};
2064 glBegin GL_QUADS; 2168 glBegin GL_QUADS;
… …
2164 fg => [1, 1, 1], 2268 fg => [1, 1, 1],
2165 active_fg => [0, 0, 0], 2269 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2], 2270 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5], 2271 active_bg => [1, 1, 1, 0.5],
2168 range => [0, 0, 100, 10, 0], 2272 range => [0, 0, 100, 10, 0],
2169 req_w => $::WIDTH / 80, 2273 min_w => $::WIDTH / 80,
2170 req_h => $::WIDTH / 80, 2274 min_h => $::WIDTH / 80,
2171 vertical => 0, 2275 vertical => 0,
2172 can_hover => 1, 2276 can_hover => 1,
2173 inner_pad => 0.02, 2277 inner_pad => 0.02,
2174 @_ 2278 @_
2175 ); 2279 );
… …
2178 $self->update; 2282 $self->update;
2179 2283
2180 $self 2284 $self
2181} 2285}
2182 2286
2287sub changed { }
2288
2183sub set_range { 2289sub set_range {
2184 my ($self, $range) = @_; 2290 my ($self, $range) = @_;
2185 2291
2186 ($range, $self->{range}) = ($self->{range}, $range); 2292 ($range, $self->{range}) = ($self->{range}, $range);
2187 2293
… …
2213} 2319}
2214 2320
2215sub size_request { 2321sub size_request {
2216 my ($self) = @_; 2322 my ($self) = @_;
2217 2323
2218 my $w = $self->{req_w}; 2324 ($self->{req_w}, $self->{req_h})
2219 my $h = $self->{req_h};
2220
2221 $self->{vertical} ? ($h, $w) : ($w, $h)
2222} 2325}
2223 2326
2224sub button_down { 2327sub button_down {
2225 my ($self, $ev, $x, $y) = @_; 2328 my ($self, $ev, $x, $y) = @_;
2226 2329
2227 $self->SUPER::button_down ($ev, $x, $y); 2330 $self->SUPER::button_down ($ev, $x, $y);
2228 2331
2229 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2332 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2230 2333
2231 $self->mouse_motion ($ev, $x, $y); 2334 $self->mouse_motion ($ev, $x, $y)
2232} 2335}
2233 2336
2234sub mouse_motion { 2337sub mouse_motion {
2235 my ($self, $ev, $x, $y) = @_; 2338 my ($self, $ev, $x, $y) = @_;
2236 2339
… …
2240 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2343 my (undef, $lo, $hi, $page) = @{$self->{range}};
2241 2344
2242 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2345 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2243 2346
2244 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2347 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2348 } else {
2349 return 0;
2350 }
2351
2245 } 2352 1
2246} 2353}
2247 2354
2248sub update { 2355sub update {
2249 my ($self) = @_; 2356 my ($self) = @_;
2250 2357
2251 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2358 delete $self->{knob_w};
2359 $self->SUPER::update;
2360}
2361
2362sub _draw {
2363 my ($self) = @_;
2364
2365 unless ($self->{knob_w}) {
2252 $self->set_value ($self->{range}[0]); 2366 $self->set_value ($self->{range}[0]);
2253 2367
2254 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2368 my ($value, $lo, $hi, $page) = @{$self->{range}};
2255 my $range = ($hi - $page - $lo) || 1e-100; 2369 my $range = ($hi - $page - $lo) || 1e-100;
2256 2370
… …
2262 $value = ($value - $lo) / $range; 2376 $value = ($value - $lo) / $range;
2263 $value = $value * $self->{scale} + $self->{offset}; 2377 $value = $value * $self->{scale} + $self->{offset};
2264 2378
2265 $self->{knob_x} = $value - $knob_w * 0.5; 2379 $self->{knob_x} = $value - $knob_w * 0.5;
2266 $self->{knob_w} = $knob_w; 2380 $self->{knob_w} = $knob_w;
2267 }); 2381 }
2268
2269 $self->SUPER::update;
2270}
2271
2272sub _draw {
2273 my ($self) = @_;
2274 2382
2275 $self->SUPER::_draw (); 2383 $self->SUPER::_draw ();
2276 2384
2277 glScale $self->{w}, $self->{h}; 2385 glScale $self->{w}, $self->{h};
2278 2386
… …
2472 2580
2473 delete $self->{texture}; 2581 delete $self->{texture};
2474 } 2582 }
2475 2583
2476 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2584 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2477 glClearColor 0.5, 0.5, 0.5, 0; 2585 glClearColor 0, 0, 0, 0;
2478 glClear GL_COLOR_BUFFER_BIT; 2586 glClear GL_COLOR_BUFFER_BIT;
2479 2587
2480 my $top = int $self->{children}[1]{range}[0]; 2588 my $top = int $self->{children}[1]{range}[0];
2481 2589
2482 my $y0 = $top; 2590 my $y0 = $top;
… …
2517sub _draw { 2625sub _draw {
2518 my ($self) = @_; 2626 my ($self) = @_;
2519 2627
2520 glEnable GL_TEXTURE_2D; 2628 glEnable GL_TEXTURE_2D;
2521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2522 glColor 1, 1, 1, 1; 2630 glColor 0, 0, 0, 1;
2523 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2631 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2524 glDisable GL_TEXTURE_2D; 2632 glDisable GL_TEXTURE_2D;
2525 2633
2526 $self->{children}[1]->draw; 2634 $self->{children}[1]->draw;
2527 2635
2528} 2636}
… …
2611} 2719}
2612 2720
2613sub set_tooltip_from { 2721sub set_tooltip_from {
2614 my ($self, $widget) = @_; 2722 my ($self, $widget) = @_;
2615 2723
2724 my $tooltip = $widget->{tooltip};
2725
2726 if ($ENV{CFPLUS_DEBUG} & 2) {
2727 $tooltip .= "\n\n" . (ref $widget) . "\n"
2728 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2729 . "req $widget->{req_w} $widget->{req_h}\n"
2730 . "visible $widget->{visible}";
2731 }
2732
2616 $self->add (new CFClient::UI::Label 2733 $self->add (new CFClient::UI::Label
2617 markup => $widget->{tooltip}, 2734 markup => $tooltip,
2618 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2735 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619 fontsize => 0.8, 2736 fontsize => 0.8,
2620 fg => [0, 0, 0, 1], 2737 fg => [0, 0, 0, 1],
2621 ellipsise => 0, 2738 ellipsise => 0,
2622 font => ($widget->{tooltip_font} || $::FONT_PROP), 2739 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2633 2750
2634sub size_allocate { 2751sub size_allocate {
2635 my ($self, $w, $h) = @_; 2752 my ($self, $w, $h) = @_;
2636 2753
2637 $self->SUPER::size_allocate ($w - 4, $h - 4); 2754 $self->SUPER::size_allocate ($w - 4, $h - 4);
2755}
2756
2757sub visibility_change {
2758 my ($self, $visible) = @_;
2759
2760 return unless $visible;
2761
2762 $self->{root}->on_post_alloc ("move_$self" => sub {
2763 my $widget = $self->{owner}
2764 or return;
2765
2766 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2767
2768 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2769 if $x + $self->{w} > $::WIDTH;
2770
2771 $self->move_abs ($x, $y);
2772 });
2638} 2773}
2639 2774
2640sub _draw { 2775sub _draw {
2641 my ($self) = @_; 2776 my ($self) = @_;
2642 2777
… …
2659 glVertex $w, $h; 2794 glVertex $w, $h;
2660 glVertex $w, 0; 2795 glVertex $w, 0;
2661 glEnd; 2796 glEnd;
2662 2797
2663 glTranslate 2 - 0.375, 2 - 0.375; 2798 glTranslate 2 - 0.375, 2 - 0.375;
2799
2664 $self->SUPER::_draw; 2800 $self->SUPER::_draw;
2665} 2801}
2666 2802
2667############################################################################# 2803#############################################################################
2668 2804
… …
2727 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2863 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2728 2864
2729 if ($tex) { 2865 if ($tex) {
2730 glEnable GL_TEXTURE_2D; 2866 glEnable GL_TEXTURE_2D;
2731 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2867 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2732 glColor 1, 1, 1, 1; 2868 glColor 0, 0, 0, 1;
2733 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2869 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2734 glDisable GL_TEXTURE_2D; 2870 glDisable GL_TEXTURE_2D;
2735 } 2871 }
2736} 2872}
2737 2873
… …
2744 $self->SUPER::DESTROY; 2880 $self->SUPER::DESTROY;
2745} 2881}
2746 2882
2747############################################################################# 2883#############################################################################
2748 2884
2749package CFClient::UI::Inventory; 2885package CFClient::UI::Buttonbar;
2750 2886
2751our @ISA = CFClient::UI::ScrolledWindow::; 2887our @ISA = CFClient::UI::HBox::;
2752 2888
2753sub new { 2889# TODO: should actualyl wrap buttons and other goodies.
2754 my $class = shift;
2755
2756 my $self = $class->SUPER::new (
2757 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2758 @_,
2759 );
2760
2761 $self
2762}
2763
2764sub set_items {
2765 my ($self, $items) = @_;
2766
2767 $self->{scrolled}->clear;
2768 return unless $items;
2769
2770 my @items = sort {
2771 ($a->{type} <=> $b->{type})
2772 or ($a->{name} cmp $b->{name})
2773 } @$items;
2774
2775 $self->{real_items} = \@items;
2776
2777 my $row = 0;
2778 for my $item (@items) {
2779 CFClient::Item::update_widgets $item;
2780
2781 $self->{scrolled}->add (0, $row, $item->{face_widget});
2782 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2783 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2784
2785 $row++;
2786 }
2787}
2788 2890
2789############################################################################# 2891#############################################################################
2790 2892
2791package CFClient::UI::Menu; 2893package CFClient::UI::Menu;
2792 2894
… …
2833 # maybe save $GRAB? must be careful about events... 2935 # maybe save $GRAB? must be careful about events...
2834 $GRAB = $self; 2936 $GRAB = $self;
2835 $self->{button} = $ev->{button}; 2937 $self->{button} = $ev->{button};
2836 2938
2837 $self->show; 2939 $self->show;
2838 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2940 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2839} 2941}
2840 2942
2841sub mouse_motion { 2943sub mouse_motion {
2842 my ($self, $ev, $x, $y) = @_; 2944 my ($self, $ev, $x, $y) = @_;
2843 2945
2844 # TODO: should use vbox->find_widget or so 2946 # TODO: should use vbox->find_widget or so
2845 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2947 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2846 $self->{hover} = $self->{item}{$HOVER}; 2948 $self->{hover} = $self->{item}{$HOVER};
2949
2950 0
2847} 2951}
2848 2952
2849sub button_up { 2953sub button_up {
2850 my ($self, $ev, $x, $y) = @_; 2954 my ($self, $ev, $x, $y) = @_;
2851 2955
… …
2853 undef $GRAB; 2957 undef $GRAB;
2854 $self->hide; 2958 $self->hide;
2855 2959
2856 $self->_emit ("popdown"); 2960 $self->_emit ("popdown");
2857 $self->{hover}[1]->() if $self->{hover}; 2961 $self->{hover}[1]->() if $self->{hover};
2962 } else {
2963 return 0
2964 }
2965
2858 } 2966 1
2859} 2967}
2860 2968
2861############################################################################# 2969#############################################################################
2862 2970
2863package CFClient::UI::Statusbox; 2971package CFClient::UI::Multiplexer;
2864 2972
2865our @ISA = CFClient::UI::VBox::; 2973our @ISA = CFClient::UI::Container::;
2866 2974
2867sub new { 2975sub new {
2868 my $class = shift; 2976 my $class = shift;
2869 2977
2870 $class->SUPER::new ( 2978 my $self = $class->SUPER::new (
2979 @_,
2980 );
2981
2982 $self->{current} = $self->{children}[0]
2983 if @{ $self->{children} };
2984
2985 $self
2986}
2987
2988sub add {
2989 my ($self, @widgets) = @_;
2990
2991 $self->SUPER::add (@widgets);
2992
2993 $self->{current} = $self->{children}[0]
2994 if @{ $self->{children} };
2995}
2996
2997sub set_current_page {
2998 my ($self, $page_or_widget) = @_;
2999
3000 my $widget = ref $page_or_widget
3001 ? $page_or_widget
3002 : $self->{children}[$page_or_widget];
3003
3004 $self->{current} = $widget;
3005 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3006
3007 $self->_emit (page_changed => $self->{current});
3008
3009 $self->realloc;
3010}
3011
3012sub visible_children {
3013 $_[0]{current}
3014}
3015
3016sub size_request {
3017 my ($self) = @_;
3018
3019 $self->{current}->size_request
3020}
3021
3022sub size_allocate {
3023 my ($self, $w, $h) = @_;
3024
3025 $self->{current}->configure (0, 0, $w, $h);
3026}
3027
3028sub _draw {
3029 my ($self) = @_;
3030
3031 $self->{current}->draw;
3032}
3033
3034#############################################################################
3035
3036package CFClient::UI::Notebook;
3037
3038our @ISA = CFClient::UI::VBox::;
3039
3040sub new {
3041 my $class = shift;
3042
3043 my $self = $class->SUPER::new (
3044 buttonbar => (new CFClient::UI::Buttonbar),
3045 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3046 # filter => # will be put between multiplexer and $self
3047 @_,
3048 );
3049
3050 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3051 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3052
3053 $self
3054}
3055
3056sub add {
3057 my ($self, $title, $widget, $tooltip) = @_;
3058
3059 Scalar::Util::weaken $self;
3060
3061 $self->{buttonbar}->add (new CFClient::UI::Button
3062 markup => $title,
3063 tooltip => $tooltip,
3064 on_activate => sub { $self->set_current_page ($widget) },
3065 );
3066
3067 $self->{multiplexer}->add ($widget);
3068}
3069
3070sub set_current_page {
3071 my ($self, $page) = @_;
3072
3073 $self->{multiplexer}->set_current_page ($page);
3074 $self->_emit (page_changed => $self->{multiplexer}{current});
3075}
3076
3077#############################################################################
3078
3079package CFClient::UI::Statusbox;
3080
3081our @ISA = CFClient::UI::VBox::;
3082
3083sub new {
3084 my $class = shift;
3085
3086 my $self = $class->SUPER::new (
2871 fontsize => 0.8, 3087 fontsize => 0.8,
2872 @_, 3088 @_,
2873 ) 3089 );
3090
3091 Scalar::Util::weaken (my $this = $self);
3092
3093 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3094
3095 $self
2874} 3096}
2875 3097
2876sub reorder { 3098sub reorder {
2877 my ($self) = @_; 3099 my ($self) = @_;
2878 my $NOW = time; 3100 my $NOW = Time::HiRes::time;
3101
3102 # freeze display when hovering over any label
3103 return if $CFClient::UI::TOOLTIP->{owner}
3104 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3105 values %{ $self->{item} };
2879 3106
2880 while (my ($k, $v) = each %{ $self->{item} }) { 3107 while (my ($k, $v) = each %{ $self->{item} }) {
2881 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3108 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2882 } 3109 }
2883 3110
… …
2886 my @items = sort { 3113 my @items = sort {
2887 $a->{pri} <=> $b->{pri} 3114 $a->{pri} <=> $b->{pri}
2888 or $b->{id} <=> $a->{id} 3115 or $b->{id} <=> $a->{id}
2889 } values %{ $self->{item} }; 3116 } values %{ $self->{item} };
2890 3117
3118 $self->{timer}->interval (1);
3119
2891 my $count = 10 + 1; 3120 my $count = 10 + 1;
2892 for my $item (@items) { 3121 for my $item (@items) {
2893 last unless --$count; 3122 last unless --$count;
2894 3123
2895 push @widgets, $item->{label} ||= do { 3124 my $label = $item->{label} ||= do {
2896 # TODO: doesn't handle markup well (read as: at all) 3125 # TODO: doesn't handle markup well (read as: at all)
2897 my $short = $item->{count} > 1 3126 my $short = $item->{count} > 1
2898 ? "<b>$item->{count} ×</b> $item->{text}" 3127 ? "<b>$item->{count} ×</b> $item->{text}"
2899 : $item->{text}; 3128 : $item->{text};
2900 3129
… …
2908 tooltip => $item->{tooltip}, 3137 tooltip => $item->{tooltip},
2909 tooltip_font => $::FONT_PROP, 3138 tooltip_font => $::FONT_PROP,
2910 tooltip_width => 0.67, 3139 tooltip_width => 0.67,
2911 fontsize => $item->{fontsize} || $self->{fontsize}, 3140 fontsize => $item->{fontsize} || $self->{fontsize},
2912 max_w => $::WIDTH * 0.44, 3141 max_w => $::WIDTH * 0.44,
2913 fg => $item->{fg}, 3142 fg => [@{ $item->{fg} }],
2914 can_events => 1, 3143 can_events => 1,
2915 can_hover => 1 3144 can_hover => 1
2916 }; 3145 };
3146
3147 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3148 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3149 $label->update;
3150 $label->set_max_size (undef, $label->{req_h} * $diff)
3151 if $diff < 1;
3152 $self->{timer}->interval (1/30);
3153 } else {
3154 $label->{fg}[3] = $item->{fg}[3] || 1;
3155 }
3156
3157 push @widgets, $label;
2917 } 3158 }
2918 3159
2919 $self->clear; 3160 $self->clear;
2920 $self->SUPER::add (reverse @widgets); 3161 $self->SUPER::add (reverse @widgets);
2921} 3162}
… …
2926 $text =~ s/^\s+//; 3167 $text =~ s/^\s+//;
2927 $text =~ s/\s+$//; 3168 $text =~ s/\s+$//;
2928 3169
2929 return unless $text; 3170 return unless $text;
2930 3171
2931 my $timeout = time + ((delete $arg{timeout}) || 60); 3172 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2932 3173
2933 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3174 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2934 3175
2935 if (my $item = $self->{item}{$group}) { 3176 if (my $item = $self->{item}{$group}) {
2936 if ($item->{text} eq $text) { 3177 if ($item->{text} eq $text) {
… …
2966 3207
2967 $self->reorder; 3208 $self->reorder;
2968 $self->SUPER::reconfigure; 3209 $self->SUPER::reconfigure;
2969} 3210}
2970 3211
3212sub DESTROY {
3213 my ($self) = @_;
3214
3215 $self->{timer}->cancel;
3216
3217 $self->SUPER::DESTROY;
3218}
3219
2971############################################################################# 3220#############################################################################
2972 3221
2973package CFClient::UI::Root; 3222package CFClient::UI::Inventory;
2974 3223
2975our @ISA = CFClient::UI::Container::; 3224our @ISA = CFClient::UI::ScrolledWindow::;
2976
2977use CFClient::OpenGL;
2978 3225
2979sub new { 3226sub new {
2980 my $class = shift; 3227 my $class = shift;
2981 3228
2982 $class->SUPER::new ( 3229 my $self = $class->SUPER::new (
3230 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3231 @_,
3232 );
3233
3234 $self
3235}
3236
3237sub set_items {
3238 my ($self, $items) = @_;
3239
3240 $self->{child}->clear;
3241 return unless $items;
3242
3243 my @items = sort {
3244 ($a->{type} <=> $b->{type})
3245 or ($a->{name} cmp $b->{name})
3246 } @$items;
3247
3248 $self->{real_items} = \@items;
3249
3250 my $row = 0;
3251 for my $item (@items) {
3252 CFClient::Item::update_widgets $item;
3253
3254 $self->{child}->add (0, $row, $item->{face_widget});
3255 $self->{child}->add (1, $row, $item->{desc_widget});
3256 $self->{child}->add (2, $row, $item->{weight_widget});
3257
3258 $row++;
3259 }
3260}
3261
3262#############################################################################
3263
3264package CFClient::UI::BindEditor;
3265
3266our @ISA = CFClient::UI::FancyFrame::;
3267
3268sub new {
3269 my $class = shift;
3270
3271 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3272
3273 $self->add (my $vb = new CFClient::UI::VBox);
3274
3275
3276 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3277 text => "start recording",
3278 tooltip => "Start/Stops recording of actions."
3279 ."All subsequent actions after the recording started will be captured."
3280 ."The actions are displayed after the record was stopped."
3281 ."To bind the action you have to click on the 'Bind' button",
3282 on_activate => sub {
3283 unless ($self->{recording}) {
3284 $self->start;
3285 } else {
3286 $self->stop;
3287 }
3288 });
3289
3290 $vb->add (new CFClient::UI::Label text => "Actions:");
3291 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3292
3293 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3294 $vb->add (my $hb = new CFClient::UI::HBox);
3295 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3296 $hb->add (new CFClient::UI::Button
3297 text => "bind",
3298 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3299 on_activate => sub {
3300 $self->ask_for_bind;
3301 });
3302
3303 $vb->add (my $hb = new CFClient::UI::HBox);
3304 $hb->add (new CFClient::UI::Button
3305 text => "ok",
3306 expand => 1,
3307 tooltip => "This closes the binding editor and saves the binding",
3308 on_activate => sub {
3309 $self->hide;
3310 $self->commit;
3311 });
3312
3313 $hb->add (new CFClient::UI::Button
3314 text => "cancel",
3315 expand => 1,
3316 tooltip => "This closes the binding editor without saving",
3317 on_activate => sub {
3318 $self->hide;
3319 $self->{binding_cancel}->()
3320 if $self->{binding_cancel};
3321 });
3322
3323 $self->update_binding_widgets;
3324
3325 $self
3326}
3327
3328sub commit {
3329 my ($self) = @_;
3330 my ($mod, $sym, $cmds) = $self->get_binding;
3331 if ($sym != 0 && @$cmds > 0) {
3332 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3333 ."'. Don't forget 'Save Config'!");
3334 $self->{binding_change}->($mod, $sym, $cmds)
3335 if $self->{binding_change};
3336 } else {
3337 $::STATUSBOX->add ("No action bound, no key or action specified!");
3338 $self->{binding_cancel}->()
3339 if $self->{binding_cancel};
3340 }
3341}
3342
3343sub start {
3344 my ($self) = @_;
3345
3346 $self->{rec_btn}->set_text ("stop recording");
3347 $self->{recording} = 1;
3348 $self->clear_command_list;
3349 $::CONN->start_record if $::CONN;
3350}
3351
3352sub stop {
3353 my ($self) = @_;
3354
3355 $self->{rec_btn}->set_text ("start recording");
3356 $self->{recording} = 0;
3357
3358 my $rec;
3359 $rec = $::CONN->stop_record if $::CONN;
3360 return unless ref $rec eq 'ARRAY';
3361 $self->set_command_list ($rec);
3362}
3363
3364
3365sub ask_for_bind_and_commit {
3366 my ($self) = @_;
3367 $self->ask_for_bind (1);
3368}
3369
3370sub ask_for_bind {
3371 my ($self, $commit) = @_;
3372
3373 CFClient::Binder::open_binding_dialog (sub {
3374 my ($mod, $sym) = @_;
3375 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3376 $self->update_binding_widgets;
3377 $self->commit if $commit;
3378 });
3379}
3380
3381# $mod and $sym are the modifiers and key symbol
3382# $cmds is a array ref of strings (the commands)
3383# $cb is the callback that is executed on OK
3384# $ccb is the callback that is executed on CANCEL and
3385# when the binding was unsuccessful on OK
3386sub set_binding {
3387 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3388
3389 $self->clear_command_list;
3390 $self->{recording} = 0;
3391 $self->{rec_btn}->set_text ("start recording");
3392
3393 $self->{binding} = [$mod, $sym];
3394 $self->{commands} = $cmds;
3395
3396 $self->{binding_change} = $cb;
3397 $self->{binding_cancel} = $ccb;
3398
3399 $self->update_binding_widgets;
3400}
3401
3402# this is a shortcut method that asks for a binding
3403# and then just binds it.
3404sub do_quick_binding {
3405 my ($self, $cmds) = @_;
3406 $self->set_binding (undef, undef, $cmds, sub {
3407 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3408 });
3409 $self->ask_for_bind (1);
3410}
3411
3412sub update_binding_widgets {
3413 my ($self) = @_;
3414 my ($mod, $sym, $cmds) = $self->get_binding;
3415 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3416 $self->set_command_list ($cmds);
3417}
3418
3419sub get_binding {
3420 my ($self) = @_;
3421 return (
3422 $self->{binding}->[0],
3423 $self->{binding}->[1],
3424 [ grep { defined $_ } @{$self->{commands}} ]
3425 );
3426}
3427
3428sub clear_command_list {
3429 my ($self) = @_;
3430 $self->{cmdbox}->clear ();
3431}
3432
3433sub set_command_list {
3434 my ($self, $cmds) = @_;
3435
3436 $self->{cmdbox}->clear ();
3437 $self->{commands} = $cmds;
3438
3439 my $idx = 0;
3440
3441 for (@$cmds) {
3442 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3443
3444 my $i = $idx;
3445 $hb->add (new CFClient::UI::Label text => $_);
3446 $hb->add (new CFClient::UI::Button
3447 text => "delete",
3448 tooltip => "Deletes the action from the record",
3449 on_activate => sub {
3450 $self->{cmdbox}->remove ($hb);
3451 $cmds->[$i] = undef;
3452 });
3453
3454
3455 $idx++
3456 }
3457}
3458
3459#############################################################################
3460
3461package CFClient::UI::SpellList;
3462
3463our @ISA = CFClient::UI::Table::;
3464
3465sub new {
3466 my $class = shift;
3467
3468 my $self = $class->SUPER::new (
3469 binding => [],
3470 commands => [],
3471 @_,
3472 )
3473}
3474
3475# XXX: Do sorting? Argl...
3476sub add_spell {
3477 my ($self, $spell) = @_;
3478 $self->{spells}->{$spell->{name}} = $spell;
3479
3480 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3481 face => $spell->{face},
3482 can_hover => 1,
3483 can_events => 1,
3484 tooltip => $spell->{message});
3485
3486 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3487 text => $spell->{name},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message},
3491 expand => 1);
3492
3493 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3494 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3495 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3496 expand => 1);
3497
3498 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3499 text => "bind to key",
3500 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3501}
3502
3503sub rebuild_spell_list {
3504 my ($self) = @_;
3505 $self->{tbl_idx} = 0;
3506 $self->add_spell ($_) for values %{$self->{spells}};
3507}
3508
3509sub remove_spell {
3510 my ($self, $spell) = @_;
3511 delete $self->{spells}->{$spell->{name}};
3512 $self->rebuild_spell_list;
3513}
3514
3515#############################################################################
3516
3517package CFClient::UI::Root;
3518
3519our @ISA = CFClient::UI::Container::;
3520
3521use List::Util qw(min max);
3522
3523use CFClient::OpenGL;
3524
3525sub new {
3526 my $class = shift;
3527
3528 my $self = $class->SUPER::new (
2983 visible => 1, 3529 visible => 1,
2984 @_, 3530 @_,
2985 ) 3531 );
2986}
2987 3532
2988sub configure { 3533 Scalar::Util::weaken ($self->{root} = $self);
2989 my ($self, $x, $y, $w, $h) = @_;
2990 3534
2991 $self->{w} = $w; 3535 $self
2992 $self->{h} = $h;
2993}
2994
2995sub check_size {
2996 my ($self) = @_;
2997
2998 $self->size_allocate ($self->{w}, $self->{h})
2999 if $self->{w};
3000} 3536}
3001 3537
3002sub size_request { 3538sub size_request {
3003 my ($self) = @_; 3539 my ($self) = @_;
3004 3540
3005 ($self->{w}, $self->{h}) 3541 ($self->{w}, $self->{h})
3542}
3543
3544sub _to_pixel {
3545 my ($coord, $size, $max) = @_;
3546
3547 $coord =
3548 $coord eq "center" ? ($max - $size) * 0.5
3549 : $coord eq "max" ? $max
3550 : $coord;
3551
3552 $coord = 0 if $coord < 0;
3553 $coord = $max - $size if $coord > $max - $size;
3554
3555 int $coord + 0.5
3006} 3556}
3007 3557
3008sub size_allocate { 3558sub size_allocate {
3009 my ($self, $w, $h) = @_; 3559 my ($self, $w, $h) = @_;
3010 3560
3011 for my $child ($self->children) { 3561 for my $child ($self->children) {
3012 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3562 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3013 3563
3014 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3564 $X = $child->{force_x} if exists $child->{force_x};
3015 if exists $child->{req_x}; 3565 $Y = $child->{force_y} if exists $child->{force_y};
3016 3566
3017 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3567 $X = _to_pixel $X, $W, $self->{w};
3018 if exists $child->{req_y}; 3568 $Y = _to_pixel $Y, $H, $self->{h};
3019
3020 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3021
3022 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3023 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3024 3569
3025 $child->configure ($X, $Y, $W, $H); 3570 $child->configure ($X, $Y, $W, $H);
3026 } 3571 }
3027} 3572}
3028 3573
… …
3039} 3584}
3040 3585
3041sub update { 3586sub update {
3042 my ($self) = @_; 3587 my ($self) = @_;
3043 3588
3044 $self->check_size;
3045 $::WANT_REFRESH++; 3589 $::WANT_REFRESH++;
3046} 3590}
3047 3591
3048sub add { 3592sub add {
3049 my ($self, @children) = @_; 3593 my ($self, @children) = @_;
3050 3594
3051 for my $child (@children) {
3052 $child->{is_toplevel} = 1; 3595 $_->{is_toplevel} = 1
3053 3596 for @children;
3054 # integerise window positions
3055 $child->{x} = int $child->{x};
3056 $child->{y} = int $child->{y};
3057 }
3058 3597
3059 $self->SUPER::add (@children); 3598 $self->SUPER::add (@children);
3060
3061 for (my @widgets = @children; my $w = pop @widgets; ) {
3062 push @widgets, $w->children;
3063 $w->set_visible;
3064 }
3065
3066} 3599}
3067 3600
3068sub remove { 3601sub remove {
3069 my ($self, @children) = @_; 3602 my ($self, @children) = @_;
3070 3603
3071 $self->SUPER::remove (@children); 3604 $self->SUPER::remove (@children);
3605
3606 delete $self->{is_toplevel}
3607 for @children;
3072 3608
3073 while (@children) { 3609 while (@children) {
3074 my $w = pop @children; 3610 my $w = pop @children;
3075 push @children, $w->children; 3611 push @children, $w->children;
3076 $w->set_invisible; 3612 $w->set_invisible;
… …
3095 while ($self->{refresh_hook}) { 3631 while ($self->{refresh_hook}) {
3096 $_->() 3632 $_->()
3097 for values %{delete $self->{refresh_hook}}; 3633 for values %{delete $self->{refresh_hook}};
3098 } 3634 }
3099 3635
3100 if ($self->{check_size}) { 3636 if ($self->{realloc}) {
3637 my %queue;
3101 my @queue; 3638 my @queue;
3639 my $widget;
3102 3640
3641 outer:
3103 while () { 3642 while () {
3104 if ($self->{check_size}) { 3643 if (my $realloc = delete $self->{realloc}) {
3105 #TODO use array-of-depth approach 3644 for $widget (values %$realloc) {
3645 $widget->{visible} or next; # do not resize invisible widgets
3106 3646
3107 @queue = sort { $a->{visible} <=> $b->{visible} } 3647 $queue{$widget+0}++ and next; # duplicates are common
3108 @queue, values %{delete $self->{check_size}}; 3648
3649 push @{ $queue[$widget->{visible}] }, $widget;
3650 }
3109 } 3651 }
3110 3652
3653 while () {
3654 @queue or last outer;
3655
3111 my $widget = pop @queue || last; 3656 $widget = pop @{ $queue[-1] || [] }
3112 3657 and last;
3113 defined $widget->{visible} or last; # do not resize invisible widgets
3114
3115 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3116 ? @$widget{qw(def_w def_h)}
3117 : $widget->size_request;
3118
3119 if (delete $widget->{force_alloc}
3120 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3121 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3122 3658
3659 pop @queue;
3660 }
3661
3662 delete $queue{$widget+0};
3663
3664 my ($w, $h) = $widget->size_request;
3665
3666 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3667 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3668
3669 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3670 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3671
3672 $w = $widget->{force_w} if exists $widget->{force_w};
3673 $h = $widget->{force_h} if exists $widget->{force_h};
3674
3675 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3676 || delete $widget->{force_realloc}) {
3123 $widget->{req_w} = $w; 3677 $widget->{req_w} = $w;
3124 $widget->{req_h} = $h; 3678 $widget->{req_h} = $h;
3125 3679
3126 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3680 $self->{size_alloc}{$widget+0} = $widget;
3127 3681
3128 $widget->{parent}->check_size
3129 if $widget->{parent}; 3682 if (my $parent = $widget->{parent}) {
3683 $self->{realloc}{$parent+0} = $parent
3684 unless $queue{$parent+0};
3685
3686 $parent->{force_size_alloc} = 1;
3687 $self->{size_alloc}{$parent+0} = $parent;
3688 }
3130 } 3689 }
3690
3691 delete $self->{realloc}{$widget+0};
3131 } 3692 }
3132 } 3693 }
3133 3694
3134 while (my $size_alloc = delete $self->{size_alloc}) { 3695 while (my $size_alloc = delete $self->{size_alloc}) {
3135 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3696 my @queue = sort { $b->{visible} <=> $a->{visible} }
3136 values %$size_alloc; 3697 values %$size_alloc;
3137 3698
3138 while () { 3699 while () {
3139 my ($widget, $w, $h) = @{ pop @queue or last }; 3700 my $widget = pop @queue || last;
3701
3702 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3140 3703
3141 $w = 0 if $w < 0; 3704 $w = 0 if $w < 0;
3142 $h = 0 if $h < 0; 3705 $h = 0 if $h < 0;
3143 3706
3707 $w = int $w + 0.5;
3708 $h = int $h + 0.5;
3709
3710 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3711 $widget->{old_w} = $widget->{w};
3712 $widget->{old_h} = $widget->{h};
3713
3144 $widget->{w} = $w; 3714 $widget->{w} = $w;
3145 $widget->{h} = $h; 3715 $widget->{h} = $h;
3716
3146 $widget->emit (size_allocate => $w, $h); 3717 $widget->emit (size_allocate => $w, $h);
3718 }
3147 } 3719 }
3148 } 3720 }
3149 3721
3150 while ($self->{post_alloc_hook}) { 3722 while ($self->{post_alloc_hook}) {
3151 $_->() 3723 $_->()
3152 for values %{delete $self->{post_alloc_hook}}; 3724 for values %{delete $self->{post_alloc_hook}};
3153 } 3725 }
3726
3154 3727
3155 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3728 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3156 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3729 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3157 glClear GL_COLOR_BUFFER_BIT; 3730 glClear GL_COLOR_BUFFER_BIT;
3158 3731
… …
3160 glLoadIdentity; 3733 glLoadIdentity;
3161 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3734 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3162 glMatrixMode GL_MODELVIEW; 3735 glMatrixMode GL_MODELVIEW;
3163 glLoadIdentity; 3736 glLoadIdentity;
3164 3737
3738 {
3739 package CFClient::UI::Base;
3740
3741 ($draw_x, $draw_y, $draw_w, $draw_h) =
3742 (0, 0, $self->{w}, $self->{h});
3743 }
3744
3165 $self->_draw; 3745 $self->_draw;
3166} 3746}
3167 3747
3168############################################################################# 3748#############################################################################
3169 3749

Diff Legend

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