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

Diff Legend

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