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

Diff Legend

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