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.406 by root, Sat Jul 21 23:17:35 2007 UTC

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

Diff Legend

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