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.397 by root, Sat Jul 21 14:01:35 2007 UTC

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

Diff Legend

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