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

Diff Legend

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