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

Diff Legend

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