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.286 by root, Mon Jun 5 03:48:49 2006 UTC vs.
Revision 1.387 by root, Fri Jul 20 18:19:45 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
98 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
100 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
101} 125}
102 126
103sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
104 my ($ev) = @_; 128 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 129
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 131
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 133
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
112 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 136
114 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 139 $grab->update if $grab;
117 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
118 141
142 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 143 $TOOLTIP_WATCHER->cb->();
120 } 144 }
121} 145}
122 146
123sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
124 my ($ev) = @_; 148 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
126 150
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 152
129 if ($widget != $HOVER) { 153 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 154
132 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 156 if $HOVER;
140} 157}
141 158
142# convert position array to integers 159# convert position array to integers
143sub harmonize { 160sub harmonize {
… …
193 reconfigure_widgets; 210 reconfigure_widgets;
194} 211}
195 212
196############################################################################# 213#############################################################################
197 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
198package CFClient::UI::Base; 223package CFPlus::UI::Base;
199 224
200use strict; 225use strict;
201 226
202use CFClient::OpenGL; 227use CFPlus::OpenGL;
203 228
204sub new { 229sub new {
205 my $class = shift; 230 my $class = shift;
206 231
207 my $self = bless { 232 my $self = bless {
… …
212 h => undef, 237 h => undef,
213 can_events => 1, 238 can_events => 1,
214 @_ 239 @_
215 }, $class; 240 }, $class;
216 241
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 243
219 for (keys %$self) { 244 for (keys %$self) {
220 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
222 } 247 }
223 } 248 }
224 249
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 255
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 258
234 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
239 264
240sub destroy { 265sub destroy {
241 my ($self) = @_; 266 my ($self) = @_;
242 267
243 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
244 %$self = (); 270 %$self = ();
245} 271}
246 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
247sub show { 277sub show {
248 my ($self) = @_; 278 my ($self) = @_;
249 279
250 return if $self->{parent}; 280 return if $self->{parent};
251 281
252 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
253} 283}
254 284
255sub set_visible { 285sub set_visible {
256 my ($self) = @_; 286 my ($self) = @_;
257 287
… …
272 302
273 return unless $self->{visible}; 303 return unless $self->{visible};
274 304
275 $_->set_invisible for $self->children; 305 $_->set_invisible for $self->children;
276 306
307 delete $self->{visible};
277 delete $self->{root}; 308 delete $self->{root};
278 delete $self->{visible};
279 309
280 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
282 312
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
285 315
286 $self->focus_out; 316 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
289} 318}
290 319
291sub set_visibility { 320sub set_visibility {
292 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
293 322
294 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
295 324
296 $visible ? $self->hide 325 $visible ? $self->show
297 : $self->show; 326 : $self->hide;
298} 327}
299 328
300sub toggle_visibility { 329sub toggle_visibility {
301 my ($self) = @_; 330 my ($self) = @_;
302 331
… …
315} 344}
316 345
317sub move_abs { 346sub move_abs {
318 my ($self, $x, $y, $z) = @_; 347 my ($self, $x, $y, $z) = @_;
319 348
320 $self->{x} = List::Util::max 0, int $x; 349 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
321 $self->{y} = List::Util::max 0, int $y; 350 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322 $self->{z} = $z if defined $z; 351 $self->{z} = $z if defined $z;
323 352
324 $self->update; 353 $self->update;
325} 354}
326 355
… …
336sub size_request { 365sub size_request {
337 require Carp; 366 require Carp;
338 Carp::confess "size_request is abstract"; 367 Carp::confess "size_request is abstract";
339} 368}
340 369
370sub baseline_shift {
371 0
372}
373
341sub configure { 374sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
343 376
344 if ($self->{aspect}) { 377 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
346 379
347 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349 382
350 # use alignment to adjust x, y 383 # use alignment to adjust x, y
351 384
352 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
353 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
367 400
368 $self->{root}{size_alloc}{$self+0} = $self; 401 $self->{root}{size_alloc}{$self+0} = $self;
369 } 402 }
370} 403}
371 404
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 405sub children {
377 # nop 406 # nop
378} 407}
379 408
380sub visible_children { 409sub visible_children {
… …
398 427
399 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
400 429
401 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
402 431
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
406 } 435 }
407} 436}
408 437
409# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
410sub coord2local { 439sub coord2local {
411 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
412 441
442 Carp::confess unless $self->{parent};#d#
443
413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414} 445}
415 446
416# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
417sub coord2global { 448sub coord2global {
418 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
419 450
451 Carp::confess unless $self->{parent};#d#
452
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 454}
422 455
423sub focus_in { 456sub invoke_focus_in {
424 my ($self) = @_; 457 my ($self) = @_;
425 458
426 return if $FOCUS == $self; 459 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
428 461
429 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
430 463
431 $self->_emit (focus_in => $focus); 464 $self->update;
432 465
433 $focus->update if $focus; 466 0
434 $FOCUS->update;
435} 467}
436 468
437sub focus_out { 469sub invoke_focus_out {
438 my ($self) = @_; 470 my ($self) = @_;
439 471
440 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
441 473
442 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
443 475
444 $self->_emit (focus_out => $focus); 476 $self->update;
445 477
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 479 unless $FOCUS;
450}
451 480
481 0
482}
483
484sub grab_focus {
485 my ($self) = @_;
486
487 $FOCUS->emit ("focus_out") if $FOCUS;
488 $self->emit ("focus_in");
489}
490
452sub mouse_motion { 0 } 491sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 492sub invoke_button_up { 0 }
454sub key_down { 0 } 493sub invoke_key_down { 0 }
455sub key_up { 0 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
456 496
457sub button_down { 497sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
459 499
460 $self->focus_in; 500 $self->grab_focus;
461 501
462 0 502 0
463} 503}
464 504
505sub connect {
506 my ($self, $signal, $cb) = @_;
507
508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
528
529sub emit {
530 my ($self, $signal, @args) = @_;
531
532 # I do not really like this solution, but I do not like duplication
533 # and needlessly verbose code, either.
534 my @append
535 = $has_coords{$signal}
536 ? $args[0]->xy ($self)
537 : ();
538
539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
540
541 for my $cb (
542 @{$self->{signal_cb}{$signal} || []}, # before
543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args)
550}
551
465sub find_widget { 552#sub find_widget {
466 my ($self, $x, $y) = @_; 553# in .xs
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476 554
477sub set_parent { 555sub set_parent {
478 my ($self, $parent) = @_; 556 my ($self, $parent) = @_;
479 557
480 Scalar::Util::weaken ($self->{parent} = $parent); 558 CFPlus::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 559 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505} 560}
506 561
507sub realloc { 562sub realloc {
508 my ($self) = @_; 563 my ($self) = @_;
509 564
… …
542 return unless $self->{h} && $self->{w}; 597 return unless $self->{h} && $self->{w};
543 598
544 # update screen rectangle 599 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 600 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 601 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 602
550 # skip widgets that are entirely outside the drawing area 603 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 604 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 605 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 606
… …
576 glVertex $self->{w} - 1, 0; 629 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1; 630 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1; 631 glVertex 0 , $self->{h} - 1;
579 glEnd; 632 glEnd;
580 glPopMatrix; 633 glPopMatrix;
581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 634 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582 } 635 }
583 636
584 $self->_draw; 637 $self->_draw;
585 glPopMatrix; 638 glPopMatrix;
586} 639}
… …
589 my ($self) = @_; 642 my ($self) = @_;
590 643
591 warn "no draw defined for $self\n"; 644 warn "no draw defined for $self\n";
592} 645}
593 646
647my $cntx;#d#
594sub DESTROY { 648sub DESTROY {
595 my ($self) = @_; 649 my ($self) = @_;
596 650
651 return if CFPlus::in_destruct;
652
653 eval { $self->destroy };
654 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
655
597 delete $WIDGET{$self+0}; 656 delete $WIDGET{$self+0};
598 #$self->deactivate;
599} 657}
600 658
601############################################################################# 659#############################################################################
602 660
603package CFClient::UI::DrawBG; 661package CFPlus::UI::DrawBG;
604 662
605our @ISA = CFClient::UI::Base::; 663our @ISA = CFPlus::UI::Base::;
606 664
607use strict; 665use strict;
608use CFClient::OpenGL; 666use CFPlus::OpenGL;
609 667
610sub new { 668sub new {
611 my $class = shift; 669 my $class = shift;
612 670
613 # range [value, low, high, page] 671 # range [value, low, high, page]
… …
644 } 702 }
645} 703}
646 704
647############################################################################# 705#############################################################################
648 706
649package CFClient::UI::Empty; 707package CFPlus::UI::Empty;
650 708
651our @ISA = CFClient::UI::Base::; 709our @ISA = CFPlus::UI::Base::;
652 710
653sub new { 711sub new {
654 my ($class, %arg) = @_; 712 my ($class, %arg) = @_;
655 $class->SUPER::new (can_events => 0, %arg); 713 $class->SUPER::new (can_events => 0, %arg);
656} 714}
… …
663 721
664sub draw { } 722sub draw { }
665 723
666############################################################################# 724#############################################################################
667 725
668package CFClient::UI::Container; 726package CFPlus::UI::Container;
669 727
670our @ISA = CFClient::UI::Base::; 728our @ISA = CFPlus::UI::Base::;
671 729
672sub new { 730sub new {
673 my ($class, %arg) = @_; 731 my ($class, %arg) = @_;
674 732
675 my $children = delete $arg{children}; 733 my $children = delete $arg{children};
… …
684 if $children; 742 if $children;
685 743
686 $self 744 $self
687} 745}
688 746
747sub realloc {
748 my ($self) = @_;
749
750 $self->{force_realloc} = 1;
751 $self->{force_size_alloc} = 1;
752 $self->SUPER::realloc;
753}
754
689sub add { 755sub add {
690 my ($self, @widgets) = @_; 756 my ($self, @widgets) = @_;
691 757
692 $_->set_parent ($self) 758 $_->set_parent ($self)
693 for @widgets; 759 for @widgets;
… …
753 $_->draw for @{$self->{children}}; 819 $_->draw for @{$self->{children}};
754} 820}
755 821
756############################################################################# 822#############################################################################
757 823
758package CFClient::UI::Bin; 824package CFPlus::UI::Bin;
759 825
760our @ISA = CFClient::UI::Container::; 826our @ISA = CFPlus::UI::Container::;
761 827
762sub new { 828sub new {
763 my ($class, %arg) = @_; 829 my ($class, %arg) = @_;
764 830
765 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 831 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
766 832
767 $class->SUPER::new (children => [$child], %arg) 833 $class->SUPER::new (children => [$child], %arg)
768} 834}
769 835
770sub add { 836sub add {
771 my ($self, $child) = @_; 837 my ($self, $child) = @_;
772 838
773 $self->{children} = []; 839 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 840 $self->SUPER::add ($child);
776} 841}
777 842
778sub remove { 843sub remove {
779 my ($self, $widget) = @_; 844 my ($self, $widget) = @_;
780 845
781 $self->SUPER::remove ($widget); 846 $self->SUPER::remove ($widget);
782 847
783 $self->{children} = [new CFClient::UI::Empty] 848 $self->{children} = [new CFPlus::UI::Empty]
784 unless @{$self->{children}}; 849 unless @{$self->{children}};
785} 850}
786 851
787sub child { $_[0]->{children}[0] } 852sub child { $_[0]->{children}[0] }
788 853
789sub size_request { 854sub size_request {
790 $_[0]{children}[0]->size_request 855 $_[0]{children}[0]->size_request
791} 856}
792 857
793sub size_allocate { 858sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 859 my ($self, $w, $h) = @_;
795 860
796 $self->{children}[0]->configure (0, 0, $w, $h); 861 $self->{children}[0]->configure (0, 0, $w, $h);
862
863 1
797} 864}
798 865
799############################################################################# 866#############################################################################
800 867
801# back-buffered drawing area 868# back-buffered drawing area
802 869
803package CFClient::UI::Window; 870package CFPlus::UI::Window;
804 871
805our @ISA = CFClient::UI::Bin::; 872our @ISA = CFPlus::UI::Bin::;
806 873
807use CFClient::OpenGL; 874use CFPlus::OpenGL;
808 875
809sub new { 876sub new {
810 my ($class, %arg) = @_; 877 my ($class, %arg) = @_;
811 878
812 my $self = $class->SUPER::new (%arg); 879 my $self = $class->SUPER::new (%arg);
… …
817 884
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 885 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 886 $self->SUPER::update;
820} 887}
821 888
822sub size_allocate { 889sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 890 my ($self, $w, $h) = @_;
824 891
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 892 $self->update;
893
894 $self->SUPER::invoke_size_allocate ($w, $h)
827} 895}
828 896
829sub _render { 897sub _render {
830 my ($self) = @_; 898 my ($self) = @_;
831 899
… …
833} 901}
834 902
835sub render_child { 903sub render_child {
836 my ($self) = @_; 904 my ($self) = @_;
837 905
838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 906 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
839 glClearColor 0, 0, 0, 0; 907 glClearColor 0, 0, 0, 0;
840 glClear GL_COLOR_BUFFER_BIT; 908 glClear GL_COLOR_BUFFER_BIT;
841 909
842 { 910 {
843 package CFClient::UI::Base; 911 package CFPlus::UI::Base;
844 912
845 ($draw_x, $draw_y, $draw_w, $draw_h) = 913 local ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h}); 914 (0, 0, $self->{w}, $self->{h});
915
916 $self->_render;
847 } 917 }
848
849 $self->_render;
850 }; 918 };
851} 919}
852 920
853sub _draw { 921sub _draw {
854 my ($self) = @_; 922 my ($self) = @_;
855
856 my ($w, $h) = @$self{qw(w h)};
857 923
858 my $tex = $self->{texture} 924 my $tex = $self->{texture}
859 or return; 925 or return;
860 926
861 glEnable GL_TEXTURE_2D; 927 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 928 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863 glColor 0, 0, 0, 1; 929 glColor 0, 0, 0, 1;
864 930
865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 931 $tex->draw_quad_alpha_premultiplied (0, 0);
866 932
867 glDisable GL_TEXTURE_2D; 933 glDisable GL_TEXTURE_2D;
868} 934}
869 935
870############################################################################# 936#############################################################################
871 937
872package CFClient::UI::ViewPort; 938package CFPlus::UI::ViewPort;
873 939
940use List::Util qw(min max);
941
874our @ISA = CFClient::UI::Window::; 942our @ISA = CFPlus::UI::Window::;
875 943
876sub new { 944sub new {
877 my $class = shift; 945 my $class = shift;
878 946
879 $class->SUPER::new ( 947 $class->SUPER::new (
… …
892 $h = 10 if $self->{scroll_y}; 960 $h = 10 if $self->{scroll_y};
893 961
894 ($w, $h) 962 ($w, $h)
895} 963}
896 964
897sub size_allocate { 965sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 966 my ($self, $w, $h) = @_;
899 967
900 my $child = $self->child; 968 my $child = $self->child;
901 969
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 970 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 971 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 972
905 $self->child->configure (0, 0, $w, $h); 973 $self->child->configure (0, 0, $w, $h);
906 $self->update; 974 $self->update;
975
976 1
907} 977}
908 978
909sub set_offset { 979sub set_offset {
910 my ($self, $x, $y) = @_; 980 my ($self, $x, $y) = @_;
911 981
982 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
983 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
984
985 if ($x != $self->{view_x} or $y != $self->{view_y}) {
912 $self->{view_x} = int $x; 986 $self->{view_x} = $x;
913 $self->{view_y} = int $y; 987 $self->{view_y} = $y;
914 988
989 $self->emit (changed => $x, $y);
915 $self->update; 990 $self->update;
991 }
916} 992}
917 993
918# hmm, this does not work for topleft of $self... but we should not ask for that 994# hmm, this does not work for topleft of $self... but we should not ask for that
919sub coord2local { 995sub coord2local {
920 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
… …
935 my ($self, $x, $y) = @_; 1011 my ($self, $x, $y) = @_;
936 1012
937 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1013 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1014 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
939 ) { 1015 ) {
940 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1016 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941 } else { 1017 } else {
942 $self->CFClient::UI::Base::find_widget ($x, $y) 1018 $self->CFPlus::UI::Base::find_widget ($x, $y)
943 } 1019 }
944} 1020}
945 1021
946sub _render { 1022sub _render {
947 my ($self) = @_; 1023 my ($self) = @_;
948 1024
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1025 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1026 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
951 1027
952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1028 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953 1029
954 $self->SUPER::_render; 1030 $self->SUPER::_render;
955} 1031}
956 1032
957############################################################################# 1033#############################################################################
958 1034
959package CFClient::UI::ScrolledWindow; 1035package CFPlus::UI::ScrolledWindow;
960 1036
961our @ISA = CFClient::UI::HBox::; 1037our @ISA = CFPlus::UI::Table::;
962 1038
963sub new { 1039sub new {
964 my ($class, %arg) = @_; 1040 my ($class, %arg) = @_;
965 1041
966 my $child = delete $arg{child}; 1042 my $child = delete $arg{child};
967 1043
968 my $self; 1044 my $self;
969 1045
970 my $slider = new CFClient::UI::Slider 1046 my $hslider = new CFPlus::UI::Slider
1047 vertical => 0,
1048 range => [0, 0, 1, 0.01], # HACK fix
1049 on_changed => sub {
1050 $self->{hpos} = $_[1];
1051 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052 },
1053 ;
1054
1055 my $vslider = new CFPlus::UI::Slider
971 vertical => 1, 1056 vertical => 1,
972 range => [0, 0, 1, 0.01], # HACK fix 1057 range => [0, 0, 1, 0.01], # HACK fix
973 on_changed => sub { 1058 on_changed => sub {
974 $self->{vp}->set_offset (0, $_[1]); 1059 $self->{vpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
975 }, 1061 },
976 ; 1062 ;
977 1063
978 $self = $class->SUPER::new ( 1064 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1065 scroll_x => 0,
1066 scroll_y => 1,
1067 can_events => 1,
980 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
981 %arg, 1072 %arg,
982 ); 1073 );
983 1074
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1075 $self->{vp} = new CFPlus::UI::ViewPort
1076 expand => 1,
1077 scroll_x => $self->{scroll_x},
1078 scroll_y => $self->{scroll_y},
1079 on_changed => sub {
1080 my ($vp, $x, $y) = @_;
1081
1082 $vp->{parent}{hslider}->set_value ($x);
1083 $vp->{parent}{vslider}->set_value ($y);
1084
1085 0
1086 },
1087 ;
1088
1089 $self->SUPER::add_at (0, 0, $self->{vp});
1090
985 $self->add ($child) if $child; 1091 $self->add ($child) if $child;
986 1092
987 $self 1093 $self
988} 1094}
1095
1096#TODO# update range on size_allocate depending on child
989 1097
990sub add { 1098sub add {
991 my ($self, $widget) = @_; 1099 my ($self, $widget) = @_;
992 1100
993 $self->{vp}->add ($self->{child} = $widget); 1101 $self->{vp}->add ($self->{child} = $widget);
994} 1102}
995 1103
1104sub update_slider {
1105 my ($self) = @_;
1106
1107 my $child = ($self->{vp} or return)->child;
1108
1109 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1111
1112 my $visible = $w1 > $w2;
1113 if ($visible != $self->{hslider}{visible}) {
1114 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1115 : $self->{hslider}->hide;
1116 }
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120
1121 my $visible = $h1 > $h2;
1122 if ($visible != $self->{vslider}{visible}) {
1123 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1124 : $self->{vslider}->hide;
1125 }
1126}
1127
996sub update { 1128sub update {
997 my ($self) = @_; 1129 my ($self) = @_;
998 1130
1131 $self->update_slider;
999 $self->SUPER::update; 1132 $self->SUPER::update;
1000
1001 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1133}
1005 1134
1135sub invoke_mouse_wheel {
1136 my ($self, $ev) = @_;
1137
1138 return 0 unless $ev->{dy}; # only vertical movements for now
1139
1140 $self->{vslider}->emit (mouse_wheel => $ev);
1141
1142 1
1143}
1144
1145sub invoke_button_down {
1146 my ($self, $ev, $x, $y) = @_;
1147
1148 if ($ev->{button} == 2) {
1149 $self->grab_focus;
1150
1151 my $ox = $self->{vp}{view_x} + $ev->{x};
1152 my $oy = $self->{vp}{view_y} + $ev->{y};
1153
1154 $self->{motion} = sub {
1155 my ($ev, $x, $y) = @_;
1156
1157 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1158 $self->update;
1159 };
1160
1161 return 1;
1162 }
1163
1164 0
1165}
1166
1167sub invoke_button_up {
1168 my ($self, $ev, $x, $y) = @_;
1169
1170 if (delete $self->{motion}) {
1171 return 1;
1172 }
1173
1174 0
1175}
1176
1177sub invoke_mouse_motion {
1178 my ($self, $ev, $x, $y) = @_;
1179
1180 if ($self->{motion}) {
1181 $self->{motion}->($ev, $x, $y);
1182 return 1;
1183 }
1184
1185 0
1186}
1187
1006sub size_allocate { 1188sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1189 my ($self, $w, $h) = @_;
1008 1190
1191 $self->update_slider;
1009 $self->SUPER::size_allocate ($w, $h); 1192 $self->SUPER::invoke_size_allocate ($w, $h)
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013} 1193}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1194
1018############################################################################# 1195#############################################################################
1019 1196
1020package CFClient::UI::Frame; 1197package CFPlus::UI::Frame;
1021 1198
1022our @ISA = CFClient::UI::Bin::; 1199our @ISA = CFPlus::UI::Bin::;
1023 1200
1024use CFClient::OpenGL; 1201use CFPlus::OpenGL;
1025 1202
1026sub new { 1203sub new {
1027 my $class = shift; 1204 my $class = shift;
1028 1205
1029 $class->SUPER::new ( 1206 $class->SUPER::new (
… …
1055 $self->SUPER::_draw; 1232 $self->SUPER::_draw;
1056} 1233}
1057 1234
1058############################################################################# 1235#############################################################################
1059 1236
1060package CFClient::UI::FancyFrame; 1237package CFPlus::UI::FancyFrame;
1061 1238
1062our @ISA = CFClient::UI::Bin::; 1239our @ISA = CFPlus::UI::Bin::;
1063 1240
1064use CFClient::OpenGL; 1241use CFPlus::OpenGL;
1065
1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1242
1074sub new { 1243sub new {
1075 my ($class, %arg) = @_; 1244 my ($class, %arg) = @_;
1076 1245
1077 my $title = delete $arg{title}; 1246 if ((exists $arg{label}) && !ref $arg{label}) {
1247 $arg{label} = new CFPlus::UI::Label
1248 align => 1,
1249 valign => 0,
1250 text => $arg{label},
1251 fontsize => ($arg{border} || 0.8) * 0.75;
1252 }
1253
1254 my $self = $class->SUPER::new (
1255 # label => "",
1256 fg => [0.6, 0.3, 0.1],
1257 border => 0.8,
1258 style => 'single',
1259 %arg,
1260 );
1261
1262 $self
1263}
1264
1265sub add {
1266 my ($self, @widgets) = @_;
1267
1268 $self->SUPER::add (@widgets);
1269 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1270}
1271
1272sub border {
1273 int $_[0]{border} * $::FONTSIZE
1274}
1275
1276sub size_request {
1277 my ($self) = @_;
1278
1279 ($self->{label_w}, undef) = $self->{label}->size_request
1280 if $self->{label};
1281
1282 my ($w, $h) = $self->SUPER::size_request;
1283
1284 (
1285 $w + $self->border * 2,
1286 $h + $self->border * 2,
1287 )
1288}
1289
1290sub invoke_size_allocate {
1291 my ($self, $w, $h) = @_;
1292
1293 my $border = $self->border;
1294
1295 $w -= List::Util::max 0, $border * 2;
1296 $h -= List::Util::max 0, $border * 2;
1297
1298 if (my $label = $self->{label}) {
1299 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1300 $label->{h} = List::Util::min $h, $border;
1301 $label->invoke_size_allocate ($label->{w}, $label->{h});
1302 }
1303
1304 $self->child->configure ($border, $border, $w, $h);
1305
1306 1
1307}
1308
1309sub _draw {
1310 my ($self) = @_;
1311
1312 my $child = $self->{children}[0];
1313
1314 my $border = $self->border;
1315 my ($w, $h) = ($self->{w}, $self->{h});
1316
1317 $child->draw;
1318
1319 glColor @{$self->{fg}};
1320 glBegin GL_LINE_STRIP;
1321 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1322 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1323 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1324 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1325 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1327 glEnd;
1328
1329 if ($self->{label}) {
1330 glTranslate $border * 2, 0;
1331 $self->{label}->_draw;
1332 }
1333}
1334
1335#############################################################################
1336
1337package CFPlus::UI::Toplevel;
1338
1339our @ISA = CFPlus::UI::Bin::;
1340
1341use CFPlus::OpenGL;
1342
1343my $bg =
1344 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1345 mipmap => 1, wrap => 1;
1346
1347my @border =
1348 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1349 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1350
1351my @icon =
1352 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1353 qw(x1_move.png x1_resize.png);
1354
1355sub new {
1356 my ($class, %arg) = @_;
1078 1357
1079 my $self = $class->SUPER::new ( 1358 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1359 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1360 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1361 border => 0.6,
1083 can_events => 1, 1362 can_events => 1,
1084 min_w => 16, 1363 min_w => 64,
1085 min_h => 16, 1364 min_h => 32,
1086 %arg, 1365 %arg,
1087 ); 1366 );
1088 1367
1089 $self->{title} = new CFClient::UI::Label 1368 $self->{title_widget} = new CFPlus::UI::Label
1090 align => 0, 1369 align => 0,
1091 valign => 1, 1370 valign => 1,
1092 text => $title, 1371 text => $self->{title},
1093 fontsize => $self->{border} 1372 fontsize => $self->{border},
1094 if defined $title; 1373 if exists $self->{title};
1374
1375 if ($self->{has_close_button}) {
1376 $self->{close_button} =
1377 new CFPlus::UI::ImageButton
1378 path => 'x1_close.png',
1379 on_activate => sub { $self->emit ("delete") };
1380
1381 $self->CFPlus::UI::Container::add ($self->{close_button});
1382 }
1095 1383
1096 $self 1384 $self
1097} 1385}
1098 1386
1099sub add { 1387sub add {
1100 my ($self, @widgets) = @_; 1388 my ($self, @widgets) = @_;
1101 1389
1102 $self->SUPER::add (@widgets); 1390 $self->SUPER::add (@widgets);
1391 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1392 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1393}
1105 1394
1106sub border { 1395sub border {
1107 int $_[0]{border} * $::FONTSIZE 1396 int $_[0]{border} * $::FONTSIZE
1108} 1397}
1109 1398
1110sub size_request { 1399sub size_request {
1111 my ($self) = @_; 1400 my ($self) = @_;
1112 1401
1113 $self->{title}->size_request 1402 $self->{title_widget}->size_request
1114 if $self->{title}; 1403 if $self->{title_widget};
1404
1405 $self->{close_button}->size_request
1406 if $self->{close_button};
1115 1407
1116 my ($w, $h) = $self->SUPER::size_request; 1408 my ($w, $h) = $self->SUPER::size_request;
1117 1409
1118 ( 1410 (
1119 $w + $self->border * 2, 1411 $w + $self->border * 2,
1120 $h + $self->border * 2, 1412 $h + $self->border * 2,
1121 ) 1413 )
1122} 1414}
1123 1415
1124sub size_allocate { 1416sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1417 my ($self, $w, $h) = @_;
1126 1418
1127 if ($self->{title}) { 1419 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1420 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1421 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1422 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1423 }
1132 1424
1133 my $border = $self->border; 1425 my $border = $self->border;
1134 1426
1135 $h -= List::Util::max 0, $border * 2; 1427 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1428 $w -= List::Util::max 0, $border * 2;
1429
1430 $self->child->configure ($border, $border, $w, $h);
1431
1432 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1433 if $self->{close_button};
1434
1435 1
1436}
1437
1438sub invoke_delete {
1439 my ($self) = @_;
1440
1441 $self->hide;
1137 1442
1138 $self->child->configure ($border, $border, $w, $h); 1443 1
1139} 1444}
1140 1445
1141sub button_down { 1446sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1447 my ($self, $ev, $x, $y) = @_;
1143 1448
1144 my ($w, $h) = @$self{qw(w h)}; 1449 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1450 my $border = $self->border;
1146 1451
… …
1177 1482
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1483 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1484
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1485 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1486 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1487 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1488 };
1184 } else { 1489 } else {
1185 return 0; 1490 return 0;
1186 } 1491 }
1187 1492
1188 1 1493 1
1189} 1494}
1190 1495
1191sub button_up { 1496sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1497 my ($self, $ev, $x, $y) = @_;
1193 1498
1194 !!delete $self->{motion} 1499 ! ! delete $self->{motion}
1195} 1500}
1196 1501
1197sub mouse_motion { 1502sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1503 my ($self, $ev, $x, $y) = @_;
1199 1504
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1505 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1506
1202 !!$self->{motion} 1507 ! ! $self->{motion}
1508}
1509
1510sub invoke_visibility_change {
1511 my ($self, $visible) = @_;
1512
1513 delete $self->{motion} unless $visible;
1514
1515 0
1203} 1516}
1204 1517
1205sub _draw { 1518sub _draw {
1206 my ($self) = @_; 1519 my ($self) = @_;
1207 1520
… …
1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1215 1528
1216 my $border = $self->border; 1529 my $border = $self->border;
1217 1530
1218 glColor @{ $self->{border_bg} }; 1531 glColor @{ $self->{border_bg} };
1219 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1532 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1533 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1534 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1535 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1536
1537 # move
1538 my $w2 = ($w - $border) * .5;
1539 my $h2 = ($h - $border) * .5;
1540 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1541 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1542 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1543
1544 # resize
1545 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1546 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1547 unless $self->{has_close_button};
1548 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1223 1550
1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1551 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1225 glColor @{ $self->{bg} }; 1552 glColor @{ $self->{bg} };
1226 1553
1227 # TODO: repeat texture not scale 1554 # TODO: repeat texture not scale
… …
1233 1560
1234 glDisable GL_TEXTURE_2D; 1561 glDisable GL_TEXTURE_2D;
1235 1562
1236 $child->draw; 1563 $child->draw;
1237 1564
1238 if ($self->{title}) { 1565 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1566 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1567 $self->{title_widget}->_draw;
1568
1569 glTranslate 0, - ($border - $self->{h});
1241 } 1570 }
1571
1572 $self->{close_button}->draw
1573 if $self->{close_button};
1242} 1574}
1243 1575
1244############################################################################# 1576#############################################################################
1245 1577
1246package CFClient::UI::Table; 1578package CFPlus::UI::Table;
1247 1579
1248our @ISA = CFClient::UI::Base::; 1580our @ISA = CFPlus::UI::Base::;
1249 1581
1250use List::Util qw(max sum); 1582use List::Util qw(max sum);
1251 1583
1252use CFClient::OpenGL; 1584use CFPlus::OpenGL;
1253 1585
1254sub new { 1586sub new {
1255 my $class = shift; 1587 my $class = shift;
1256 1588
1257 $class->SUPER::new ( 1589 $class->SUPER::new (
1590 children => [],
1258 col_expand => [], 1591 col_expand => [],
1592 row_expand => [],
1259 @_, 1593 @_,
1260 ) 1594 )
1261} 1595}
1262 1596
1263sub children { 1597sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1598 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265} 1599}
1266 1600
1601# TODO: store row/col info in child widget and use standard add/del
1267sub add { 1602sub add {
1268 my ($self, $x, $y, $child) = @_; 1603 my $self = shift;
1269 1604
1605 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1606 $self->add_at (@_);
1607}
1608
1609sub add_at {
1610 my $self = shift;
1611
1612 while (@_) {
1613 my ($col, $row, $child) = splice @_, 0, 3, ();
1614
1270 $child->set_parent ($self); 1615 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1616 $self->{children}[$row][$col] = $child;
1617 }
1272 1618
1619 $self->{force_realloc} = 1;
1620 $self->{force_size_alloc} = 1;
1273 $self->realloc; 1621 $self->realloc;
1622}
1623
1624sub remove {
1625 my ($self, $child) = @_;
1626
1627 for (@{ $self->{children} }) {
1628 for (@{ $_ || [] }) {
1629 $_ = undef if $_ == $child;
1630 }
1631 }
1274} 1632}
1275 1633
1276# TODO: move to container class maybe? send children a signal on removal? 1634# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1635sub clear {
1278 my ($self) = @_; 1636 my ($self) = @_;
… …
1319 (sum @$ws), 1677 (sum @$ws),
1320 (sum @$hs), 1678 (sum @$hs),
1321 ) 1679 )
1322} 1680}
1323 1681
1324sub size_allocate { 1682sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1683 my ($self, $w, $h) = @_;
1326 1684
1327 my ($ws, $hs) = $self->get_wh; 1685 my ($ws, $hs) = $self->get_wh;
1328 1686
1329 my $req_w = (sum @$ws) || 1; 1687 my $req_w = (sum @$ws) || 1;
1330 my $req_h = (sum @$hs) || 1; 1688 my $req_h = (sum @$hs) || 1;
1331 1689
1332 # TODO: nicer code && do row_expand 1690 # TODO: nicer code
1333 my @col_expand = @{$self->{col_expand}}; 1691 my @col_expand = @{$self->{col_expand}};
1334 @col_expand = (1) x @$ws unless @col_expand; 1692 @col_expand = (1) x @$ws unless @col_expand;
1335 my $col_expand = (sum @col_expand) || 1; 1693 my $col_expand = (sum @col_expand) || 1;
1336 1694
1337 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1696
1341 CFClient::UI::harmonize $ws; 1697 CFPlus::UI::harmonize $ws;
1698
1699 my @row_expand = @{$self->{row_expand}};
1700 @row_expand = (1) x @$ws unless @row_expand;
1701 my $row_expand = (sum @row_expand) || 1;
1702
1703 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1704
1342 CFClient::UI::harmonize $hs; 1705 CFPlus::UI::harmonize $hs;
1343 1706
1344 my $y; 1707 my $y;
1345 1708
1346 for my $r (0 .. $#{$self->{children}}) { 1709 for my $r (0 .. $#{$self->{children}}) {
1347 my $row = $self->{children}[$r] 1710 my $row = $self->{children}[$r]
… …
1361 } 1724 }
1362 1725
1363 $y += $row_h; 1726 $y += $row_h;
1364 } 1727 }
1365 1728
1729 1
1366} 1730}
1367 1731
1368sub find_widget { 1732sub find_widget {
1369 my ($self, $x, $y) = @_; 1733 my ($self, $x, $y) = @_;
1370 1734
… …
1389 } 1753 }
1390} 1754}
1391 1755
1392############################################################################# 1756#############################################################################
1393 1757
1394package CFClient::UI::Box; 1758package CFPlus::UI::Fixed;
1395 1759
1760use List::Util qw(min max);
1761
1396our @ISA = CFClient::UI::Container::; 1762our @ISA = CFPlus::UI::Container::;
1763
1764sub add {
1765 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1766
1767 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1768 $self->SUPER::add ($child);
1769}
1770
1771sub _scale($$$) {
1772 my ($mode, $val, $max) = @_;
1773
1774 $mode eq "abs" ? $val
1775 : $mode eq "rel" ? $val * $max
1776 : 0
1777}
1778
1779sub size_request {
1780 my ($self) = @_;
1781
1782 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1783
1784 # determine overall size by querying abs widgets
1785 for my $child ($self->visible_children) {
1786 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1787
1788 if ($pos eq "abs") {
1789 $w = _scale $size, $w, $child->{req_w};
1790 $h = _scale $size, $h, $child->{req_h};
1791
1792 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1793 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1794 }
1795 }
1796
1797 my $W = $x2 - $x1;
1798 my $H = $y2 - $y1;
1799
1800 # now layout remaining widgets
1801 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1803
1804 if ($pos ne "abs") {
1805 $x = _scale $pos, $x, $W;
1806 $y = _scale $pos, $x, $H;
1807 $w = _scale $size, $w, $child->{req_w};
1808 $h = _scale $size, $h, $child->{req_h};
1809
1810 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1811 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1812 }
1813 }
1814
1815 my $W = $x2 - $x1;
1816 my $H = $y2 - $y1;
1817
1818 ($W, $H)
1819}
1820
1821sub invoke_size_allocate {
1822 my ($self, $W, $H) = @_;
1823
1824 for my $child ($self->visible_children) {
1825 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1826
1827 $x = _scale $pos, $x, $W;
1828 $y = _scale $pos, $x, $H;
1829 $w = _scale $size, $w, $child->{req_w};
1830 $h = _scale $size, $h, $child->{req_h};
1831
1832 $child->configure ($x, $y, $w, $h);
1833 }
1834
1835 1
1836}
1837
1838#############################################################################
1839
1840package CFPlus::UI::Box;
1841
1842our @ISA = CFPlus::UI::Container::;
1397 1843
1398sub size_request { 1844sub size_request {
1399 my ($self) = @_; 1845 my ($self) = @_;
1400 1846
1401 $self->{vertical} 1847 $self->{vertical}
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1853 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1854 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1855 )
1410} 1856}
1411 1857
1412sub size_allocate { 1858sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1859 my ($self, $w, $h) = @_;
1414 1860
1415 my $space = $self->{vertical} ? $h : $w; 1861 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1862 my @children = $self->visible_children;
1417 1863
1418 my @req; 1864 my @req;
1419 1865
1420 if ($self->{homogeneous}) { 1866 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1867 @req = ($space / (@children || 1)) x @children;
1422 } else { 1868 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1869 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1870 my $req = List::Util::sum @req;
1425 1871
1426 if ($req > $space) { 1872 if ($req > $space) {
1427 # ah well, not enough space 1873 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1874 $_ *= $space / $req for @req;
1429 } else { 1875 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1876 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1877
1432 $space = ($space - $req) / $expand; # remaining space to give away 1878 $space = ($space - $req) / $expand; # remaining space to give away
1433 1879
1434 $req[$_] += $space * $children->[$_]{expand} 1880 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1881 for 0 .. $#children;
1436 } 1882 }
1437 } 1883 }
1438 1884
1439 CFClient::UI::harmonize \@req; 1885 CFPlus::UI::harmonize \@req;
1440 1886
1441 my $pos = 0; 1887 my $pos = 0;
1442 for (0 .. $#$children) { 1888 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1889 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1890 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1891
1446 $pos += $alloc; 1892 $pos += $alloc;
1447 } 1893 }
1448 1894
1449 1 1895 1
1450} 1896}
1451 1897
1452############################################################################# 1898#############################################################################
1453 1899
1454package CFClient::UI::HBox; 1900package CFPlus::UI::HBox;
1455 1901
1456our @ISA = CFClient::UI::Box::; 1902our @ISA = CFPlus::UI::Box::;
1457 1903
1458sub new { 1904sub new {
1459 my $class = shift; 1905 my $class = shift;
1460 1906
1461 $class->SUPER::new ( 1907 $class->SUPER::new (
… …
1464 ) 1910 )
1465} 1911}
1466 1912
1467############################################################################# 1913#############################################################################
1468 1914
1469package CFClient::UI::VBox; 1915package CFPlus::UI::VBox;
1470 1916
1471our @ISA = CFClient::UI::Box::; 1917our @ISA = CFPlus::UI::Box::;
1472 1918
1473sub new { 1919sub new {
1474 my $class = shift; 1920 my $class = shift;
1475 1921
1476 $class->SUPER::new ( 1922 $class->SUPER::new (
… …
1479 ) 1925 )
1480} 1926}
1481 1927
1482############################################################################# 1928#############################################################################
1483 1929
1484package CFClient::UI::Label; 1930package CFPlus::UI::Label;
1485 1931
1486our @ISA = CFClient::UI::DrawBG::; 1932our @ISA = CFPlus::UI::DrawBG::;
1487 1933
1488use CFClient::OpenGL; 1934use CFPlus::OpenGL;
1489 1935
1490sub new { 1936sub new {
1491 my ($class, %arg) = @_; 1937 my ($class, %arg) = @_;
1492 1938
1493 my $self = $class->SUPER::new ( 1939 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1942 #active_bg => none
1497 #font => default_font 1943 #font => default_font
1498 #text => initial text 1944 #text => initial text
1499 #markup => initial narkup 1945 #markup => initial narkup
1500 #max_w => maximum pixel width 1946 #max_w => maximum pixel width
1947 #style => 0, # render flags
1501 ellipsise => 3, # end 1948 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1949 layout => (new CFPlus::Layout),
1503 fontsize => 1, 1950 fontsize => 1,
1504 align => -1, 1951 align => -1,
1505 valign => -1, 1952 valign => -1,
1506 padding_x => 2, 1953 padding_x => 2,
1507 padding_y => 2, 1954 padding_y => 2,
1508 can_events => 0, 1955 can_events => 0,
1509 %arg 1956 %arg
1510 ); 1957 );
1511 1958
1512 if (exists $self->{template}) { 1959 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1960 my $layout = new CFPlus::Layout;
1514 $layout->set_text (delete $self->{template}); 1961 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1962 $self->{template} = $layout;
1516 } 1963 }
1517 1964
1518 if (exists $self->{markup}) { 1965 if (exists $self->{markup}) {
… …
1522 } 1969 }
1523 1970
1524 $self 1971 $self
1525} 1972}
1526 1973
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1974sub update {
1538 my ($self) = @_; 1975 my ($self) = @_;
1539 1976
1540 delete $self->{texture}; 1977 delete $self->{texture};
1541 $self->SUPER::update; 1978 $self->SUPER::update;
… …
1552 my ($self, $text) = @_; 1989 my ($self, $text) = @_;
1553 1990
1554 return if $self->{text} eq "T$text"; 1991 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1992 $self->{text} = "T$text";
1556 1993
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1994 $self->{layout}->set_text ($text);
1995
1559 delete $self->{req_h}; 1996 delete $self->{size_req};
1560
1561 $self->realloc; 1997 $self->realloc;
1562 $self->update; 1998 $self->update;
1563} 1999}
1564 2000
1565sub set_markup { 2001sub set_markup {
… …
1568 return if $self->{text} eq "M$markup"; 2004 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 2005 $self->{text} = "M$markup";
1570 2006
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 2007 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 2008
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 2009 $self->{layout}->set_markup ($markup);
2010
1575 delete $self->{req_h}; 2011 delete $self->{size_req};
1576
1577 $self->realloc; 2012 $self->realloc;
1578 $self->update; 2013 $self->update;
1579} 2014}
1580 2015
1581sub size_request { 2016sub size_request {
1582 my ($self) = @_; 2017 my ($self) = @_;
1583 2018
1584 if (exists $self->{req_h}) { 2019 $self->{size_req} ||= do {
1585 @$self{qw(req_w req_h)}
1586 } else {
1587 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2020 $self->{layout}->set_font ($self->{font}) if $self->{font};
1588 $self->{layout}->set_width ($self->{max_w} || -1); 2021 $self->{layout}->set_width ($self->{max_w} || -1);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2022 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2023 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2024 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592 2025
1593 my ($w, $h) = $self->{layout}->size; 2026 my ($w, $h) = $self->{layout}->size;
1594 2027
1595 if (exists $self->{template}) { 2028 if (exists $self->{template}) {
1596 $self->{template}->set_font ($self->{font}) if $self->{font}; 2029 $self->{template}->set_font ($self->{font}) if $self->{font};
2030 $self->{template}->set_width ($self->{max_w} || -1);
1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2031 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 2032
1599 my ($w2, $h2) = $self->{template}->size; 2033 my ($w2, $h2) = $self->{template}->size;
1600 2034
1601 $w = List::Util::max $w, $w2; 2035 $w = List::Util::max $w, $w2;
1602 $h = List::Util::max $h, $h2; 2036 $h = List::Util::max $h, $h2;
1603 } 2037 }
1604 2038
1605 ($w, $h) 2039 [$w, $h]
1606 } 2040 };
1607}
1608 2041
2042 @{ $self->{size_req} }
2043}
2044
2045sub baseline_shift {
2046 $_[0]{layout}->descent
2047}
2048
1609sub size_allocate { 2049sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 2050 my ($self, $w, $h) = @_;
1611 2051
1612 delete $self->{ox}; 2052 delete $self->{ox};
1613 2053
1614 delete $self->{texture} 2054 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2055 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2056
2057 1
1616} 2058}
1617 2059
1618sub set_fontsize { 2060sub set_fontsize {
1619 my ($self, $fontsize) = @_; 2061 my ($self, $fontsize) = @_;
1620 2062
1621 $self->{fontsize} = $fontsize; 2063 $self->{fontsize} = $fontsize;
2064 delete $self->{size_req};
1622 delete $self->{texture}; 2065 delete $self->{texture};
1623 2066
1624 $self->realloc; 2067 $self->realloc;
1625} 2068}
1626 2069
2070sub reconfigure {
2071 my ($self) = @_;
2072
2073 delete $self->{size_req};
2074 delete $self->{texture};
2075
2076 $self->SUPER::reconfigure;
2077}
2078
1627sub _draw { 2079sub _draw {
1628 my ($self) = @_; 2080 my ($self) = @_;
1629 2081
1630 $self->SUPER::_draw; # draw background, if applicable 2082 $self->SUPER::_draw; # draw background, if applicable
1631 2083
1632 my $tex = $self->{texture} ||= do { 2084 my $size = $self->{texture} ||= do {
1633 $self->{layout}->set_foreground (@{$self->{fg}}); 2085 $self->{layout}->set_foreground (@{$self->{fg}});
1634 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2086 $self->{layout}->set_font ($self->{font}) if $self->{font};
1635 $self->{layout}->set_width ($self->{w}); 2087 $self->{layout}->set_width ($self->{w});
1636 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2088 $self->{layout}->set_ellipsise ($self->{ellipsise});
1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2089 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2090 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639 2091
1640 new_from_layout CFClient::Texture $self->{layout} 2092 [$self->{layout}->size]
1641 }; 2093 };
1642 2094
1643 unless (exists $self->{ox}) { 2095 unless (exists $self->{ox}) {
1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2096 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2097 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1646 : ($self->{w} - $tex->{w}) * 0.5); 2098 : ($self->{w} - $size->[0]) * 0.5);
1647 2099
1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2100 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2101 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1650 : ($self->{h} - $tex->{h}) * 0.5); 2102 : ($self->{h} - $size->[1]) * 0.5);
1651 }; 2103 };
1652 2104
1653 glEnable GL_TEXTURE_2D; 2105 my $w = List::Util::min $self->{w} + 4, $size->[0];
1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2106 my $h = List::Util::min $self->{h} + 2, $size->[1];
1655 2107
1656 if ($tex->{format} == GL_ALPHA) { 2108 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1657 glColor @{$self->{fg}};
1658 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1659 } else {
1660 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1661 }
1662
1663 glDisable GL_TEXTURE_2D;
1664} 2109}
1665 2110
1666############################################################################# 2111#############################################################################
1667 2112
1668package CFClient::UI::EntryBase; 2113package CFPlus::UI::EntryBase;
1669 2114
1670our @ISA = CFClient::UI::Label::; 2115our @ISA = CFPlus::UI::Label::;
1671 2116
1672use CFClient::OpenGL; 2117use CFPlus::OpenGL;
1673 2118
1674sub new { 2119sub new {
1675 my $class = shift; 2120 my $class = shift;
1676 2121
1677 $class->SUPER::new ( 2122 $class->SUPER::new (
… …
1681 active_fg => [0, 0, 0], 2126 active_fg => [0, 0, 0],
1682 can_hover => 1, 2127 can_hover => 1,
1683 can_focus => 1, 2128 can_focus => 1,
1684 valign => 0, 2129 valign => 0,
1685 can_events => 1, 2130 can_events => 1,
2131 ellipsise => 0,
1686 #text => ... 2132 #text => ...
2133 #hidden => "*",
1687 @_ 2134 @_
1688 ) 2135 )
1689} 2136}
1690 2137
1691sub _set_text { 2138sub _set_text {
… …
1698 $self->{last_activity} = $::NOW; 2145 $self->{last_activity} = $::NOW;
1699 $self->{text} = $text; 2146 $self->{text} = $text;
1700 2147
1701 $text =~ s/./*/g if $self->{hidden}; 2148 $text =~ s/./*/g if $self->{hidden};
1702 $self->{layout}->set_text ("$text "); 2149 $self->{layout}->set_text ("$text ");
1703 delete $self->{req_h}; 2150 delete $self->{size_req};
1704 2151
1705 $self->_emit (changed => $self->{text}); 2152 $self->emit (changed => $self->{text});
1706 2153
1707 $self->realloc; 2154 $self->realloc;
1708 $self->update; 2155 $self->update;
1709} 2156}
1710 2157
… …
1725 my ($w, $h) = $self->SUPER::size_request; 2172 my ($w, $h) = $self->SUPER::size_request;
1726 2173
1727 ($w + 1, $h) # add 1 for cursor 2174 ($w + 1, $h) # add 1 for cursor
1728} 2175}
1729 2176
1730sub key_down { 2177sub invoke_key_down {
1731 my ($self, $ev) = @_; 2178 my ($self, $ev) = @_;
1732 2179
1733 my $mod = $ev->{mod}; 2180 my $mod = $ev->{mod};
1734 my $sym = $ev->{sym}; 2181 my $sym = $ev->{sym};
1735 my $uni = $ev->{unicode}; 2182 my $uni = $ev->{unicode};
1736 2183
1737 my $text = $self->get_text; 2184 my $text = $self->get_text;
2185
2186 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1738 2187
1739 if ($uni == 8) { 2188 if ($uni == 8) {
1740 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2189 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1741 } elsif ($uni == 127) { 2190 } elsif ($uni == 127) {
1742 substr $text, $self->{cursor}, 1, ""; 2191 substr $text, $self->{cursor}, 1, "";
1743 } elsif ($sym == CFClient::SDLK_LEFT) { 2192 } elsif ($sym == CFPlus::SDLK_LEFT) {
1744 --$self->{cursor} if $self->{cursor}; 2193 --$self->{cursor} if $self->{cursor};
1745 } elsif ($sym == CFClient::SDLK_RIGHT) { 2194 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1746 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2195 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1747 } elsif ($sym == CFClient::SDLK_HOME) { 2196 } elsif ($sym == CFPlus::SDLK_HOME) {
2197 # what a hack
2198 $self->{cursor} =
2199 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2200 ? length $1
2201 : 0;
2202 } elsif ($sym == CFPlus::SDLK_END) {
2203 # uh, again
2204 $self->{cursor} =
2205 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2206 ? $self->{cursor} + length $1
2207 : length $self->{text};
2208 } elsif ($uni == 21) { # ctrl-u
2209 $text = "";
1748 $self->{cursor} = 0; 2210 $self->{cursor} = 0;
1749 } elsif ($sym == CFClient::SDLK_END) {
1750 $self->{cursor} = length $text;
1751 } elsif ($uni == 27) { 2211 } elsif ($uni == 27) {
1752 $self->_emit ('escape'); 2212 $self->emit ('escape');
1753 } elsif ($uni) { 2213 } elsif ($uni == 0x0d) {
2214 substr $text, $self->{cursor}++, 0, "\012";
2215 } elsif ($uni >= 0x20) {
1754 substr $text, $self->{cursor}++, 0, chr $uni; 2216 substr $text, $self->{cursor}++, 0, chr $uni;
1755 } else { 2217 } else {
1756 return 0; 2218 return 0;
1757 } 2219 }
1758 2220
1759 $self->_set_text ($text); 2221 $self->_set_text ($text);
1760 2222
1761 $self->realloc; 2223 $self->realloc;
2224 $self->update;
1762 2225
1763 1 2226 1
1764} 2227}
1765 2228
1766sub focus_in { 2229sub invoke_focus_in {
1767 my ($self) = @_; 2230 my ($self) = @_;
1768 2231
1769 $self->{last_activity} = $::NOW; 2232 $self->{last_activity} = $::NOW;
1770 2233
1771 $self->SUPER::focus_in; 2234 $self->SUPER::invoke_focus_in
1772} 2235}
1773 2236
1774sub button_down { 2237sub invoke_button_down {
1775 my ($self, $ev, $x, $y) = @_; 2238 my ($self, $ev, $x, $y) = @_;
1776 2239
1777 $self->SUPER::button_down ($ev, $x, $y); 2240 $self->SUPER::invoke_button_down ($ev, $x, $y);
1778 2241
1779 my $idx = $self->{layout}->xy_to_index ($x, $y); 2242 my $idx = $self->{layout}->xy_to_index ($x, $y);
1780 2243
1781 # byte-index to char-index 2244 # byte-index to char-index
1782 my $text = $self->{text}; 2245 my $text = $self->{text};
1783 utf8::encode $text; 2246 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1784 $self->{cursor} = length substr $text, 0, $idx; 2247 $self->{cursor} = length $text;
1785 2248
1786 $self->_set_text ($self->{text}); 2249 $self->_set_text ($self->{text});
1787 $self->update; 2250 $self->update;
1788 2251
1789 1 2252 1
1790} 2253}
1791 2254
1792sub mouse_motion { 2255sub invoke_mouse_motion {
1793 my ($self, $ev, $x, $y) = @_; 2256 my ($self, $ev, $x, $y) = @_;
1794# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2257# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1795 2258
1796 0 2259 1
1797} 2260}
1798 2261
1799sub _draw { 2262sub _draw {
1800 my ($self) = @_; 2263 my ($self) = @_;
1801 2264
… …
1828 utf8::encode $text; 2291 utf8::encode $text;
1829 2292
1830 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2293 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1831 } 2294 }
1832 2295
1833 glColor @{$self->{fg}};
1834 glBegin GL_LINES; 2296 glBegin GL_LINES;
1835 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2297 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1836 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2298 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1837 glEnd; 2299 glEnd;
1838 } 2300 }
1839} 2301}
1840 2302
2303#############################################################################
2304
1841package CFClient::UI::Entry; 2305package CFPlus::UI::Entry;
1842 2306
1843our @ISA = CFClient::UI::EntryBase::; 2307our @ISA = CFPlus::UI::EntryBase::;
1844 2308
1845use CFClient::OpenGL; 2309use CFPlus::OpenGL;
1846 2310
1847sub key_down { 2311sub invoke_key_down {
1848 my ($self, $ev) = @_; 2312 my ($self, $ev) = @_;
1849 2313
1850 my $sym = $ev->{sym}; 2314 my $sym = $ev->{sym};
1851 2315
1852 if ($sym == 13) { 2316 if ($ev->{uni} == 0x0d || $sym == 13) {
1853 unshift @{$self->{history}}, 2317 unshift @{$self->{history}},
1854 my $txt = $self->get_text; 2318 my $txt = $self->get_text;
2319
1855 $self->{history_pointer} = -1; 2320 $self->{history_pointer} = -1;
1856 $self->{history_saveback} = ''; 2321 $self->{history_saveback} = '';
1857 $self->_emit (activate => $txt); 2322 $self->emit (activate => $txt);
1858 $self->update; 2323 $self->update;
1859 2324
1860 } elsif ($sym == CFClient::SDLK_UP) { 2325 } elsif ($sym == CFPlus::SDLK_UP) {
1861 if ($self->{history_pointer} < 0) { 2326 if ($self->{history_pointer} < 0) {
1862 $self->{history_saveback} = $self->get_text; 2327 $self->{history_saveback} = $self->get_text;
1863 } 2328 }
1864 if (@{$self->{history} || []} > 0) { 2329 if (@{$self->{history} || []} > 0) {
1865 $self->{history_pointer}++; 2330 $self->{history_pointer}++;
… …
1867 $self->{history_pointer} = @{$self->{history} || []} - 1; 2332 $self->{history_pointer} = @{$self->{history} || []} - 1;
1868 } 2333 }
1869 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2334 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1870 } 2335 }
1871 2336
1872 } elsif ($sym == CFClient::SDLK_DOWN) { 2337 } elsif ($sym == CFPlus::SDLK_DOWN) {
1873 $self->{history_pointer}--; 2338 $self->{history_pointer}--;
1874 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2339 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1875 2340
1876 if ($self->{history_pointer} >= 0) { 2341 if ($self->{history_pointer} >= 0) {
1877 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2342 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1878 } else { 2343 } else {
1879 $self->set_text ($self->{history_saveback}); 2344 $self->set_text ($self->{history_saveback});
1880 } 2345 }
1881 2346
1882 } else { 2347 } else {
1883 return $self->SUPER::key_down ($ev) 2348 return $self->SUPER::invoke_key_down ($ev)
1884 } 2349 }
1885 2350
1886 1 2351 1
1887} 2352}
1888 2353
1889############################################################################# 2354#############################################################################
1890 2355
2356package CFPlus::UI::TextEdit;
2357
2358our @ISA = CFPlus::UI::EntryBase::;
2359
2360use CFPlus::OpenGL;
2361
2362sub move_cursor_ver {
2363 my ($self, $dy) = @_;
2364
2365 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2366
2367 $y += $dy;
2368
2369 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2370 $self->{cursor} = $index;
2371 delete $self->{cur_h};
2372 $self->update;
2373 return;
2374 }
2375}
2376
2377sub invoke_key_down {
2378 my ($self, $ev) = @_;
2379
2380 my $sym = $ev->{sym};
2381
2382 if ($sym == CFPlus::SDLK_UP) {
2383 $self->move_cursor_ver (-1);
2384 } elsif ($sym == CFPlus::SDLK_DOWN) {
2385 $self->move_cursor_ver (+1);
2386 } else {
2387 return $self->SUPER::invoke_key_down ($ev)
2388 }
2389
2390 1
2391}
2392
2393#############################################################################
2394
1891package CFClient::UI::Button; 2395package CFPlus::UI::Button;
1892 2396
1893our @ISA = CFClient::UI::Label::; 2397our @ISA = CFPlus::UI::Label::;
1894 2398
1895use CFClient::OpenGL; 2399use CFPlus::OpenGL;
1896 2400
1897my @tex = 2401my @tex =
1898 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2402 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1899 qw(b1_button_active.png); 2403 qw(b1_button_inactive.png b1_button_active.png);
1900 2404
1901sub new { 2405sub new {
1902 my $class = shift; 2406 my $class = shift;
1903 2407
1904 $class->SUPER::new ( 2408 $class->SUPER::new (
1905 padding_x => 4, 2409 padding_x => 4,
1906 padding_y => 4, 2410 padding_y => 4,
1907 fg => [1, 1, 1], 2411 fg => [1.0, 1.0, 1.0],
1908 active_fg => [0, 0, 1], 2412 active_fg => [0.8, 0.8, 0.8],
1909 can_hover => 1, 2413 can_hover => 1,
1910 align => 0, 2414 align => 0,
1911 valign => 0, 2415 valign => 0,
1912 can_events => 1, 2416 can_events => 1,
1913 @_ 2417 @_
1914 ) 2418 )
1915} 2419}
1916 2420
1917sub activate { }
1918
1919sub button_up { 2421sub invoke_button_up {
1920 my ($self, $ev, $x, $y) = @_; 2422 my ($self, $ev, $x, $y) = @_;
1921 2423
1922 $self->emit ("activate") 2424 $self->emit ("activate")
1923 if $x >= 0 && $x < $self->{w} 2425 if $x >= 0 && $x < $self->{w}
1924 && $y >= 0 && $y < $self->{h}; 2426 && $y >= 0 && $y < $self->{h};
… …
1933 2435
1934 glEnable GL_TEXTURE_2D; 2436 glEnable GL_TEXTURE_2D;
1935 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1936 glColor 0, 0, 0, 1; 2438 glColor 0, 0, 0, 1;
1937 2439
2440 my $tex = $tex[$GRAB == $self];
1938 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2441 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1939 2442
1940 glDisable GL_TEXTURE_2D; 2443 glDisable GL_TEXTURE_2D;
1941 2444
1942 $self->SUPER::_draw; 2445 $self->SUPER::_draw;
1943} 2446}
1944 2447
1945############################################################################# 2448#############################################################################
1946 2449
1947package CFClient::UI::CheckBox; 2450package CFPlus::UI::CheckBox;
1948 2451
1949our @ISA = CFClient::UI::DrawBG::; 2452our @ISA = CFPlus::UI::DrawBG::;
1950 2453
1951my @tex = 2454my @tex =
1952 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2455 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1953 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2456 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1954 2457
1955use CFClient::OpenGL; 2458use CFPlus::OpenGL;
1956 2459
1957sub new { 2460sub new {
1958 my $class = shift; 2461 my $class = shift;
1959 2462
1960 $class->SUPER::new ( 2463 $class->SUPER::new (
… …
1974 my ($self) = @_; 2477 my ($self) = @_;
1975 2478
1976 (6) x 2 2479 (6) x 2
1977} 2480}
1978 2481
2482sub toggle {
2483 my ($self) = @_;
2484
2485 $self->{state} = !$self->{state};
2486 $self->emit (changed => $self->{state});
2487 $self->update;
2488}
2489
1979sub button_down { 2490sub invoke_button_down {
1980 my ($self, $ev, $x, $y) = @_; 2491 my ($self, $ev, $x, $y) = @_;
1981 2492
1982 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2493 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1983 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2494 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1984 $self->{state} = !$self->{state}; 2495 $self->toggle;
1985 $self->_emit (changed => $self->{state});
1986 } else { 2496 } else {
1987 return 0 2497 return 0
1988 } 2498 }
1989 2499
1990 1 2500 1
… …
2010 glDisable GL_TEXTURE_2D; 2520 glDisable GL_TEXTURE_2D;
2011} 2521}
2012 2522
2013############################################################################# 2523#############################################################################
2014 2524
2015package CFClient::UI::Image; 2525package CFPlus::UI::Image;
2016 2526
2017our @ISA = CFClient::UI::Base::; 2527our @ISA = CFPlus::UI::Base::;
2018 2528
2019use CFClient::OpenGL; 2529use CFPlus::OpenGL;
2020use Carp qw/confess/;
2021 2530
2022our %loaded_images; 2531our %texture_cache;
2023 2532
2024sub new { 2533sub new {
2025 my $class = shift; 2534 my $class = shift;
2026 2535
2027 my $self = $class->SUPER::new (can_events => 0, @_); 2536 my $self = $class->SUPER::new (
2537 can_events => 0,
2538 @_,
2539 );
2028 2540
2029 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2541 $self->{path} || $self->{tex}
2542 or Carp::croak "'path' or 'tex' attributes required";
2030 2543
2031 $loaded_images{$self->{image}} ||= 2544 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2032 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2545 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2033 2546
2034 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2547 CFPlus::weaken $texture_cache{$self->{path}};
2035 2548
2036 Scalar::Util::weaken $loaded_images{$self->{image}}; 2549 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2037
2038 $self->{aspect} = $tex->{w} / $tex->{h};
2039 2550
2040 $self 2551 $self
2041} 2552}
2042 2553
2554sub STORABLE_freeze {
2555 my ($self, $cloning) = @_;
2556
2557 $self->{path}
2558 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2559
2560 $self->{path}
2561}
2562
2563sub STORABLE_attach {
2564 my ($self, $cloning, $path) = @_;
2565
2566 $self->new (path => $path)
2567}
2568
2043sub size_request { 2569sub size_request {
2044 my ($self) = @_; 2570 my ($self) = @_;
2045 2571
2046 ($self->{tex}->{w}, $self->{tex}->{h}) 2572 ($self->{tex}{w}, $self->{tex}{h})
2047} 2573}
2048 2574
2049sub _draw { 2575sub _draw {
2050 my ($self) = @_; 2576 my ($self) = @_;
2051 2577
… …
2061 } 2587 }
2062 2588
2063 glEnable GL_TEXTURE_2D; 2589 glEnable GL_TEXTURE_2D;
2064 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2590 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2065 2591
2066 $tex->draw_quad_alpha (0, 0, $w, $h); 2592 $tex->draw_quad (0, 0, $w, $h);
2067 2593
2068 glDisable GL_TEXTURE_2D; 2594 glDisable GL_TEXTURE_2D;
2069} 2595}
2070 2596
2071############################################################################# 2597#############################################################################
2072 2598
2599package CFPlus::UI::ImageButton;
2600
2601our @ISA = CFPlus::UI::Image::;
2602
2603use CFPlus::OpenGL;
2604
2605my %textures;
2606
2607sub new {
2608 my $class = shift;
2609
2610 my $self = $class->SUPER::new (
2611 padding_x => 4,
2612 padding_y => 4,
2613 fg => [1, 1, 1],
2614 active_fg => [0, 0, 1],
2615 can_hover => 1,
2616 align => 0,
2617 valign => 0,
2618 can_events => 1,
2619 @_
2620 );
2621}
2622
2623sub invoke_button_up {
2624 my ($self, $ev, $x, $y) = @_;
2625
2626 $self->emit ("activate")
2627 if $x >= 0 && $x < $self->{w}
2628 && $y >= 0 && $y < $self->{h};
2629
2630 1
2631}
2632
2633#############################################################################
2634
2073package CFClient::UI::VGauge; 2635package CFPlus::UI::VGauge;
2074 2636
2075our @ISA = CFClient::UI::Base::; 2637our @ISA = CFPlus::UI::Base::;
2076 2638
2077use List::Util qw(min max); 2639use List::Util qw(min max);
2078 2640
2079use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2080 2642
2081my %tex = ( 2643my %tex = (
2082 food => [ 2644 food => [
2083 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2645 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2084 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2646 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2085 ], 2647 ],
2086 grace => [ 2648 grace => [
2087 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2649 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2088 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2650 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2089 ], 2651 ],
2090 hp => [ 2652 hp => [
2091 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2092 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2654 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2093 ], 2655 ],
2094 mana => [ 2656 mana => [
2095 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2657 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2096 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2658 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2097 ], 2659 ],
2098); 2660);
2099 2661
2100# eg. VGauge->new (gauge => 'food'), default gauge: food 2662# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2160 my $ycut1 = max 0, min 1, $ycut; 2722 my $ycut1 = max 0, min 1, $ycut;
2161 my $ycut2 = max 0, min 1, $ycut - 1; 2723 my $ycut2 = max 0, min 1, $ycut - 1;
2162 2724
2163 my $h1 = $self->{h} * (1 - $ycut1); 2725 my $h1 = $self->{h} * (1 - $ycut1);
2164 my $h2 = $self->{h} * (1 - $ycut2); 2726 my $h2 = $self->{h} * (1 - $ycut2);
2727 my $h3 = $self->{h};
2728
2729 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2165 2730
2166 glEnable GL_BLEND; 2731 glEnable GL_BLEND;
2167 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2732 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2168 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2733 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2169 glEnable GL_TEXTURE_2D; 2734 glEnable GL_TEXTURE_2D;
… …
2188 2753
2189 if ($t3) { 2754 if ($t3) {
2190 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2755 glBindTexture GL_TEXTURE_2D, $t3->{name};
2191 glBegin GL_QUADS; 2756 glBegin GL_QUADS;
2192 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2757 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2193 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2758 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2194 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2759 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2195 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2760 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2196 glEnd; 2761 glEnd;
2197 } 2762 }
2198 2763
2199 glDisable GL_BLEND; 2764 glDisable GL_BLEND;
2200 glDisable GL_TEXTURE_2D; 2765 glDisable GL_TEXTURE_2D;
2201} 2766}
2202 2767
2203############################################################################# 2768#############################################################################
2204 2769
2205package CFClient::UI::Gauge; 2770package CFPlus::UI::Gauge;
2206 2771
2207our @ISA = CFClient::UI::VBox::; 2772our @ISA = CFPlus::UI::VBox::;
2208 2773
2209sub new { 2774sub new {
2210 my ($class, %arg) = @_; 2775 my ($class, %arg) = @_;
2211 2776
2212 my $self = $class->SUPER::new ( 2777 my $self = $class->SUPER::new (
… …
2214 can_hover => 1, 2779 can_hover => 1,
2215 can_events => 1, 2780 can_events => 1,
2216 %arg, 2781 %arg,
2217 ); 2782 );
2218 2783
2219 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2784 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2220 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2785 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2221 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2786 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2222 2787
2223 $self 2788 $self
2224} 2789}
2225 2790
2226sub set_fontsize { 2791sub set_fontsize {
… …
2247 $self->{value}->set_text ($val); 2812 $self->{value}->set_text ($val);
2248} 2813}
2249 2814
2250############################################################################# 2815#############################################################################
2251 2816
2252package CFClient::UI::Slider; 2817package CFPlus::UI::Slider;
2253 2818
2254use strict; 2819use strict;
2255 2820
2256use CFClient::OpenGL; 2821use CFPlus::OpenGL;
2257 2822
2258our @ISA = CFClient::UI::DrawBG::; 2823our @ISA = CFPlus::UI::DrawBG::;
2259 2824
2260my @tex = 2825my @tex =
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2826 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2262 qw(s1_slider.png s1_slider_bg.png); 2827 qw(s1_slider.png s1_slider_bg.png);
2263 2828
2264sub new { 2829sub new {
2265 my $class = shift; 2830 my $class = shift;
2266 2831
… …
2287 $self->update; 2852 $self->update;
2288 2853
2289 $self 2854 $self
2290} 2855}
2291 2856
2292sub changed { }
2293
2294sub set_range { 2857sub set_range {
2295 my ($self, $range) = @_; 2858 my ($self, $range) = @_;
2296 2859
2297 ($range, $self->{range}) = ($self->{range}, $range); 2860 ($range, $self->{range}) = ($self->{range}, $range);
2298 2861
2299 $self->update
2300 if "@$range" ne "@{$self->{range}}"; 2862 if ("@$range" ne "@{$self->{range}}") {
2863 $self->update;
2864 $self->set_value ($self->{range}[0]);
2865 }
2301} 2866}
2302 2867
2303sub set_value { 2868sub set_value {
2304 my ($self, $value) = @_; 2869 my ($self, $value) = @_;
2305 2870
… …
2316 if $unit; 2881 if $unit;
2317 2882
2318 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2883 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2319 2884
2320 if ($value != $old_value) { 2885 if ($value != $old_value) {
2321 $self->_emit (changed => $value); 2886 $self->emit (changed => $value);
2322 $self->update; 2887 $self->update;
2323 } 2888 }
2324} 2889}
2325 2890
2326sub size_request { 2891sub size_request {
2327 my ($self) = @_; 2892 my ($self) = @_;
2328 2893
2329 ($self->{req_w}, $self->{req_h}) 2894 ($self->{req_w}, $self->{req_h})
2330} 2895}
2331 2896
2332sub button_down { 2897sub invoke_button_down {
2333 my ($self, $ev, $x, $y) = @_; 2898 my ($self, $ev, $x, $y) = @_;
2334 2899
2335 $self->SUPER::button_down ($ev, $x, $y); 2900 $self->SUPER::invoke_button_down ($ev, $x, $y);
2336 2901
2337 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2902 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2338 2903
2339 $self->mouse_motion ($ev, $x, $y) 2904 $self->invoke_mouse_motion ($ev, $x, $y)
2340} 2905}
2341 2906
2342sub mouse_motion { 2907sub invoke_mouse_motion {
2343 my ($self, $ev, $x, $y) = @_; 2908 my ($self, $ev, $x, $y) = @_;
2344 2909
2345 if ($GRAB == $self) { 2910 if ($GRAB == $self) {
2346 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2911 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2347 2912
… …
2353 } else { 2918 } else {
2354 return 0; 2919 return 0;
2355 } 2920 }
2356 2921
2357 1 2922 1
2923}
2924
2925sub invoke_mouse_wheel {
2926 my ($self, $ev) = @_;
2927
2928 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2929
2930 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2931
2932 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2933
2934 ! ! $delta
2358} 2935}
2359 2936
2360sub update { 2937sub update {
2361 my ($self) = @_; 2938 my ($self) = @_;
2362 2939
… …
2411 glDisable GL_TEXTURE_2D; 2988 glDisable GL_TEXTURE_2D;
2412} 2989}
2413 2990
2414############################################################################# 2991#############################################################################
2415 2992
2416package CFClient::UI::ValSlider; 2993package CFPlus::UI::ValSlider;
2417 2994
2418our @ISA = CFClient::UI::HBox::; 2995our @ISA = CFPlus::UI::HBox::;
2419 2996
2420sub new { 2997sub new {
2421 my ($class, %arg) = @_; 2998 my ($class, %arg) = @_;
2422 2999
2423 my $range = delete $arg{range}; 3000 my $range = delete $arg{range};
2424 3001
2425 my $self = $class->SUPER::new ( 3002 my $self = $class->SUPER::new (
2426 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3003 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2427 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3004 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2428 to_value => sub { shift }, 3005 to_value => sub { shift },
2429 from_value => sub { shift }, 3006 from_value => sub { shift },
2430 %arg, 3007 %arg,
2431 ); 3008 );
2432 3009
… …
2452sub set_range { shift->{slider}->set_range (@_) } 3029sub set_range { shift->{slider}->set_range (@_) }
2453sub set_value { shift->{slider}->set_value (@_) } 3030sub set_value { shift->{slider}->set_value (@_) }
2454 3031
2455############################################################################# 3032#############################################################################
2456 3033
2457package CFClient::UI::TextView; 3034package CFPlus::UI::TextScroller;
2458 3035
2459our @ISA = CFClient::UI::HBox::; 3036our @ISA = CFPlus::UI::HBox::;
2460 3037
2461use CFClient::OpenGL; 3038use CFPlus::OpenGL;
2462 3039
2463sub new { 3040sub new {
2464 my $class = shift; 3041 my $class = shift;
2465 3042
2466 my $self = $class->SUPER::new ( 3043 my $self = $class->SUPER::new (
2467 fontsize => 1, 3044 fontsize => 1,
2468 can_events => 0, 3045 can_events => 1,
3046 indent => 0,
2469 #font => default_font 3047 #font => default_font
2470 @_, 3048 @_,
2471 3049
2472 layout => (new CFClient::Layout 1), 3050 layout => (new CFPlus::Layout),
2473 par => [], 3051 par => [],
3052 max_par => 0,
2474 height => 0, 3053 height => 0,
2475 children => [ 3054 children => [
2476 (new CFClient::UI::Empty expand => 1), 3055 (new CFPlus::UI::Empty expand => 1),
2477 (new CFClient::UI::Slider vertical => 1), 3056 (new CFPlus::UI::Slider vertical => 1),
2478 ], 3057 ],
2479 ); 3058 );
2480 3059
2481 $self->{children}[1]->connect (changed => sub { $self->update }); 3060 $self->{children}[1]->connect (changed => sub { $self->update });
2482 3061
… …
2488 3067
2489 $self->{fontsize} = $fontsize; 3068 $self->{fontsize} = $fontsize;
2490 $self->reflow; 3069 $self->reflow;
2491} 3070}
2492 3071
3072sub size_request {
3073 my ($self) = @_;
3074
3075 my ($empty, $slider) = @{ $self->{children} };
3076
3077 local $self->{children} = [$empty, $slider];
3078 $self->SUPER::size_request
3079}
3080
2493sub size_allocate { 3081sub invoke_size_allocate {
2494 my ($self, $w, $h) = @_; 3082 my ($self, $w, $h) = @_;
2495 3083
2496 $self->SUPER::size_allocate ($w, $h); 3084 my ($empty, $slider, @other) = @{ $self->{children} };
3085 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2497 3086
2498 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3087 $self->{layout}->set_font ($self->{font}) if $self->{font};
2499 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3088 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2500 $self->{layout}->set_width ($self->{children}[0]{w}); 3089 $self->{layout}->set_width ($empty->{w});
3090 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2501 3091
2502 $self->reflow; 3092 $self->reflow;
2503}
2504 3093
2505sub text_size { 3094 local $self->{children} = [$empty, $slider];
3095 $self->SUPER::invoke_size_allocate ($w, $h)
3096}
3097
3098sub invoke_mouse_wheel {
2506 my ($self, $text, $indent) = @_; 3099 my ($self, $ev) = @_;
3100
3101 return 0 unless $ev->{dy}; # only vertical movements
3102
3103 $self->{children}[1]->emit (mouse_wheel => $ev);
3104
3105 1
3106}
3107
3108sub get_layout {
3109 my ($self, $para) = @_;
2507 3110
2508 my $layout = $self->{layout}; 3111 my $layout = $self->{layout};
2509 3112
3113 $layout->set_font ($self->{font}) if $self->{font};
3114 $layout->set_foreground (@{$para->{fg}});
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3115 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511 $layout->set_width ($self->{children}[0]{w} - $indent); 3116 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3117 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2512 $layout->set_markup ($text); 3118 $layout->set_markup ($para->{markup});
3119
3120 $layout->set_shapes (
3121 map
3122 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3123 @{$para->{widget}}
2513 3124 );
3125
2514 $layout->size 3126 $layout
2515} 3127}
2516 3128
2517sub reflow { 3129sub reflow {
2518 my ($self) = @_; 3130 my ($self) = @_;
2519 3131
… …
2526 3138
2527 # todo: base offset on lines or so, not on pixels 3139 # todo: base offset on lines or so, not on pixels
2528 $self->{children}[1]->set_value ($offset); 3140 $self->{children}[1]->set_value ($offset);
2529} 3141}
2530 3142
3143sub current_paragraph {
3144 my ($self) = @_;
3145
3146 $self->{top_paragraph} - 1
3147}
3148
3149sub scroll_to {
3150 my ($self, $para) = @_;
3151
3152 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3153
3154 $self->{scroll_to} = $para;
3155 $self->update;
3156}
3157
2531sub clear { 3158sub clear {
2532 my ($self) = @_; 3159 my ($self) = @_;
3160
3161 my (undef, undef, @other) = @{ $self->{children} };
3162 $self->remove ($_) for @other;
2533 3163
2534 $self->{par} = []; 3164 $self->{par} = [];
2535 $self->{height} = 0; 3165 $self->{height} = 0;
2536 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3166 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2537} 3167}
2538 3168
2539sub add_paragraph { 3169sub add_paragraph {
2540 my ($self, $color, $text, $indent) = @_; 3170 my $self = shift;
2541 3171
2542 for my $line (split /\n/, $text) { 3172 for my $para (@_) {
2543 my ($w, $h) = $self->text_size ($line); 3173 $para = {
3174 fg => [1, 1, 1, 1],
3175 indent => 0,
3176 markup => "",
3177 widget => [],
3178 ref $para ? %$para : (markup => $para),
3179 w => 1e10,
3180 wrapped => 1,
3181 };
3182
3183 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3184 push @{$self->{par}}, $para;
3185 }
3186
3187 if (my $max = $self->{max_par}) {
3188 shift @{$self->{par}} while @{$self->{par}} > $max;
3189 }
3190
3191 $self->{need_reflow}++;
3192 $self->update;
3193}
3194
3195sub scroll_to_bottom {
3196 my ($self) = @_;
3197
3198 $self->{scroll_to} = $#{$self->{par}};
3199 $self->update;
3200}
3201
3202sub force_uptodate {
3203 my ($self) = @_;
3204
3205 if (delete $self->{need_reflow}) {
3206 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3207
3208 my $height = 0;
3209
3210 for my $para (@{$self->{par}}) {
3211 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3212 my $layout = $self->get_layout ($para);
3213 my ($w, $h) = $layout->size;
3214
3215 $para->{w} = $w + $para->{indent};
3216 $para->{h} = $h;
3217 $para->{wrapped} = $layout->has_wrapped;
3218 }
3219
3220 $para->{y} = $height;
3221 $height += $para->{h};
3222 }
3223
2544 $self->{height} += $h; 3224 $self->{height} = $height;
2545 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3225 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2546 }
2547 3226
2548 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3227 delete $self->{texture};
3228 }
3229
3230 if (my $paridx = delete $self->{scroll_to}) {
3231 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3232 }
2549} 3233}
2550 3234
2551sub update { 3235sub update {
2552 my ($self) = @_; 3236 my ($self) = @_;
2553 3237
… …
2555 3239
2556 return unless $self->{h} > 0; 3240 return unless $self->{h} > 0;
2557 3241
2558 delete $self->{texture}; 3242 delete $self->{texture};
2559 3243
2560 $ROOT->on_post_alloc ($self, sub { 3244 $ROOT->on_post_alloc ($self => sub {
3245 $self->force_uptodate;
3246
2561 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3247 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2562 3248
2563 if (delete $self->{need_reflow}) {
2564 my $height = 0;
2565
2566 my $layout = $self->{layout};
2567
2568 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2569
2570 for (@{$self->{par}}) {
2571 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2572 $layout->set_width ($W - $_->[3]);
2573 $layout->set_markup ($_->[4]);
2574 my ($w, $h) = $layout->size;
2575 $_->[0] = $w + $_->[3];
2576 $_->[1] = $h;
2577 }
2578
2579 $height += $_->[1];
2580 }
2581
2582 $self->{height} = $height;
2583
2584 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2585
2586 delete $self->{texture};
2587 }
2588
2589 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3249 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2590 glClearColor 0, 0, 0, 0; 3250 glClearColor 0, 0, 0, 0;
2591 glClear GL_COLOR_BUFFER_BIT; 3251 glClear GL_COLOR_BUFFER_BIT;
2592 3252
3253 package CFPlus::UI::Base;
3254 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3255 (0, 0, $self->{w}, $self->{h});
3256
3257 my $top = int $self->{children}[1]{range}[0];
3258
3259 my $paridx = 0;
3260 my $top_paragraph;
2593 my $top = int $self->{children}[1]{range}[0]; 3261 my $top = int $self->{children}[1]{range}[0];
2594 3262
2595 my $y0 = $top; 3263 my $y0 = $top;
2596 my $y1 = $top + $H; 3264 my $y1 = $top + $H;
2597 3265
2598 my $y = 0;
2599
2600 my $layout = $self->{layout};
2601
2602 $layout->set_font ($self->{font}) if $self->{font};
2603
2604 glEnable GL_BLEND;
2605 #TODO# not correct in windows where rgba is forced off
2606 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2607
2608 for my $par (@{$self->{par}}) { 3266 for my $para (@{$self->{par}}) {
2609 my $h = $par->[1]; 3267 my $h = $para->{h};
3268 my $y = $para->{y};
2610 3269
2611 if ($y0 < $y + $h && $y < $y1) { 3270 if ($y0 < $y + $h && $y < $y1) {
2612 $layout->set_foreground (@{ $par->[2] }); 3271 my $layout = $self->get_layout ($para);
2613 $layout->set_width ($W - $par->[3]);
2614 $layout->set_markup ($par->[4]);
2615 3272
2616 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3273 $layout->render ($para->{indent}, $y - $y0);
2617 3274
2618 glRasterPos $par->[3], $y - $y0; 3275 if (my @w = @{ $para->{widget} }) {
2619 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3276 my @s = $layout->get_shapes;
3277
3278 for (@w) {
3279 my ($dx, $dy) = splice @s, 0, 2, ();
3280
3281 $_->{x} = $dx + $para->{indent};
3282 $_->{y} = $dy + $y - $y0;
3283
3284 $_->draw;
3285 }
3286 }
2620 } 3287 }
2621 3288
2622 $y += $h; 3289 $paridx++;
3290 $top_paragraph ||= $paridx if $y >= $top;
2623 } 3291 }
2624 3292
2625 glDisable GL_BLEND; 3293 $self->{top_paragraph} = $top_paragraph;
2626 }; 3294 };
2627 }); 3295 });
3296}
3297
3298sub reconfigure {
3299 my ($self) = @_;
3300
3301 $self->SUPER::reconfigure;
3302
3303 $_->{w} = 1e10 for @{ $self->{par} };
3304 $self->reflow;
2628} 3305}
2629 3306
2630sub _draw { 3307sub _draw {
2631 my ($self) = @_; 3308 my ($self) = @_;
2632 3309
… …
2635 glColor 0, 0, 0, 1; 3312 glColor 0, 0, 0, 1;
2636 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3313 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2637 glDisable GL_TEXTURE_2D; 3314 glDisable GL_TEXTURE_2D;
2638 3315
2639 $self->{children}[1]->draw; 3316 $self->{children}[1]->draw;
2640
2641} 3317}
2642 3318
2643############################################################################# 3319#############################################################################
2644 3320
2645package CFClient::UI::Animator; 3321package CFPlus::UI::Animator;
2646 3322
2647use CFClient::OpenGL; 3323use CFPlus::OpenGL;
2648 3324
2649our @ISA = CFClient::UI::Bin::; 3325our @ISA = CFPlus::UI::Bin::;
2650 3326
2651sub moveto { 3327sub moveto {
2652 my ($self, $x, $y) = @_; 3328 my ($self, $x, $y) = @_;
2653 3329
2654 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3330 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2682 glPopMatrix; 3358 glPopMatrix;
2683} 3359}
2684 3360
2685############################################################################# 3361#############################################################################
2686 3362
2687package CFClient::UI::Flopper; 3363package CFPlus::UI::Flopper;
2688 3364
2689our @ISA = CFClient::UI::Button::; 3365our @ISA = CFPlus::UI::Button::;
2690 3366
2691sub new { 3367sub new {
2692 my $class = shift; 3368 my $class = shift;
2693 3369
2694 my $self = $class->SUPER::new ( 3370 my $self = $class->SUPER::new (
… …
2706 $self->{other}->toggle_visibility; 3382 $self->{other}->toggle_visibility;
2707} 3383}
2708 3384
2709############################################################################# 3385#############################################################################
2710 3386
2711package CFClient::UI::Tooltip; 3387package CFPlus::UI::Tooltip;
2712 3388
2713our @ISA = CFClient::UI::Bin::; 3389our @ISA = CFPlus::UI::Bin::;
2714 3390
2715use CFClient::OpenGL; 3391use CFPlus::OpenGL;
2716 3392
2717sub new { 3393sub new {
2718 my $class = shift; 3394 my $class = shift;
2719 3395
2720 $class->SUPER::new ( 3396 $class->SUPER::new (
… …
2723 ) 3399 )
2724} 3400}
2725 3401
2726sub set_tooltip_from { 3402sub set_tooltip_from {
2727 my ($self, $widget) = @_; 3403 my ($self, $widget) = @_;
3404
3405 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3406 if $widget->{tooltip} =~ /^#(.*)$/;
2728 3407
2729 my $tooltip = $widget->{tooltip}; 3408 my $tooltip = $widget->{tooltip};
2730 3409
2731 if ($ENV{CFPLUS_DEBUG} & 2) { 3410 if ($ENV{CFPLUS_DEBUG} & 2) {
2732 $tooltip .= "\n\n" . (ref $widget) . "\n" 3411 $tooltip .= "\n\n" . (ref $widget) . "\n"
2733 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3412 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2734 . "req $widget->{req_w} $widget->{req_h}\n" 3413 . "req $widget->{req_w} $widget->{req_h}\n"
2735 . "visible $widget->{visible}"; 3414 . "visible $widget->{visible}";
2736 } 3415 }
2737 3416
3417 $tooltip =~ s/^\n+//;
3418 $tooltip =~ s/\n+$//;
3419
2738 $self->add (new CFClient::UI::Label 3420 $self->add (new CFPlus::UI::Label
2739 markup => $tooltip, 3421 markup => $tooltip,
2740 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3422 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2741 fontsize => 0.8, 3423 fontsize => 0.8,
2742 fg => [0, 0, 0, 1], 3424 style => 1, # FLAG_INVERSE
2743 ellipsise => 0, 3425 ellipsise => 0,
2744 font => ($widget->{tooltip_font} || $::FONT_PROP), 3426 font => ($widget->{tooltip_font} || $::FONT_PROP),
2745 ); 3427 );
2746} 3428}
2747 3429
… …
2751 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3433 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2752 3434
2753 ($w + 4, $h + 4) 3435 ($w + 4, $h + 4)
2754} 3436}
2755 3437
2756sub size_allocate { 3438sub invoke_size_allocate {
2757 my ($self, $w, $h) = @_; 3439 my ($self, $w, $h) = @_;
2758 3440
2759 $self->SUPER::size_allocate ($w - 4, $h - 4); 3441 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2760} 3442}
2761 3443
2762sub visibility_change { 3444sub invoke_visibility_change {
2763 my ($self, $visible) = @_; 3445 my ($self, $visible) = @_;
2764 3446
2765 return unless $visible; 3447 return unless $visible;
2766 3448
2767 $self->{root}->on_post_alloc ("move_$self" => sub { 3449 $self->{root}->on_post_alloc ("move_$self" => sub {
2768 my $widget = $self->{owner} 3450 my $widget = $self->{owner}
2769 or return; 3451 or return;
2770 3452
3453 if ($widget->{visible}) {
2771 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3454 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2772 3455
2773 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3456 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2774 if $x + $self->{w} > $::WIDTH; 3457 if $x + $self->{w} > $self->{root}{w};
2775 3458
2776 $self->move_abs ($x, $y); 3459 $self->move_abs ($x, $y);
3460 } else {
3461 $self->hide;
3462 }
2777 }); 3463 });
2778} 3464}
2779 3465
2780sub _draw { 3466sub _draw {
2781 my ($self) = @_; 3467 my ($self) = @_;
… …
2805 $self->SUPER::_draw; 3491 $self->SUPER::_draw;
2806} 3492}
2807 3493
2808############################################################################# 3494#############################################################################
2809 3495
2810package CFClient::UI::Face; 3496package CFPlus::UI::Face;
2811 3497
2812our @ISA = CFClient::UI::Base::; 3498our @ISA = CFPlus::UI::DrawBG::;
2813 3499
2814use CFClient::OpenGL; 3500use CFPlus::OpenGL;
2815 3501
2816sub new { 3502sub new {
2817 my $class = shift; 3503 my $class = shift;
2818 3504
2819 my $self = $class->SUPER::new ( 3505 my $self = $class->SUPER::new (
3506 size_w => 32,
3507 size_h => 8,
2820 aspect => 1, 3508 aspect => 1,
2821 can_events => 0, 3509 can_events => 0,
2822 @_, 3510 @_,
2823 ); 3511 );
2824 3512
2825 if ($self->{anim} && $self->{animspeed}) { 3513 if ($self->{anim} && $self->{animspeed}) {
2826 Scalar::Util::weaken (my $widget = $self); 3514 CFPlus::weaken (my $widget = $self);
2827 3515
3516 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3517 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2828 $self->{timer} = Event->timer ( 3518 $self->{timer} = Event->timer (
2829 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2830 hard => 1, 3519 parked => 1,
2831 interval => $self->{animspeed},
2832 cb => sub { 3520 cb => sub {
3521 return unless $::CONN && $widget;
3522
2833 ++$widget->{frame}; 3523 ++$widget->{frame};
3524 $widget->update_face;
2834 $widget->update; 3525 $widget->update;
3526
3527 $widget->update_timer;
2835 }, 3528 },
2836 ); 3529 );
3530
3531 $self->update_face;
3532 $self->update_timer;
2837 } 3533 }
2838 3534
2839 $self 3535 $self
2840} 3536}
2841 3537
3538sub update_timer {
3539 my ($self) = @_;
3540
3541 return unless $self->{timer};
3542
3543 if ($self->{visible}) {
3544 $self->{timer}->at (
3545 $self->{anim_start}
3546 + $self->{animspeed}
3547 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3548 );
3549 $self->{timer}->start;
3550 } else {
3551 $self->{timer}->stop;
3552 }
3553}
3554
3555sub update_face {
3556 my ($self) = @_;
3557
3558 return unless $::CONN;
3559
3560 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3561 if ($anim && @$anim) {
3562 delete $self->{wait_face};
3563 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3564 }
3565 }
3566}
3567
2842sub size_request { 3568sub size_request {
2843 (32, 8) 3569 my ($self) = @_;
3570
3571 if ($::CONN) {
3572 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3573 if (my $tex = $::CONN->{texture}[$faceid]) {
3574 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3575 } else {
3576 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3577 $self->realloc;
3578 });
3579 }
3580 }
3581 }
3582
3583 ($self->{size_w} || 8, $self->{size_h} || 8)
2844} 3584}
2845 3585
2846sub update { 3586sub update {
2847 my ($self) = @_; 3587 my ($self) = @_;
2848 3588
2849 return unless $self->{visible}; 3589 return unless $self->{visible};
2850 3590
2851 $self->SUPER::update; 3591 $self->SUPER::update;
2852} 3592}
2853 3593
3594sub invoke_visibility_change {
3595 my ($self) = @_;
3596
3597 $self->update_timer;
3598
3599 0
3600}
3601
2854sub _draw { 3602sub _draw {
2855 my ($self) = @_; 3603 my ($self) = @_;
2856 3604
2857 return unless $::CONN; 3605 return unless $::CONN;
2858 3606
2859 my $face; 3607 $self->SUPER::_draw;
2860 3608
2861 if ($self->{frame}) {
2862 my $anim = $::CONN->{anim}[$self->{anim}]; 3609 my $faceid = $::CONN->{faceid}[$self->{face}]
2863 3610 or return;
2864 $face = $anim->[ $self->{frame} % @$anim ]
2865 if $anim && @$anim;
2866 }
2867 3611
2868 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3612 my $tex = $::CONN->{texture}[$faceid];
2869 3613
2870 if ($tex) { 3614 if ($tex) {
2871 glEnable GL_TEXTURE_2D; 3615 glEnable GL_TEXTURE_2D;
2872 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2873 glColor 0, 0, 0, 1; 3617 glColor 0, 0, 0, 1;
2874 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3618 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2875 glDisable GL_TEXTURE_2D; 3619 glDisable GL_TEXTURE_2D;
2876 } 3620 }
2877} 3621}
2878 3622
2879sub DESTROY { 3623sub destroy {
2880 my ($self) = @_; 3624 my ($self) = @_;
2881 3625
2882 $self->{timer}->cancel 3626 (delete $self->{timer})->cancel
2883 if $self->{timer}; 3627 if $self->{timer};
2884 3628
2885 $self->SUPER::DESTROY; 3629 $self->SUPER::destroy;
2886} 3630}
2887 3631
2888############################################################################# 3632#############################################################################
2889 3633
2890package CFClient::UI::Buttonbar; 3634package CFPlus::UI::Buttonbar;
2891 3635
2892our @ISA = CFClient::UI::HBox::; 3636our @ISA = CFPlus::UI::HBox::;
2893 3637
2894# TODO: should actualyl wrap buttons and other goodies. 3638# TODO: should actually wrap buttons and other goodies.
2895 3639
2896############################################################################# 3640#############################################################################
2897 3641
2898package CFClient::UI::Menu; 3642package CFPlus::UI::Menu;
2899 3643
2900our @ISA = CFClient::UI::FancyFrame::; 3644our @ISA = CFPlus::UI::Toplevel::;
2901 3645
2902use CFClient::OpenGL; 3646use CFPlus::OpenGL;
2903 3647
2904sub new { 3648sub new {
2905 my $class = shift; 3649 my $class = shift;
2906 3650
2907 my $self = $class->SUPER::new ( 3651 my $self = $class->SUPER::new (
2908 items => [], 3652 items => [],
2909 z => 100, 3653 z => 100,
2910 @_, 3654 @_,
2911 ); 3655 );
2912 3656
2913 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3657 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2914 3658
2915 for my $item (@{ $self->{items} }) { 3659 for my $item (@{ $self->{items} }) {
2916 my ($widget, $cb) = @$item; 3660 my ($widget, $cb, $tooltip) = @$item;
2917 3661
2918 # handle various types of items, only text for now 3662 # handle various types of items, only text for now
2919 if (!ref $widget) { 3663 if (!ref $widget) {
3664 if ($widget =~ /\t/) {
3665 my ($left, $right) = split /\t/, $widget, 2;
3666
2920 $widget = new CFClient::UI::Label 3667 $widget = new CFPlus::UI::HBox
2921 can_hover => 1, 3668 can_hover => 1,
2922 can_events => 1, 3669 can_events => 1,
3670 tooltip => $tooltip,
3671 children => [
3672 (new CFPlus::UI::Label markup => $left, expand => 1),
3673 (new CFPlus::UI::Label markup => $right, align => +1),
3674 ],
3675 ;
3676
3677 } else {
3678 $widget = new CFPlus::UI::Label
3679 can_hover => 1,
3680 can_events => 1,
2923 text => $widget; 3681 markup => $widget,
3682 tooltip => $tooltip;
3683 }
2924 } 3684 }
2925 3685
2926 $self->{item}{$widget} = $item; 3686 $self->{item}{$widget} = $item;
2927 3687
2928 $self->{vbox}->add ($widget); 3688 $self->{vbox}->add ($widget);
… …
2933 3693
2934# popup given the event (must be a mouse button down event currently) 3694# popup given the event (must be a mouse button down event currently)
2935sub popup { 3695sub popup {
2936 my ($self, $ev) = @_; 3696 my ($self, $ev) = @_;
2937 3697
2938 $self->_emit ("popdown"); 3698 $self->emit ("popdown");
2939 3699
2940 # maybe save $GRAB? must be careful about events... 3700 # maybe save $GRAB? must be careful about events...
2941 $GRAB = $self; 3701 $GRAB = $self;
2942 $self->{button} = $ev->{button}; 3702 $self->{button} = $ev->{button};
2943 3703
2944 $self->show; 3704 $self->show;
2945 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3705 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2946} 3706}
2947 3707
2948sub mouse_motion { 3708sub invoke_mouse_motion {
2949 my ($self, $ev, $x, $y) = @_; 3709 my ($self, $ev, $x, $y) = @_;
2950 3710
2951 # TODO: should use vbox->find_widget or so 3711 # TODO: should use vbox->find_widget or so
2952 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3712 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2953 $self->{hover} = $self->{item}{$HOVER}; 3713 $self->{hover} = $self->{item}{$HOVER};
2954 3714
2955 0 3715 0
2956} 3716}
2957 3717
2958sub button_up { 3718sub invoke_button_up {
2959 my ($self, $ev, $x, $y) = @_; 3719 my ($self, $ev, $x, $y) = @_;
2960 3720
2961 if ($ev->{button} == $self->{button}) { 3721 if ($ev->{button} == $self->{button}) {
2962 undef $GRAB; 3722 undef $GRAB;
2963 $self->hide; 3723 $self->hide;
2964 3724
2965 $self->_emit ("popdown"); 3725 $self->emit ("popdown");
2966 $self->{hover}[1]->() if $self->{hover}; 3726 $self->{hover}[1]->() if $self->{hover};
2967 } else { 3727 } else {
2968 return 0 3728 return 0
2969 } 3729 }
2970 3730
2971 1 3731 1
2972} 3732}
2973 3733
2974############################################################################# 3734#############################################################################
2975 3735
2976package CFClient::UI::Multiplexer; 3736package CFPlus::UI::Multiplexer;
2977 3737
2978our @ISA = CFClient::UI::Container::; 3738our @ISA = CFPlus::UI::Container::;
2979 3739
2980sub new { 3740sub new {
2981 my $class = shift; 3741 my $class = shift;
2982 3742
2983 my $self = $class->SUPER::new ( 3743 my $self = $class->SUPER::new (
… …
2997 3757
2998 $self->{current} = $self->{children}[0] 3758 $self->{current} = $self->{children}[0]
2999 if @{ $self->{children} }; 3759 if @{ $self->{children} };
3000} 3760}
3001 3761
3762sub get_current_page {
3763 my ($self) = @_;
3764
3765 $self->{current}
3766}
3767
3002sub set_current_page { 3768sub set_current_page {
3003 my ($self, $page_or_widget) = @_; 3769 my ($self, $page_or_widget) = @_;
3004 3770
3005 my $widget = ref $page_or_widget 3771 my $widget = ref $page_or_widget
3006 ? $page_or_widget 3772 ? $page_or_widget
3007 : $self->{children}[$page_or_widget]; 3773 : $self->{children}[$page_or_widget];
3008 3774
3009 $self->{current} = $widget; 3775 $self->{current} = $widget;
3010 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3776 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3011 3777
3012 $self->_emit (page_changed => $self->{current}); 3778 $self->emit (page_changed => $self->{current});
3013 3779
3014 $self->realloc; 3780 $self->realloc;
3015} 3781}
3016 3782
3017sub visible_children { 3783sub visible_children {
… …
3022 my ($self) = @_; 3788 my ($self) = @_;
3023 3789
3024 $self->{current}->size_request 3790 $self->{current}->size_request
3025} 3791}
3026 3792
3027sub size_allocate { 3793sub invoke_size_allocate {
3028 my ($self, $w, $h) = @_; 3794 my ($self, $w, $h) = @_;
3029 3795
3030 $self->{current}->configure (0, 0, $w, $h); 3796 $self->{current}->configure (0, 0, $w, $h);
3797
3798 1
3031} 3799}
3032 3800
3033sub _draw { 3801sub _draw {
3034 my ($self) = @_; 3802 my ($self) = @_;
3035 3803
3036 $self->{current}->draw; 3804 $self->{current}->draw;
3037} 3805}
3038 3806
3039############################################################################# 3807#############################################################################
3040 3808
3041package CFClient::UI::Notebook; 3809package CFPlus::UI::Notebook;
3042 3810
3043our @ISA = CFClient::UI::VBox::; 3811our @ISA = CFPlus::UI::VBox::;
3044 3812
3045sub new { 3813sub new {
3046 my $class = shift; 3814 my $class = shift;
3047 3815
3048 my $self = $class->SUPER::new ( 3816 my $self = $class->SUPER::new (
3049 buttonbar => (new CFClient::UI::Buttonbar), 3817 buttonbar => (new CFPlus::UI::Buttonbar),
3050 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3818 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3051 # filter => # will be put between multiplexer and $self 3819 # filter => # will be put between multiplexer and $self
3052 @_, 3820 @_,
3053 ); 3821 );
3054 3822
3055 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3823 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3059} 3827}
3060 3828
3061sub add { 3829sub add {
3062 my ($self, $title, $widget, $tooltip) = @_; 3830 my ($self, $title, $widget, $tooltip) = @_;
3063 3831
3064 Scalar::Util::weaken $self; 3832 CFPlus::weaken $self;
3065 3833
3066 $self->{buttonbar}->add (new CFClient::UI::Button 3834 $self->{buttonbar}->add (new CFPlus::UI::Button
3067 markup => $title, 3835 markup => $title,
3068 tooltip => $tooltip, 3836 tooltip => $tooltip,
3069 on_activate => sub { $self->set_current_page ($widget) }, 3837 on_activate => sub { $self->set_current_page ($widget) },
3070 ); 3838 );
3071 3839
3072 $self->{multiplexer}->add ($widget); 3840 $self->{multiplexer}->add ($widget);
3073} 3841}
3074 3842
3843sub get_current_page {
3844 my ($self) = @_;
3845
3846 $self->{multiplexer}->get_current_page
3847}
3848
3075sub set_current_page { 3849sub set_current_page {
3076 my ($self, $page) = @_; 3850 my ($self, $page) = @_;
3077 3851
3078 $self->{multiplexer}->set_current_page ($page); 3852 $self->{multiplexer}->set_current_page ($page);
3079 $self->_emit (page_changed => $self->{multiplexer}{current}); 3853 $self->emit (page_changed => $self->{multiplexer}{current});
3080} 3854}
3081 3855
3082############################################################################# 3856#############################################################################
3083 3857
3858package CFPlus::UI::Selector;
3859
3860use utf8;
3861
3862our @ISA = CFPlus::UI::Button::;
3863
3864sub new {
3865 my $class = shift;
3866
3867 my $self = $class->SUPER::new (
3868 options => [], # [value, title, longdesc], ...
3869 value => undef,
3870 @_,
3871 );
3872
3873 $self->_set_value ($self->{value});
3874
3875 $self
3876}
3877
3878sub invoke_button_down {
3879 my ($self, $ev) = @_;
3880
3881 my @menu_items;
3882
3883 for (@{ $self->{options} }) {
3884 my ($value, $title, $tooltip) = @$_;
3885
3886 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3887 }
3888
3889 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3890}
3891
3892sub _set_value {
3893 my ($self, $value) = @_;
3894
3895 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3896 or return;
3897
3898 $self->{value} = $item->[0];
3899 $self->set_markup ("$item->[1] ⇓");
3900 $self->set_tooltip ($item->[2]);
3901}
3902
3903sub set_value {
3904 my ($self, $value) = @_;
3905
3906 return unless $self->{value} ne $value;
3907
3908 $self->_set_value ($value);
3909 $self->emit (changed => $value);
3910}
3911
3912#############################################################################
3913
3084package CFClient::UI::Statusbox; 3914package CFPlus::UI::Statusbox;
3085 3915
3086our @ISA = CFClient::UI::VBox::; 3916our @ISA = CFPlus::UI::VBox::;
3087 3917
3088sub new { 3918sub new {
3089 my $class = shift; 3919 my $class = shift;
3090 3920
3091 my $self = $class->SUPER::new ( 3921 my $self = $class->SUPER::new (
3092 fontsize => 0.8, 3922 fontsize => 0.8,
3093 @_, 3923 @_,
3094 ); 3924 );
3095 3925
3096 Scalar::Util::weaken (my $this = $self); 3926 CFPlus::weaken (my $this = $self);
3097 3927
3098 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3928 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3099 3929
3100 $self 3930 $self
3101} 3931}
… …
3103sub reorder { 3933sub reorder {
3104 my ($self) = @_; 3934 my ($self) = @_;
3105 my $NOW = Time::HiRes::time; 3935 my $NOW = Time::HiRes::time;
3106 3936
3107 # freeze display when hovering over any label 3937 # freeze display when hovering over any label
3108 return if $CFClient::UI::TOOLTIP->{owner} 3938 return if $CFPlus::UI::TOOLTIP->{owner}
3109 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3939 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3110 values %{ $self->{item} }; 3940 values %{ $self->{item} };
3111 3941
3112 while (my ($k, $v) = each %{ $self->{item} }) { 3942 while (my ($k, $v) = each %{ $self->{item} }) {
3113 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3943 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3114 } 3944 }
… …
3135 for ($short) { 3965 for ($short) {
3136 s/^\s+//; 3966 s/^\s+//;
3137 s/\s+/ /g; 3967 s/\s+/ /g;
3138 } 3968 }
3139 3969
3140 new CFClient::UI::Label 3970 new CFPlus::UI::Label
3141 markup => $short, 3971 markup => $short,
3142 tooltip => $item->{tooltip}, 3972 tooltip => $item->{tooltip},
3143 tooltip_font => $::FONT_PROP, 3973 tooltip_font => $::FONT_PROP,
3144 tooltip_width => 0.67, 3974 tooltip_width => 0.67,
3145 fontsize => $item->{fontsize} || $self->{fontsize}, 3975 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3183 $item->{count}++; 4013 $item->{count}++;
3184 } else { 4014 } else {
3185 $item->{count} = 1; 4015 $item->{count} = 1;
3186 $item->{text} = $item->{tooltip} = $text; 4016 $item->{text} = $item->{tooltip} = $text;
3187 } 4017 }
3188 $item->{id} = ++$self->{id}; 4018 $item->{id} += 0.2;#d#
3189 $item->{timeout} = $timeout; 4019 $item->{timeout} = $timeout;
3190 delete $item->{label}; 4020 delete $item->{label};
3191 } else { 4021 } else {
3192 $self->{item}{$group} = { 4022 $self->{item}{$group} = {
3193 id => ++$self->{id}, 4023 id => ++$self->{id},
… …
3199 count => 1, 4029 count => 1,
3200 %arg, 4030 %arg,
3201 }; 4031 };
3202 } 4032 }
3203 4033
4034 $ROOT->on_refresh (reorder => sub {
3204 $self->reorder; 4035 $self->reorder;
4036 });
3205} 4037}
3206 4038
3207sub reconfigure { 4039sub reconfigure {
3208 my ($self) = @_; 4040 my ($self) = @_;
3209 4041
… …
3212 4044
3213 $self->reorder; 4045 $self->reorder;
3214 $self->SUPER::reconfigure; 4046 $self->SUPER::reconfigure;
3215} 4047}
3216 4048
3217sub DESTROY { 4049sub destroy {
3218 my ($self) = @_; 4050 my ($self) = @_;
3219 4051
3220 $self->{timer}->cancel; 4052 $self->{timer}->cancel;
3221 4053
3222 $self->SUPER::DESTROY; 4054 $self->SUPER::destroy;
3223} 4055}
3224 4056
3225############################################################################# 4057#############################################################################
3226 4058
3227package CFClient::UI::Inventory;
3228
3229our @ISA = CFClient::UI::ScrolledWindow::;
3230
3231sub new {
3232 my $class = shift;
3233
3234 my $self = $class->SUPER::new (
3235 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3236 @_,
3237 );
3238
3239 $self
3240}
3241
3242sub set_items {
3243 my ($self, $items) = @_;
3244
3245 $self->{child}->clear;
3246 return unless $items;
3247
3248 my @items = sort {
3249 ($a->{type} <=> $b->{type})
3250 or ($a->{name} cmp $b->{name})
3251 } @$items;
3252
3253 $self->{real_items} = \@items;
3254
3255 my $row = 0;
3256 for my $item (@items) {
3257 CFClient::Item::update_widgets $item;
3258
3259 $self->{child}->add (0, $row, $item->{face_widget});
3260 $self->{child}->add (1, $row, $item->{desc_widget});
3261 $self->{child}->add (2, $row, $item->{weight_widget});
3262
3263 $row++;
3264 }
3265}
3266
3267#############################################################################
3268
3269package CFClient::UI::BindEditor;
3270
3271our @ISA = CFClient::UI::FancyFrame::;
3272
3273sub new {
3274 my $class = shift;
3275
3276 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3277
3278 $self->add (my $vb = new CFClient::UI::VBox);
3279
3280
3281 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3282 text => "start recording",
3283 tooltip => "Start/Stops recording of actions."
3284 ."All subsequent actions after the recording started will be captured."
3285 ."The actions are displayed after the record was stopped."
3286 ."To bind the action you have to click on the 'Bind' button",
3287 on_activate => sub {
3288 unless ($self->{recording}) {
3289 $self->start;
3290 } else {
3291 $self->stop;
3292 }
3293 });
3294
3295 $vb->add (new CFClient::UI::Label text => "Actions:");
3296 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3297
3298 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3299 $vb->add (my $hb = new CFClient::UI::HBox);
3300 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3301 $hb->add (new CFClient::UI::Button
3302 text => "bind",
3303 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3304 on_activate => sub {
3305 $self->ask_for_bind;
3306 });
3307
3308 $vb->add (my $hb = new CFClient::UI::HBox);
3309 $hb->add (new CFClient::UI::Button
3310 text => "ok",
3311 expand => 1,
3312 tooltip => "This closes the binding editor and saves the binding",
3313 on_activate => sub {
3314 $self->hide;
3315 $self->commit;
3316 });
3317
3318 $hb->add (new CFClient::UI::Button
3319 text => "cancel",
3320 expand => 1,
3321 tooltip => "This closes the binding editor without saving",
3322 on_activate => sub {
3323 $self->hide;
3324 $self->{binding_cancel}->()
3325 if $self->{binding_cancel};
3326 });
3327
3328 $self->update_binding_widgets;
3329
3330 $self
3331}
3332
3333sub commit {
3334 my ($self) = @_;
3335 my ($mod, $sym, $cmds) = $self->get_binding;
3336 if ($sym != 0 && @$cmds > 0) {
3337 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3338 ."'. Don't forget 'Save Config'!");
3339 $self->{binding_change}->($mod, $sym, $cmds)
3340 if $self->{binding_change};
3341 } else {
3342 $::STATUSBOX->add ("No action bound, no key or action specified!");
3343 $self->{binding_cancel}->()
3344 if $self->{binding_cancel};
3345 }
3346}
3347
3348sub start {
3349 my ($self) = @_;
3350
3351 $self->{rec_btn}->set_text ("stop recording");
3352 $self->{recording} = 1;
3353 $self->clear_command_list;
3354 $::CONN->start_record if $::CONN;
3355}
3356
3357sub stop {
3358 my ($self) = @_;
3359
3360 $self->{rec_btn}->set_text ("start recording");
3361 $self->{recording} = 0;
3362
3363 my $rec;
3364 $rec = $::CONN->stop_record if $::CONN;
3365 return unless ref $rec eq 'ARRAY';
3366 $self->set_command_list ($rec);
3367}
3368
3369
3370sub ask_for_bind_and_commit {
3371 my ($self) = @_;
3372 $self->ask_for_bind (1);
3373}
3374
3375sub ask_for_bind {
3376 my ($self, $commit) = @_;
3377
3378 CFClient::Binder::open_binding_dialog (sub {
3379 my ($mod, $sym) = @_;
3380 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3381 $self->update_binding_widgets;
3382 $self->commit if $commit;
3383 });
3384}
3385
3386# $mod and $sym are the modifiers and key symbol
3387# $cmds is a array ref of strings (the commands)
3388# $cb is the callback that is executed on OK
3389# $ccb is the callback that is executed on CANCEL and
3390# when the binding was unsuccessful on OK
3391sub set_binding {
3392 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3393
3394 $self->clear_command_list;
3395 $self->{recording} = 0;
3396 $self->{rec_btn}->set_text ("start recording");
3397
3398 $self->{binding} = [$mod, $sym];
3399 $self->{commands} = $cmds;
3400
3401 $self->{binding_change} = $cb;
3402 $self->{binding_cancel} = $ccb;
3403
3404 $self->update_binding_widgets;
3405}
3406
3407# this is a shortcut method that asks for a binding
3408# and then just binds it.
3409sub do_quick_binding {
3410 my ($self, $cmds) = @_;
3411 $self->set_binding (undef, undef, $cmds, sub {
3412 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3413 });
3414 $self->ask_for_bind (1);
3415}
3416
3417sub update_binding_widgets {
3418 my ($self) = @_;
3419 my ($mod, $sym, $cmds) = $self->get_binding;
3420 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3421 $self->set_command_list ($cmds);
3422}
3423
3424sub get_binding {
3425 my ($self) = @_;
3426 return (
3427 $self->{binding}->[0],
3428 $self->{binding}->[1],
3429 [ grep { defined $_ } @{$self->{commands}} ]
3430 );
3431}
3432
3433sub clear_command_list {
3434 my ($self) = @_;
3435 $self->{cmdbox}->clear ();
3436}
3437
3438sub set_command_list {
3439 my ($self, $cmds) = @_;
3440
3441 $self->{cmdbox}->clear ();
3442 $self->{commands} = $cmds;
3443
3444 my $idx = 0;
3445
3446 for (@$cmds) {
3447 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3448
3449 my $i = $idx;
3450 $hb->add (new CFClient::UI::Label text => $_);
3451 $hb->add (new CFClient::UI::Button
3452 text => "delete",
3453 tooltip => "Deletes the action from the record",
3454 on_activate => sub {
3455 $self->{cmdbox}->remove ($hb);
3456 $cmds->[$i] = undef;
3457 });
3458
3459
3460 $idx++
3461 }
3462}
3463
3464#############################################################################
3465
3466package CFClient::UI::SpellList;
3467
3468our @ISA = CFClient::UI::Table::;
3469
3470sub new {
3471 my $class = shift;
3472
3473 my $self = $class->SUPER::new (
3474 binding => [],
3475 commands => [],
3476 @_,
3477 )
3478}
3479
3480# XXX: Do sorting? Argl...
3481sub add_spell {
3482 my ($self, $spell) = @_;
3483 $self->{spells}->{$spell->{name}} = $spell;
3484
3485 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3486 face => $spell->{face},
3487 can_hover => 1,
3488 can_events => 1,
3489 tooltip => $spell->{message});
3490
3491 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3492 text => $spell->{name},
3493 can_hover => 1,
3494 can_events => 1,
3495 tooltip => $spell->{message},
3496 expand => 1);
3497
3498 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3499 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3500 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3501 expand => 1);
3502
3503 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3504 text => "bind to key",
3505 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3506}
3507
3508sub rebuild_spell_list {
3509 my ($self) = @_;
3510 $self->{tbl_idx} = 0;
3511 $self->add_spell ($_) for values %{$self->{spells}};
3512}
3513
3514sub remove_spell {
3515 my ($self, $spell) = @_;
3516 delete $self->{spells}->{$spell->{name}};
3517 $self->rebuild_spell_list;
3518}
3519
3520#############################################################################
3521
3522package CFClient::UI::Root; 4059package CFPlus::UI::Root;
3523 4060
3524our @ISA = CFClient::UI::Container::; 4061our @ISA = CFPlus::UI::Container::;
3525 4062
3526use List::Util qw(min max); 4063use List::Util qw(min max);
3527 4064
3528use CFClient::OpenGL; 4065use CFPlus::OpenGL;
3529 4066
3530sub new { 4067sub new {
3531 my $class = shift; 4068 my $class = shift;
3532 4069
3533 my $self = $class->SUPER::new ( 4070 my $self = $class->SUPER::new (
3534 visible => 1, 4071 visible => 1,
3535 @_, 4072 @_,
3536 ); 4073 );
3537 4074
3538 Scalar::Util::weaken ($self->{root} = $self); 4075 CFPlus::weaken ($self->{root} = $self);
3539 4076
3540 $self 4077 $self
3541} 4078}
3542 4079
3543sub size_request { 4080sub size_request {
… …
3558 $coord = $max - $size if $coord > $max - $size; 4095 $coord = $max - $size if $coord > $max - $size;
3559 4096
3560 int $coord + 0.5 4097 int $coord + 0.5
3561} 4098}
3562 4099
3563sub size_allocate { 4100sub invoke_size_allocate {
3564 my ($self, $w, $h) = @_; 4101 my ($self, $w, $h) = @_;
3565 4102
3566 for my $child ($self->children) { 4103 for my $child ($self->children) {
3567 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4104 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3568 4105
… …
3572 $X = _to_pixel $X, $W, $self->{w}; 4109 $X = _to_pixel $X, $W, $self->{w};
3573 $Y = _to_pixel $Y, $H, $self->{h}; 4110 $Y = _to_pixel $Y, $H, $self->{h};
3574 4111
3575 $child->configure ($X, $Y, $W, $H); 4112 $child->configure ($X, $Y, $W, $H);
3576 } 4113 }
4114
4115 1
3577} 4116}
3578 4117
3579sub coord2local { 4118sub coord2local {
3580 my ($self, $x, $y) = @_; 4119 my ($self, $x, $y) = @_;
3581 4120
… …
3707 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4246 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3708 4247
3709 $w = 0 if $w < 0; 4248 $w = 0 if $w < 0;
3710 $h = 0 if $h < 0; 4249 $h = 0 if $h < 0;
3711 4250
4251 $w = max $widget->{min_w}, $w;
4252 $h = max $widget->{min_h}, $h;
4253
4254# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4255# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4256
4257 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4258 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4259
3712 $w = int $w + 0.5; 4260 $w = int $w + 0.5;
3713 $h = int $h + 0.5; 4261 $h = int $h + 0.5;
3714 4262
3715 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4263 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3716 $widget->{old_w} = $widget->{w}; 4264 $widget->{old_w} = $widget->{w};
… …
3726 4274
3727 while ($self->{post_alloc_hook}) { 4275 while ($self->{post_alloc_hook}) {
3728 $_->() 4276 $_->()
3729 for values %{delete $self->{post_alloc_hook}}; 4277 for values %{delete $self->{post_alloc_hook}};
3730 } 4278 }
3731
3732 4279
3733 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4280 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3734 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4281 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3735 glClear GL_COLOR_BUFFER_BIT; 4282 glClear GL_COLOR_BUFFER_BIT;
3736 4283
… …
3739 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4286 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3740 glMatrixMode GL_MODELVIEW; 4287 glMatrixMode GL_MODELVIEW;
3741 glLoadIdentity; 4288 glLoadIdentity;
3742 4289
3743 { 4290 {
3744 package CFClient::UI::Base; 4291 package CFPlus::UI::Base;
3745 4292
3746 ($draw_x, $draw_y, $draw_w, $draw_h) = 4293 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3747 (0, 0, $self->{w}, $self->{h}); 4294 (0, 0, $self->{w}, $self->{h});
3748 }
3749 4295
3750 $self->_draw; 4296 $self->_draw;
4297 }
3751} 4298}
3752 4299
3753############################################################################# 4300#############################################################################
3754 4301
3755package CFClient::UI; 4302package CFPlus::UI;
3756 4303
3757$ROOT = new CFClient::UI::Root; 4304$ROOT = new CFPlus::UI::Root;
3758$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4305$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3759 4306
37601 43071
3761 4308

Diff Legend

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