ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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