ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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