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

Diff Legend

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