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

Diff Legend

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