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.288 by root, Mon Jun 5 21:14:40 2006 UTC vs.
Revision 1.375 by root, Mon Jul 16 20:12:19 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
503}
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)
463} 550}
464 551
465sub find_widget { 552sub find_widget {
466 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
467 554
… …
475} 562}
476 563
477sub set_parent { 564sub set_parent {
478 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
479 566
480 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 568 $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} 569}
506 570
507sub realloc { 571sub realloc {
508 my ($self) = @_; 572 my ($self) = @_;
509 573
… …
526} 590}
527 591
528sub reconfigure { 592sub reconfigure {
529 my ($self) = @_; 593 my ($self) = @_;
530 594
531 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
534
535 $self->realloc; 595 $self->realloc;
536 $self->update; 596 $self->update;
537} 597}
538 598
539# using global variables seems a bit hacky, but passing through all drawing 599# using global variables seems a bit hacky, but passing through all drawing
… …
546 return unless $self->{h} && $self->{w}; 606 return unless $self->{h} && $self->{w};
547 607
548 # update screen rectangle 608 # update screen rectangle
549 local $draw_x = $draw_x + $self->{x}; 609 local $draw_x = $draw_x + $self->{x};
550 local $draw_y = $draw_y + $self->{y}; 610 local $draw_y = $draw_y + $self->{y};
551 local $draw_w = $draw_x + $self->{w};
552 local $draw_h = $draw_y + $self->{h};
553 611
554 # skip widgets that are entirely outside the drawing area 612 # skip widgets that are entirely outside the drawing area
555 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
556 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
557 615
… …
580 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
581 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
582 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
583 glEnd; 641 glEnd;
584 glPopMatrix; 642 glPopMatrix;
585 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
586 } 644 }
587 645
588 $self->_draw; 646 $self->_draw;
589 glPopMatrix; 647 glPopMatrix;
590} 648}
… …
593 my ($self) = @_; 651 my ($self) = @_;
594 652
595 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
596} 654}
597 655
656my $cntx;#d#
598sub DESTROY { 657sub DESTROY {
599 my ($self) = @_; 658 my ($self) = @_;
600 659
660 return if CFPlus::in_destruct;
661
662 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
601 delete $WIDGET{$self+0}; 665 delete $WIDGET{$self+0};
602 #$self->deactivate;
603} 666}
604 667
605############################################################################# 668#############################################################################
606 669
607package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
608 671
609our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
610 673
611use strict; 674use strict;
612use CFClient::OpenGL; 675use CFPlus::OpenGL;
613 676
614sub new { 677sub new {
615 my $class = shift; 678 my $class = shift;
616 679
617 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
648 } 711 }
649} 712}
650 713
651############################################################################# 714#############################################################################
652 715
653package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
654 717
655our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
656 719
657sub new { 720sub new {
658 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
659 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
660} 723}
… …
667 730
668sub draw { } 731sub draw { }
669 732
670############################################################################# 733#############################################################################
671 734
672package CFClient::UI::Container; 735package CFPlus::UI::Container;
673 736
674our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
675 738
676sub new { 739sub new {
677 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
678 741
679 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
688 if $children; 751 if $children;
689 752
690 $self 753 $self
691} 754}
692 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
693sub add { 764sub add {
694 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
695 766
696 $_->set_parent ($self) 767 $_->set_parent ($self)
697 for @widgets; 768 for @widgets;
… …
757 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
758} 829}
759 830
760############################################################################# 831#############################################################################
761 832
762package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
763 834
764our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
765 836
766sub new { 837sub new {
767 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
768 839
769 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
770 841
771 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
772} 843}
773 844
774sub add { 845sub add {
775 my ($self, $child) = @_; 846 my ($self, $child) = @_;
776 847
777 $self->{children} = []; 848 $self->SUPER::remove ($_) for @{ $self->{children} };
778
779 $self->SUPER::add ($child); 849 $self->SUPER::add ($child);
780} 850}
781 851
782sub remove { 852sub remove {
783 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
784 854
785 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
786 856
787 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
788 unless @{$self->{children}}; 858 unless @{$self->{children}};
789} 859}
790 860
791sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
792 862
793sub size_request { 863sub size_request {
794 $_[0]{children}[0]->size_request 864 $_[0]{children}[0]->size_request
795} 865}
796 866
797sub size_allocate { 867sub invoke_size_allocate {
798 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
799 869
800 $self->{children}[0]->configure (0, 0, $w, $h); 870 $self->{children}[0]->configure (0, 0, $w, $h);
871
872 1
801} 873}
802 874
803############################################################################# 875#############################################################################
804 876
805# back-buffered drawing area 877# back-buffered drawing area
806 878
807package CFClient::UI::Window; 879package CFPlus::UI::Window;
808 880
809our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
810 882
811use CFClient::OpenGL; 883use CFPlus::OpenGL;
812 884
813sub new { 885sub new {
814 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
815 887
816 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
821 893
822 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 894 $ROOT->on_post_alloc ($self => sub { $self->render_child });
823 $self->SUPER::update; 895 $self->SUPER::update;
824} 896}
825 897
826sub size_allocate { 898sub invoke_size_allocate {
827 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
828 900
829 $self->SUPER::size_allocate ($w, $h);
830 $self->update; 901 $self->update;
902
903 $self->SUPER::invoke_size_allocate ($w, $h)
831} 904}
832 905
833sub _render { 906sub _render {
834 my ($self) = @_; 907 my ($self) = @_;
835 908
… …
837} 910}
838 911
839sub render_child { 912sub render_child {
840 my ($self) = @_; 913 my ($self) = @_;
841 914
842 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
843 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
844 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
845 918
846 { 919 {
847 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
848 921
849 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
850 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
851 } 926 }
852
853 $self->_render;
854 }; 927 };
855} 928}
856 929
857sub _draw { 930sub _draw {
858 my ($self) = @_; 931 my ($self) = @_;
859
860 my ($w, $h) = @$self{qw(w h)};
861 932
862 my $tex = $self->{texture} 933 my $tex = $self->{texture}
863 or return; 934 or return;
864 935
865 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
867 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
868 939
869 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
870 941
871 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
872} 943}
873 944
874############################################################################# 945#############################################################################
875 946
876package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
877 948
949use List::Util qw(min max);
950
878our @ISA = CFClient::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
879 952
880sub new { 953sub new {
881 my $class = shift; 954 my $class = shift;
882 955
883 $class->SUPER::new ( 956 $class->SUPER::new (
… …
896 $h = 10 if $self->{scroll_y}; 969 $h = 10 if $self->{scroll_y};
897 970
898 ($w, $h) 971 ($w, $h)
899} 972}
900 973
901sub size_allocate { 974sub invoke_size_allocate {
902 my ($self, $w, $h) = @_; 975 my ($self, $w, $h) = @_;
903 976
904 my $child = $self->child; 977 my $child = $self->child;
905 978
906 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 979 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
907 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 980 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
908 981
909 $self->child->configure (0, 0, $w, $h); 982 $self->child->configure (0, 0, $w, $h);
910 $self->update; 983 $self->update;
984
985 1
911} 986}
912 987
913sub set_offset { 988sub set_offset {
914 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
915 990
916 $self->{view_x} = int $x; 991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
917 $self->{view_y} = int $y; 992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
918 993
919 $self->update; 994 $self->update;
920} 995}
921 996
922# hmm, this does not work for topleft of $self... but we should not ask for that 997# hmm, this does not work for topleft of $self... but we should not ask for that
… …
941 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1016 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
942 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1017 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
943 ) { 1018 ) {
944 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1019 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
945 } else { 1020 } else {
946 $self->CFClient::UI::Base::find_widget ($x, $y) 1021 $self->CFPlus::UI::Base::find_widget ($x, $y)
947 } 1022 }
948} 1023}
949 1024
950sub _render { 1025sub _render {
951 my ($self) = @_; 1026 my ($self) = @_;
952 1027
953 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1028 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
954 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1029 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
955 1030
956 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1031 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
957 1032
958 $self->SUPER::_render; 1033 $self->SUPER::_render;
959} 1034}
960 1035
961############################################################################# 1036#############################################################################
962 1037
963package CFClient::UI::ScrolledWindow; 1038package CFPlus::UI::ScrolledWindow;
964 1039
965our @ISA = CFClient::UI::HBox::; 1040our @ISA = CFPlus::UI::Table::;
966 1041
967sub new { 1042sub new {
968 my ($class, %arg) = @_; 1043 my ($class, %arg) = @_;
969 1044
970 my $child = delete $arg{child}; 1045 my $child = delete $arg{child};
971 1046
972 my $self; 1047 my $self;
973 1048
974 my $slider = new CFClient::UI::Slider 1049 my $hslider = new CFPlus::UI::Slider
1050 vertical => 0,
1051 range => [0, 0, 1, 0.01], # HACK fix
1052 on_changed => sub {
1053 $self->{hpos} = $_[1];
1054 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1055 },
1056 ;
1057
1058 my $vslider = new CFPlus::UI::Slider
975 vertical => 1, 1059 vertical => 1,
976 range => [0, 0, 1, 0.01], # HACK fix 1060 range => [0, 0, 1, 0.01], # HACK fix
977 on_changed => sub { 1061 on_changed => sub {
978 $self->{vp}->set_offset (0, $_[1]); 1062 $self->{vpos} = $_[1];
1063 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
979 }, 1064 },
980 ; 1065 ;
981 1066
982 $self = $class->SUPER::new ( 1067 $self = $class->SUPER::new (
983 vp => (new CFClient::UI::ViewPort expand => 1), 1068 scroll_x => 0,
1069 scroll_y => 1,
1070 can_events => 1,
984 slider => $slider, 1071 hslider => $hslider,
1072 vslider => $vslider,
1073 col_expand => [1, 0],
1074 row_expand => [1, 0],
985 %arg, 1075 %arg,
986 ); 1076 );
987 1077
1078 $self->{vp} = new CFPlus::UI::ViewPort
1079 expand => 1,
1080 scroll_x => $self->{scroll_x},
1081 scroll_y => $self->{scroll_y},
1082 ;
1083
988 $self->SUPER::add ($self->{vp}, $self->{slider}); 1084 $self->SUPER::add (0, 0, $self->{vp});
1085
989 $self->add ($child) if $child; 1086 $self->add ($child) if $child;
990 1087
991 $self 1088 $self
992} 1089}
1090
1091#TODO# update range on size_allocate depending on child
993 1092
994sub add { 1093sub add {
995 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
996 1095
997 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
998} 1097}
999 1098
1099sub update_slider {
1100 my ($self) = @_;
1101
1102 my $child = ($self->{vp} or return)->child;
1103
1104 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1105 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1106
1107 my $visible = $w1 > $w2;
1108 if ($visible != $self->{hslider}{visible}) {
1109 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1110 : $self->{hslider}->hide;
1111 }
1112
1113 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1114 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1115
1116 my $visible = $h1 > $h2;
1117 if ($visible != $self->{vslider}{visible}) {
1118 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1119 : $self->{vslider}->hide;
1120 }
1121}
1122
1000sub update { 1123sub update {
1001 my ($self) = @_; 1124 my ($self) = @_;
1002 1125
1003 $self->SUPER::update; 1126 $self->SUPER::update;
1004 1127 $self->update_slider;
1005 # todo: overwrite size_allocate of child
1006 my $child = $self->{vp}->child;
1007 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1008} 1128}
1009 1129
1130sub invoke_mouse_wheel {
1131 my ($self, $ev) = @_;
1132
1133 return 0 unless $ev->{dy}; # only vertical movements for now
1134
1135 $self->{vslider}->emit (mouse_wheel => $ev);
1136
1137 1
1138}
1139
1140sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_;
1142
1143 if ($ev->{button} == 2) {
1144 $self->grab_focus;
1145
1146 $self->{motion} = sub {
1147 my ($ev, $x, $y) = @_;
1148
1149 $self->{vp}->set_offset (
1150 $self->{vp}{view_x} - $ev->{xrel},
1151 $self->{vp}{view_y} - $ev->{yrel},
1152 );
1153 };
1154
1155 return 1;
1156 }
1157
1158 0
1159}
1160
1161sub invoke_button_up {
1162 my ($self, $ev, $x, $y) = @_;
1163
1164 if (delete $self->{motion}) {
1165 return 1;
1166 }
1167
1168 0
1169}
1170
1171sub invoke_mouse_motion {
1172 my ($self, $ev, $x, $y) = @_;
1173
1174 if ($self->{motion}) {
1175 $self->{motion}->($ev, $x, $y);
1176 return 1;
1177 }
1178
1179 0
1180}
1181
1010sub size_allocate { 1182sub invoke_size_allocate {
1011 my ($self, $w, $h) = @_; 1183 my ($self, $w, $h) = @_;
1012 1184
1185 $self->update_slider;
1013 $self->SUPER::size_allocate ($w, $h); 1186 $self->SUPER::invoke_size_allocate ($w, $h)
1014
1015 my $child = $self->{vp}->child;
1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1017} 1187}
1018
1019#TODO# update range on size_allocate depending on child
1020# update viewport offset on scroll
1021 1188
1022############################################################################# 1189#############################################################################
1023 1190
1024package CFClient::UI::Frame; 1191package CFPlus::UI::Frame;
1025 1192
1026our @ISA = CFClient::UI::Bin::; 1193our @ISA = CFPlus::UI::Bin::;
1027 1194
1028use CFClient::OpenGL; 1195use CFPlus::OpenGL;
1029 1196
1030sub new { 1197sub new {
1031 my $class = shift; 1198 my $class = shift;
1032 1199
1033 $class->SUPER::new ( 1200 $class->SUPER::new (
… …
1059 $self->SUPER::_draw; 1226 $self->SUPER::_draw;
1060} 1227}
1061 1228
1062############################################################################# 1229#############################################################################
1063 1230
1064package CFClient::UI::FancyFrame; 1231package CFPlus::UI::FancyFrame;
1065 1232
1066our @ISA = CFClient::UI::Bin::; 1233our @ISA = CFPlus::UI::Bin::;
1067 1234
1068use CFClient::OpenGL; 1235use CFPlus::OpenGL;
1069
1070my $bg =
1071 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1072 mipmap => 1, wrap => 1;
1073
1074my @border =
1075 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1076 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1077 1236
1078sub new { 1237sub new {
1079 my ($class, %arg) = @_; 1238 my ($class, %arg) = @_;
1080 1239
1081 my $title = delete $arg{title}; 1240 if ((exists $arg{label}) && !ref $arg{label}) {
1241 $arg{label} = new CFPlus::UI::Label
1242 align => 1,
1243 valign => 0,
1244 text => $arg{label},
1245 fontsize => ($arg{border} || 0.8) * 0.75;
1246 }
1247
1248 my $self = $class->SUPER::new (
1249 # label => "",
1250 fg => [0.6, 0.3, 0.1],
1251 border => 0.8,
1252 style => 'single',
1253 %arg,
1254 );
1255
1256 $self
1257}
1258
1259sub add {
1260 my ($self, @widgets) = @_;
1261
1262 $self->SUPER::add (@widgets);
1263 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1264}
1265
1266sub border {
1267 int $_[0]{border} * $::FONTSIZE
1268}
1269
1270sub size_request {
1271 my ($self) = @_;
1272
1273 ($self->{label_w}, undef) = $self->{label}->size_request
1274 if $self->{label};
1275
1276 my ($w, $h) = $self->SUPER::size_request;
1277
1278 (
1279 $w + $self->border * 2,
1280 $h + $self->border * 2,
1281 )
1282}
1283
1284sub invoke_size_allocate {
1285 my ($self, $w, $h) = @_;
1286
1287 my $border = $self->border;
1288
1289 $w -= List::Util::max 0, $border * 2;
1290 $h -= List::Util::max 0, $border * 2;
1291
1292 if (my $label = $self->{label}) {
1293 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1294 $label->{h} = List::Util::min $h, $border;
1295 $label->invoke_size_allocate ($label->{w}, $label->{h});
1296 }
1297
1298 $self->child->configure ($border, $border, $w, $h);
1299
1300 1
1301}
1302
1303sub _draw {
1304 my ($self) = @_;
1305
1306 my $child = $self->{children}[0];
1307
1308 my $border = $self->border;
1309 my ($w, $h) = ($self->{w}, $self->{h});
1310
1311 $child->draw;
1312
1313 glColor @{$self->{fg}};
1314 glBegin GL_LINE_STRIP;
1315 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1316 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1317 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1318 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1319 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1320 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1321 glEnd;
1322
1323 if ($self->{label}) {
1324 glTranslate $border * 2, 0;
1325 $self->{label}->_draw;
1326 }
1327}
1328
1329#############################################################################
1330
1331package CFPlus::UI::Toplevel;
1332
1333our @ISA = CFPlus::UI::Bin::;
1334
1335use CFPlus::OpenGL;
1336
1337my $bg =
1338 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1339 mipmap => 1, wrap => 1;
1340
1341my @border =
1342 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1343 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1344
1345sub new {
1346 my ($class, %arg) = @_;
1082 1347
1083 my $self = $class->SUPER::new ( 1348 my $self = $class->SUPER::new (
1084 bg => [1, 1, 1, 1], 1349 bg => [1, 1, 1, 1],
1085 border_bg => [1, 1, 1, 1], 1350 border_bg => [1, 1, 1, 1],
1086 border => 0.6, 1351 border => 0.6,
1087 can_events => 1, 1352 can_events => 1,
1088 min_w => 16, 1353 min_w => 64,
1089 min_h => 16, 1354 min_h => 32,
1090 %arg, 1355 %arg,
1091 ); 1356 );
1092 1357
1093 $self->{title} = new CFClient::UI::Label 1358 $self->{title_widget} = new CFPlus::UI::Label
1094 align => 0, 1359 align => 0,
1095 valign => 1, 1360 valign => 1,
1096 text => $title, 1361 text => $self->{title},
1097 fontsize => $self->{border} 1362 fontsize => $self->{border},
1098 if defined $title; 1363 if exists $self->{title};
1364
1365 if ($self->{has_close_button}) {
1366 $self->{close_button} =
1367 new CFPlus::UI::ImageButton
1368 path => 'x1_close.png',
1369 on_activate => sub { $self->emit ("delete") };
1370
1371 $self->CFPlus::UI::Container::add ($self->{close_button});
1372 }
1099 1373
1100 $self 1374 $self
1101} 1375}
1102 1376
1103sub add { 1377sub add {
1104 my ($self, @widgets) = @_; 1378 my ($self, @widgets) = @_;
1105 1379
1106 $self->SUPER::add (@widgets); 1380 $self->SUPER::add (@widgets);
1381 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1107 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1382 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1108} 1383}
1109 1384
1110sub border { 1385sub border {
1111 int $_[0]{border} * $::FONTSIZE 1386 int $_[0]{border} * $::FONTSIZE
1112} 1387}
1113 1388
1114sub size_request { 1389sub size_request {
1115 my ($self) = @_; 1390 my ($self) = @_;
1116 1391
1117 $self->{title}->size_request 1392 $self->{title_widget}->size_request
1118 if $self->{title}; 1393 if $self->{title_widget};
1394
1395 $self->{close_button}->size_request
1396 if $self->{close_button};
1119 1397
1120 my ($w, $h) = $self->SUPER::size_request; 1398 my ($w, $h) = $self->SUPER::size_request;
1121 1399
1122 ( 1400 (
1123 $w + $self->border * 2, 1401 $w + $self->border * 2,
1124 $h + $self->border * 2, 1402 $h + $self->border * 2,
1125 ) 1403 )
1126} 1404}
1127 1405
1128sub size_allocate { 1406sub invoke_size_allocate {
1129 my ($self, $w, $h) = @_; 1407 my ($self, $w, $h) = @_;
1130 1408
1131 if ($self->{title}) { 1409 if ($self->{title_widget}) {
1132 $self->{title}{w} = $w; 1410 $self->{title_widget}{w} = $w;
1133 $self->{title}{h} = $h; 1411 $self->{title_widget}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h); 1412 $self->{title_widget}->invoke_size_allocate ($w, $h);
1135 } 1413 }
1136 1414
1137 my $border = $self->border; 1415 my $border = $self->border;
1138 1416
1139 $h -= List::Util::max 0, $border * 2; 1417 $h -= List::Util::max 0, $border * 2;
1140 $w -= List::Util::max 0, $border * 2; 1418 $w -= List::Util::max 0, $border * 2;
1419
1420 $self->child->configure ($border, $border, $w, $h);
1421
1422 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1423 if $self->{close_button};
1424
1425 1
1426}
1427
1428sub invoke_delete {
1429 my ($self) = @_;
1430
1431 $self->hide;
1141 1432
1142 $self->child->configure ($border, $border, $w, $h); 1433 1
1143} 1434}
1144 1435
1145sub button_down { 1436sub invoke_button_down {
1146 my ($self, $ev, $x, $y) = @_; 1437 my ($self, $ev, $x, $y) = @_;
1147 1438
1148 my ($w, $h) = @$self{qw(w h)}; 1439 my ($w, $h) = @$self{qw(w h)};
1149 my $border = $self->border; 1440 my $border = $self->border;
1150 1441
… …
1181 1472
1182 ($x, $y) = ($ev->{x}, $ev->{y}); 1473 ($x, $y) = ($ev->{x}, $ev->{y});
1183 1474
1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1475 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1185 # HACK: the next line is required to enforce placement 1476 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1477 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1187 }; 1478 };
1188 } else { 1479 } else {
1189 return 0; 1480 return 0;
1190 } 1481 }
1191 1482
1192 1 1483 1
1193} 1484}
1194 1485
1195sub button_up { 1486sub invoke_button_up {
1196 my ($self, $ev, $x, $y) = @_; 1487 my ($self, $ev, $x, $y) = @_;
1197 1488
1198 !!delete $self->{motion} 1489 ! ! delete $self->{motion}
1199} 1490}
1200 1491
1201sub mouse_motion { 1492sub invoke_mouse_motion {
1202 my ($self, $ev, $x, $y) = @_; 1493 my ($self, $ev, $x, $y) = @_;
1203 1494
1204 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1495 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205 1496
1206 !!$self->{motion} 1497 ! ! $self->{motion}
1498}
1499
1500sub invoke_visibility_change {
1501 my ($self, $visible) = @_;
1502
1503 delete $self->{motion} unless $visible;
1504
1505 0
1207} 1506}
1208 1507
1209sub _draw { 1508sub _draw {
1210 my ($self) = @_; 1509 my ($self) = @_;
1211 1510
… …
1237 1536
1238 glDisable GL_TEXTURE_2D; 1537 glDisable GL_TEXTURE_2D;
1239 1538
1240 $child->draw; 1539 $child->draw;
1241 1540
1242 if ($self->{title}) { 1541 if ($self->{title_widget}) {
1243 glTranslate 0, $border - $self->{h}; 1542 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw; 1543 $self->{title_widget}->_draw;
1544
1545 glTranslate 0, - ($border - $self->{h});
1245 } 1546 }
1547
1548 $self->{close_button}->draw
1549 if $self->{close_button};
1246} 1550}
1247 1551
1248############################################################################# 1552#############################################################################
1249 1553
1250package CFClient::UI::Table; 1554package CFPlus::UI::Table;
1251 1555
1252our @ISA = CFClient::UI::Base::; 1556our @ISA = CFPlus::UI::Base::;
1253 1557
1254use List::Util qw(max sum); 1558use List::Util qw(max sum);
1255 1559
1256use CFClient::OpenGL; 1560use CFPlus::OpenGL;
1257 1561
1258sub new { 1562sub new {
1259 my $class = shift; 1563 my $class = shift;
1260 1564
1261 $class->SUPER::new ( 1565 $class->SUPER::new (
1566 children => [],
1262 col_expand => [], 1567 col_expand => [],
1568 row_expand => [],
1263 @_, 1569 @_,
1264 ) 1570 )
1265} 1571}
1266 1572
1267sub children { 1573sub children {
1268 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1574 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1269} 1575}
1270 1576
1577# TODO: store row/col info in child widget and use standard add/del
1271sub add { 1578sub add {
1272 my ($self, $x, $y, $child) = @_; 1579 my ($self) = shift;
1273 1580
1581 while (@_) {
1582 my ($x, $y, $child) = splice @_, 0, 3, ();
1274 $child->set_parent ($self); 1583 $child->set_parent ($self);
1275 $self->{children}[$y][$x] = $child; 1584 $self->{children}[$y][$x] = $child;
1585 }
1276 1586
1587 $self->{force_realloc} = 1;
1588 $self->{force_size_alloc} = 1;
1277 $self->realloc; 1589 $self->realloc;
1590}
1591
1592sub remove {
1593 my ($self, $child) = @_;
1594
1595 for (@{ $self->{children} }) {
1596 for (@{ $_ || [] }) {
1597 $_ = undef if $_ == $child;
1598 }
1599 }
1278} 1600}
1279 1601
1280# TODO: move to container class maybe? send children a signal on removal? 1602# TODO: move to container class maybe? send children a signal on removal?
1281sub clear { 1603sub clear {
1282 my ($self) = @_; 1604 my ($self) = @_;
… …
1323 (sum @$ws), 1645 (sum @$ws),
1324 (sum @$hs), 1646 (sum @$hs),
1325 ) 1647 )
1326} 1648}
1327 1649
1328sub size_allocate { 1650sub invoke_size_allocate {
1329 my ($self, $w, $h) = @_; 1651 my ($self, $w, $h) = @_;
1330 1652
1331 my ($ws, $hs) = $self->get_wh; 1653 my ($ws, $hs) = $self->get_wh;
1332 1654
1333 my $req_w = (sum @$ws) || 1; 1655 my $req_w = (sum @$ws) || 1;
1334 my $req_h = (sum @$hs) || 1; 1656 my $req_h = (sum @$hs) || 1;
1335 1657
1336 # TODO: nicer code && do row_expand 1658 # TODO: nicer code
1337 my @col_expand = @{$self->{col_expand}}; 1659 my @col_expand = @{$self->{col_expand}};
1338 @col_expand = (1) x @$ws unless @col_expand; 1660 @col_expand = (1) x @$ws unless @col_expand;
1339 my $col_expand = (sum @col_expand) || 1; 1661 my $col_expand = (sum @col_expand) || 1;
1340 1662
1341 # linearly scale sizes
1342 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1663 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1343 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1344 1664
1345 CFClient::UI::harmonize $ws; 1665 CFPlus::UI::harmonize $ws;
1666
1667 my @row_expand = @{$self->{row_expand}};
1668 @row_expand = (1) x @$ws unless @row_expand;
1669 my $row_expand = (sum @row_expand) || 1;
1670
1671 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1672
1346 CFClient::UI::harmonize $hs; 1673 CFPlus::UI::harmonize $hs;
1347 1674
1348 my $y; 1675 my $y;
1349 1676
1350 for my $r (0 .. $#{$self->{children}}) { 1677 for my $r (0 .. $#{$self->{children}}) {
1351 my $row = $self->{children}[$r] 1678 my $row = $self->{children}[$r]
… …
1365 } 1692 }
1366 1693
1367 $y += $row_h; 1694 $y += $row_h;
1368 } 1695 }
1369 1696
1697 1
1370} 1698}
1371 1699
1372sub find_widget { 1700sub find_widget {
1373 my ($self, $x, $y) = @_; 1701 my ($self, $x, $y) = @_;
1374 1702
… …
1393 } 1721 }
1394} 1722}
1395 1723
1396############################################################################# 1724#############################################################################
1397 1725
1398package CFClient::UI::Box; 1726package CFPlus::UI::Fixed;
1399 1727
1728use List::Util qw(min max);
1729
1400our @ISA = CFClient::UI::Container::; 1730our @ISA = CFPlus::UI::Container::;
1731
1732sub add {
1733 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1734
1735 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1736 $self->SUPER::add ($child);
1737}
1738
1739sub _scale($$$) {
1740 my ($mode, $val, $max) = @_;
1741
1742 $mode eq "abs" ? $val
1743 : $mode eq "rel" ? $val * $max
1744 : 0
1745}
1746
1747sub size_request {
1748 my ($self) = @_;
1749
1750 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1751
1752 # determine overall size by querying abs widgets
1753 for my $child ($self->visible_children) {
1754 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1755
1756 if ($pos eq "abs") {
1757 $w = _scale $size, $w, $child->{req_w};
1758 $h = _scale $size, $h, $child->{req_h};
1759
1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1762 }
1763 }
1764
1765 my $W = $x2 - $x1;
1766 my $H = $y2 - $y1;
1767
1768 # now layout remaining widgets
1769 for my $child ($self->visible_children) {
1770 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1771
1772 if ($pos ne "abs") {
1773 $x = _scale $pos, $x, $W;
1774 $y = _scale $pos, $x, $H;
1775 $w = _scale $size, $w, $child->{req_w};
1776 $h = _scale $size, $h, $child->{req_h};
1777
1778 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1779 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1780 }
1781 }
1782
1783 my $W = $x2 - $x1;
1784 my $H = $y2 - $y1;
1785
1786 ($W, $H)
1787}
1788
1789sub invoke_size_allocate {
1790 my ($self, $W, $H) = @_;
1791
1792 for my $child ($self->visible_children) {
1793 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1794
1795 $x = _scale $pos, $x, $W;
1796 $y = _scale $pos, $x, $H;
1797 $w = _scale $size, $w, $child->{req_w};
1798 $h = _scale $size, $h, $child->{req_h};
1799
1800 $child->configure ($x, $y, $w, $h);
1801 }
1802
1803 1
1804}
1805
1806#############################################################################
1807
1808package CFPlus::UI::Box;
1809
1810our @ISA = CFPlus::UI::Container::;
1401 1811
1402sub size_request { 1812sub size_request {
1403 my ($self) = @_; 1813 my ($self) = @_;
1404 1814
1405 $self->{vertical} 1815 $self->{vertical}
… …
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1821 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1822 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 ) 1823 )
1414} 1824}
1415 1825
1416sub size_allocate { 1826sub invoke_size_allocate {
1417 my ($self, $w, $h) = @_; 1827 my ($self, $w, $h) = @_;
1418 1828
1419 my $space = $self->{vertical} ? $h : $w; 1829 my $space = $self->{vertical} ? $h : $w;
1420 my $children = $self->{children}; 1830 my @children = $self->visible_children;
1421 1831
1422 my @req; 1832 my @req;
1423 1833
1424 if ($self->{homogeneous}) { 1834 if ($self->{homogeneous}) {
1425 @req = ($space / (@$children || 1)) x @$children; 1835 @req = ($space / (@children || 1)) x @children;
1426 } else { 1836 } else {
1427 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1837 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1428 my $req = List::Util::sum @req; 1838 my $req = List::Util::sum @req;
1429 1839
1430 if ($req > $space) { 1840 if ($req > $space) {
1431 # ah well, not enough space 1841 # ah well, not enough space
1432 $_ *= $space / $req for @req; 1842 $_ *= $space / $req for @req;
1433 } else { 1843 } else {
1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1844 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1435 1845
1436 $space = ($space - $req) / $expand; # remaining space to give away 1846 $space = ($space - $req) / $expand; # remaining space to give away
1437 1847
1438 $req[$_] += $space * $children->[$_]{expand} 1848 $req[$_] += $space * $children[$_]{expand}
1439 for 0 .. $#$children; 1849 for 0 .. $#children;
1440 } 1850 }
1441 } 1851 }
1442 1852
1443 CFClient::UI::harmonize \@req; 1853 CFPlus::UI::harmonize \@req;
1444 1854
1445 my $pos = 0; 1855 my $pos = 0;
1446 for (0 .. $#$children) { 1856 for (0 .. $#children) {
1447 my $alloc = $req[$_]; 1857 my $alloc = $req[$_];
1448 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1858 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1449 1859
1450 $pos += $alloc; 1860 $pos += $alloc;
1451 } 1861 }
1452 1862
1453 1 1863 1
1454} 1864}
1455 1865
1456############################################################################# 1866#############################################################################
1457 1867
1458package CFClient::UI::HBox; 1868package CFPlus::UI::HBox;
1459 1869
1460our @ISA = CFClient::UI::Box::; 1870our @ISA = CFPlus::UI::Box::;
1461 1871
1462sub new { 1872sub new {
1463 my $class = shift; 1873 my $class = shift;
1464 1874
1465 $class->SUPER::new ( 1875 $class->SUPER::new (
… …
1468 ) 1878 )
1469} 1879}
1470 1880
1471############################################################################# 1881#############################################################################
1472 1882
1473package CFClient::UI::VBox; 1883package CFPlus::UI::VBox;
1474 1884
1475our @ISA = CFClient::UI::Box::; 1885our @ISA = CFPlus::UI::Box::;
1476 1886
1477sub new { 1887sub new {
1478 my $class = shift; 1888 my $class = shift;
1479 1889
1480 $class->SUPER::new ( 1890 $class->SUPER::new (
… …
1483 ) 1893 )
1484} 1894}
1485 1895
1486############################################################################# 1896#############################################################################
1487 1897
1488package CFClient::UI::Label; 1898package CFPlus::UI::Label;
1489 1899
1490our @ISA = CFClient::UI::DrawBG::; 1900our @ISA = CFPlus::UI::DrawBG::;
1491 1901
1492use CFClient::OpenGL; 1902use CFPlus::OpenGL;
1493 1903
1494sub new { 1904sub new {
1495 my ($class, %arg) = @_; 1905 my ($class, %arg) = @_;
1496 1906
1497 my $self = $class->SUPER::new ( 1907 my $self = $class->SUPER::new (
… …
1500 #active_bg => none 1910 #active_bg => none
1501 #font => default_font 1911 #font => default_font
1502 #text => initial text 1912 #text => initial text
1503 #markup => initial narkup 1913 #markup => initial narkup
1504 #max_w => maximum pixel width 1914 #max_w => maximum pixel width
1915 #style => 0, # render flags
1505 ellipsise => 3, # end 1916 ellipsise => 3, # end
1506 layout => (new CFClient::Layout), 1917 layout => (new CFPlus::Layout),
1507 fontsize => 1, 1918 fontsize => 1,
1508 align => -1, 1919 align => -1,
1509 valign => -1, 1920 valign => -1,
1510 padding_x => 2, 1921 padding_x => 2,
1511 padding_y => 2, 1922 padding_y => 2,
1512 can_events => 0, 1923 can_events => 0,
1513 %arg 1924 %arg
1514 ); 1925 );
1515 1926
1516 if (exists $self->{template}) { 1927 if (exists $self->{template}) {
1517 my $layout = new CFClient::Layout; 1928 my $layout = new CFPlus::Layout;
1518 $layout->set_text (delete $self->{template}); 1929 $layout->set_text (delete $self->{template});
1519 $self->{template} = $layout; 1930 $self->{template} = $layout;
1520 } 1931 }
1521 1932
1522 if (exists $self->{markup}) { 1933 if (exists $self->{markup}) {
… …
1526 } 1937 }
1527 1938
1528 $self 1939 $self
1529} 1940}
1530 1941
1531sub escape($) {
1532 local $_ = $_[0];
1533
1534 s/&/&amp;/g;
1535 s/>/&gt;/g;
1536 s/</&lt;/g;
1537
1538 $_
1539}
1540
1541sub update { 1942sub update {
1542 my ($self) = @_; 1943 my ($self) = @_;
1543 1944
1544 delete $self->{texture}; 1945 delete $self->{texture};
1545 $self->SUPER::update; 1946 $self->SUPER::update;
… …
1556 my ($self, $text) = @_; 1957 my ($self, $text) = @_;
1557 1958
1558 return if $self->{text} eq "T$text"; 1959 return if $self->{text} eq "T$text";
1559 $self->{text} = "T$text"; 1960 $self->{text} = "T$text";
1560 1961
1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1562 $self->{layout}->set_text ($text); 1962 $self->{layout}->set_text ($text);
1563 1963
1564 delete $self->{req_h}; 1964 delete $self->{size_req};
1565 $self->realloc; 1965 $self->realloc;
1566 $self->update; 1966 $self->update;
1567} 1967}
1568 1968
1569sub set_markup { 1969sub set_markup {
… …
1572 return if $self->{text} eq "M$markup"; 1972 return if $self->{text} eq "M$markup";
1573 $self->{text} = "M$markup"; 1973 $self->{text} = "M$markup";
1574 1974
1575 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1975 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1576 1976
1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1578 $self->{layout}->set_markup ($markup); 1977 $self->{layout}->set_markup ($markup);
1579 1978
1580 delete $self->{req_h}; 1979 delete $self->{size_req};
1581 $self->realloc; 1980 $self->realloc;
1582 $self->update; 1981 $self->update;
1583} 1982}
1584 1983
1585sub size_request { 1984sub size_request {
1586 my ($self) = @_; 1985 my ($self) = @_;
1587 1986
1588 if (exists $self->{req_h}) { 1987 $self->{size_req} ||= do {
1589 @$self{qw(req_w req_h)}
1590 } else {
1591 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1988 $self->{layout}->set_font ($self->{font}) if $self->{font};
1592 $self->{layout}->set_width ($self->{max_w} || -1); 1989 $self->{layout}->set_width ($self->{max_w} || -1);
1593 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1990 $self->{layout}->set_ellipsise ($self->{ellipsise});
1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1991 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1992 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1993
1597 my ($w, $h) = $self->{layout}->size; 1994 my ($w, $h) = $self->{layout}->size;
1598 1995
1599 if (exists $self->{template}) { 1996 if (exists $self->{template}) {
1600 $self->{template}->set_font ($self->{font}) if $self->{font}; 1997 $self->{template}->set_font ($self->{font}) if $self->{font};
1998 $self->{template}->set_width ($self->{max_w} || -1);
1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1999 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1602 2000
1603 my ($w2, $h2) = $self->{template}->size; 2001 my ($w2, $h2) = $self->{template}->size;
1604 2002
1605 $w = List::Util::max $w, $w2; 2003 $w = List::Util::max $w, $w2;
1606 $h = List::Util::max $h, $h2; 2004 $h = List::Util::max $h, $h2;
1607 } 2005 }
1608 2006
1609 ($w, $h) 2007 [$w, $h]
1610 } 2008 };
1611}
1612 2009
2010 @{ $self->{size_req} }
2011}
2012
2013sub baseline_shift {
2014 $_[0]{layout}->descent
2015}
2016
1613sub size_allocate { 2017sub invoke_size_allocate {
1614 my ($self, $w, $h) = @_; 2018 my ($self, $w, $h) = @_;
1615 2019
1616 delete $self->{ox}; 2020 delete $self->{ox};
1617 2021
1618 delete $self->{texture} 2022 delete $self->{texture}
1619 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2023 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2024
2025 1
1620} 2026}
1621 2027
1622sub set_fontsize { 2028sub set_fontsize {
1623 my ($self, $fontsize) = @_; 2029 my ($self, $fontsize) = @_;
1624 2030
1625 $self->{fontsize} = $fontsize; 2031 $self->{fontsize} = $fontsize;
2032 delete $self->{size_req};
1626 delete $self->{texture}; 2033 delete $self->{texture};
1627 2034
1628 $self->realloc; 2035 $self->realloc;
1629} 2036}
1630 2037
2038sub reconfigure {
2039 my ($self) = @_;
2040
2041 delete $self->{size_req};
2042 delete $self->{texture};
2043
2044 $self->SUPER::reconfigure;
2045}
2046
1631sub _draw { 2047sub _draw {
1632 my ($self) = @_; 2048 my ($self) = @_;
1633 2049
1634 $self->SUPER::_draw; # draw background, if applicable 2050 $self->SUPER::_draw; # draw background, if applicable
1635 2051
1636 my $tex = $self->{texture} ||= do { 2052 my $size = $self->{texture} ||= do {
1637 $self->{layout}->set_foreground (@{$self->{fg}}); 2053 $self->{layout}->set_foreground (@{$self->{fg}});
1638 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2054 $self->{layout}->set_font ($self->{font}) if $self->{font};
1639 $self->{layout}->set_width ($self->{w}); 2055 $self->{layout}->set_width ($self->{w});
1640 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2056 $self->{layout}->set_ellipsise ($self->{ellipsise});
1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2057 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2058 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1643 2059
1644 new_from_layout CFClient::Texture $self->{layout} 2060 [$self->{layout}->size]
1645 }; 2061 };
1646 2062
1647 unless (exists $self->{ox}) { 2063 unless (exists $self->{ox}) {
1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2064 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2065 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1650 : ($self->{w} - $tex->{w}) * 0.5); 2066 : ($self->{w} - $size->[0]) * 0.5);
1651 2067
1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2068 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2069 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1654 : ($self->{h} - $tex->{h}) * 0.5); 2070 : ($self->{h} - $size->[1]) * 0.5);
1655 }; 2071 };
1656 2072
1657 glEnable GL_TEXTURE_2D; 2073 my $w = List::Util::min $self->{w} + 4, $size->[0];
2074 my $h = List::Util::min $self->{h} + 2, $size->[1];
1658 2075
1659 if ($tex->{format} == GL_ALPHA) { 2076 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1661 glColor @{$self->{fg}};
1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1663 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1666 }
1667
1668 glDisable GL_TEXTURE_2D;
1669} 2077}
1670 2078
1671############################################################################# 2079#############################################################################
1672 2080
1673package CFClient::UI::EntryBase; 2081package CFPlus::UI::EntryBase;
1674 2082
1675our @ISA = CFClient::UI::Label::; 2083our @ISA = CFPlus::UI::Label::;
1676 2084
1677use CFClient::OpenGL; 2085use CFPlus::OpenGL;
1678 2086
1679sub new { 2087sub new {
1680 my $class = shift; 2088 my $class = shift;
1681 2089
1682 $class->SUPER::new ( 2090 $class->SUPER::new (
… …
1686 active_fg => [0, 0, 0], 2094 active_fg => [0, 0, 0],
1687 can_hover => 1, 2095 can_hover => 1,
1688 can_focus => 1, 2096 can_focus => 1,
1689 valign => 0, 2097 valign => 0,
1690 can_events => 1, 2098 can_events => 1,
2099 ellipsise => 0,
1691 #text => ... 2100 #text => ...
2101 #hidden => "*",
1692 @_ 2102 @_
1693 ) 2103 )
1694} 2104}
1695 2105
1696sub _set_text { 2106sub _set_text {
… …
1703 $self->{last_activity} = $::NOW; 2113 $self->{last_activity} = $::NOW;
1704 $self->{text} = $text; 2114 $self->{text} = $text;
1705 2115
1706 $text =~ s/./*/g if $self->{hidden}; 2116 $text =~ s/./*/g if $self->{hidden};
1707 $self->{layout}->set_text ("$text "); 2117 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h}; 2118 delete $self->{size_req};
1709 2119
1710 $self->_emit (changed => $self->{text}); 2120 $self->emit (changed => $self->{text});
1711 2121
1712 $self->realloc; 2122 $self->realloc;
1713 $self->update; 2123 $self->update;
1714} 2124}
1715 2125
… …
1730 my ($w, $h) = $self->SUPER::size_request; 2140 my ($w, $h) = $self->SUPER::size_request;
1731 2141
1732 ($w + 1, $h) # add 1 for cursor 2142 ($w + 1, $h) # add 1 for cursor
1733} 2143}
1734 2144
1735sub key_down { 2145sub invoke_key_down {
1736 my ($self, $ev) = @_; 2146 my ($self, $ev) = @_;
1737 2147
1738 my $mod = $ev->{mod}; 2148 my $mod = $ev->{mod};
1739 my $sym = $ev->{sym}; 2149 my $sym = $ev->{sym};
1740 my $uni = $ev->{unicode}; 2150 my $uni = $ev->{unicode};
1741 2151
1742 my $text = $self->get_text; 2152 my $text = $self->get_text;
2153
2154 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1743 2155
1744 if ($uni == 8) { 2156 if ($uni == 8) {
1745 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2157 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1746 } elsif ($uni == 127) { 2158 } elsif ($uni == 127) {
1747 substr $text, $self->{cursor}, 1, ""; 2159 substr $text, $self->{cursor}, 1, "";
1748 } elsif ($sym == CFClient::SDLK_LEFT) { 2160 } elsif ($sym == CFPlus::SDLK_LEFT) {
1749 --$self->{cursor} if $self->{cursor}; 2161 --$self->{cursor} if $self->{cursor};
1750 } elsif ($sym == CFClient::SDLK_RIGHT) { 2162 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1751 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2163 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1752 } elsif ($sym == CFClient::SDLK_HOME) { 2164 } elsif ($sym == CFPlus::SDLK_HOME) {
2165 # what a hack
2166 $self->{cursor} =
2167 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2168 ? length $1
2169 : 0;
2170 } elsif ($sym == CFPlus::SDLK_END) {
2171 # uh, again
2172 $self->{cursor} =
2173 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2174 ? $self->{cursor} + length $1
2175 : length $self->{text};
2176 } elsif ($uni == 21) { # ctrl-u
2177 $text = "";
1753 $self->{cursor} = 0; 2178 $self->{cursor} = 0;
1754 } elsif ($sym == CFClient::SDLK_END) {
1755 $self->{cursor} = length $text;
1756 } elsif ($uni == 27) { 2179 } elsif ($uni == 27) {
1757 $self->_emit ('escape'); 2180 $self->emit ('escape');
1758 } elsif ($uni) { 2181 } elsif ($uni == 0x0d) {
2182 substr $text, $self->{cursor}++, 0, "\012";
2183 } elsif ($uni >= 0x20) {
1759 substr $text, $self->{cursor}++, 0, chr $uni; 2184 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else { 2185 } else {
1761 return 0; 2186 return 0;
1762 } 2187 }
1763 2188
1764 $self->_set_text ($text); 2189 $self->_set_text ($text);
1765 2190
1766 $self->realloc; 2191 $self->realloc;
2192 $self->update;
1767 2193
1768 1 2194 1
1769} 2195}
1770 2196
1771sub focus_in { 2197sub invoke_focus_in {
1772 my ($self) = @_; 2198 my ($self) = @_;
1773 2199
1774 $self->{last_activity} = $::NOW; 2200 $self->{last_activity} = $::NOW;
1775 2201
1776 $self->SUPER::focus_in; 2202 $self->SUPER::invoke_focus_in
1777} 2203}
1778 2204
1779sub button_down { 2205sub invoke_button_down {
1780 my ($self, $ev, $x, $y) = @_; 2206 my ($self, $ev, $x, $y) = @_;
1781 2207
1782 $self->SUPER::button_down ($ev, $x, $y); 2208 $self->SUPER::invoke_button_down ($ev, $x, $y);
1783 2209
1784 my $idx = $self->{layout}->xy_to_index ($x, $y); 2210 my $idx = $self->{layout}->xy_to_index ($x, $y);
1785 2211
1786 # byte-index to char-index 2212 # byte-index to char-index
1787 my $text = $self->{text}; 2213 my $text = $self->{text};
1788 utf8::encode $text; 2214 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1789 $self->{cursor} = length substr $text, 0, $idx; 2215 $self->{cursor} = length $text;
1790 2216
1791 $self->_set_text ($self->{text}); 2217 $self->_set_text ($self->{text});
1792 $self->update; 2218 $self->update;
1793 2219
1794 1 2220 1
1795} 2221}
1796 2222
1797sub mouse_motion { 2223sub invoke_mouse_motion {
1798 my ($self, $ev, $x, $y) = @_; 2224 my ($self, $ev, $x, $y) = @_;
1799# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2225# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1800 2226
1801 0 2227 1
1802} 2228}
1803 2229
1804sub _draw { 2230sub _draw {
1805 my ($self) = @_; 2231 my ($self) = @_;
1806 2232
… …
1833 utf8::encode $text; 2259 utf8::encode $text;
1834 2260
1835 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2261 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1836 } 2262 }
1837 2263
1838 glColor @{$self->{fg}};
1839 glBegin GL_LINES; 2264 glBegin GL_LINES;
1840 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2265 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1841 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2266 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1842 glEnd; 2267 glEnd;
1843 } 2268 }
1844} 2269}
1845 2270
2271#############################################################################
2272
1846package CFClient::UI::Entry; 2273package CFPlus::UI::Entry;
1847 2274
1848our @ISA = CFClient::UI::EntryBase::; 2275our @ISA = CFPlus::UI::EntryBase::;
1849 2276
1850use CFClient::OpenGL; 2277use CFPlus::OpenGL;
1851 2278
1852sub key_down { 2279sub invoke_key_down {
1853 my ($self, $ev) = @_; 2280 my ($self, $ev) = @_;
1854 2281
1855 my $sym = $ev->{sym}; 2282 my $sym = $ev->{sym};
1856 2283
1857 if ($sym == 13) { 2284 if ($ev->{uni} == 0x0d || $sym == 13) {
1858 unshift @{$self->{history}}, 2285 unshift @{$self->{history}},
1859 my $txt = $self->get_text; 2286 my $txt = $self->get_text;
2287
1860 $self->{history_pointer} = -1; 2288 $self->{history_pointer} = -1;
1861 $self->{history_saveback} = ''; 2289 $self->{history_saveback} = '';
1862 $self->_emit (activate => $txt); 2290 $self->emit (activate => $txt);
1863 $self->update; 2291 $self->update;
1864 2292
1865 } elsif ($sym == CFClient::SDLK_UP) { 2293 } elsif ($sym == CFPlus::SDLK_UP) {
1866 if ($self->{history_pointer} < 0) { 2294 if ($self->{history_pointer} < 0) {
1867 $self->{history_saveback} = $self->get_text; 2295 $self->{history_saveback} = $self->get_text;
1868 } 2296 }
1869 if (@{$self->{history} || []} > 0) { 2297 if (@{$self->{history} || []} > 0) {
1870 $self->{history_pointer}++; 2298 $self->{history_pointer}++;
… …
1872 $self->{history_pointer} = @{$self->{history} || []} - 1; 2300 $self->{history_pointer} = @{$self->{history} || []} - 1;
1873 } 2301 }
1874 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2302 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1875 } 2303 }
1876 2304
1877 } elsif ($sym == CFClient::SDLK_DOWN) { 2305 } elsif ($sym == CFPlus::SDLK_DOWN) {
1878 $self->{history_pointer}--; 2306 $self->{history_pointer}--;
1879 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2307 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1880 2308
1881 if ($self->{history_pointer} >= 0) { 2309 if ($self->{history_pointer} >= 0) {
1882 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2310 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1883 } else { 2311 } else {
1884 $self->set_text ($self->{history_saveback}); 2312 $self->set_text ($self->{history_saveback});
1885 } 2313 }
1886 2314
1887 } else { 2315 } else {
1888 return $self->SUPER::key_down ($ev) 2316 return $self->SUPER::invoke_key_down ($ev)
1889 } 2317 }
1890 2318
1891 1 2319 1
1892} 2320}
1893 2321
1894############################################################################# 2322#############################################################################
1895 2323
2324package CFPlus::UI::TextEdit;
2325
2326our @ISA = CFPlus::UI::EntryBase::;
2327
2328use CFPlus::OpenGL;
2329
2330sub move_cursor_ver {
2331 my ($self, $dy) = @_;
2332
2333 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2334
2335 $y += $dy;
2336
2337 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2338 $self->{cursor} = $index;
2339 delete $self->{cur_h};
2340 $self->update;
2341 return;
2342 }
2343}
2344
2345sub invoke_key_down {
2346 my ($self, $ev) = @_;
2347
2348 my $sym = $ev->{sym};
2349
2350 if ($sym == CFPlus::SDLK_UP) {
2351 $self->move_cursor_ver (-1);
2352 } elsif ($sym == CFPlus::SDLK_DOWN) {
2353 $self->move_cursor_ver (+1);
2354 } else {
2355 return $self->SUPER::invoke_key_down ($ev)
2356 }
2357
2358 1
2359}
2360
2361#############################################################################
2362
1896package CFClient::UI::Button; 2363package CFPlus::UI::Button;
1897 2364
1898our @ISA = CFClient::UI::Label::; 2365our @ISA = CFPlus::UI::Label::;
1899 2366
1900use CFClient::OpenGL; 2367use CFPlus::OpenGL;
1901 2368
1902my @tex = 2369my @tex =
1903 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2370 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1904 qw(b1_button_active.png); 2371 qw(b1_button_active.png);
1905 2372
1906sub new { 2373sub new {
1907 my $class = shift; 2374 my $class = shift;
1908 2375
… …
1917 can_events => 1, 2384 can_events => 1,
1918 @_ 2385 @_
1919 ) 2386 )
1920} 2387}
1921 2388
1922sub activate { }
1923
1924sub button_up { 2389sub invoke_button_up {
1925 my ($self, $ev, $x, $y) = @_; 2390 my ($self, $ev, $x, $y) = @_;
1926 2391
1927 $self->emit ("activate") 2392 $self->emit ("activate")
1928 if $x >= 0 && $x < $self->{w} 2393 if $x >= 0 && $x < $self->{w}
1929 && $y >= 0 && $y < $self->{h}; 2394 && $y >= 0 && $y < $self->{h};
… …
1947 $self->SUPER::_draw; 2412 $self->SUPER::_draw;
1948} 2413}
1949 2414
1950############################################################################# 2415#############################################################################
1951 2416
1952package CFClient::UI::CheckBox; 2417package CFPlus::UI::CheckBox;
1953 2418
1954our @ISA = CFClient::UI::DrawBG::; 2419our @ISA = CFPlus::UI::DrawBG::;
1955 2420
1956my @tex = 2421my @tex =
1957 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2422 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1958 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2423 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1959 2424
1960use CFClient::OpenGL; 2425use CFPlus::OpenGL;
1961 2426
1962sub new { 2427sub new {
1963 my $class = shift; 2428 my $class = shift;
1964 2429
1965 $class->SUPER::new ( 2430 $class->SUPER::new (
… …
1979 my ($self) = @_; 2444 my ($self) = @_;
1980 2445
1981 (6) x 2 2446 (6) x 2
1982} 2447}
1983 2448
2449sub toggle {
2450 my ($self) = @_;
2451
2452 $self->{state} = !$self->{state};
2453 $self->emit (changed => $self->{state});
2454 $self->update;
2455}
2456
1984sub button_down { 2457sub invoke_button_down {
1985 my ($self, $ev, $x, $y) = @_; 2458 my ($self, $ev, $x, $y) = @_;
1986 2459
1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2460 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2461 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1989 $self->{state} = !$self->{state}; 2462 $self->toggle;
1990 $self->_emit (changed => $self->{state});
1991 } else { 2463 } else {
1992 return 0 2464 return 0
1993 } 2465 }
1994 2466
1995 1 2467 1
… …
2015 glDisable GL_TEXTURE_2D; 2487 glDisable GL_TEXTURE_2D;
2016} 2488}
2017 2489
2018############################################################################# 2490#############################################################################
2019 2491
2020package CFClient::UI::Image; 2492package CFPlus::UI::Image;
2021 2493
2022our @ISA = CFClient::UI::Base::; 2494our @ISA = CFPlus::UI::Base::;
2023 2495
2024use CFClient::OpenGL; 2496use CFPlus::OpenGL;
2025use Carp qw/confess/;
2026 2497
2027our %loaded_images; 2498our %texture_cache;
2028 2499
2029sub new { 2500sub new {
2030 my $class = shift; 2501 my $class = shift;
2031 2502
2032 my $self = $class->SUPER::new (can_events => 0, @_); 2503 my $self = $class->SUPER::new (
2504 can_events => 0,
2505 @_,
2506 );
2033 2507
2034 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2508 $self->{path} || $self->{tex}
2509 or Carp::croak "'path' or 'tex' attributes required";
2035 2510
2036 $loaded_images{$self->{image}} ||= 2511 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2037 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2512 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2038 2513
2039 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2514 CFPlus::weaken $texture_cache{$self->{path}};
2040 2515
2041 Scalar::Util::weaken $loaded_images{$self->{image}}; 2516 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2042
2043 $self->{aspect} = $tex->{w} / $tex->{h};
2044 2517
2045 $self 2518 $self
2046} 2519}
2047 2520
2521sub STORABLE_freeze {
2522 my ($self, $cloning) = @_;
2523
2524 $self->{path}
2525 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2526
2527 $self->{path}
2528}
2529
2530sub STORABLE_attach {
2531 my ($self, $cloning, $path) = @_;
2532
2533 $self->new (path => $path)
2534}
2535
2048sub size_request { 2536sub size_request {
2049 my ($self) = @_; 2537 my ($self) = @_;
2050 2538
2051 ($self->{tex}->{w}, $self->{tex}->{h}) 2539 ($self->{tex}{w}, $self->{tex}{h})
2052} 2540}
2053 2541
2054sub _draw { 2542sub _draw {
2055 my ($self) = @_; 2543 my ($self) = @_;
2056 2544
… …
2066 } 2554 }
2067 2555
2068 glEnable GL_TEXTURE_2D; 2556 glEnable GL_TEXTURE_2D;
2069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2557 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2070 2558
2071 $tex->draw_quad_alpha (0, 0, $w, $h); 2559 $tex->draw_quad (0, 0, $w, $h);
2072 2560
2073 glDisable GL_TEXTURE_2D; 2561 glDisable GL_TEXTURE_2D;
2074} 2562}
2075 2563
2076############################################################################# 2564#############################################################################
2077 2565
2566package CFPlus::UI::ImageButton;
2567
2568our @ISA = CFPlus::UI::Image::;
2569
2570use CFPlus::OpenGL;
2571
2572my %textures;
2573
2574sub new {
2575 my $class = shift;
2576
2577 my $self = $class->SUPER::new (
2578 padding_x => 4,
2579 padding_y => 4,
2580 fg => [1, 1, 1],
2581 active_fg => [0, 0, 1],
2582 can_hover => 1,
2583 align => 0,
2584 valign => 0,
2585 can_events => 1,
2586 @_
2587 );
2588}
2589
2590sub invoke_button_up {
2591 my ($self, $ev, $x, $y) = @_;
2592
2593 $self->emit ("activate")
2594 if $x >= 0 && $x < $self->{w}
2595 && $y >= 0 && $y < $self->{h};
2596
2597 1
2598}
2599
2600#############################################################################
2601
2078package CFClient::UI::VGauge; 2602package CFPlus::UI::VGauge;
2079 2603
2080our @ISA = CFClient::UI::Base::; 2604our @ISA = CFPlus::UI::Base::;
2081 2605
2082use List::Util qw(min max); 2606use List::Util qw(min max);
2083 2607
2084use CFClient::OpenGL; 2608use CFPlus::OpenGL;
2085 2609
2086my %tex = ( 2610my %tex = (
2087 food => [ 2611 food => [
2088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2612 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2089 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2613 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2090 ], 2614 ],
2091 grace => [ 2615 grace => [
2092 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2616 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2093 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2617 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2094 ], 2618 ],
2095 hp => [ 2619 hp => [
2096 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2620 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2097 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2621 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2098 ], 2622 ],
2099 mana => [ 2623 mana => [
2100 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2624 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2101 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2625 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2102 ], 2626 ],
2103); 2627);
2104 2628
2105# eg. VGauge->new (gauge => 'food'), default gauge: food 2629# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2165 my $ycut1 = max 0, min 1, $ycut; 2689 my $ycut1 = max 0, min 1, $ycut;
2166 my $ycut2 = max 0, min 1, $ycut - 1; 2690 my $ycut2 = max 0, min 1, $ycut - 1;
2167 2691
2168 my $h1 = $self->{h} * (1 - $ycut1); 2692 my $h1 = $self->{h} * (1 - $ycut1);
2169 my $h2 = $self->{h} * (1 - $ycut2); 2693 my $h2 = $self->{h} * (1 - $ycut2);
2694 my $h3 = $self->{h};
2695
2696 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2170 2697
2171 glEnable GL_BLEND; 2698 glEnable GL_BLEND;
2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2699 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2700 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2174 glEnable GL_TEXTURE_2D; 2701 glEnable GL_TEXTURE_2D;
… …
2193 2720
2194 if ($t3) { 2721 if ($t3) {
2195 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2722 glBindTexture GL_TEXTURE_2D, $t3->{name};
2196 glBegin GL_QUADS; 2723 glBegin GL_QUADS;
2197 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2724 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2198 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2725 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2199 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2726 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2200 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2727 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2201 glEnd; 2728 glEnd;
2202 } 2729 }
2203 2730
2204 glDisable GL_BLEND; 2731 glDisable GL_BLEND;
2205 glDisable GL_TEXTURE_2D; 2732 glDisable GL_TEXTURE_2D;
2206} 2733}
2207 2734
2208############################################################################# 2735#############################################################################
2209 2736
2210package CFClient::UI::Gauge; 2737package CFPlus::UI::Gauge;
2211 2738
2212our @ISA = CFClient::UI::VBox::; 2739our @ISA = CFPlus::UI::VBox::;
2213 2740
2214sub new { 2741sub new {
2215 my ($class, %arg) = @_; 2742 my ($class, %arg) = @_;
2216 2743
2217 my $self = $class->SUPER::new ( 2744 my $self = $class->SUPER::new (
… …
2219 can_hover => 1, 2746 can_hover => 1,
2220 can_events => 1, 2747 can_events => 1,
2221 %arg, 2748 %arg,
2222 ); 2749 );
2223 2750
2224 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2751 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2225 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2752 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2226 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2753 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2227 2754
2228 $self 2755 $self
2229} 2756}
2230 2757
2231sub set_fontsize { 2758sub set_fontsize {
… …
2252 $self->{value}->set_text ($val); 2779 $self->{value}->set_text ($val);
2253} 2780}
2254 2781
2255############################################################################# 2782#############################################################################
2256 2783
2257package CFClient::UI::Slider; 2784package CFPlus::UI::Slider;
2258 2785
2259use strict; 2786use strict;
2260 2787
2261use CFClient::OpenGL; 2788use CFPlus::OpenGL;
2262 2789
2263our @ISA = CFClient::UI::DrawBG::; 2790our @ISA = CFPlus::UI::DrawBG::;
2264 2791
2265my @tex = 2792my @tex =
2266 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2793 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2267 qw(s1_slider.png s1_slider_bg.png); 2794 qw(s1_slider.png s1_slider_bg.png);
2268 2795
2269sub new { 2796sub new {
2270 my $class = shift; 2797 my $class = shift;
2271 2798
… …
2292 $self->update; 2819 $self->update;
2293 2820
2294 $self 2821 $self
2295} 2822}
2296 2823
2297sub changed { }
2298
2299sub set_range { 2824sub set_range {
2300 my ($self, $range) = @_; 2825 my ($self, $range) = @_;
2301 2826
2302 ($range, $self->{range}) = ($self->{range}, $range); 2827 ($range, $self->{range}) = ($self->{range}, $range);
2303 2828
2304 $self->update
2305 if "@$range" ne "@{$self->{range}}"; 2829 if ("@$range" ne "@{$self->{range}}") {
2830 $self->update;
2831 $self->set_value ($self->{range}[0]);
2832 }
2306} 2833}
2307 2834
2308sub set_value { 2835sub set_value {
2309 my ($self, $value) = @_; 2836 my ($self, $value) = @_;
2310 2837
… …
2321 if $unit; 2848 if $unit;
2322 2849
2323 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2850 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2324 2851
2325 if ($value != $old_value) { 2852 if ($value != $old_value) {
2326 $self->_emit (changed => $value); 2853 $self->emit (changed => $value);
2327 $self->update; 2854 $self->update;
2328 } 2855 }
2329} 2856}
2330 2857
2331sub size_request { 2858sub size_request {
2332 my ($self) = @_; 2859 my ($self) = @_;
2333 2860
2334 ($self->{req_w}, $self->{req_h}) 2861 ($self->{req_w}, $self->{req_h})
2335} 2862}
2336 2863
2337sub button_down { 2864sub invoke_button_down {
2338 my ($self, $ev, $x, $y) = @_; 2865 my ($self, $ev, $x, $y) = @_;
2339 2866
2340 $self->SUPER::button_down ($ev, $x, $y); 2867 $self->SUPER::invoke_button_down ($ev, $x, $y);
2341 2868
2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2869 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2343 2870
2344 $self->mouse_motion ($ev, $x, $y) 2871 $self->invoke_mouse_motion ($ev, $x, $y)
2345} 2872}
2346 2873
2347sub mouse_motion { 2874sub invoke_mouse_motion {
2348 my ($self, $ev, $x, $y) = @_; 2875 my ($self, $ev, $x, $y) = @_;
2349 2876
2350 if ($GRAB == $self) { 2877 if ($GRAB == $self) {
2351 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2878 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2352 2879
… …
2358 } else { 2885 } else {
2359 return 0; 2886 return 0;
2360 } 2887 }
2361 2888
2362 1 2889 1
2890}
2891
2892sub invoke_mouse_wheel {
2893 my ($self, $ev) = @_;
2894
2895 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2896
2897 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2898
2899 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2900
2901 ! ! $delta
2363} 2902}
2364 2903
2365sub update { 2904sub update {
2366 my ($self) = @_; 2905 my ($self) = @_;
2367 2906
… …
2416 glDisable GL_TEXTURE_2D; 2955 glDisable GL_TEXTURE_2D;
2417} 2956}
2418 2957
2419############################################################################# 2958#############################################################################
2420 2959
2421package CFClient::UI::ValSlider; 2960package CFPlus::UI::ValSlider;
2422 2961
2423our @ISA = CFClient::UI::HBox::; 2962our @ISA = CFPlus::UI::HBox::;
2424 2963
2425sub new { 2964sub new {
2426 my ($class, %arg) = @_; 2965 my ($class, %arg) = @_;
2427 2966
2428 my $range = delete $arg{range}; 2967 my $range = delete $arg{range};
2429 2968
2430 my $self = $class->SUPER::new ( 2969 my $self = $class->SUPER::new (
2431 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2970 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2432 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2971 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2433 to_value => sub { shift }, 2972 to_value => sub { shift },
2434 from_value => sub { shift }, 2973 from_value => sub { shift },
2435 %arg, 2974 %arg,
2436 ); 2975 );
2437 2976
… …
2457sub set_range { shift->{slider}->set_range (@_) } 2996sub set_range { shift->{slider}->set_range (@_) }
2458sub set_value { shift->{slider}->set_value (@_) } 2997sub set_value { shift->{slider}->set_value (@_) }
2459 2998
2460############################################################################# 2999#############################################################################
2461 3000
2462package CFClient::UI::TextView; 3001package CFPlus::UI::TextScroller;
2463 3002
2464our @ISA = CFClient::UI::HBox::; 3003our @ISA = CFPlus::UI::HBox::;
2465 3004
2466use CFClient::OpenGL; 3005use CFPlus::OpenGL;
2467 3006
2468sub new { 3007sub new {
2469 my $class = shift; 3008 my $class = shift;
2470 3009
2471 my $self = $class->SUPER::new ( 3010 my $self = $class->SUPER::new (
2472 fontsize => 1, 3011 fontsize => 1,
2473 can_events => 0, 3012 can_events => 1,
3013 indent => 0,
2474 #font => default_font 3014 #font => default_font
2475 @_, 3015 @_,
2476 3016
2477 layout => (new CFClient::Layout 1), 3017 layout => (new CFPlus::Layout),
2478 par => [], 3018 par => [],
3019 max_par => 0,
2479 height => 0, 3020 height => 0,
2480 children => [ 3021 children => [
2481 (new CFClient::UI::Empty expand => 1), 3022 (new CFPlus::UI::Empty expand => 1),
2482 (new CFClient::UI::Slider vertical => 1), 3023 (new CFPlus::UI::Slider vertical => 1),
2483 ], 3024 ],
2484 ); 3025 );
2485 3026
2486 $self->{children}[1]->connect (changed => sub { $self->update }); 3027 $self->{children}[1]->connect (changed => sub { $self->update });
2487 3028
… …
2493 3034
2494 $self->{fontsize} = $fontsize; 3035 $self->{fontsize} = $fontsize;
2495 $self->reflow; 3036 $self->reflow;
2496} 3037}
2497 3038
3039sub size_request {
3040 my ($self) = @_;
3041
3042 my ($empty, $slider) = @{ $self->{children} };
3043
3044 local $self->{children} = [$empty, $slider];
3045 $self->SUPER::size_request
3046}
3047
2498sub size_allocate { 3048sub invoke_size_allocate {
2499 my ($self, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2500 3050
2501 $self->SUPER::size_allocate ($w, $h); 3051 my ($empty, $slider, @other) = @{ $self->{children} };
3052 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2502 3053
2503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3054 $self->{layout}->set_font ($self->{font}) if $self->{font};
2504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3055 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2505 $self->{layout}->set_width ($self->{children}[0]{w}); 3056 $self->{layout}->set_width ($empty->{w});
3057 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2506 3058
2507 $self->reflow; 3059 $self->reflow;
2508}
2509 3060
2510sub text_size { 3061 local $self->{children} = [$empty, $slider];
3062 $self->SUPER::invoke_size_allocate ($w, $h)
3063}
3064
3065sub invoke_mouse_wheel {
2511 my ($self, $text, $indent) = @_; 3066 my ($self, $ev) = @_;
3067
3068 return 0 unless $ev->{dy}; # only vertical movements
3069
3070 $self->{children}[1]->emit (mouse_wheel => $ev);
3071
3072 1
3073}
3074
3075sub get_layout {
3076 my ($self, $para) = @_;
2512 3077
2513 my $layout = $self->{layout}; 3078 my $layout = $self->{layout};
2514 3079
3080 $layout->set_font ($self->{font}) if $self->{font};
3081 $layout->set_foreground (@{$para->{fg}});
2515 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3082 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $layout->set_width ($self->{children}[0]{w} - $indent); 3083 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3084 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2517 $layout->set_markup ($text); 3085 $layout->set_markup ($para->{markup});
3086
3087 $layout->set_shapes (
3088 map
3089 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3090 @{$para->{widget}}
2518 3091 );
3092
2519 $layout->size 3093 $layout
2520} 3094}
2521 3095
2522sub reflow { 3096sub reflow {
2523 my ($self) = @_; 3097 my ($self) = @_;
2524 3098
… …
2531 3105
2532 # todo: base offset on lines or so, not on pixels 3106 # todo: base offset on lines or so, not on pixels
2533 $self->{children}[1]->set_value ($offset); 3107 $self->{children}[1]->set_value ($offset);
2534} 3108}
2535 3109
3110sub current_paragraph {
3111 my ($self) = @_;
3112
3113 $self->{top_paragraph} - 1
3114}
3115
3116sub scroll_to {
3117 my ($self, $para) = @_;
3118
3119 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3120
3121 $self->{scroll_to} = $para;
3122 $self->update;
3123}
3124
2536sub clear { 3125sub clear {
2537 my ($self) = @_; 3126 my ($self) = @_;
3127
3128 my (undef, undef, @other) = @{ $self->{children} };
3129 $self->remove ($_) for @other;
2538 3130
2539 $self->{par} = []; 3131 $self->{par} = [];
2540 $self->{height} = 0; 3132 $self->{height} = 0;
2541 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3133 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2542} 3134}
2543 3135
2544sub add_paragraph { 3136sub add_paragraph {
2545 my ($self, $color, $text, $indent) = @_; 3137 my $self = shift;
2546 3138
2547 for my $line (split /\n/, $text) { 3139 for my $para (@_) {
2548 my ($w, $h) = $self->text_size ($line); 3140 $para = {
3141 fg => [1, 1, 1, 1],
3142 indent => 0,
3143 markup => "",
3144 widget => [],
3145 ref $para ? %$para : (markup => $para),
3146 w => 1e10,
3147 wrapped => 1,
3148 };
3149
3150 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3151 push @{$self->{par}}, $para;
3152 }
3153
3154 if (my $max = $self->{max_par}) {
3155 shift @{$self->{par}} while @{$self->{par}} > $max;
3156 }
3157
3158 $self->{need_reflow}++;
3159 $self->update;
3160}
3161
3162sub scroll_to_bottom {
3163 my ($self) = @_;
3164
3165 $self->{scroll_to} = $#{$self->{par}};
3166 $self->update;
3167}
3168
3169sub force_uptodate {
3170 my ($self) = @_;
3171
3172 if (delete $self->{need_reflow}) {
3173 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3174
3175 my $height = 0;
3176
3177 for my $para (@{$self->{par}}) {
3178 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3179 my $layout = $self->get_layout ($para);
3180 my ($w, $h) = $layout->size;
3181
3182 $para->{w} = $w + $para->{indent};
3183 $para->{h} = $h;
3184 $para->{wrapped} = $layout->has_wrapped;
3185 }
3186
3187 $para->{y} = $height;
3188 $height += $para->{h};
3189 }
3190
2549 $self->{height} += $h; 3191 $self->{height} = $height;
2550 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3192 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2551 }
2552 3193
2553 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3194 delete $self->{texture};
3195 }
3196
3197 if (my $paridx = delete $self->{scroll_to}) {
3198 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3199 }
2554} 3200}
2555 3201
2556sub update { 3202sub update {
2557 my ($self) = @_; 3203 my ($self) = @_;
2558 3204
… …
2560 3206
2561 return unless $self->{h} > 0; 3207 return unless $self->{h} > 0;
2562 3208
2563 delete $self->{texture}; 3209 delete $self->{texture};
2564 3210
2565 $ROOT->on_post_alloc ($self, sub { 3211 $ROOT->on_post_alloc ($self => sub {
3212 $self->force_uptodate;
3213
2566 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3214 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2567 3215
2568 if (delete $self->{need_reflow}) {
2569 my $height = 0;
2570
2571 my $layout = $self->{layout};
2572
2573 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2574
2575 for (@{$self->{par}}) {
2576 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2577 $layout->set_width ($W - $_->[3]);
2578 $layout->set_markup ($_->[4]);
2579 my ($w, $h) = $layout->size;
2580 $_->[0] = $w + $_->[3];
2581 $_->[1] = $h;
2582 }
2583
2584 $height += $_->[1];
2585 }
2586
2587 $self->{height} = $height;
2588
2589 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2590
2591 delete $self->{texture};
2592 }
2593
2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3216 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2595 glClearColor 0, 0, 0, 0; 3217 glClearColor 0, 0, 0, 0;
2596 glClear GL_COLOR_BUFFER_BIT; 3218 glClear GL_COLOR_BUFFER_BIT;
2597 3219
3220 package CFPlus::UI::Base;
3221 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3222 (0, 0, $self->{w}, $self->{h});
3223
3224 my $top = int $self->{children}[1]{range}[0];
3225
3226 my $paridx = 0;
3227 my $top_paragraph;
2598 my $top = int $self->{children}[1]{range}[0]; 3228 my $top = int $self->{children}[1]{range}[0];
2599 3229
2600 my $y0 = $top; 3230 my $y0 = $top;
2601 my $y1 = $top + $H; 3231 my $y1 = $top + $H;
2602 3232
2603 my $y = 0;
2604
2605 my $layout = $self->{layout};
2606
2607 $layout->set_font ($self->{font}) if $self->{font};
2608
2609 glEnable GL_BLEND;
2610 #TODO# not correct in windows where rgba is forced off
2611 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2612
2613 for my $par (@{$self->{par}}) { 3233 for my $para (@{$self->{par}}) {
2614 my $h = $par->[1]; 3234 my $h = $para->{h};
3235 my $y = $para->{y};
2615 3236
2616 if ($y0 < $y + $h && $y < $y1) { 3237 if ($y0 < $y + $h && $y < $y1) {
2617 $layout->set_foreground (@{ $par->[2] }); 3238 my $layout = $self->get_layout ($para);
2618 $layout->set_width ($W - $par->[3]);
2619 $layout->set_markup ($par->[4]);
2620 3239
2621 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3240 $layout->render ($para->{indent}, $y - $y0);
2622 3241
2623 glRasterPos $par->[3], $y - $y0; 3242 if (my @w = @{ $para->{widget} }) {
2624 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3243 my @s = $layout->get_shapes;
3244
3245 for (@w) {
3246 my ($dx, $dy) = splice @s, 0, 2, ();
3247
3248 $_->{x} = $dx + $para->{indent};
3249 $_->{y} = $dy + $y - $y0;
3250
3251 $_->draw;
3252 }
3253 }
2625 } 3254 }
2626 3255
2627 $y += $h; 3256 $paridx++;
3257 $top_paragraph ||= $paridx if $y >= $top;
2628 } 3258 }
2629 3259
2630 glDisable GL_BLEND; 3260 $self->{top_paragraph} = $top_paragraph;
2631 }; 3261 };
2632 }); 3262 });
3263}
3264
3265sub reconfigure {
3266 my ($self) = @_;
3267
3268 $self->SUPER::reconfigure;
3269
3270 $_->{w} = 1e10 for @{ $self->{par} };
3271 $self->reflow;
2633} 3272}
2634 3273
2635sub _draw { 3274sub _draw {
2636 my ($self) = @_; 3275 my ($self) = @_;
2637 3276
… …
2640 glColor 0, 0, 0, 1; 3279 glColor 0, 0, 0, 1;
2641 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3280 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2642 glDisable GL_TEXTURE_2D; 3281 glDisable GL_TEXTURE_2D;
2643 3282
2644 $self->{children}[1]->draw; 3283 $self->{children}[1]->draw;
2645
2646} 3284}
2647 3285
2648############################################################################# 3286#############################################################################
2649 3287
2650package CFClient::UI::Animator; 3288package CFPlus::UI::Animator;
2651 3289
2652use CFClient::OpenGL; 3290use CFPlus::OpenGL;
2653 3291
2654our @ISA = CFClient::UI::Bin::; 3292our @ISA = CFPlus::UI::Bin::;
2655 3293
2656sub moveto { 3294sub moveto {
2657 my ($self, $x, $y) = @_; 3295 my ($self, $x, $y) = @_;
2658 3296
2659 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3297 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2687 glPopMatrix; 3325 glPopMatrix;
2688} 3326}
2689 3327
2690############################################################################# 3328#############################################################################
2691 3329
2692package CFClient::UI::Flopper; 3330package CFPlus::UI::Flopper;
2693 3331
2694our @ISA = CFClient::UI::Button::; 3332our @ISA = CFPlus::UI::Button::;
2695 3333
2696sub new { 3334sub new {
2697 my $class = shift; 3335 my $class = shift;
2698 3336
2699 my $self = $class->SUPER::new ( 3337 my $self = $class->SUPER::new (
… …
2711 $self->{other}->toggle_visibility; 3349 $self->{other}->toggle_visibility;
2712} 3350}
2713 3351
2714############################################################################# 3352#############################################################################
2715 3353
2716package CFClient::UI::Tooltip; 3354package CFPlus::UI::Tooltip;
2717 3355
2718our @ISA = CFClient::UI::Bin::; 3356our @ISA = CFPlus::UI::Bin::;
2719 3357
2720use CFClient::OpenGL; 3358use CFPlus::OpenGL;
2721 3359
2722sub new { 3360sub new {
2723 my $class = shift; 3361 my $class = shift;
2724 3362
2725 $class->SUPER::new ( 3363 $class->SUPER::new (
… …
2728 ) 3366 )
2729} 3367}
2730 3368
2731sub set_tooltip_from { 3369sub set_tooltip_from {
2732 my ($self, $widget) = @_; 3370 my ($self, $widget) = @_;
3371
3372 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3373 if $widget->{tooltip} =~ /^#(.*)$/;
2733 3374
2734 my $tooltip = $widget->{tooltip}; 3375 my $tooltip = $widget->{tooltip};
2735 3376
2736 if ($ENV{CFPLUS_DEBUG} & 2) { 3377 if ($ENV{CFPLUS_DEBUG} & 2) {
2737 $tooltip .= "\n\n" . (ref $widget) . "\n" 3378 $tooltip .= "\n\n" . (ref $widget) . "\n"
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3379 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n" 3380 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}"; 3381 . "visible $widget->{visible}";
2741 } 3382 }
2742 3383
3384 $tooltip =~ s/^\n+//;
3385 $tooltip =~ s/\n+$//;
3386
2743 $self->add (new CFClient::UI::Label 3387 $self->add (new CFPlus::UI::Label
2744 markup => $tooltip, 3388 markup => $tooltip,
2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3389 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2746 fontsize => 0.8, 3390 fontsize => 0.8,
2747 fg => [0, 0, 0, 1], 3391 style => 1, # FLAG_INVERSE
2748 ellipsise => 0, 3392 ellipsise => 0,
2749 font => ($widget->{tooltip_font} || $::FONT_PROP), 3393 font => ($widget->{tooltip_font} || $::FONT_PROP),
2750 ); 3394 );
2751} 3395}
2752 3396
… …
2756 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3400 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2757 3401
2758 ($w + 4, $h + 4) 3402 ($w + 4, $h + 4)
2759} 3403}
2760 3404
2761sub size_allocate { 3405sub invoke_size_allocate {
2762 my ($self, $w, $h) = @_; 3406 my ($self, $w, $h) = @_;
2763 3407
2764 $self->SUPER::size_allocate ($w - 4, $h - 4); 3408 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2765} 3409}
2766 3410
2767sub visibility_change { 3411sub invoke_visibility_change {
2768 my ($self, $visible) = @_; 3412 my ($self, $visible) = @_;
2769 3413
2770 return unless $visible; 3414 return unless $visible;
2771 3415
2772 $self->{root}->on_post_alloc ("move_$self" => sub { 3416 $self->{root}->on_post_alloc ("move_$self" => sub {
2773 my $widget = $self->{owner} 3417 my $widget = $self->{owner}
2774 or return; 3418 or return;
2775 3419
3420 if ($widget->{visible}) {
2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3421 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777 3422
2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3423 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779 if $x + $self->{w} > $::WIDTH; 3424 if $x + $self->{w} > $self->{root}{w};
2780 3425
2781 $self->move_abs ($x, $y); 3426 $self->move_abs ($x, $y);
3427 } else {
3428 $self->hide;
3429 }
2782 }); 3430 });
2783} 3431}
2784 3432
2785sub _draw { 3433sub _draw {
2786 my ($self) = @_; 3434 my ($self) = @_;
… …
2810 $self->SUPER::_draw; 3458 $self->SUPER::_draw;
2811} 3459}
2812 3460
2813############################################################################# 3461#############################################################################
2814 3462
2815package CFClient::UI::Face; 3463package CFPlus::UI::Face;
2816 3464
2817our @ISA = CFClient::UI::Base::; 3465our @ISA = CFPlus::UI::DrawBG::;
2818 3466
2819use CFClient::OpenGL; 3467use CFPlus::OpenGL;
2820 3468
2821sub new { 3469sub new {
2822 my $class = shift; 3470 my $class = shift;
2823 3471
2824 my $self = $class->SUPER::new ( 3472 my $self = $class->SUPER::new (
3473 size_w => 32,
3474 size_h => 8,
2825 aspect => 1, 3475 aspect => 1,
2826 can_events => 0, 3476 can_events => 0,
2827 @_, 3477 @_,
2828 ); 3478 );
2829 3479
2830 if ($self->{anim} && $self->{animspeed}) { 3480 if ($self->{anim} && $self->{animspeed}) {
2831 Scalar::Util::weaken (my $widget = $self); 3481 CFPlus::weaken (my $widget = $self);
2832 3482
2833 $self->{timer} = Event->timer ( 3483 $self->{timer} = Event->timer (
2834 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3484 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2835 hard => 1, 3485 hard => 1,
2836 interval => $self->{animspeed}, 3486 interval => $self->{animspeed},
2837 cb => sub { 3487 cb => sub {
3488 return unless $::CONN;
3489
2838 ++$widget->{frame}; 3490 ++$widget->{frame};
3491 $self->update_face;
2839 $widget->update; 3492 $self->update;
2840 }, 3493 },
2841 ); 3494 );
3495
3496 $self->update_face;
2842 } 3497 }
2843 3498
2844 $self 3499 $self
2845} 3500}
2846 3501
3502sub update_face {
3503 my ($self) = @_;
3504
3505 return unless $::CONN;
3506
3507 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3508 if ($anim && @$anim) {
3509 delete $self->{wait_face};
3510 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3511 }
3512 }
3513}
3514
2847sub size_request { 3515sub size_request {
2848 (32, 8) 3516 my ($self) = @_;
3517
3518 if ($::CONN) {
3519 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3520 if (my $tex = $::CONN->{texture}[$faceid]) {
3521 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3522 } else {
3523 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3524 $self->realloc;
3525 });
3526 }
3527 }
3528 }
3529
3530 ($self->{size_w} || 8, $self->{size_h} || 8)
2849} 3531}
2850 3532
2851sub update { 3533sub update {
2852 my ($self) = @_; 3534 my ($self) = @_;
2853 3535
… …
2859sub _draw { 3541sub _draw {
2860 my ($self) = @_; 3542 my ($self) = @_;
2861 3543
2862 return unless $::CONN; 3544 return unless $::CONN;
2863 3545
2864 my $face; 3546 $self->SUPER::_draw;
2865 3547
2866 if ($self->{frame}) {
2867 my $anim = $::CONN->{anim}[$self->{anim}]; 3548 my $faceid = $::CONN->{faceid}[$self->{face}]
2868 3549 or return;
2869 $face = $anim->[ $self->{frame} % @$anim ]
2870 if $anim && @$anim;
2871 }
2872 3550
2873 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3551 my $tex = $::CONN->{texture}[$faceid];
2874 3552
2875 if ($tex) { 3553 if ($tex) {
2876 glEnable GL_TEXTURE_2D; 3554 glEnable GL_TEXTURE_2D;
2877 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2878 glColor 0, 0, 0, 1; 3556 glColor 0, 0, 0, 1;
2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3557 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2880 glDisable GL_TEXTURE_2D; 3558 glDisable GL_TEXTURE_2D;
2881 } 3559 }
2882} 3560}
2883 3561
2884sub DESTROY { 3562sub destroy {
2885 my ($self) = @_; 3563 my ($self) = @_;
2886 3564
2887 $self->{timer}->cancel 3565 $self->{timer}->cancel
2888 if $self->{timer}; 3566 if $self->{timer};
2889 3567
2890 $self->SUPER::DESTROY; 3568 $self->SUPER::destroy;
2891} 3569}
2892 3570
2893############################################################################# 3571#############################################################################
2894 3572
2895package CFClient::UI::Buttonbar; 3573package CFPlus::UI::Buttonbar;
2896 3574
2897our @ISA = CFClient::UI::HBox::; 3575our @ISA = CFPlus::UI::HBox::;
2898 3576
2899# TODO: should actualyl wrap buttons and other goodies. 3577# TODO: should actually wrap buttons and other goodies.
2900 3578
2901############################################################################# 3579#############################################################################
2902 3580
2903package CFClient::UI::Menu; 3581package CFPlus::UI::Menu;
2904 3582
2905our @ISA = CFClient::UI::FancyFrame::; 3583our @ISA = CFPlus::UI::Toplevel::;
2906 3584
2907use CFClient::OpenGL; 3585use CFPlus::OpenGL;
2908 3586
2909sub new { 3587sub new {
2910 my $class = shift; 3588 my $class = shift;
2911 3589
2912 my $self = $class->SUPER::new ( 3590 my $self = $class->SUPER::new (
2913 items => [], 3591 items => [],
2914 z => 100, 3592 z => 100,
2915 @_, 3593 @_,
2916 ); 3594 );
2917 3595
2918 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3596 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2919 3597
2920 for my $item (@{ $self->{items} }) { 3598 for my $item (@{ $self->{items} }) {
2921 my ($widget, $cb) = @$item; 3599 my ($widget, $cb, $tooltip) = @$item;
2922 3600
2923 # handle various types of items, only text for now 3601 # handle various types of items, only text for now
2924 if (!ref $widget) { 3602 if (!ref $widget) {
3603 if ($widget =~ /\t/) {
3604 my ($left, $right) = split /\t/, $widget, 2;
3605
2925 $widget = new CFClient::UI::Label 3606 $widget = new CFPlus::UI::HBox
2926 can_hover => 1, 3607 can_hover => 1,
2927 can_events => 1, 3608 can_events => 1,
3609 tooltip => $tooltip,
3610 children => [
3611 (new CFPlus::UI::Label markup => $left, expand => 1),
3612 (new CFPlus::UI::Label markup => $right, align => +1),
3613 ],
3614 ;
3615
3616 } else {
3617 $widget = new CFPlus::UI::Label
3618 can_hover => 1,
3619 can_events => 1,
2928 text => $widget; 3620 markup => $widget,
3621 tooltip => $tooltip;
3622 }
2929 } 3623 }
2930 3624
2931 $self->{item}{$widget} = $item; 3625 $self->{item}{$widget} = $item;
2932 3626
2933 $self->{vbox}->add ($widget); 3627 $self->{vbox}->add ($widget);
… …
2938 3632
2939# popup given the event (must be a mouse button down event currently) 3633# popup given the event (must be a mouse button down event currently)
2940sub popup { 3634sub popup {
2941 my ($self, $ev) = @_; 3635 my ($self, $ev) = @_;
2942 3636
2943 $self->_emit ("popdown"); 3637 $self->emit ("popdown");
2944 3638
2945 # maybe save $GRAB? must be careful about events... 3639 # maybe save $GRAB? must be careful about events...
2946 $GRAB = $self; 3640 $GRAB = $self;
2947 $self->{button} = $ev->{button}; 3641 $self->{button} = $ev->{button};
2948 3642
2949 $self->show; 3643 $self->show;
2950 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3644 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2951} 3645}
2952 3646
2953sub mouse_motion { 3647sub invoke_mouse_motion {
2954 my ($self, $ev, $x, $y) = @_; 3648 my ($self, $ev, $x, $y) = @_;
2955 3649
2956 # TODO: should use vbox->find_widget or so 3650 # TODO: should use vbox->find_widget or so
2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3651 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2958 $self->{hover} = $self->{item}{$HOVER}; 3652 $self->{hover} = $self->{item}{$HOVER};
2959 3653
2960 0 3654 0
2961} 3655}
2962 3656
2963sub button_up { 3657sub invoke_button_up {
2964 my ($self, $ev, $x, $y) = @_; 3658 my ($self, $ev, $x, $y) = @_;
2965 3659
2966 if ($ev->{button} == $self->{button}) { 3660 if ($ev->{button} == $self->{button}) {
2967 undef $GRAB; 3661 undef $GRAB;
2968 $self->hide; 3662 $self->hide;
2969 3663
2970 $self->_emit ("popdown"); 3664 $self->emit ("popdown");
2971 $self->{hover}[1]->() if $self->{hover}; 3665 $self->{hover}[1]->() if $self->{hover};
2972 } else { 3666 } else {
2973 return 0 3667 return 0
2974 } 3668 }
2975 3669
2976 1 3670 1
2977} 3671}
2978 3672
2979############################################################################# 3673#############################################################################
2980 3674
2981package CFClient::UI::Multiplexer; 3675package CFPlus::UI::Multiplexer;
2982 3676
2983our @ISA = CFClient::UI::Container::; 3677our @ISA = CFPlus::UI::Container::;
2984 3678
2985sub new { 3679sub new {
2986 my $class = shift; 3680 my $class = shift;
2987 3681
2988 my $self = $class->SUPER::new ( 3682 my $self = $class->SUPER::new (
… …
3002 3696
3003 $self->{current} = $self->{children}[0] 3697 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} }; 3698 if @{ $self->{children} };
3005} 3699}
3006 3700
3701sub get_current_page {
3702 my ($self) = @_;
3703
3704 $self->{current}
3705}
3706
3007sub set_current_page { 3707sub set_current_page {
3008 my ($self, $page_or_widget) = @_; 3708 my ($self, $page_or_widget) = @_;
3009 3709
3010 my $widget = ref $page_or_widget 3710 my $widget = ref $page_or_widget
3011 ? $page_or_widget 3711 ? $page_or_widget
3012 : $self->{children}[$page_or_widget]; 3712 : $self->{children}[$page_or_widget];
3013 3713
3014 $self->{current} = $widget; 3714 $self->{current} = $widget;
3015 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3715 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016 3716
3017 $self->_emit (page_changed => $self->{current}); 3717 $self->emit (page_changed => $self->{current});
3018 3718
3019 $self->realloc; 3719 $self->realloc;
3020} 3720}
3021 3721
3022sub visible_children { 3722sub visible_children {
… …
3027 my ($self) = @_; 3727 my ($self) = @_;
3028 3728
3029 $self->{current}->size_request 3729 $self->{current}->size_request
3030} 3730}
3031 3731
3032sub size_allocate { 3732sub invoke_size_allocate {
3033 my ($self, $w, $h) = @_; 3733 my ($self, $w, $h) = @_;
3034 3734
3035 $self->{current}->configure (0, 0, $w, $h); 3735 $self->{current}->configure (0, 0, $w, $h);
3736
3737 1
3036} 3738}
3037 3739
3038sub _draw { 3740sub _draw {
3039 my ($self) = @_; 3741 my ($self) = @_;
3040 3742
3041 $self->{current}->draw; 3743 $self->{current}->draw;
3042} 3744}
3043 3745
3044############################################################################# 3746#############################################################################
3045 3747
3046package CFClient::UI::Notebook; 3748package CFPlus::UI::Notebook;
3047 3749
3048our @ISA = CFClient::UI::VBox::; 3750our @ISA = CFPlus::UI::VBox::;
3049 3751
3050sub new { 3752sub new {
3051 my $class = shift; 3753 my $class = shift;
3052 3754
3053 my $self = $class->SUPER::new ( 3755 my $self = $class->SUPER::new (
3054 buttonbar => (new CFClient::UI::Buttonbar), 3756 buttonbar => (new CFPlus::UI::Buttonbar),
3055 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3757 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3056 # filter => # will be put between multiplexer and $self 3758 # filter => # will be put between multiplexer and $self
3057 @_, 3759 @_,
3058 ); 3760 );
3059 3761
3060 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3762 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3064} 3766}
3065 3767
3066sub add { 3768sub add {
3067 my ($self, $title, $widget, $tooltip) = @_; 3769 my ($self, $title, $widget, $tooltip) = @_;
3068 3770
3069 Scalar::Util::weaken $self; 3771 CFPlus::weaken $self;
3070 3772
3071 $self->{buttonbar}->add (new CFClient::UI::Button 3773 $self->{buttonbar}->add (new CFPlus::UI::Button
3072 markup => $title, 3774 markup => $title,
3073 tooltip => $tooltip, 3775 tooltip => $tooltip,
3074 on_activate => sub { $self->set_current_page ($widget) }, 3776 on_activate => sub { $self->set_current_page ($widget) },
3075 ); 3777 );
3076 3778
3077 $self->{multiplexer}->add ($widget); 3779 $self->{multiplexer}->add ($widget);
3078} 3780}
3079 3781
3782sub get_current_page {
3783 my ($self) = @_;
3784
3785 $self->{multiplexer}->get_current_page
3786}
3787
3080sub set_current_page { 3788sub set_current_page {
3081 my ($self, $page) = @_; 3789 my ($self, $page) = @_;
3082 3790
3083 $self->{multiplexer}->set_current_page ($page); 3791 $self->{multiplexer}->set_current_page ($page);
3084 $self->_emit (page_changed => $self->{multiplexer}{current}); 3792 $self->emit (page_changed => $self->{multiplexer}{current});
3085} 3793}
3086 3794
3087############################################################################# 3795#############################################################################
3088 3796
3797package CFPlus::UI::Selector;
3798
3799use utf8;
3800
3801our @ISA = CFPlus::UI::Button::;
3802
3803sub new {
3804 my $class = shift;
3805
3806 my $self = $class->SUPER::new (
3807 options => [], # [value, title, longdesc], ...
3808 value => undef,
3809 @_,
3810 );
3811
3812 $self->_set_value ($self->{value});
3813
3814 $self
3815}
3816
3817sub invoke_button_down {
3818 my ($self, $ev) = @_;
3819
3820 my @menu_items;
3821
3822 for (@{ $self->{options} }) {
3823 my ($value, $title, $tooltip) = @$_;
3824
3825 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3826 }
3827
3828 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3829}
3830
3831sub _set_value {
3832 my ($self, $value) = @_;
3833
3834 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3835 or return;
3836
3837 $self->{value} = $item->[0];
3838 $self->set_markup ("$item->[1] ⇓");
3839 $self->set_tooltip ($item->[2]);
3840}
3841
3842sub set_value {
3843 my ($self, $value) = @_;
3844
3845 return unless $self->{value} ne $value;
3846
3847 $self->_set_value ($value);
3848 $self->emit (changed => $value);
3849}
3850
3851#############################################################################
3852
3089package CFClient::UI::Statusbox; 3853package CFPlus::UI::Statusbox;
3090 3854
3091our @ISA = CFClient::UI::VBox::; 3855our @ISA = CFPlus::UI::VBox::;
3092 3856
3093sub new { 3857sub new {
3094 my $class = shift; 3858 my $class = shift;
3095 3859
3096 my $self = $class->SUPER::new ( 3860 my $self = $class->SUPER::new (
3097 fontsize => 0.8, 3861 fontsize => 0.8,
3098 @_, 3862 @_,
3099 ); 3863 );
3100 3864
3101 Scalar::Util::weaken (my $this = $self); 3865 CFPlus::weaken (my $this = $self);
3102 3866
3103 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3867 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3104 3868
3105 $self 3869 $self
3106} 3870}
… …
3108sub reorder { 3872sub reorder {
3109 my ($self) = @_; 3873 my ($self) = @_;
3110 my $NOW = Time::HiRes::time; 3874 my $NOW = Time::HiRes::time;
3111 3875
3112 # freeze display when hovering over any label 3876 # freeze display when hovering over any label
3113 return if $CFClient::UI::TOOLTIP->{owner} 3877 return if $CFPlus::UI::TOOLTIP->{owner}
3114 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3878 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3115 values %{ $self->{item} }; 3879 values %{ $self->{item} };
3116 3880
3117 while (my ($k, $v) = each %{ $self->{item} }) { 3881 while (my ($k, $v) = each %{ $self->{item} }) {
3118 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3882 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3119 } 3883 }
… …
3140 for ($short) { 3904 for ($short) {
3141 s/^\s+//; 3905 s/^\s+//;
3142 s/\s+/ /g; 3906 s/\s+/ /g;
3143 } 3907 }
3144 3908
3145 new CFClient::UI::Label 3909 new CFPlus::UI::Label
3146 markup => $short, 3910 markup => $short,
3147 tooltip => $item->{tooltip}, 3911 tooltip => $item->{tooltip},
3148 tooltip_font => $::FONT_PROP, 3912 tooltip_font => $::FONT_PROP,
3149 tooltip_width => 0.67, 3913 tooltip_width => 0.67,
3150 fontsize => $item->{fontsize} || $self->{fontsize}, 3914 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3188 $item->{count}++; 3952 $item->{count}++;
3189 } else { 3953 } else {
3190 $item->{count} = 1; 3954 $item->{count} = 1;
3191 $item->{text} = $item->{tooltip} = $text; 3955 $item->{text} = $item->{tooltip} = $text;
3192 } 3956 }
3193 $item->{id} = ++$self->{id}; 3957 $item->{id} += 0.2;#d#
3194 $item->{timeout} = $timeout; 3958 $item->{timeout} = $timeout;
3195 delete $item->{label}; 3959 delete $item->{label};
3196 } else { 3960 } else {
3197 $self->{item}{$group} = { 3961 $self->{item}{$group} = {
3198 id => ++$self->{id}, 3962 id => ++$self->{id},
… …
3204 count => 1, 3968 count => 1,
3205 %arg, 3969 %arg,
3206 }; 3970 };
3207 } 3971 }
3208 3972
3973 $ROOT->on_refresh (reorder => sub {
3209 $self->reorder; 3974 $self->reorder;
3975 });
3210} 3976}
3211 3977
3212sub reconfigure { 3978sub reconfigure {
3213 my ($self) = @_; 3979 my ($self) = @_;
3214 3980
… …
3217 3983
3218 $self->reorder; 3984 $self->reorder;
3219 $self->SUPER::reconfigure; 3985 $self->SUPER::reconfigure;
3220} 3986}
3221 3987
3222sub DESTROY { 3988sub destroy {
3223 my ($self) = @_; 3989 my ($self) = @_;
3224 3990
3225 $self->{timer}->cancel; 3991 $self->{timer}->cancel;
3226 3992
3227 $self->SUPER::DESTROY; 3993 $self->SUPER::destroy;
3228} 3994}
3229 3995
3230############################################################################# 3996#############################################################################
3231 3997
3232package CFClient::UI::Inventory;
3233
3234our @ISA = CFClient::UI::ScrolledWindow::;
3235
3236sub new {
3237 my $class = shift;
3238
3239 my $self = $class->SUPER::new (
3240 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3241 @_,
3242 );
3243
3244 $self
3245}
3246
3247sub set_items {
3248 my ($self, $items) = @_;
3249
3250 $self->{child}->clear;
3251 return unless $items;
3252
3253 my @items = sort {
3254 ($a->{type} <=> $b->{type})
3255 or ($a->{name} cmp $b->{name})
3256 } @$items;
3257
3258 $self->{real_items} = \@items;
3259
3260 my $row = 0;
3261 for my $item (@items) {
3262 CFClient::Item::update_widgets $item;
3263
3264 $self->{child}->add (0, $row, $item->{face_widget});
3265 $self->{child}->add (1, $row, $item->{desc_widget});
3266 $self->{child}->add (2, $row, $item->{weight_widget});
3267
3268 $row++;
3269 }
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::BindEditor;
3275
3276our @ISA = CFClient::UI::FancyFrame::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3282
3283 $self->add (my $vb = new CFClient::UI::VBox);
3284
3285
3286 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3287 text => "start recording",
3288 tooltip => "Start/Stops recording of actions."
3289 ."All subsequent actions after the recording started will be captured."
3290 ."The actions are displayed after the record was stopped."
3291 ."To bind the action you have to click on the 'Bind' button",
3292 on_activate => sub {
3293 unless ($self->{recording}) {
3294 $self->start;
3295 } else {
3296 $self->stop;
3297 }
3298 });
3299
3300 $vb->add (new CFClient::UI::Label text => "Actions:");
3301 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3302
3303 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3304 $vb->add (my $hb = new CFClient::UI::HBox);
3305 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3306 $hb->add (new CFClient::UI::Button
3307 text => "bind",
3308 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3309 on_activate => sub {
3310 $self->ask_for_bind;
3311 });
3312
3313 $vb->add (my $hb = new CFClient::UI::HBox);
3314 $hb->add (new CFClient::UI::Button
3315 text => "ok",
3316 expand => 1,
3317 tooltip => "This closes the binding editor and saves the binding",
3318 on_activate => sub {
3319 $self->hide;
3320 $self->commit;
3321 });
3322
3323 $hb->add (new CFClient::UI::Button
3324 text => "cancel",
3325 expand => 1,
3326 tooltip => "This closes the binding editor without saving",
3327 on_activate => sub {
3328 $self->hide;
3329 $self->{binding_cancel}->()
3330 if $self->{binding_cancel};
3331 });
3332
3333 $self->update_binding_widgets;
3334
3335 $self
3336}
3337
3338sub commit {
3339 my ($self) = @_;
3340 my ($mod, $sym, $cmds) = $self->get_binding;
3341 if ($sym != 0 && @$cmds > 0) {
3342 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3343 ."'. Don't forget 'Save Config'!");
3344 $self->{binding_change}->($mod, $sym, $cmds)
3345 if $self->{binding_change};
3346 } else {
3347 $::STATUSBOX->add ("No action bound, no key or action specified!");
3348 $self->{binding_cancel}->()
3349 if $self->{binding_cancel};
3350 }
3351}
3352
3353sub start {
3354 my ($self) = @_;
3355
3356 $self->{rec_btn}->set_text ("stop recording");
3357 $self->{recording} = 1;
3358 $self->clear_command_list;
3359 $::CONN->start_record if $::CONN;
3360}
3361
3362sub stop {
3363 my ($self) = @_;
3364
3365 $self->{rec_btn}->set_text ("start recording");
3366 $self->{recording} = 0;
3367
3368 my $rec;
3369 $rec = $::CONN->stop_record if $::CONN;
3370 return unless ref $rec eq 'ARRAY';
3371 $self->set_command_list ($rec);
3372}
3373
3374
3375sub ask_for_bind_and_commit {
3376 my ($self) = @_;
3377 $self->ask_for_bind (1);
3378}
3379
3380sub ask_for_bind {
3381 my ($self, $commit) = @_;
3382
3383 CFClient::Binder::open_binding_dialog (sub {
3384 my ($mod, $sym) = @_;
3385 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3386 $self->update_binding_widgets;
3387 $self->commit if $commit;
3388 });
3389}
3390
3391# $mod and $sym are the modifiers and key symbol
3392# $cmds is a array ref of strings (the commands)
3393# $cb is the callback that is executed on OK
3394# $ccb is the callback that is executed on CANCEL and
3395# when the binding was unsuccessful on OK
3396sub set_binding {
3397 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3398
3399 $self->clear_command_list;
3400 $self->{recording} = 0;
3401 $self->{rec_btn}->set_text ("start recording");
3402
3403 $self->{binding} = [$mod, $sym];
3404 $self->{commands} = $cmds;
3405
3406 $self->{binding_change} = $cb;
3407 $self->{binding_cancel} = $ccb;
3408
3409 $self->update_binding_widgets;
3410}
3411
3412# this is a shortcut method that asks for a binding
3413# and then just binds it.
3414sub do_quick_binding {
3415 my ($self, $cmds) = @_;
3416 $self->set_binding (undef, undef, $cmds, sub {
3417 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3418 });
3419 $self->ask_for_bind (1);
3420}
3421
3422sub update_binding_widgets {
3423 my ($self) = @_;
3424 my ($mod, $sym, $cmds) = $self->get_binding;
3425 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3426 $self->set_command_list ($cmds);
3427}
3428
3429sub get_binding {
3430 my ($self) = @_;
3431 return (
3432 $self->{binding}->[0],
3433 $self->{binding}->[1],
3434 [ grep { defined $_ } @{$self->{commands}} ]
3435 );
3436}
3437
3438sub clear_command_list {
3439 my ($self) = @_;
3440 $self->{cmdbox}->clear ();
3441}
3442
3443sub set_command_list {
3444 my ($self, $cmds) = @_;
3445
3446 $self->{cmdbox}->clear ();
3447 $self->{commands} = $cmds;
3448
3449 my $idx = 0;
3450
3451 for (@$cmds) {
3452 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3453
3454 my $i = $idx;
3455 $hb->add (new CFClient::UI::Label text => $_);
3456 $hb->add (new CFClient::UI::Button
3457 text => "delete",
3458 tooltip => "Deletes the action from the record",
3459 on_activate => sub {
3460 $self->{cmdbox}->remove ($hb);
3461 $cmds->[$i] = undef;
3462 });
3463
3464
3465 $idx++
3466 }
3467}
3468
3469#############################################################################
3470
3471package CFClient::UI::SpellList;
3472
3473our @ISA = CFClient::UI::Table::;
3474
3475sub new {
3476 my $class = shift;
3477
3478 my $self = $class->SUPER::new (
3479 binding => [],
3480 commands => [],
3481 @_,
3482 )
3483}
3484
3485# XXX: Do sorting? Argl...
3486sub add_spell {
3487 my ($self, $spell) = @_;
3488 $self->{spells}->{$spell->{name}} = $spell;
3489
3490 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3491 face => $spell->{face},
3492 can_hover => 1,
3493 can_events => 1,
3494 tooltip => $spell->{message});
3495
3496 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => $spell->{name},
3498 can_hover => 1,
3499 can_events => 1,
3500 tooltip => $spell->{message},
3501 expand => 1);
3502
3503 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3504 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3505 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3506 expand => 1);
3507
3508 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3509 text => "bind to key",
3510 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3511}
3512
3513sub rebuild_spell_list {
3514 my ($self) = @_;
3515 $self->{tbl_idx} = 0;
3516 $self->add_spell ($_) for values %{$self->{spells}};
3517}
3518
3519sub remove_spell {
3520 my ($self, $spell) = @_;
3521 delete $self->{spells}->{$spell->{name}};
3522 $self->rebuild_spell_list;
3523}
3524
3525#############################################################################
3526
3527package CFClient::UI::Root; 3998package CFPlus::UI::Root;
3528 3999
3529our @ISA = CFClient::UI::Container::; 4000our @ISA = CFPlus::UI::Container::;
3530 4001
3531use List::Util qw(min max); 4002use List::Util qw(min max);
3532 4003
3533use CFClient::OpenGL; 4004use CFPlus::OpenGL;
3534 4005
3535sub new { 4006sub new {
3536 my $class = shift; 4007 my $class = shift;
3537 4008
3538 my $self = $class->SUPER::new ( 4009 my $self = $class->SUPER::new (
3539 visible => 1, 4010 visible => 1,
3540 @_, 4011 @_,
3541 ); 4012 );
3542 4013
3543 Scalar::Util::weaken ($self->{root} = $self); 4014 CFPlus::weaken ($self->{root} = $self);
3544 4015
3545 $self 4016 $self
3546} 4017}
3547 4018
3548sub size_request { 4019sub size_request {
… …
3563 $coord = $max - $size if $coord > $max - $size; 4034 $coord = $max - $size if $coord > $max - $size;
3564 4035
3565 int $coord + 0.5 4036 int $coord + 0.5
3566} 4037}
3567 4038
3568sub size_allocate { 4039sub invoke_size_allocate {
3569 my ($self, $w, $h) = @_; 4040 my ($self, $w, $h) = @_;
3570 4041
3571 for my $child ($self->children) { 4042 for my $child ($self->children) {
3572 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4043 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3573 4044
… …
3577 $X = _to_pixel $X, $W, $self->{w}; 4048 $X = _to_pixel $X, $W, $self->{w};
3578 $Y = _to_pixel $Y, $H, $self->{h}; 4049 $Y = _to_pixel $Y, $H, $self->{h};
3579 4050
3580 $child->configure ($X, $Y, $W, $H); 4051 $child->configure ($X, $Y, $W, $H);
3581 } 4052 }
4053
4054 1
3582} 4055}
3583 4056
3584sub coord2local { 4057sub coord2local {
3585 my ($self, $x, $y) = @_; 4058 my ($self, $x, $y) = @_;
3586 4059
… …
3712 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4185 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3713 4186
3714 $w = 0 if $w < 0; 4187 $w = 0 if $w < 0;
3715 $h = 0 if $h < 0; 4188 $h = 0 if $h < 0;
3716 4189
4190 $w = max $widget->{min_w}, $w;
4191 $h = max $widget->{min_h}, $h;
4192
4193# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4194# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4195
4196 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4197 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4198
3717 $w = int $w + 0.5; 4199 $w = int $w + 0.5;
3718 $h = int $h + 0.5; 4200 $h = int $h + 0.5;
3719 4201
3720 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4202 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3721 $widget->{old_w} = $widget->{w}; 4203 $widget->{old_w} = $widget->{w};
… …
3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4226 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3745 glMatrixMode GL_MODELVIEW; 4227 glMatrixMode GL_MODELVIEW;
3746 glLoadIdentity; 4228 glLoadIdentity;
3747 4229
3748 { 4230 {
3749 package CFClient::UI::Base; 4231 package CFPlus::UI::Base;
3750 4232
3751 ($draw_x, $draw_y, $draw_w, $draw_h) = 4233 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3752 (0, 0, $self->{w}, $self->{h}); 4234 (0, 0, $self->{w}, $self->{h});
3753 }
3754 4235
3755 $self->_draw; 4236 $self->_draw;
4237 }
3756} 4238}
3757 4239
3758############################################################################# 4240#############################################################################
3759 4241
3760package CFClient::UI; 4242package CFPlus::UI;
3761 4243
3762$ROOT = new CFClient::UI::Root; 4244$ROOT = new CFPlus::UI::Root;
3763$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4245$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3764 4246
37651 42471
3766 4248

Diff Legend

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