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.258 by root, Tue May 30 02:55:45 2006 UTC vs.
Revision 1.311 by root, Fri Jun 23 22:35:16 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
52 $TOOLTIP->{owner} = $widget;
53
54 my $tip = $widget->{tooltip};
55
56 $tip = $tip->($widget) if CODE:: eq ref $tip;
57
58 $TOOLTIP->set_tooltip_from ($widget);
59 $TOOLTIP->show;
60 }
61
62 return;
63 }
64 }
65 }
66
67 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner};
69}
70
71# class methods for events 73# class methods for events
72sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
73 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS; 76 if $FOCUS;
75} 77}
… …
87 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
88 90
89 $GRAB = $widget; 91 $GRAB = $widget;
90 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
91 93
92 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
93 } 95 }
94 96
95 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
96 98
97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
112 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
113 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
114 $grab->update if $grab; 116 $grab->update if $grab;
115 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
116 118
117 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
118 } 120 }
119} 121}
120 122
121sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
122 my ($ev) = @_; 124 my ($ev) = @_;
… …
128 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
129 131
130 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
131 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
132 134
133 check_tooltip; 135 $TOOLTIP_WATCHER->start;
134 } 136 }
135 137
136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER; 139 if $HOVER;
138} 140}
… …
170sub rescale_widgets { 172sub rescale_widgets {
171 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
172 174
173 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177 179
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 183 $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}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 186
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187 189
188 } 190 }
189 } 191 }
190 192
191 reconfigure_widgets; 193 reconfigure_widgets;
… …
219 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
220 } 222 }
221 } 223 }
222 224
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x}; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y}; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w}; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h}; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228 230
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231 233
232 $self->show if $layout->{show}; 234 $self->show if $layout->{show};
… …
270 272
271 return unless $self->{visible}; 273 return unless $self->{visible};
272 274
273 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
274 276
277 delete $self->{visible};
275 delete $self->{root}; 278 delete $self->{root};
276 delete $self->{visible};
277 279
278 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
280 282
281 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
282 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
283 285
284 $self->focus_out; 286 $self->emit ("focus_out");
285
286 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
287} 288}
288 289
289sub set_visibility { 290sub set_visibility {
290 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
313} 314}
314 315
315sub move_abs { 316sub move_abs {
316 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
317 318
318 $self->{x} = List::Util::max 0, int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
319 $self->{y} = List::Util::max 0, int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
320 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
321 322
322 $self->update; 323 $self->update;
323} 324}
324 325
… …
332} 333}
333 334
334sub size_request { 335sub size_request {
335 require Carp; 336 require Carp;
336 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
337} 342}
338 343
339sub configure { 344sub configure {
340 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
341 346
… …
355 $self->{x} = $x; 360 $self->{x} = $x;
356 $self->{y} = $y; 361 $self->{y} = $y;
357 $self->update; 362 $self->update;
358 } 363 }
359 364
360 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible}; 366 return unless $self->{visible};
362 367
368 $self->{alloc_w} = $w;
369 $self->{alloc_h} = $h;
370
363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 371 $self->{root}{size_alloc}{$self+0} = $self;
364 } 372 }
365}
366
367sub size_allocate {
368 # nothing to be done
369} 373}
370 374
371sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
372} 381}
373 382
374sub set_max_size { 383sub set_max_size {
375 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
376 385
377 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
378 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
379} 390}
380 391
381sub set_tooltip { 392sub set_tooltip {
382 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
383 394
… …
388 399
389 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
390 401
391 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
392 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
393 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
394 } 405 }
395} 406}
396 407
397# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
398sub coord2local { 409sub coord2local {
… …
406 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
407 418
408 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
409} 420}
410 421
411sub focus_in { 422sub invoke_focus_in {
412 my ($self) = @_; 423 my ($self) = @_;
413 424
414 return if $FOCUS == $self; 425 return if $FOCUS == $self;
415 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
416 427
417 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
418 429
419 $self->_emit (focus_in => $focus);
420
421 $focus->update if $focus; 430 $focus->update if $focus;
422 $FOCUS->update; 431 $FOCUS->update;
423}
424 432
433 0
434}
435
425sub focus_out { 436sub invoke_focus_out {
426 my ($self) = @_; 437 my ($self) = @_;
427 438
428 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
429 440
430 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
431 442
432 $self->_emit (focus_out => $focus);
433
434 $focus->update if $focus; #? 443 $focus->update if $focus; #?
435 444
436 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
437 unless $FOCUS; 446 unless $FOCUS;
438}
439 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
440sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
441sub button_up { } 458sub invoke_button_up { 1 }
442sub key_down { } 459sub invoke_key_down { 1 }
443sub key_up { } 460sub invoke_key_up { 1 }
444 461
445sub button_down { 462sub invoke_button_down {
446 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
447 464
448 $self->focus_in; 465 $self->grab_focus;
449}
450 466
451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
455sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
456 484
457sub find_widget { 485sub find_widget {
458 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
459 487
460 return () unless $self->{can_events}; 488 return () unless $self->{can_events};
… …
471 499
472 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
474} 502}
475 503
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc { 504sub realloc {
500 my ($self) = @_; 505 my ($self) = @_;
501 506
502 if ($self->{visible}) { 507 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self}; 508 return if $self->{root}{realloc}{$self+0};
504 509
505 $self->{root}{realloc}{$self} = $self; 510 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update; 511 $self->{root}->update;
507 } else { 512 } else {
508 delete $self->{req_w}; 513 delete $self->{req_w};
514 delete $self->{req_h};
509 } 515 }
510} 516}
511 517
512sub update { 518sub update {
513 my ($self) = @_; 519 my ($self) = @_;
… …
521 527
522 $self->realloc; 528 $self->realloc;
523 $self->update; 529 $self->update;
524} 530}
525 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
535
526sub draw { 536sub draw {
527 my ($self) = @_; 537 my ($self) = @_;
528 538
529 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);
530 550
531 glPushMatrix; 551 glPushMatrix;
532 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
533 $self->_draw;
534 glPopMatrix;
535 553
536 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
537 my ($x, $y) = @$self{qw(x y)};
538
539 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
540 glEnable GL_BLEND; 556 glEnable GL_BLEND;
541 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
542 glBegin GL_QUADS; 558 glBegin GL_QUADS;
543 glVertex $x , $y; 559 glVertex 0 , 0;
544 glVertex $x + $self->{w}, $y; 560 glVertex $self->{w}, 0;
545 glVertex $x + $self->{w}, $y + $self->{h}; 561 glVertex $self->{w}, $self->{h};
546 glVertex $x , $y + $self->{h}; 562 glVertex 0 , $self->{h};
547 glEnd; 563 glEnd;
548 glDisable GL_BLEND; 564 glDisable GL_BLEND;
549 } 565 }
550 566
551 if ($ENV{CFPLUS_DEBUG}) { 567 if ($ENV{CFPLUS_DEBUG} & 1) {
552 glPushMatrix; 568 glPushMatrix;
553 glColor 1, 1, 0, 1; 569 glColor 1, 1, 0, 1;
554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 570 glTranslate 0.375, 0.375;
555 glBegin GL_LINE_LOOP; 571 glBegin GL_LINE_LOOP;
556 glVertex 0 , 0; 572 glVertex 0 , 0;
557 glVertex $self->{w} - 1, 0; 573 glVertex $self->{w} - 1, 0;
558 glVertex $self->{w} - 1, $self->{h} - 1; 574 glVertex $self->{w} - 1, $self->{h} - 1;
559 glVertex 0 , $self->{h} - 1; 575 glVertex 0 , $self->{h} - 1;
560 glEnd; 576 glEnd;
561 glPopMatrix; 577 glPopMatrix;
562 #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;
563 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
564} 583}
565 584
566sub _draw { 585sub _draw {
567 my ($self) = @_; 586 my ($self) = @_;
568 587
… …
571 590
572sub DESTROY { 591sub DESTROY {
573 my ($self) = @_; 592 my ($self) = @_;
574 593
575 delete $WIDGET{$self+0}; 594 delete $WIDGET{$self+0};
576 #$self->deactivate; 595
596 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
577} 598}
578 599
579############################################################################# 600#############################################################################
580 601
581package CFClient::UI::DrawBG; 602package CFClient::UI::DrawBG;
… …
606 627
607 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
608 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
609 630
610 glEnable GL_BLEND; 631 glEnable GL_BLEND;
611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
612 glColor @$color; 633 glColor_premultiply @$color;
613 634
614 glBegin GL_QUADS; 635 glBegin GL_QUADS;
615 glVertex 0 , 0; 636 glVertex 0 , 0;
616 glVertex 0 , $h; 637 glVertex 0 , $h;
617 glVertex $w, $h; 638 glVertex $w, $h;
… …
648our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
649 670
650sub new { 671sub new {
651 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
652 673
653 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
654 675
655 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
656 children => [], 677 children => [],
657 can_events => 0, 678 can_events => 0,
658 %arg, 679 %arg,
659 ); 680 );
681
660 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
661 684
662 $self 685 $self
663} 686}
664 687
665sub add { 688sub add {
… …
713 $x -= $self->{x}; 736 $x -= $self->{x};
714 $y -= $self->{y}; 737 $y -= $self->{y};
715 738
716 my $res; 739 my $res;
717 740
718 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
719 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
720 and return $res; 743 and return $res;
721 } 744 }
722 745
723 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
744} 767}
745 768
746sub add { 769sub add {
747 my ($self, $child) = @_; 770 my ($self, $child) = @_;
748 771
749 $self->{children} = []; 772 $self->SUPER::remove ($_) for @{ $self->{children} };
750
751 $self->SUPER::add ($child); 773 $self->SUPER::add ($child);
752} 774}
753 775
754sub remove { 776sub remove {
755 my ($self, $widget) = @_; 777 my ($self, $widget) = @_;
… …
764 786
765sub size_request { 787sub size_request {
766 $_[0]{children}[0]->size_request 788 $_[0]{children}[0]->size_request
767} 789}
768 790
769sub size_allocate { 791sub invoke_size_allocate {
770 my ($self, $w, $h, $changed) = @_; 792 my ($self, $w, $h) = @_;
771 793
772 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
795
796 1
773} 797}
774 798
775############################################################################# 799#############################################################################
800
801# back-buffered drawing area
776 802
777package CFClient::UI::Window; 803package CFClient::UI::Window;
778 804
779our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
780 806
… …
791 817
792 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
793 $self->SUPER::update; 819 $self->SUPER::update;
794} 820}
795 821
796sub size_allocate { 822sub invoke_size_allocate {
797 my ($self, $w, $h, $changed) = @_; 823 my ($self, $w, $h) = @_;
798 824
799 $self->SUPER::size_allocate ($w, $h, $changed);
800 $self->update 825 $self->update;
801 if $changed; 826
827 $self->SUPER::invoke_size_allocate ($w, $h)
802} 828}
803 829
804sub _render { 830sub _render {
831 my ($self) = @_;
832
805 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
806} 834}
807 835
808sub render_child { 836sub render_child {
809 my ($self) = @_; 837 my ($self) = @_;
810 838
811 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
812 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
813 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
814 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
815 $self->_render; 850 $self->_render;
816 }; 851 };
817} 852}
818 853
819sub _draw { 854sub _draw {
820 my ($self) = @_; 855 my ($self) = @_;
821 856
822 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
823 858
824 my $tex = $self->{texture} 859 my $tex = $self->{texture}
825 or return; 860 or return;
826 861
827 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
829 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
830 865
831 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
832 867
833 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
834} 869}
… …
850} 885}
851 886
852sub size_request { 887sub size_request {
853 my ($self) = @_; 888 my ($self) = @_;
854 889
855 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
856 891
857 $w = 10 if $self->{scroll_x}; 892 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y}; 893 $h = 10 if $self->{scroll_y};
859 894
860 ($w, $h) 895 ($w, $h)
861} 896}
862 897
863sub size_allocate { 898sub invoke_size_allocate {
864 my ($self, $w, $h, $changed) = @_; 899 my ($self, $w, $h) = @_;
865 900
901 my $child = $self->child;
902
866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
868 905
869 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
870 $self->update; 907 $self->update;
908
909 1
871} 910}
872 911
873sub set_offset { 912sub set_offset {
874 my ($self, $x, $y) = @_; 913 my ($self, $x, $y) = @_;
875 914
… …
908} 947}
909 948
910sub _render { 949sub _render {
911 my ($self) = @_; 950 my ($self) = @_;
912 951
952 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
953 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
954
913 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 955 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
914 956
915 $self->SUPER::_render; 957 $self->SUPER::_render;
916} 958}
917 959
… …
920package CFClient::UI::ScrolledWindow; 962package CFClient::UI::ScrolledWindow;
921 963
922our @ISA = CFClient::UI::HBox::; 964our @ISA = CFClient::UI::HBox::;
923 965
924sub new { 966sub new {
925 my $class = shift; 967 my ($class, %arg) = @_;
968
969 my $child = delete $arg{child};
926 970
927 my $self; 971 my $self;
928 972
929 my $slider = new CFClient::UI::Slider 973 my $slider = new CFClient::UI::Slider
930 vertical => 1, 974 vertical => 1,
… …
935 ; 979 ;
936 980
937 $self = $class->SUPER::new ( 981 $self = $class->SUPER::new (
938 vp => (new CFClient::UI::ViewPort expand => 1), 982 vp => (new CFClient::UI::ViewPort expand => 1),
939 slider => $slider, 983 slider => $slider,
940 @_, 984 %arg,
941 ); 985 );
942 986
943 $self->{vp}->add ($self->{scrolled});
944 $self->add ($self->{vp});
945 $self->add ($self->{slider}); 987 $self->SUPER::add ($self->{vp}, $self->{slider});
988 $self->add ($child) if $child;
946 989
947 $self 990 $self
991}
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
948} 997}
949 998
950sub update { 999sub update {
951 my ($self) = @_; 1000 my ($self) = @_;
952 1001
… …
955 # todo: overwrite size_allocate of child 1004 # todo: overwrite size_allocate of child
956 my $child = $self->{vp}->child; 1005 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1006 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958} 1007}
959 1008
960sub size_allocate { 1009sub invoke_size_allocate {
961 my ($self, $w, $h, $changed) = @_; 1010 my ($self, $w, $h) = @_;
962
963 $self->SUPER::size_allocate ($w, $h, $changed);
964 1011
965 my $child = $self->{vp}->child; 1012 my $child = $self->{vp}->child;
966 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014
1015 $self->SUPER::invoke_size_allocate ($w, $h)
967} 1016}
968 1017
969#TODO# update range on size_allocate depending on child 1018#TODO# update range on size_allocate depending on child
970# update viewport offset on scroll 1019# update viewport offset on scroll
971 1020
… …
991 1040
992 if ($self->{bg}) { 1041 if ($self->{bg}) {
993 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
994 1043
995 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
996 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
997 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
998 1047
999 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
1000 glVertex 0 , 0; 1049 glVertex 0 , 0;
1001 glVertex 0 , $h; 1050 glVertex 0 , $h;
1002 glVertex $w, $h; 1051 glVertex $w, $h;
… …
1024my @border = 1073my @border =
1025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1026 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1027 1076
1028sub new { 1077sub new {
1029 my $class = shift; 1078 my ($class, %arg) = @_;
1030 1079
1031 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1032 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1033 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1034 border => 0.6, 1083 border => 0.6,
1035 can_events => 1, 1084 can_events => 1,
1036 min_w => 16, 1085 min_w => 16,
1037 min_h => 16, 1086 min_h => 16,
1038 @_ 1087 %arg,
1039 ); 1088 );
1040 1089
1041 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1042 align => 0, 1091 align => 0,
1043 valign => 1, 1092 valign => 1,
1044 text => $self->{title}, 1093 text => $self->{title},
1045 fontsize => $self->{border}; 1094 fontsize => $self->{border},
1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->hide };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1046 1105
1047 $self 1106 $self
1107}
1108
1109sub add {
1110 my ($self, @widgets) = @_;
1111
1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1048} 1115}
1049 1116
1050sub border { 1117sub border {
1051 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1052} 1119}
1053 1120
1054sub size_request { 1121sub size_request {
1055 my ($self) = @_; 1122 my ($self) = @_;
1123
1124 $self->{title_widget}->size_request
1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1056 1129
1057 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1058 1131
1059 ( 1132 (
1060 $w + $self->border * 2, 1133 $w + $self->border * 2,
1061 $h + $self->border * 2, 1134 $h + $self->border * 2,
1062 ) 1135 )
1063} 1136}
1064 1137
1065sub size_allocate { 1138sub invoke_size_allocate {
1066 my ($self, $w, $h, $changed) = @_; 1139 my ($self, $w, $h) = @_;
1067 1140
1068 return unless $changed; 1141 if ($self->{title_widget}) {
1142 $self->{title_widget}{w} = $w;
1143 $self->{title_widget}{h} = $h;
1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1145 }
1069 1146
1147 my $border = $self->border;
1148
1070 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1071 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1072 1151
1073 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1074 if $self->{title};
1075
1076 $self->child->configure ($self->border, $self->border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1077}
1078 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1079sub button_down { 1160sub invoke_button_down {
1080 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1081 1162
1082 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
1083 my $border = $self->border; 1164 my $border = $self->border;
1084 1165
… …
1100 my $dy = $ev->{y} - $oy; 1181 my $dy = $ev->{y} - $oy;
1101 1182
1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1183 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1184 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104 1185
1186 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1105 $self->realloc; 1187 $self->realloc;
1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1107 }; 1188 };
1108 1189
1109 } elsif ($lr ^ $td) { 1190 } elsif ($lr ^ $td) {
1110 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1191 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1111 my ($bx, $by) = ($self->{x}, $self->{y}); 1192 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1114 my ($ev, $x, $y) = @_; 1195 my ($ev, $x, $y) = @_;
1115 1196
1116 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
1117 1198
1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1200 # HACK: the next line is required to enforce placement
1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1119 }; 1202 };
1203 } else {
1204 return 0;
1205 }
1206
1120 } 1207 1
1121} 1208}
1122 1209
1123sub button_up { 1210sub invoke_button_up {
1124 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
1125 1212
1126 delete $self->{motion}; 1213 ! ! delete $self->{motion}
1127} 1214}
1128 1215
1129sub mouse_motion { 1216sub invoke_mouse_motion {
1130 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
1131 1218
1132 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220
1221 ! ! $self->{motion}
1133} 1222}
1134 1223
1135sub _draw { 1224sub _draw {
1136 my ($self) = @_; 1225 my ($self) = @_;
1137 1226
1227 my $child = $self->{children}[0];
1228
1138 my ($w, $h ) = ($self->{w}, $self->{h}); 1229 my ($w, $h ) = ($self->{w}, $self->{h});
1139 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1230 my ($cw, $ch) = ($child->{w}, $child->{h});
1140 1231
1141 glEnable GL_TEXTURE_2D; 1232 glEnable GL_TEXTURE_2D;
1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1143 1234
1144 my $border = $self->border; 1235 my $border = $self->border;
… …
1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1250 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160 } 1251 }
1161 1252
1162 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1163 1254
1164 $self->{title}->draw if $self->{title};
1165
1166 $self->child->draw; 1255 $child->draw;
1256
1257 if ($self->{title_widget}) {
1258 glTranslate 0, $border - $self->{h};
1259 $self->{title_widget}->_draw;
1260
1261 glTranslate 0, - ($border - $self->{h});
1262 }
1263
1264 $self->{close_button}->draw
1265 if $self->{close_button};
1167} 1266}
1168 1267
1169############################################################################# 1268#############################################################################
1170 1269
1171package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
1194 1293
1195 $child->set_parent ($self); 1294 $child->set_parent ($self);
1196 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1197 1296
1198 $self->realloc; 1297 $self->realloc;
1298}
1299
1300sub remove {
1301 my ($self, $child) = @_;
1302
1303 # TODO: not yet implemented
1199} 1304}
1200 1305
1201# TODO: move to container class maybe? send children a signal on removal? 1306# TODO: move to container class maybe? send children a signal on removal?
1202sub clear { 1307sub clear {
1203 my ($self) = @_; 1308 my ($self) = @_;
… …
1244 (sum @$ws), 1349 (sum @$ws),
1245 (sum @$hs), 1350 (sum @$hs),
1246 ) 1351 )
1247} 1352}
1248 1353
1249sub size_allocate { 1354sub invoke_size_allocate {
1250 my ($self, $w, $h, $changed) = @_; 1355 my ($self, $w, $h) = @_;
1251 1356
1252 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1253 1358
1254 my $req_w = (sum @$ws) || 1; 1359 my $req_w = (sum @$ws) || 1;
1255 my $req_h = (sum @$hs) || 1; 1360 my $req_h = (sum @$hs) || 1;
… …
1286 } 1391 }
1287 1392
1288 $y += $row_h; 1393 $y += $row_h;
1289 } 1394 }
1290 1395
1396 1
1291} 1397}
1292 1398
1293sub find_widget { 1399sub find_widget {
1294 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1295 1401
… …
1332 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1333 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1334 ) 1440 )
1335} 1441}
1336 1442
1337sub size_allocate { 1443sub invoke_size_allocate {
1338 my ($self, $w, $h, $changed) = @_; 1444 my ($self, $w, $h) = @_;
1339 1445
1340 my $space = $self->{vertical} ? $h : $w; 1446 my $space = $self->{vertical} ? $h : $w;
1341 my $children = $self->{children}; 1447 my @children = $self->visible_children;
1342 1448
1343 my @req; 1449 my @req;
1344 1450
1345 if ($self->{homogeneous}) { 1451 if ($self->{homogeneous}) {
1346 @req = ($space / (@$children || 1)) x @$children; 1452 @req = ($space / (@children || 1)) x @children;
1347 } else { 1453 } else {
1348 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1349 my $req = List::Util::sum @req; 1455 my $req = List::Util::sum @req;
1350 1456
1351 if ($req > $space) { 1457 if ($req > $space) {
1352 # ah well, not enough space 1458 # ah well, not enough space
1353 $_ *= $space / $req for @req; 1459 $_ *= $space / $req for @req;
1354 } else { 1460 } else {
1355 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1356 1462
1357 $space = ($space - $req) / $expand; # remaining space to give away 1463 $space = ($space - $req) / $expand; # remaining space to give away
1358 1464
1359 $req[$_] += $space * $children->[$_]{expand} 1465 $req[$_] += $space * $children[$_]{expand}
1360 for 0 .. $#$children; 1466 for 0 .. $#children;
1361 } 1467 }
1362 } 1468 }
1363 1469
1364 CFClient::UI::harmonize \@req; 1470 CFClient::UI::harmonize \@req;
1365 1471
1366 my $pos = 0; 1472 my $pos = 0;
1367 for (0 .. $#$children) { 1473 for (0 .. $#children) {
1368 my $alloc = $req[$_]; 1474 my $alloc = $req[$_];
1369 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1370 1476
1371 $pos += $alloc; 1477 $pos += $alloc;
1372 } 1478 }
1373 1479
1374 1 1480 1
… …
1464 1570
1465 delete $self->{texture}; 1571 delete $self->{texture};
1466 $self->SUPER::update; 1572 $self->SUPER::update;
1467} 1573}
1468 1574
1575sub realloc {
1576 my ($self) = @_;
1577
1578 delete $self->{ox};
1579 $self->SUPER::realloc;
1580}
1581
1469sub set_text { 1582sub set_text {
1470 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1471 1584
1472 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1473 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1474 1587
1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1476 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1477 1590
1591 delete $self->{size_req};
1478 $self->realloc; 1592 $self->realloc;
1479 $self->update; 1593 $self->update;
1480} 1594}
1481 1595
1482sub set_markup { 1596sub set_markup {
… …
1488 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1489 1603
1490 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1491 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1492 1606
1607 delete $self->{size_req};
1493 $self->realloc; 1608 $self->realloc;
1494 $self->update; 1609 $self->update;
1495} 1610}
1496 1611
1497sub size_request { 1612sub size_request {
1498 my ($self) = @_; 1613 my ($self) = @_;
1499 1614
1615 $self->{size_req} ||= do {
1500 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1501 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1502 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1503 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1621
1506 my ($w, $h) = $self->{layout}->size; 1622 my ($w, $h) = $self->{layout}->size;
1507 1623
1508 if (exists $self->{template}) { 1624 if (exists $self->{template}) {
1509 $self->{template}->set_font ($self->{font}) if $self->{font}; 1625 $self->{template}->set_font ($self->{font}) if $self->{font};
1510 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1511 1627
1512 my ($w2, $h2) = $self->{template}->size; 1628 my ($w2, $h2) = $self->{template}->size;
1513 1629
1514 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1515 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1632 }
1633
1634 [$w, $h]
1516 } 1635 };
1517 1636
1518 ($w, $h) 1637 @{ $self->{size_req} }
1519} 1638}
1520 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1521sub size_allocate { 1644sub invoke_size_allocate {
1522 my ($self, $w, $h, $changed) = @_; 1645 my ($self, $w, $h) = @_;
1646
1647 delete $self->{ox};
1523 1648
1524 delete $self->{texture} 1649 delete $self->{texture}
1525 if $changed; 1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1526} 1653}
1527 1654
1528sub set_fontsize { 1655sub set_fontsize {
1529 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1530 1657
1531 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1532 delete $self->{texture}; 1659 delete $self->{texture};
1533 1660
1534 $self->realloc; 1661 $self->realloc;
1662}
1663
1664sub reconfigure {
1665 my ($self) = @_;
1666
1667 delete $self->{size_req};
1668
1669 $self->SUPER::reconfigure;
1535} 1670}
1536 1671
1537sub _draw { 1672sub _draw {
1538 my ($self) = @_; 1673 my ($self) = @_;
1539 1674
… …
1545 $self->{layout}->set_width ($self->{w}); 1680 $self->{layout}->set_width ($self->{w});
1546 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1681 $self->{layout}->set_ellipsise ($self->{ellipsise});
1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549 1684
1550 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1685 new_from_layout CFClient::Texture $self->{layout}
1686 };
1551 1687
1688 unless (exists $self->{ox}) {
1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1554 : ($self->{w} - $tex->{w}) * 0.5); 1691 : ($self->{w} - $tex->{w}) * 0.5);
1555 1692
1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1558 : ($self->{h} - $tex->{h}) * 0.5); 1695 : ($self->{h} - $tex->{h}) * 0.5);
1559
1560 $tex
1561 }; 1696 };
1562 1697
1563 glEnable GL_TEXTURE_2D; 1698 glEnable GL_TEXTURE_2D;
1564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1565 1702
1566 if ($tex->{format} == GL_ALPHA) { 1703 if ($tex->{format} == GL_ALPHA) {
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1567 glColor @{$self->{fg}}; 1705 glColor @{$self->{fg}};
1568 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1569 } else { 1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1570 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1571 } 1710 }
1572 1711
1573 glDisable GL_TEXTURE_2D; 1712 glDisable GL_TEXTURE_2D;
1574} 1713}
1575 1714
… …
1592 can_hover => 1, 1731 can_hover => 1,
1593 can_focus => 1, 1732 can_focus => 1,
1594 valign => 0, 1733 valign => 0,
1595 can_events => 1, 1734 can_events => 1,
1596 #text => ... 1735 #text => ...
1736 #hidden => "*",
1597 @_ 1737 @_
1598 ) 1738 )
1599} 1739}
1600 1740
1601sub _set_text { 1741sub _set_text {
… …
1603 1743
1604 delete $self->{cur_h}; 1744 delete $self->{cur_h};
1605 1745
1606 return if $self->{text} eq $text; 1746 return if $self->{text} eq $text;
1607 1747
1608 delete $self->{texture};
1609
1610 $self->{last_activity} = $::NOW; 1748 $self->{last_activity} = $::NOW;
1611 $self->{text} = $text; 1749 $self->{text} = $text;
1612 1750
1613 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1614 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1753 delete $self->{size_req};
1615 1754
1616 $self->_emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1756
1757 $self->realloc;
1758 $self->update;
1617} 1759}
1618 1760
1619sub set_text { 1761sub set_text {
1620 my ($self, $text) = @_; 1762 my ($self, $text) = @_;
1621 1763
1622 $self->{cursor} = length $text; 1764 $self->{cursor} = length $text;
1623 $self->_set_text ($text); 1765 $self->_set_text ($text);
1624
1625 $self->realloc;
1626} 1766}
1627 1767
1628sub get_text { 1768sub get_text {
1629 $_[0]{text} 1769 $_[0]{text}
1630} 1770}
… …
1635 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1636 1776
1637 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1638} 1778}
1639 1779
1640sub key_down { 1780sub invoke_key_down {
1641 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1642 1782
1643 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1644 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1645 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
… …
1657 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1658 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1659 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1660 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1661 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1662 $self->_emit ('escape'); 1802 $self->emit ('escape');
1663 } elsif ($uni) { 1803 } elsif ($uni) {
1664 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else {
1806 return 0;
1665 } 1807 }
1666 1808
1667 $self->_set_text ($text); 1809 $self->_set_text ($text);
1668 1810
1669 $self->realloc; 1811 $self->realloc;
1670}
1671 1812
1813 1
1814}
1815
1672sub focus_in { 1816sub invoke_focus_in {
1673 my ($self) = @_; 1817 my ($self) = @_;
1674 1818
1675 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1676 1820
1677 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1678} 1822}
1679 1823
1680sub button_down { 1824sub invoke_button_down {
1681 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1682 1826
1683 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1684 1828
1685 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1686 1830
1687 # byte-index to char-index 1831 # byte-index to char-index
1688 my $text = $self->{text}; 1832 my $text = $self->{text};
1689 utf8::encode $text; 1833 utf8::encode $text;
1690 $self->{cursor} = length substr $text, 0, $idx; 1834 $self->{cursor} = length substr $text, 0, $idx;
1691 1835
1692 $self->_set_text ($self->{text}); 1836 $self->_set_text ($self->{text});
1693 $self->update; 1837 $self->update;
1838
1839 1
1694} 1840}
1695 1841
1696sub mouse_motion { 1842sub invoke_mouse_motion {
1697 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1698# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1844# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1845
1846 1
1699} 1847}
1700 1848
1701sub _draw { 1849sub _draw {
1702 my ($self) = @_; 1850 my ($self) = @_;
1703 1851
1704 local $self->{fg} = $self->{fg}; 1852 local $self->{fg} = $self->{fg};
1705 1853
1706 if ($FOCUS == $self) { 1854 if ($FOCUS == $self) {
1707 glColor @{$self->{active_bg}}; 1855 glColor_premultiply @{$self->{active_bg}};
1708 $self->{fg} = $self->{active_fg}; 1856 $self->{fg} = $self->{active_fg};
1709 } else { 1857 } else {
1710 glColor @{$self->{bg}}; 1858 glColor_premultiply @{$self->{bg}};
1711 } 1859 }
1712 1860
1713 glEnable GL_BLEND; 1861 glEnable GL_BLEND;
1714 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1715 glBegin GL_QUADS; 1863 glBegin GL_QUADS;
1716 glVertex 0 , 0; 1864 glVertex 0 , 0;
1717 glVertex 0 , $self->{h}; 1865 glVertex 0 , $self->{h};
1718 glVertex $self->{w}, $self->{h}; 1866 glVertex $self->{w}, $self->{h};
1719 glVertex $self->{w}, 0; 1867 glVertex $self->{w}, 0;
… …
1744 1892
1745our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1746 1894
1747use CFClient::OpenGL; 1895use CFClient::OpenGL;
1748 1896
1749sub key_down { 1897sub invoke_key_down {
1750 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1751 1899
1752 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1753 1901
1754 if ($sym == 13) { 1902 if ($sym == 13) {
1755 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1756 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1757 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1758 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1759 $self->_emit (activate => $txt); 1908 $self->emit (activate => $txt);
1760 $self->update; 1909 $self->update;
1761 1910
1762 } elsif ($sym == CFClient::SDLK_UP) { 1911 } elsif ($sym == CFClient::SDLK_UP) {
1763 if ($self->{history_pointer} < 0) { 1912 if ($self->{history_pointer} < 0) {
1764 $self->{history_saveback} = $self->get_text; 1913 $self->{history_saveback} = $self->get_text;
… …
1780 } else { 1929 } else {
1781 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1782 } 1931 }
1783 1932
1784 } else { 1933 } else {
1785 $self->SUPER::key_down ($ev); 1934 return $self->SUPER::invoke_key_down ($ev)
1935 }
1936
1786 } 1937 1
1787
1788} 1938}
1789 1939
1790############################################################################# 1940#############################################################################
1791 1941
1792package CFClient::UI::Button; 1942package CFClient::UI::Button;
… …
1813 can_events => 1, 1963 can_events => 1,
1814 @_ 1964 @_
1815 ) 1965 )
1816} 1966}
1817 1967
1818sub activate { }
1819
1820sub button_up { 1968sub invoke_button_up {
1821 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1822 1970
1823 $self->emit ("activate") 1971 $self->emit ("activate")
1824 if $x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1825 && $y >= 0 && $y < $self->{h}; 1973 && $y >= 0 && $y < $self->{h};
1974
1975 1
1826} 1976}
1827 1977
1828sub _draw { 1978sub _draw {
1829 my ($self) = @_; 1979 my ($self) = @_;
1830 1980
1831 local $self->{fg} = $self->{fg}; 1981 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1832
1833 if ($GRAB == $self) {
1834 $self->{fg} = $self->{active_fg};
1835 }
1836 1982
1837 glEnable GL_TEXTURE_2D; 1983 glEnable GL_TEXTURE_2D;
1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1839 glColor 0, 0, 0, 1; 1985 glColor 0, 0, 0, 1;
1840 1986
1841 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1842 1988
1843 glDisable GL_TEXTURE_2D; 1989 glDisable GL_TEXTURE_2D;
1844 1990
1845 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1992}
1993
1994#############################################################################
1995
1996package CFClient::UI::ImageButton;
1997
1998our @ISA = CFClient::UI::Image::;
1999
2000use CFClient::OpenGL;
2001
2002my %textures;
2003
2004sub new {
2005 my $class = shift;
2006
2007 my $self = $class->SUPER::new (
2008 padding_x => 4,
2009 padding_y => 4,
2010 fg => [1, 1, 1],
2011 active_fg => [0, 0, 1],
2012 can_hover => 1,
2013 align => 0,
2014 valign => 0,
2015 can_events => 1,
2016 @_
2017 );
2018}
2019
2020sub invoke_button_up {
2021 my ($self, $ev, $x, $y) = @_;
2022
2023 $self->emit ("activate")
2024 if $x >= 0 && $x < $self->{w}
2025 && $y >= 0 && $y < $self->{h};
2026
2027 1
1846} 2028}
1847 2029
1848############################################################################# 2030#############################################################################
1849 2031
1850package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
… …
1877 my ($self) = @_; 2059 my ($self) = @_;
1878 2060
1879 (6) x 2 2061 (6) x 2
1880} 2062}
1881 2063
1882sub button_down { 2064sub invoke_button_down {
1883 my ($self, $ev, $x, $y) = @_; 2065 my ($self, $ev, $x, $y) = @_;
1884 2066
1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1887 $self->{state} = !$self->{state}; 2069 $self->{state} = !$self->{state};
1888 $self->_emit (changed => $self->{state}); 2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
1889 } 2075 1
1890} 2076}
1891 2077
1892sub _draw { 2078sub _draw {
1893 my ($self) = @_; 2079 my ($self) = @_;
1894 2080
… …
1914package CFClient::UI::Image; 2100package CFClient::UI::Image;
1915 2101
1916our @ISA = CFClient::UI::Base::; 2102our @ISA = CFClient::UI::Base::;
1917 2103
1918use CFClient::OpenGL; 2104use CFClient::OpenGL;
1919use Carp qw/confess/;
1920 2105
1921our %loaded_images; 2106our %texture_cache;
1922 2107
1923sub new { 2108sub new {
1924 my $class = shift; 2109 my $class = shift;
1925 2110
1926 my $self = $class->SUPER::new (can_events => 0, @_); 2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
1927 2115
1928 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
1929 2118
1930 $loaded_images{$self->{image}} ||= 2119 $self->{tex} = $texture_cache{$self->{path}} ||=
1931 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1932 2121
1933 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2122 Scalar::Util::weaken $texture_cache{$self->{path}};
1934 2123
1935 Scalar::Util::weaken $loaded_images{$self->{image}}; 2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1936
1937 $self->{aspect} = $tex->{w} / $tex->{h};
1938 2125
1939 $self 2126 $self
1940} 2127}
1941 2128
1942sub size_request { 2129sub size_request {
1943 my ($self) = @_; 2130 my ($self) = @_;
1944 2131
1945 ($self->{tex}->{w}, $self->{tex}->{h}) 2132 ($self->{tex}{w}, $self->{tex}{h})
1946} 2133}
1947 2134
1948sub _draw { 2135sub _draw {
1949 my ($self) = @_; 2136 my ($self) = @_;
1950 2137
… …
2061 2248
2062 my $h1 = $self->{h} * (1 - $ycut1); 2249 my $h1 = $self->{h} * (1 - $ycut1);
2063 my $h2 = $self->{h} * (1 - $ycut2); 2250 my $h2 = $self->{h} * (1 - $ycut2);
2064 2251
2065 glEnable GL_BLEND; 2252 glEnable GL_BLEND;
2066 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2067 glEnable GL_TEXTURE_2D; 2255 glEnable GL_TEXTURE_2D;
2068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2256 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2069 2257
2070 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2258 glBindTexture GL_TEXTURE_2D, $t1->{name};
2071 glBegin GL_QUADS; 2259 glBegin GL_QUADS;
… …
2185 $self->update; 2373 $self->update;
2186 2374
2187 $self 2375 $self
2188} 2376}
2189 2377
2190sub changed { }
2191
2192sub set_range { 2378sub set_range {
2193 my ($self, $range) = @_; 2379 my ($self, $range) = @_;
2194 2380
2195 ($range, $self->{range}) = ($self->{range}, $range); 2381 ($range, $self->{range}) = ($self->{range}, $range);
2196 2382
2197 $self->update
2198 if "@$range" ne "@{$self->{range}}"; 2383 if ("@$range" ne "@{$self->{range}}") {
2384 $self->update;
2385 $self->set_value ($self->{range}[0]);
2386 }
2199} 2387}
2200 2388
2201sub set_value { 2389sub set_value {
2202 my ($self, $value) = @_; 2390 my ($self, $value) = @_;
2203 2391
… …
2214 if $unit; 2402 if $unit;
2215 2403
2216 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2404 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2217 2405
2218 if ($value != $old_value) { 2406 if ($value != $old_value) {
2219 $self->_emit (changed => $value); 2407 $self->emit (changed => $value);
2220 $self->update; 2408 $self->update;
2221 } 2409 }
2222} 2410}
2223 2411
2224sub size_request { 2412sub size_request {
2225 my ($self) = @_; 2413 my ($self) = @_;
2226 2414
2227 ($self->{req_w}, $self->{req_h}) 2415 ($self->{req_w}, $self->{req_h})
2228} 2416}
2229 2417
2230sub button_down { 2418sub invoke_button_down {
2231 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2232 2420
2233 $self->SUPER::button_down ($ev, $x, $y); 2421 $self->SUPER::invoke_button_down ($ev, $x, $y);
2234 2422
2235 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2423 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236 2424
2237 $self->mouse_motion ($ev, $x, $y); 2425 $self->invoke_mouse_motion ($ev, $x, $y)
2238} 2426}
2239 2427
2240sub mouse_motion { 2428sub invoke_mouse_motion {
2241 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2242 2430
2243 if ($GRAB == $self) { 2431 if ($GRAB == $self) {
2244 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2245 2433
2246 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2434 my (undef, $lo, $hi, $page) = @{$self->{range}};
2247 2435
2248 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2436 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249 2437
2250 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2438 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2439 } else {
2440 return 0;
2441 }
2442
2251 } 2443 1
2252} 2444}
2253 2445
2254sub update { 2446sub update {
2255 my ($self) = @_; 2447 my ($self) = @_;
2256 2448
2257 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2449 delete $self->{knob_w};
2450 $self->SUPER::update;
2451}
2452
2453sub _draw {
2454 my ($self) = @_;
2455
2456 unless ($self->{knob_w}) {
2258 $self->set_value ($self->{range}[0]); 2457 $self->set_value ($self->{range}[0]);
2259 2458
2260 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2459 my ($value, $lo, $hi, $page) = @{$self->{range}};
2261 my $range = ($hi - $page - $lo) || 1e-100; 2460 my $range = ($hi - $page - $lo) || 1e-100;
2262 2461
… …
2268 $value = ($value - $lo) / $range; 2467 $value = ($value - $lo) / $range;
2269 $value = $value * $self->{scale} + $self->{offset}; 2468 $value = $value * $self->{scale} + $self->{offset};
2270 2469
2271 $self->{knob_x} = $value - $knob_w * 0.5; 2470 $self->{knob_x} = $value - $knob_w * 0.5;
2272 $self->{knob_w} = $knob_w; 2471 $self->{knob_w} = $knob_w;
2273 }); 2472 }
2274
2275 $self->SUPER::update;
2276}
2277
2278sub _draw {
2279 my ($self) = @_;
2280 2473
2281 $self->SUPER::_draw (); 2474 $self->SUPER::_draw ();
2282 2475
2283 glScale $self->{w}, $self->{h}; 2476 glScale $self->{w}, $self->{h};
2284 2477
… …
2345sub set_range { shift->{slider}->set_range (@_) } 2538sub set_range { shift->{slider}->set_range (@_) }
2346sub set_value { shift->{slider}->set_value (@_) } 2539sub set_value { shift->{slider}->set_value (@_) }
2347 2540
2348############################################################################# 2541#############################################################################
2349 2542
2350package CFClient::UI::TextView; 2543package CFClient::UI::TextScroller;
2351 2544
2352our @ISA = CFClient::UI::HBox::; 2545our @ISA = CFClient::UI::HBox::;
2353 2546
2354use CFClient::OpenGL; 2547use CFClient::OpenGL;
2355 2548
… …
2357 my $class = shift; 2550 my $class = shift;
2358 2551
2359 my $self = $class->SUPER::new ( 2552 my $self = $class->SUPER::new (
2360 fontsize => 1, 2553 fontsize => 1,
2361 can_events => 0, 2554 can_events => 0,
2555 indent => 0,
2362 #font => default_font 2556 #font => default_font
2363 @_, 2557 @_,
2364 2558
2365 layout => (new CFClient::Layout 1), 2559 layout => (new CFClient::Layout 1),
2366 par => [], 2560 par => [],
… …
2381 2575
2382 $self->{fontsize} = $fontsize; 2576 $self->{fontsize} = $fontsize;
2383 $self->reflow; 2577 $self->reflow;
2384} 2578}
2385 2579
2580sub visible_children {
2581 my ($self) = @_;
2582
2583 @{$self->{children}}[0,1]
2584}
2585
2386sub size_allocate { 2586sub invoke_size_allocate {
2387 my ($self, $w, $h, $changed) = @_; 2587 my ($self, $w, $h) = @_;
2388 2588
2389 $self->SUPER::size_allocate ($w, $h, $changed); 2589 my ($empty, $slider, @other) = @{ $self->{children} };
2390 2590 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2391 return unless $changed;
2392 2591
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2592 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2593 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 2594 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 2596
2397 $self->reflow; 2597 $self->reflow;
2398}
2399 2598
2400sub text_size { 2599 $self->SUPER::invoke_size_allocate ($w, $h)
2401 my ($self, $text, $indent) = @_; 2600}
2601
2602sub get_layout {
2603 my ($self, $para) = @_;
2402 2604
2403 my $layout = $self->{layout}; 2605 my $layout = $self->{layout};
2404 2606
2607 $layout->set_font ($self->{font}) if $self->{font};
2608 $layout->set_foreground (@{$para->{fg}});
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2609 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent); 2610 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2611 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($text); 2612 $layout->set_markup ($para->{markup});
2613
2614 $layout->set_shapes (
2615 map
2616 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2617 @{$para->{widget}}
2408 2618 );
2619
2409 $layout->size 2620 $layout
2410} 2621}
2411 2622
2412sub reflow { 2623sub reflow {
2413 my ($self) = @_; 2624 my ($self) = @_;
2414 2625
… …
2423 $self->{children}[1]->set_value ($offset); 2634 $self->{children}[1]->set_value ($offset);
2424} 2635}
2425 2636
2426sub clear { 2637sub clear {
2427 my ($self) = @_; 2638 my ($self) = @_;
2639
2640 my (undef, undef, @other) = @{ $self->{children} };
2641 $self->remove ($_) for @other;
2428 2642
2429 $self->{par} = []; 2643 $self->{par} = [];
2430 $self->{height} = 0; 2644 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2645 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432} 2646}
2433 2647
2434sub add_paragraph { 2648sub add_paragraph {
2435 my ($self, $color, $text, $indent) = @_; 2649 my ($self, $color, $para, $indent) = @_;
2436 2650
2437 for my $line (split /\n/, $text) { 2651 my ($text, @w) = ref $para ? @$para : $para;
2438 my ($w, $h) = $self->text_size ($line); 2652
2439 $self->{height} += $h; 2653 $para = {
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2654 w => 1e10,
2655 wrapped => 1,
2656 fg => $color,
2657 indent => $indent,
2658 markup => $text,
2659 widget => \@w,
2441 } 2660 };
2442 2661
2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2662 $self->add (@w) if @w;
2663 push @{$self->{par}}, $para;
2664
2665 $self->{need_reflow}++;
2666 $self->update;
2667}
2668
2669sub scroll_to_bottom {
2670 my ($self) = @_;
2671
2672 $self->{scroll_to_bottom} = 1;
2673 $self->update;
2444} 2674}
2445 2675
2446sub update { 2676sub update {
2447 my ($self) = @_; 2677 my ($self) = @_;
2448 2678
… …
2450 2680
2451 return unless $self->{h} > 0; 2681 return unless $self->{h} > 0;
2452 2682
2453 delete $self->{texture}; 2683 delete $self->{texture};
2454 2684
2455 $ROOT->on_post_alloc ($self, sub { 2685 $ROOT->on_post_alloc ($self => sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2686 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457 2687
2458 if (delete $self->{need_reflow}) { 2688 if (delete $self->{need_reflow}) {
2459 my $height = 0; 2689 my $height = 0;
2460 2690
2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2465 for (@{$self->{par}}) { 2691 for my $para (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2692 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2467 $layout->set_width ($W - $_->[3]); 2693 my $layout = $self->get_layout ($para);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size; 2694 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3]; 2695
2471 $_->[1] = $h; 2696 $para->{w} = $w + $para->{indent};
2697 $para->{h} = $h;
2698 $para->{wrapped} = $layout->has_wrapped;
2472 } 2699 }
2473 2700
2474 $height += $_->[1]; 2701 $height += $para->{h};
2475 } 2702 }
2476 2703
2477 $self->{height} = $height; 2704 $self->{height} = $height;
2478 2705
2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2706 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2480 2707
2481 delete $self->{texture}; 2708 delete $self->{texture};
2482 } 2709 }
2483 2710
2711 if (delete $self->{scroll_to_bottom}) {
2712 $self->{children}[1]->set_value (1e10);
2713 }
2714
2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2715 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 2716 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 2717 glClear GL_COLOR_BUFFER_BIT;
2487 2718
2488 my $top = int $self->{children}[1]{range}[0]; 2719 my $top = int $self->{children}[1]{range}[0];
2489 2720
2490 my $y0 = $top; 2721 my $y0 = $top;
2491 my $y1 = $top + $H; 2722 my $y1 = $top + $H;
2492 2723
2493 my $y = 0; 2724 my $y = 0;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498 2725
2499 glEnable GL_BLEND; 2726 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off 2727 #TODO# not correct in windows where rgba is forced off
2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2502 2729
2503 for my $par (@{$self->{par}}) { 2730 for my $para (@{$self->{par}}) {
2504 my $h = $par->[1]; 2731 my $h = $para->{h};
2505 2732
2506 if ($y0 < $y + $h && $y < $y1) { 2733 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] }); 2734
2508 $layout->set_width ($W - $par->[3]); 2735 my $layout = $self->get_layout ($para);
2509 $layout->set_markup ($par->[4]);
2510 2736
2511 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2512 2738
2513 glRasterPos $par->[3], $y - $y0; 2739 glRasterPos $para->{indent}, $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741
2742 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes;
2744
2745 for (@w) {
2746 my ($dx, $dy) = splice @s, 0, 2, ();
2747
2748 $_->{x} = $dx + $para->{indent};
2749 $_->{y} = $dy + $y - $y0;
2750
2751 $_->draw;
2752 }
2753 }
2515 } 2754 }
2516 2755
2517 $y += $h; 2756 $y += $h;
2518 } 2757 }
2519 2758
2520 glDisable GL_BLEND; 2759 glDisable GL_BLEND;
2521 }; 2760 };
2522 }); 2761 });
2523} 2762}
2524 2763
2764sub reconfigure {
2765 my ($self) = @_;
2766
2767 $self->SUPER::reconfigure;
2768
2769 $_->{w} = 1e10 for @{ $self->{par} };
2770 $self->reflow;
2771}
2772
2525sub _draw { 2773sub _draw {
2526 my ($self) = @_; 2774 my ($self) = @_;
2527 2775
2528 glEnable GL_TEXTURE_2D; 2776 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 2778 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2779 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 2780 glDisable GL_TEXTURE_2D;
2533 2781
2534 $self->{children}[1]->draw; 2782 $self->{children}[1]->draw;
2535
2536} 2783}
2537 2784
2538############################################################################# 2785#############################################################################
2539 2786
2540package CFClient::UI::Animator; 2787package CFClient::UI::Animator;
… …
2619} 2866}
2620 2867
2621sub set_tooltip_from { 2868sub set_tooltip_from {
2622 my ($self, $widget) = @_; 2869 my ($self, $widget) = @_;
2623 2870
2871 my $tooltip = $widget->{tooltip};
2872
2873 if ($ENV{CFPLUS_DEBUG} & 2) {
2874 $tooltip .= "\n\n" . (ref $widget) . "\n"
2875 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2876 . "req $widget->{req_w} $widget->{req_h}\n"
2877 . "visible $widget->{visible}";
2878 }
2879
2880 $tooltip =~ s/^\n+//;
2881 $tooltip =~ s/\n+$//;
2882
2624 $self->add (new CFClient::UI::Label 2883 $self->add (new CFClient::UI::Label
2625 markup => $widget->{tooltip}, 2884 markup => $tooltip,
2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2885 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8, 2886 fontsize => 0.8,
2628 fg => [0, 0, 0, 1], 2887 fg => [0, 0, 0, 1],
2629 ellipsise => 0, 2888 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP), 2889 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2637 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2896 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2638 2897
2639 ($w + 4, $h + 4) 2898 ($w + 4, $h + 4)
2640} 2899}
2641 2900
2642sub size_allocate { 2901sub invoke_size_allocate {
2643 my ($self, $w, $h, $changed) = @_; 2902 my ($self, $w, $h) = @_;
2644 2903
2645 return unless $changed;
2646
2647 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2904 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2648} 2905}
2649 2906
2650sub visibility_change { 2907sub invoke_visibility_change {
2651 my ($self, $visible) = @_; 2908 my ($self, $visible) = @_;
2652 2909
2653 return unless $visible; 2910 return unless $visible;
2654 2911
2655 $self->{root}->on_post_alloc ("move_$self" => sub { 2912 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2657 or return; 2914 or return;
2658 2915
2659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2916 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2660 2917
2661 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2918 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2662 if $x + $self->{w} > $::WIDTH; 2919 if $x + $self->{w} > $self->{root}{w};
2663 2920
2664 $self->move_abs ($x, $y); 2921 $self->move_abs ($x, $y);
2665 }); 2922 });
2666} 2923}
2667 2924
… …
2756 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3013 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2757 3014
2758 if ($tex) { 3015 if ($tex) {
2759 glEnable GL_TEXTURE_2D; 3016 glEnable GL_TEXTURE_2D;
2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3017 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2761 glColor 1, 1, 1, 1; 3018 glColor 0, 0, 0, 1;
2762 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3019 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2763 glDisable GL_TEXTURE_2D; 3020 glDisable GL_TEXTURE_2D;
2764 } 3021 }
2765} 3022}
2766 3023
2767sub DESTROY { 3024sub destroy {
2768 my ($self) = @_; 3025 my ($self) = @_;
2769 3026
2770 $self->{timer}->cancel 3027 $self->{timer}->cancel
2771 if $self->{timer}; 3028 if $self->{timer};
2772 3029
2773 $self->SUPER::DESTROY; 3030 $self->SUPER::destroy;
2774} 3031}
2775 3032
2776############################################################################# 3033#############################################################################
2777 3034
2778package CFClient::UI::Inventory; 3035package CFClient::UI::Buttonbar;
2779 3036
2780our @ISA = CFClient::UI::ScrolledWindow::; 3037our @ISA = CFClient::UI::HBox::;
2781 3038
2782sub new { 3039# TODO: should actualyl wrap buttons and other goodies.
2783 my $class = shift;
2784
2785 my $self = $class->SUPER::new (
2786 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2787 @_,
2788 );
2789
2790 $self
2791}
2792
2793sub set_items {
2794 my ($self, $items) = @_;
2795
2796 $self->{scrolled}->clear;
2797 return unless $items;
2798
2799 my @items = sort {
2800 ($a->{type} <=> $b->{type})
2801 or ($a->{name} cmp $b->{name})
2802 } @$items;
2803
2804 $self->{real_items} = \@items;
2805
2806 my $row = 0;
2807 for my $item (@items) {
2808 CFClient::Item::update_widgets $item;
2809
2810 $self->{scrolled}->add (0, $row, $item->{face_widget});
2811 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2812 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2813
2814 $row++;
2815 }
2816}
2817 3040
2818############################################################################# 3041#############################################################################
2819 3042
2820package CFClient::UI::Menu; 3043package CFClient::UI::Menu;
2821 3044
… …
2833 ); 3056 );
2834 3057
2835 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3058 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2836 3059
2837 for my $item (@{ $self->{items} }) { 3060 for my $item (@{ $self->{items} }) {
2838 my ($widget, $cb) = @$item; 3061 my ($widget, $cb, $tooltip) = @$item;
2839 3062
2840 # handle various types of items, only text for now 3063 # handle various types of items, only text for now
2841 if (!ref $widget) { 3064 if (!ref $widget) {
2842 $widget = new CFClient::UI::Label 3065 $widget = new CFClient::UI::Label
2843 can_hover => 1, 3066 can_hover => 1,
2844 can_events => 1, 3067 can_events => 1,
2845 text => $widget; 3068 markup => $widget,
3069 tooltip => $tooltip
2846 } 3070 }
2847 3071
2848 $self->{item}{$widget} = $item; 3072 $self->{item}{$widget} = $item;
2849 3073
2850 $self->{vbox}->add ($widget); 3074 $self->{vbox}->add ($widget);
… …
2855 3079
2856# popup given the event (must be a mouse button down event currently) 3080# popup given the event (must be a mouse button down event currently)
2857sub popup { 3081sub popup {
2858 my ($self, $ev) = @_; 3082 my ($self, $ev) = @_;
2859 3083
2860 $self->_emit ("popdown"); 3084 $self->emit ("popdown");
2861 3085
2862 # maybe save $GRAB? must be careful about events... 3086 # maybe save $GRAB? must be careful about events...
2863 $GRAB = $self; 3087 $GRAB = $self;
2864 $self->{button} = $ev->{button}; 3088 $self->{button} = $ev->{button};
2865 3089
2866 $self->show; 3090 $self->show;
2867 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3091 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2868} 3092}
2869 3093
2870sub mouse_motion { 3094sub invoke_mouse_motion {
2871 my ($self, $ev, $x, $y) = @_; 3095 my ($self, $ev, $x, $y) = @_;
2872 3096
2873 # TODO: should use vbox->find_widget or so 3097 # TODO: should use vbox->find_widget or so
2874 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3098 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875 $self->{hover} = $self->{item}{$HOVER}; 3099 $self->{hover} = $self->{item}{$HOVER};
2876}
2877 3100
3101 0
3102}
3103
2878sub button_up { 3104sub invoke_button_up {
2879 my ($self, $ev, $x, $y) = @_; 3105 my ($self, $ev, $x, $y) = @_;
2880 3106
2881 if ($ev->{button} == $self->{button}) { 3107 if ($ev->{button} == $self->{button}) {
2882 undef $GRAB; 3108 undef $GRAB;
2883 $self->hide; 3109 $self->hide;
2884 3110
2885 $self->_emit ("popdown"); 3111 $self->emit ("popdown");
2886 $self->{hover}[1]->() if $self->{hover}; 3112 $self->{hover}[1]->() if $self->{hover};
3113 } else {
3114 return 0
3115 }
3116
2887 } 3117 1
2888} 3118}
2889 3119
2890############################################################################# 3120#############################################################################
2891 3121
2892package CFClient::UI::Statusbox; 3122package CFClient::UI::Multiplexer;
2893 3123
2894our @ISA = CFClient::UI::VBox::; 3124our @ISA = CFClient::UI::Container::;
2895 3125
2896sub new { 3126sub new {
2897 my $class = shift; 3127 my $class = shift;
2898 3128
2899 $class->SUPER::new ( 3129 my $self = $class->SUPER::new (
3130 @_,
3131 );
3132
3133 $self->{current} = $self->{children}[0]
3134 if @{ $self->{children} };
3135
3136 $self
3137}
3138
3139sub add {
3140 my ($self, @widgets) = @_;
3141
3142 $self->SUPER::add (@widgets);
3143
3144 $self->{current} = $self->{children}[0]
3145 if @{ $self->{children} };
3146}
3147
3148sub set_current_page {
3149 my ($self, $page_or_widget) = @_;
3150
3151 my $widget = ref $page_or_widget
3152 ? $page_or_widget
3153 : $self->{children}[$page_or_widget];
3154
3155 $self->{current} = $widget;
3156 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3157
3158 $self->emit (page_changed => $self->{current});
3159
3160 $self->realloc;
3161}
3162
3163sub visible_children {
3164 $_[0]{current}
3165}
3166
3167sub size_request {
3168 my ($self) = @_;
3169
3170 $self->{current}->size_request
3171}
3172
3173sub invoke_size_allocate {
3174 my ($self, $w, $h) = @_;
3175
3176 $self->{current}->configure (0, 0, $w, $h);
3177
3178 1
3179}
3180
3181sub _draw {
3182 my ($self) = @_;
3183
3184 $self->{current}->draw;
3185}
3186
3187#############################################################################
3188
3189package CFClient::UI::Notebook;
3190
3191our @ISA = CFClient::UI::VBox::;
3192
3193sub new {
3194 my $class = shift;
3195
3196 my $self = $class->SUPER::new (
3197 buttonbar => (new CFClient::UI::Buttonbar),
3198 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3199 # filter => # will be put between multiplexer and $self
3200 @_,
3201 );
3202
3203 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3204 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3205
3206 $self
3207}
3208
3209sub add {
3210 my ($self, $title, $widget, $tooltip) = @_;
3211
3212 Scalar::Util::weaken $self;
3213
3214 $self->{buttonbar}->add (new CFClient::UI::Button
3215 markup => $title,
3216 tooltip => $tooltip,
3217 on_activate => sub { $self->set_current_page ($widget) },
3218 );
3219
3220 $self->{multiplexer}->add ($widget);
3221}
3222
3223sub set_current_page {
3224 my ($self, $page) = @_;
3225
3226 $self->{multiplexer}->set_current_page ($page);
3227 $self->emit (page_changed => $self->{multiplexer}{current});
3228}
3229
3230#############################################################################
3231
3232package CFClient::UI::Combobox;
3233
3234use utf8;
3235
3236our @ISA = CFClient::UI::Button::;
3237
3238sub new {
3239 my $class = shift;
3240
3241 my $self = $class->SUPER::new (
3242 options => [], # [value, title, longdesc], ...
3243 value => undef,
3244 @_,
3245 );
3246
3247 $self->_set_value ($self->{value});
3248
3249 $self
3250}
3251
3252sub invoke_button_down {
3253 my ($self, $ev) = @_;
3254
3255 my @menu_items;
3256
3257 for (@{ $self->{options} }) {
3258 my ($value, $title, $tooltip) = @$_;
3259
3260 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261 }
3262
3263 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264}
3265
3266sub _set_value {
3267 my ($self, $value) = @_;
3268
3269 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3270 or return;
3271
3272 $self->{value} = $item->[0];
3273 $self->set_markup ("$item->[1] ⇓");
3274 $self->set_tooltip ($item->[2]);
3275}
3276
3277sub set_value {
3278 my ($self, $value) = @_;
3279
3280 return unless $self->{value} ne $value;
3281
3282 $self->_set_value ($value);
3283 $self->emit (changed => $value);
3284}
3285
3286#############################################################################
3287
3288package CFClient::UI::Statusbox;
3289
3290our @ISA = CFClient::UI::VBox::;
3291
3292sub new {
3293 my $class = shift;
3294
3295 my $self = $class->SUPER::new (
2900 fontsize => 0.8, 3296 fontsize => 0.8,
2901 @_, 3297 @_,
2902 ) 3298 );
3299
3300 Scalar::Util::weaken (my $this = $self);
3301
3302 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3303
3304 $self
2903} 3305}
2904 3306
2905sub reorder { 3307sub reorder {
2906 my ($self) = @_; 3308 my ($self) = @_;
2907 my $NOW = time; 3309 my $NOW = Time::HiRes::time;
3310
3311 # freeze display when hovering over any label
3312 return if $CFClient::UI::TOOLTIP->{owner}
3313 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3314 values %{ $self->{item} };
2908 3315
2909 while (my ($k, $v) = each %{ $self->{item} }) { 3316 while (my ($k, $v) = each %{ $self->{item} }) {
2910 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3317 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2911 } 3318 }
2912 3319
… …
2915 my @items = sort { 3322 my @items = sort {
2916 $a->{pri} <=> $b->{pri} 3323 $a->{pri} <=> $b->{pri}
2917 or $b->{id} <=> $a->{id} 3324 or $b->{id} <=> $a->{id}
2918 } values %{ $self->{item} }; 3325 } values %{ $self->{item} };
2919 3326
3327 $self->{timer}->interval (1);
3328
2920 my $count = 10 + 1; 3329 my $count = 10 + 1;
2921 for my $item (@items) { 3330 for my $item (@items) {
2922 last unless --$count; 3331 last unless --$count;
2923 3332
2924 push @widgets, $item->{label} ||= do { 3333 my $label = $item->{label} ||= do {
2925 # TODO: doesn't handle markup well (read as: at all) 3334 # TODO: doesn't handle markup well (read as: at all)
2926 my $short = $item->{count} > 1 3335 my $short = $item->{count} > 1
2927 ? "<b>$item->{count} ×</b> $item->{text}" 3336 ? "<b>$item->{count} ×</b> $item->{text}"
2928 : $item->{text}; 3337 : $item->{text};
2929 3338
… …
2937 tooltip => $item->{tooltip}, 3346 tooltip => $item->{tooltip},
2938 tooltip_font => $::FONT_PROP, 3347 tooltip_font => $::FONT_PROP,
2939 tooltip_width => 0.67, 3348 tooltip_width => 0.67,
2940 fontsize => $item->{fontsize} || $self->{fontsize}, 3349 fontsize => $item->{fontsize} || $self->{fontsize},
2941 max_w => $::WIDTH * 0.44, 3350 max_w => $::WIDTH * 0.44,
2942 fg => $item->{fg}, 3351 fg => [@{ $item->{fg} }],
2943 can_events => 1, 3352 can_events => 1,
2944 can_hover => 1 3353 can_hover => 1
2945 }; 3354 };
3355
3356 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3357 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3358 $label->update;
3359 $label->set_max_size (undef, $label->{req_h} * $diff)
3360 if $diff < 1;
3361 $self->{timer}->interval (1/30);
3362 } else {
3363 $label->{fg}[3] = $item->{fg}[3] || 1;
3364 }
3365
3366 push @widgets, $label;
2946 } 3367 }
2947 3368
2948 $self->clear; 3369 $self->clear;
2949 $self->SUPER::add (reverse @widgets); 3370 $self->SUPER::add (reverse @widgets);
2950} 3371}
… …
2955 $text =~ s/^\s+//; 3376 $text =~ s/^\s+//;
2956 $text =~ s/\s+$//; 3377 $text =~ s/\s+$//;
2957 3378
2958 return unless $text; 3379 return unless $text;
2959 3380
2960 my $timeout = time + ((delete $arg{timeout}) || 60); 3381 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2961 3382
2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3383 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2963 3384
2964 if (my $item = $self->{item}{$group}) { 3385 if (my $item = $self->{item}{$group}) {
2965 if ($item->{text} eq $text) { 3386 if ($item->{text} eq $text) {
2966 $item->{count}++; 3387 $item->{count}++;
2967 } else { 3388 } else {
2968 $item->{count} = 1; 3389 $item->{count} = 1;
2969 $item->{text} = $item->{tooltip} = $text; 3390 $item->{text} = $item->{tooltip} = $text;
2970 } 3391 }
2971 $item->{id} = ++$self->{id}; 3392 $item->{id} += 0.2;#d#
2972 $item->{timeout} = $timeout; 3393 $item->{timeout} = $timeout;
2973 delete $item->{label}; 3394 delete $item->{label};
2974 } else { 3395 } else {
2975 $self->{item}{$group} = { 3396 $self->{item}{$group} = {
2976 id => ++$self->{id}, 3397 id => ++$self->{id},
… …
2995 3416
2996 $self->reorder; 3417 $self->reorder;
2997 $self->SUPER::reconfigure; 3418 $self->SUPER::reconfigure;
2998} 3419}
2999 3420
3421sub destroy {
3422 my ($self) = @_;
3423
3424 $self->{timer}->cancel;
3425
3426 $self->SUPER::destroy;
3427}
3428
3000############################################################################# 3429#############################################################################
3001 3430
3431package CFClient::UI::Inventory;
3432
3433our @ISA = CFClient::UI::ScrolledWindow::;
3434
3435sub new {
3436 my $class = shift;
3437
3438 my $self = $class->SUPER::new (
3439 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3440 @_,
3441 );
3442
3443 $self
3444}
3445
3446sub set_items {
3447 my ($self, $items) = @_;
3448
3449 $self->{child}->clear;
3450 return unless $items;
3451
3452 my @items = sort {
3453 ($a->{type} <=> $b->{type})
3454 or ($a->{name} cmp $b->{name})
3455 } @$items;
3456
3457 $self->{real_items} = \@items;
3458
3459 my $row = 0;
3460 for my $item (@items) {
3461 CFClient::Item::update_widgets $item;
3462
3463 $self->{child}->add (0, $row, $item->{face_widget});
3464 $self->{child}->add (1, $row, $item->{desc_widget});
3465 $self->{child}->add (2, $row, $item->{weight_widget});
3466
3467 $row++;
3468 }
3469}
3470
3471#############################################################################
3472
3473package CFClient::UI::BindEditor;
3474
3475our @ISA = CFClient::UI::FancyFrame::;
3476
3477sub new {
3478 my $class = shift;
3479
3480 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3481
3482 $self->add (my $vb = new CFClient::UI::VBox);
3483
3484
3485 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3486 text => "start recording",
3487 tooltip => "Start/Stops recording of actions."
3488 ."All subsequent actions after the recording started will be captured."
3489 ."The actions are displayed after the record was stopped."
3490 ."To bind the action you have to click on the 'Bind' button",
3491 on_activate => sub {
3492 unless ($self->{recording}) {
3493 $self->start;
3494 } else {
3495 $self->stop;
3496 }
3497 });
3498
3499 $vb->add (new CFClient::UI::Label text => "Actions:");
3500 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3501
3502 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3503 $vb->add (my $hb = new CFClient::UI::HBox);
3504 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3505 $hb->add (new CFClient::UI::Button
3506 text => "bind",
3507 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3508 on_activate => sub {
3509 $self->ask_for_bind;
3510 });
3511
3512 $vb->add (my $hb = new CFClient::UI::HBox);
3513 $hb->add (new CFClient::UI::Button
3514 text => "ok",
3515 expand => 1,
3516 tooltip => "This closes the binding editor and saves the binding",
3517 on_activate => sub {
3518 $self->hide;
3519 $self->commit;
3520 });
3521
3522 $hb->add (new CFClient::UI::Button
3523 text => "cancel",
3524 expand => 1,
3525 tooltip => "This closes the binding editor without saving",
3526 on_activate => sub {
3527 $self->hide;
3528 $self->{binding_cancel}->()
3529 if $self->{binding_cancel};
3530 });
3531
3532 $self->update_binding_widgets;
3533
3534 $self
3535}
3536
3537sub cfg_bind {
3538 my ($self, $mod, $sym, $cmds) = @_;
3539 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540 ::update_bindings ();
3541}
3542
3543sub cfg_unbind {
3544 my ($self, $mod, $sym, $cmds) = @_;
3545 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546 ::update_bindings ();
3547}
3548
3549sub commit {
3550 my ($self) = @_;
3551 my ($mod, $sym, $cmds) = $self->get_binding;
3552 if ($sym != 0 && @$cmds > 0) {
3553 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3554 ."'. Don't forget 'Save Config'!");
3555 $self->{binding_change}->($mod, $sym, $cmds)
3556 if $self->{binding_change};
3557 } else {
3558 $::STATUSBOX->add ("No action bound, no key or action specified!");
3559 $self->{binding_cancel}->()
3560 if $self->{binding_cancel};
3561 }
3562}
3563
3564sub start {
3565 my ($self) = @_;
3566
3567 $self->{rec_btn}->set_text ("stop recording");
3568 $self->{recording} = 1;
3569 $self->clear_command_list;
3570 $::CONN->start_record if $::CONN;
3571}
3572
3573sub stop {
3574 my ($self) = @_;
3575
3576 $self->{rec_btn}->set_text ("start recording");
3577 $self->{recording} = 0;
3578
3579 my $rec;
3580 $rec = $::CONN->stop_record if $::CONN;
3581 return unless ref $rec eq 'ARRAY';
3582 $self->set_command_list ($rec);
3583}
3584
3585
3586sub ask_for_bind_and_commit {
3587 my ($self) = @_;
3588 $self->ask_for_bind (1);
3589}
3590
3591sub ask_for_bind {
3592 my ($self, $commit, $end_cb) = @_;
3593
3594 CFClient::Binder::open_binding_dialog (sub {
3595 my ($mod, $sym) = @_;
3596 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3597 $self->update_binding_widgets;
3598 $self->commit if $commit;
3599 $end_cb->() if $end_cb;
3600 });
3601}
3602
3603# $mod and $sym are the modifiers and key symbol
3604# $cmds is a array ref of strings (the commands)
3605# $cb is the callback that is executed on OK
3606# $ccb is the callback that is executed on CANCEL and
3607# when the binding was unsuccessful on OK
3608sub set_binding {
3609 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3610
3611 $self->clear_command_list;
3612 $self->{recording} = 0;
3613 $self->{rec_btn}->set_text ("start recording");
3614
3615 $self->{binding} = [$mod, $sym];
3616 $self->{commands} = $cmds;
3617
3618 $self->{binding_change} = $cb;
3619 $self->{binding_cancel} = $ccb;
3620
3621 $self->update_binding_widgets;
3622}
3623
3624# this is a shortcut method that asks for a binding
3625# and then just binds it.
3626sub do_quick_binding {
3627 my ($self, $cmds, $end_cb) = @_;
3628 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3629 $self->ask_for_bind (1, $end_cb);
3630}
3631
3632sub update_binding_widgets {
3633 my ($self) = @_;
3634 my ($mod, $sym, $cmds) = $self->get_binding;
3635 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3636 $self->set_command_list ($cmds);
3637}
3638
3639sub get_binding {
3640 my ($self) = @_;
3641 return (
3642 $self->{binding}->[0],
3643 $self->{binding}->[1],
3644 [ grep { defined $_ } @{$self->{commands}} ]
3645 );
3646}
3647
3648sub clear_command_list {
3649 my ($self) = @_;
3650 $self->{cmdbox}->clear ();
3651}
3652
3653sub set_command_list {
3654 my ($self, $cmds) = @_;
3655
3656 $self->{cmdbox}->clear ();
3657 $self->{commands} = $cmds;
3658
3659 my $idx = 0;
3660
3661 for (@$cmds) {
3662 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3663
3664 my $i = $idx;
3665 $hb->add (new CFClient::UI::Label text => $_);
3666 $hb->add (new CFClient::UI::Button
3667 text => "delete",
3668 tooltip => "Deletes the action from the record",
3669 on_activate => sub {
3670 $self->{cmdbox}->remove ($hb);
3671 $cmds->[$i] = undef;
3672 });
3673
3674
3675 $idx++
3676 }
3677}
3678
3679#############################################################################
3680
3681package CFClient::UI::SpellList;
3682
3683our @ISA = CFClient::UI::Table::;
3684
3685sub new {
3686 my $class = shift;
3687
3688 my $self = $class->SUPER::new (
3689 binding => [],
3690 commands => [],
3691 @_,
3692 )
3693}
3694
3695my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3696
3697my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3698 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3699my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3701my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3705my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3707
3708sub rebuild_spell_list {
3709 my ($self) = @_;
3710
3711 $CFClient::UI::ROOT->on_refresh ($self => sub {
3712 $self->clear;
3713
3714 return unless $::CONN;
3715
3716 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3717 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3718 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3719 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3720 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3721
3722 my $row = 0;
3723
3724 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3725 my $spell = $self->{spell}{$_};
3726
3727 $row++;
3728
3729 my $spell_cb = sub {
3730 my ($widget, $ev) = @_;
3731
3732 if ($ev->{button} == 1) {
3733 $::CONN->user_send ("cast $spell->{name}");
3734 } elsif ($ev->{button} == 2) {
3735 $::CONN->user_send ("invoke $spell->{name}");
3736 } elsif ($ev->{button} == 3) {
3737 (new CFClient::UI::Menu
3738 items => [
3739 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741 ],
3742 )->popup ($ev);
3743 } else {
3744 return 0;
3745 }
3746
3747 1
3748 };
3749
3750 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3751
3752 #TODO: add path info to tooltip
3753 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3754
3755 $self->add (0, $row, new CFClient::UI::Face
3756 face => $spell->{face},
3757 can_hover => 1,
3758 can_events => 1,
3759 tooltip => $tooltip,
3760 on_button_down => $spell_cb,
3761 );
3762
3763 $self->add (1, $row, new CFClient::UI::Label
3764 expand => 1,
3765 text => $spell->{name},
3766 can_hover => 1,
3767 can_events => 1,
3768 tooltip => $tooltip,
3769 on_button_down => $spell_cb,
3770 );
3771
3772 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3773 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3774 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3775 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3776 }
3777 });
3778}
3779
3780sub add_spell {
3781 my ($self, $spell) = @_;
3782
3783 $self->{spell}->{$spell->{name}} = $spell;
3784 $self->rebuild_spell_list;
3785}
3786
3787sub remove_spell {
3788 my ($self, $spell) = @_;
3789
3790 delete $self->{spell}->{$spell->{name}};
3791 $self->rebuild_spell_list;
3792}
3793
3794sub clear_spells {
3795 my ($self) = @_;
3796
3797 $self->{spell} = {};
3798 $self->rebuild_spell_list;
3799}
3800
3801#############################################################################
3802
3002package CFClient::UI::Root; 3803package CFClient::UI::Root;
3003 3804
3004our @ISA = CFClient::UI::Container::; 3805our @ISA = CFClient::UI::Container::;
3806
3807use List::Util qw(min max);
3005 3808
3006use CFClient::OpenGL; 3809use CFClient::OpenGL;
3007 3810
3008sub new { 3811sub new {
3009 my $class = shift; 3812 my $class = shift;
… …
3016 Scalar::Util::weaken ($self->{root} = $self); 3819 Scalar::Util::weaken ($self->{root} = $self);
3017 3820
3018 $self 3821 $self
3019} 3822}
3020 3823
3021sub configure {
3022 my ($self, $x, $y, $w, $h) = @_;
3023
3024 $self->{w} = $w;
3025 $self->{h} = $h;
3026}
3027
3028sub reconfigure {
3029 my ($self) = @_;
3030
3031 $self->SUPER::reconfigure;
3032
3033 $self->size_allocate ($self->{w}, $self->{h}, 1)
3034 if $self->{w};
3035}
3036
3037sub size_request { 3824sub size_request {
3038 my ($self) = @_; 3825 my ($self) = @_;
3039 3826
3040 ($self->{w}, $self->{h}) 3827 ($self->{w}, $self->{h})
3041} 3828}
… …
3052 $coord = $max - $size if $coord > $max - $size; 3839 $coord = $max - $size if $coord > $max - $size;
3053 3840
3054 int $coord + 0.5 3841 int $coord + 0.5
3055} 3842}
3056 3843
3057sub size_allocate { 3844sub invoke_size_allocate {
3058 my ($self, $w, $h, $changed) = @_; 3845 my ($self, $w, $h) = @_;
3059 3846
3060 for my $child ($self->children) { 3847 for my $child ($self->children) {
3061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3848 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3062 3849
3063 $X = $child->{force_x} if exists $child->{force_x}; 3850 $X = $child->{force_x} if exists $child->{force_x};
… …
3066 $X = _to_pixel $X, $W, $self->{w}; 3853 $X = _to_pixel $X, $W, $self->{w};
3067 $Y = _to_pixel $Y, $H, $self->{h}; 3854 $Y = _to_pixel $Y, $H, $self->{h};
3068 3855
3069 $child->configure ($X, $Y, $W, $H); 3856 $child->configure ($X, $Y, $W, $H);
3070 } 3857 }
3858
3859 1
3071} 3860}
3072 3861
3073sub coord2local { 3862sub coord2local {
3074 my ($self, $x, $y) = @_; 3863 my ($self, $x, $y) = @_;
3075 3864
… …
3131 $_->() 3920 $_->()
3132 for values %{delete $self->{refresh_hook}}; 3921 for values %{delete $self->{refresh_hook}};
3133 } 3922 }
3134 3923
3135 if ($self->{realloc}) { 3924 if ($self->{realloc}) {
3925 my %queue;
3136 my @queue; 3926 my @queue;
3927 my $widget;
3137 3928
3929 outer:
3138 while () { 3930 while () {
3139 if ($self->{realloc}) { 3931 if (my $realloc = delete $self->{realloc}) {
3140 #TODO use array-of-depth approach 3932 for $widget (values %$realloc) {
3933 $widget->{visible} or next; # do not resize invisible widgets
3141 3934
3142 @queue = sort { $a->{visible} <=> $b->{visible} } 3935 $queue{$widget+0}++ and next; # duplicates are common
3143 @queue, values %{delete $self->{realloc}}; 3936
3937 push @{ $queue[$widget->{visible}] }, $widget;
3938 }
3144 } 3939 }
3145 3940
3941 while () {
3942 @queue or last outer;
3943
3146 my $widget = pop @queue || last; 3944 $widget = pop @{ $queue[-1] || [] }
3945 and last;
3946
3947 pop @queue;
3948 }
3147 3949
3148 $widget->{visible} or last; # do not resize invisible widgets 3950 delete $queue{$widget+0};
3149 3951
3150 my ($w, $h) = $widget->size_request; 3952 my ($w, $h) = $widget->size_request;
3151 3953
3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3954 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3955 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3956
3957 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3958 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3154 3959
3155 $w = $widget->{force_w} if exists $widget->{force_w}; 3960 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h}; 3961 $h = $widget->{force_h} if exists $widget->{force_h};
3157 3962
3963 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3964 || delete $widget->{force_realloc}) {
3158 $widget->{req_w} = $w; 3965 $widget->{req_w} = $w;
3159 $widget->{req_h} = $h; 3966 $widget->{req_h} = $h;
3160 3967
3161 $self->{size_alloc}{$widget} = [$widget, undef, undef]; 3968 $self->{size_alloc}{$widget+0} = $widget;
3162 3969
3163 push @queue, $widget->{parent} 3970 if (my $parent = $widget->{parent}) {
3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent}; 3971 $self->{realloc}{$parent+0} = $parent
3972 unless $queue{$parent+0};
3973
3974 $parent->{force_size_alloc} = 1;
3975 $self->{size_alloc}{$parent+0} = $parent;
3976 }
3977 }
3978
3979 delete $self->{realloc}{$widget+0};
3165 } 3980 }
3166 } 3981 }
3167 3982
3168 while (my $size_alloc = delete $self->{size_alloc}) { 3983 while (my $size_alloc = delete $self->{size_alloc}) {
3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3984 my @queue = sort { $b->{visible} <=> $a->{visible} }
3170 values %$size_alloc; 3985 values %$size_alloc;
3171 3986
3172 while () { 3987 while () {
3173 my ($widget, $w, $h) = @{ pop @queue or last }; 3988 my $widget = pop @queue || last;
3174 3989
3175 $w = $widget->{w} || $widget->{req_w} unless defined $w; 3990 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3177 3991
3178 $w = 0 if $w < 0; 3992 $w = 0 if $w < 0;
3179 $h = 0 if $h < 0; 3993 $h = 0 if $h < 0;
3180 3994
3181 $w = int $w + 0.5; 3995 $w = int $w + 0.5;
3182 $h = int $h + 0.5; 3996 $h = int $h + 0.5;
3183 3997
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3998 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999 $widget->{old_w} = $widget->{w};
4000 $widget->{old_h} = $widget->{h};
3185 4001
3186 $widget->{w} = $w; 4002 $widget->{w} = $w;
3187 $widget->{h} = $h; 4003 $widget->{h} = $h;
3188 4004
3189 $widget->emit (size_allocate => $w, $h, $changed); 4005 $widget->emit (size_allocate => $w, $h);
4006 }
3190 } 4007 }
3191 } 4008 }
3192 4009
3193 while ($self->{post_alloc_hook}) { 4010 while ($self->{post_alloc_hook}) {
3194 $_->() 4011 $_->()
3195 for values %{delete $self->{post_alloc_hook}}; 4012 for values %{delete $self->{post_alloc_hook}};
3196 } 4013 }
4014
3197 4015
3198 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4016 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3199 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4017 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3200 glClear GL_COLOR_BUFFER_BIT; 4018 glClear GL_COLOR_BUFFER_BIT;
3201 4019
… …
3203 glLoadIdentity; 4021 glLoadIdentity;
3204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4022 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3205 glMatrixMode GL_MODELVIEW; 4023 glMatrixMode GL_MODELVIEW;
3206 glLoadIdentity; 4024 glLoadIdentity;
3207 4025
4026 {
4027 package CFClient::UI::Base;
4028
4029 ($draw_x, $draw_y, $draw_w, $draw_h) =
4030 (0, 0, $self->{w}, $self->{h});
4031 }
4032
3208 $self->_draw; 4033 $self->_draw;
3209} 4034}
3210 4035
3211############################################################################# 4036#############################################################################
3212 4037

Diff Legend

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