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.407 by root, Sat Jul 21 23:31:31 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# unless ($self->{list}) {
1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2033# $self->{list} = CFPlus::OpenGL::glGenList;
1638 2034# CFPlus::OpenGL::glNewList $self->{list};
1639 if ($tex->{format} == GL_ALPHA) { 2035# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1640 glColor @{$self->{fg}}; 2036# CFPlus::OpenGL::glEndList;
1641 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1642 } else {
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644 } 2037# }
2038#
2039# CFPlus::OpenGL::glCallList $self->{list};
1645 2040
1646 glDisable GL_TEXTURE_2D; 2041 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1647} 2042}
2043
2044#sub destroy {
2045# my ($self) = @_;
2046#
2047# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2048#
2049# $self->SUPER::destroy;
2050#}
1648 2051
1649############################################################################# 2052#############################################################################
1650 2053
1651package CFClient::UI::EntryBase; 2054package CFPlus::UI::EntryBase;
1652 2055
1653our @ISA = CFClient::UI::Label::; 2056our @ISA = CFPlus::UI::Label::;
1654 2057
1655use CFClient::OpenGL; 2058use CFPlus::OpenGL;
1656 2059
1657sub new { 2060sub new {
1658 my $class = shift; 2061 my $class = shift;
1659 2062
1660 $class->SUPER::new ( 2063 $class->SUPER::new (
… …
1664 active_fg => [0, 0, 0], 2067 active_fg => [0, 0, 0],
1665 can_hover => 1, 2068 can_hover => 1,
1666 can_focus => 1, 2069 can_focus => 1,
1667 valign => 0, 2070 valign => 0,
1668 can_events => 1, 2071 can_events => 1,
2072 ellipsise => 0,
1669 #text => ... 2073 #text => ...
2074 #hidden => "*",
1670 @_ 2075 @_
1671 ) 2076 )
1672} 2077}
1673 2078
1674sub _set_text { 2079sub _set_text {
… …
1681 $self->{last_activity} = $::NOW; 2086 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 2087 $self->{text} = $text;
1683 2088
1684 $text =~ s/./*/g if $self->{hidden}; 2089 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 2090 $self->{layout}->set_text ("$text ");
2091 delete $self->{size_req};
1686 2092
1687 $self->_emit (changed => $self->{text}); 2093 $self->emit (changed => $self->{text});
2094
2095 $self->realloc;
1688 $self->update; 2096 $self->update;
1689} 2097}
1690 2098
1691sub set_text { 2099sub set_text {
1692 my ($self, $text) = @_; 2100 my ($self, $text) = @_;
1693 2101
1694 $self->{cursor} = length $text; 2102 $self->{cursor} = length $text;
1695 $self->_set_text ($text); 2103 $self->_set_text ($text);
1696
1697 $self->realloc;
1698} 2104}
1699 2105
1700sub get_text { 2106sub get_text {
1701 $_[0]{text} 2107 $_[0]{text}
1702} 2108}
… …
1707 my ($w, $h) = $self->SUPER::size_request; 2113 my ($w, $h) = $self->SUPER::size_request;
1708 2114
1709 ($w + 1, $h) # add 1 for cursor 2115 ($w + 1, $h) # add 1 for cursor
1710} 2116}
1711 2117
1712sub key_down { 2118sub invoke_key_down {
1713 my ($self, $ev) = @_; 2119 my ($self, $ev) = @_;
1714 2120
1715 my $mod = $ev->{mod}; 2121 my $mod = $ev->{mod};
1716 my $sym = $ev->{sym}; 2122 my $sym = $ev->{sym};
1717 my $uni = $ev->{unicode}; 2123 my $uni = $ev->{unicode};
1718 2124
1719 my $text = $self->get_text; 2125 my $text = $self->get_text;
2126
2127 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1720 2128
1721 if ($uni == 8) { 2129 if ($uni == 8) {
1722 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2130 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1723 } elsif ($uni == 127) { 2131 } elsif ($uni == 127) {
1724 substr $text, $self->{cursor}, 1, ""; 2132 substr $text, $self->{cursor}, 1, "";
1725 } elsif ($sym == CFClient::SDLK_LEFT) { 2133 } elsif ($sym == CFPlus::SDLK_LEFT) {
1726 --$self->{cursor} if $self->{cursor}; 2134 --$self->{cursor} if $self->{cursor};
1727 } elsif ($sym == CFClient::SDLK_RIGHT) { 2135 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1728 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2136 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1729 } elsif ($sym == CFClient::SDLK_HOME) { 2137 } elsif ($sym == CFPlus::SDLK_HOME) {
2138 # what a hack
2139 $self->{cursor} =
2140 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2141 ? length $1
2142 : 0;
2143 } elsif ($sym == CFPlus::SDLK_END) {
2144 # uh, again
2145 $self->{cursor} =
2146 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2147 ? $self->{cursor} + length $1
2148 : length $self->{text};
2149 } elsif ($uni == 21) { # ctrl-u
2150 $text = "";
1730 $self->{cursor} = 0; 2151 $self->{cursor} = 0;
1731 } elsif ($sym == CFClient::SDLK_END) {
1732 $self->{cursor} = length $text;
1733 } elsif ($uni == 27) { 2152 } elsif ($uni == 27) {
1734 $self->_emit ('escape'); 2153 $self->emit ('escape');
1735 } elsif ($uni) { 2154 } elsif ($uni == 0x0d) {
2155 substr $text, $self->{cursor}++, 0, "\012";
2156 } elsif ($uni >= 0x20) {
1736 substr $text, $self->{cursor}++, 0, chr $uni; 2157 substr $text, $self->{cursor}++, 0, chr $uni;
1737 } else { 2158 } else {
1738 return 0; 2159 return 0;
1739 } 2160 }
1740 2161
1741 $self->_set_text ($text); 2162 $self->_set_text ($text);
1742 2163
1743 $self->realloc; 2164 $self->realloc;
2165 $self->update;
1744 2166
1745 1 2167 1
1746} 2168}
1747 2169
1748sub focus_in { 2170sub invoke_focus_in {
1749 my ($self) = @_; 2171 my ($self) = @_;
1750 2172
1751 $self->{last_activity} = $::NOW; 2173 $self->{last_activity} = $::NOW;
1752 2174
1753 $self->SUPER::focus_in; 2175 $self->SUPER::invoke_focus_in
1754} 2176}
1755 2177
1756sub button_down { 2178sub invoke_button_down {
1757 my ($self, $ev, $x, $y) = @_; 2179 my ($self, $ev, $x, $y) = @_;
1758 2180
1759 $self->SUPER::button_down ($ev, $x, $y); 2181 $self->SUPER::invoke_button_down ($ev, $x, $y);
1760 2182
1761 my $idx = $self->{layout}->xy_to_index ($x, $y); 2183 my $idx = $self->{layout}->xy_to_index ($x, $y);
1762 2184
1763 # byte-index to char-index 2185 # byte-index to char-index
1764 my $text = $self->{text}; 2186 my $text = $self->{text};
1765 utf8::encode $text; 2187 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1766 $self->{cursor} = length substr $text, 0, $idx; 2188 $self->{cursor} = length $text;
1767 2189
1768 $self->_set_text ($self->{text}); 2190 $self->_set_text ($self->{text});
1769 $self->update; 2191 $self->update;
1770 2192
1771 1 2193 1
1772} 2194}
1773 2195
1774sub mouse_motion { 2196sub invoke_mouse_motion {
1775 my ($self, $ev, $x, $y) = @_; 2197 my ($self, $ev, $x, $y) = @_;
1776# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2198# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1777 2199
1778 0 2200 1
1779} 2201}
1780 2202
1781sub _draw { 2203sub _draw {
1782 my ($self) = @_; 2204 my ($self) = @_;
1783 2205
1784 local $self->{fg} = $self->{fg}; 2206 local $self->{fg} = $self->{fg};
1785 2207
1786 if ($FOCUS == $self) { 2208 if ($FOCUS == $self) {
1787 glColor @{$self->{active_bg}}; 2209 glColor_premultiply @{$self->{active_bg}};
1788 $self->{fg} = $self->{active_fg}; 2210 $self->{fg} = $self->{active_fg};
1789 } else { 2211 } else {
1790 glColor @{$self->{bg}}; 2212 glColor_premultiply @{$self->{bg}};
1791 } 2213 }
1792 2214
1793 glEnable GL_BLEND; 2215 glEnable GL_BLEND;
1794 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2216 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1795 glBegin GL_QUADS; 2217 glBegin GL_QUADS;
1796 glVertex 0 , 0; 2218 glVertex 0 , 0;
1797 glVertex 0 , $self->{h}; 2219 glVertex 0 , $self->{h};
1798 glVertex $self->{w}, $self->{h}; 2220 glVertex $self->{w}, $self->{h};
1799 glVertex $self->{w}, 0; 2221 glVertex $self->{w}, 0;
… …
1810 utf8::encode $text; 2232 utf8::encode $text;
1811 2233
1812 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2234 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1813 } 2235 }
1814 2236
1815 glColor @{$self->{fg}};
1816 glBegin GL_LINES; 2237 glBegin GL_LINES;
1817 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2238 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}; 2239 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1819 glEnd; 2240 glEnd;
1820 } 2241 }
1821} 2242}
1822 2243
2244#############################################################################
2245
1823package CFClient::UI::Entry; 2246package CFPlus::UI::Entry;
1824 2247
1825our @ISA = CFClient::UI::EntryBase::; 2248our @ISA = CFPlus::UI::EntryBase::;
1826 2249
1827use CFClient::OpenGL; 2250use CFPlus::OpenGL;
1828 2251
1829sub key_down { 2252sub invoke_key_down {
1830 my ($self, $ev) = @_; 2253 my ($self, $ev) = @_;
1831 2254
1832 my $sym = $ev->{sym}; 2255 my $sym = $ev->{sym};
1833 2256
1834 if ($sym == 13) { 2257 if ($ev->{uni} == 0x0d || $sym == 13) {
1835 unshift @{$self->{history}}, 2258 unshift @{$self->{history}},
1836 my $txt = $self->get_text; 2259 my $txt = $self->get_text;
2260
1837 $self->{history_pointer} = -1; 2261 $self->{history_pointer} = -1;
1838 $self->{history_saveback} = ''; 2262 $self->{history_saveback} = '';
1839 $self->_emit (activate => $txt); 2263 $self->emit (activate => $txt);
1840 $self->update; 2264 $self->update;
1841 2265
1842 } elsif ($sym == CFClient::SDLK_UP) { 2266 } elsif ($sym == CFPlus::SDLK_UP) {
1843 if ($self->{history_pointer} < 0) { 2267 if ($self->{history_pointer} < 0) {
1844 $self->{history_saveback} = $self->get_text; 2268 $self->{history_saveback} = $self->get_text;
1845 } 2269 }
1846 if (@{$self->{history} || []} > 0) { 2270 if (@{$self->{history} || []} > 0) {
1847 $self->{history_pointer}++; 2271 $self->{history_pointer}++;
… …
1849 $self->{history_pointer} = @{$self->{history} || []} - 1; 2273 $self->{history_pointer} = @{$self->{history} || []} - 1;
1850 } 2274 }
1851 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2275 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1852 } 2276 }
1853 2277
1854 } elsif ($sym == CFClient::SDLK_DOWN) { 2278 } elsif ($sym == CFPlus::SDLK_DOWN) {
1855 $self->{history_pointer}--; 2279 $self->{history_pointer}--;
1856 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2280 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1857 2281
1858 if ($self->{history_pointer} >= 0) { 2282 if ($self->{history_pointer} >= 0) {
1859 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2283 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1860 } else { 2284 } else {
1861 $self->set_text ($self->{history_saveback}); 2285 $self->set_text ($self->{history_saveback});
1862 } 2286 }
1863 2287
1864 } else { 2288 } else {
1865 return $self->SUPER::key_down ($ev) 2289 return $self->SUPER::invoke_key_down ($ev)
1866 } 2290 }
1867 2291
1868 1 2292 1
1869} 2293}
1870 2294
1871############################################################################# 2295#############################################################################
1872 2296
2297package CFPlus::UI::TextEdit;
2298
2299our @ISA = CFPlus::UI::EntryBase::;
2300
2301use CFPlus::OpenGL;
2302
2303sub move_cursor_ver {
2304 my ($self, $dy) = @_;
2305
2306 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2307
2308 $y += $dy;
2309
2310 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2311 $self->{cursor} = $index;
2312 delete $self->{cur_h};
2313 $self->update;
2314 return;
2315 }
2316}
2317
2318sub invoke_key_down {
2319 my ($self, $ev) = @_;
2320
2321 my $sym = $ev->{sym};
2322
2323 if ($sym == CFPlus::SDLK_UP) {
2324 $self->move_cursor_ver (-1);
2325 } elsif ($sym == CFPlus::SDLK_DOWN) {
2326 $self->move_cursor_ver (+1);
2327 } else {
2328 return $self->SUPER::invoke_key_down ($ev)
2329 }
2330
2331 1
2332}
2333
2334#############################################################################
2335
1873package CFClient::UI::Button; 2336package CFPlus::UI::Button;
1874 2337
1875our @ISA = CFClient::UI::Label::; 2338our @ISA = CFPlus::UI::Label::;
1876 2339
1877use CFClient::OpenGL; 2340use CFPlus::OpenGL;
1878 2341
1879my @tex = 2342my @tex =
1880 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2343 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1881 qw(b1_button_active.png); 2344 qw(b1_button_inactive.png b1_button_active.png);
1882 2345
1883sub new { 2346sub new {
1884 my $class = shift; 2347 my $class = shift;
1885 2348
1886 $class->SUPER::new ( 2349 $class->SUPER::new (
1887 padding_x => 4, 2350 padding_x => 4,
1888 padding_y => 4, 2351 padding_y => 4,
1889 fg => [1, 1, 1], 2352 fg => [1.0, 1.0, 1.0],
1890 active_fg => [0, 0, 1], 2353 active_fg => [0.8, 0.8, 0.8],
1891 can_hover => 1, 2354 can_hover => 1,
1892 align => 0, 2355 align => 0,
1893 valign => 0, 2356 valign => 0,
1894 can_events => 1, 2357 can_events => 1,
1895 @_ 2358 @_
1896 ) 2359 )
1897} 2360}
1898 2361
1899sub activate { }
1900
1901sub button_up { 2362sub invoke_button_up {
1902 my ($self, $ev, $x, $y) = @_; 2363 my ($self, $ev, $x, $y) = @_;
1903 2364
1904 $self->emit ("activate") 2365 $self->emit ("activate")
1905 if $x >= 0 && $x < $self->{w} 2366 if $x >= 0 && $x < $self->{w}
1906 && $y >= 0 && $y < $self->{h}; 2367 && $y >= 0 && $y < $self->{h};
… …
1909} 2370}
1910 2371
1911sub _draw { 2372sub _draw {
1912 my ($self) = @_; 2373 my ($self) = @_;
1913 2374
1914 local $self->{fg} = $self->{fg}; 2375 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1915
1916 if ($GRAB == $self) {
1917 $self->{fg} = $self->{active_fg};
1918 }
1919 2376
1920 glEnable GL_TEXTURE_2D; 2377 glEnable GL_TEXTURE_2D;
1921 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2378 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1922 glColor 0, 0, 0, 1; 2379 glColor 0, 0, 0, 1;
1923 2380
2381 my $tex = $tex[$GRAB == $self];
1924 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2382 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1925 2383
1926 glDisable GL_TEXTURE_2D; 2384 glDisable GL_TEXTURE_2D;
1927 2385
1928 $self->SUPER::_draw; 2386 $self->SUPER::_draw;
1929} 2387}
1930 2388
1931############################################################################# 2389#############################################################################
1932 2390
1933package CFClient::UI::CheckBox; 2391package CFPlus::UI::CheckBox;
1934 2392
1935our @ISA = CFClient::UI::DrawBG::; 2393our @ISA = CFPlus::UI::DrawBG::;
1936 2394
1937my @tex = 2395my @tex =
1938 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2396 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1939 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2397 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1940 2398
1941use CFClient::OpenGL; 2399use CFPlus::OpenGL;
1942 2400
1943sub new { 2401sub new {
1944 my $class = shift; 2402 my $class = shift;
1945 2403
1946 $class->SUPER::new ( 2404 $class->SUPER::new (
… …
1960 my ($self) = @_; 2418 my ($self) = @_;
1961 2419
1962 (6) x 2 2420 (6) x 2
1963} 2421}
1964 2422
2423sub toggle {
2424 my ($self) = @_;
2425
2426 $self->{state} = !$self->{state};
2427 $self->emit (changed => $self->{state});
2428 $self->update;
2429}
2430
1965sub button_down { 2431sub invoke_button_down {
1966 my ($self, $ev, $x, $y) = @_; 2432 my ($self, $ev, $x, $y) = @_;
1967 2433
1968 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2434 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1969 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2435 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1970 $self->{state} = !$self->{state}; 2436 $self->toggle;
1971 $self->_emit (changed => $self->{state});
1972 } else { 2437 } else {
1973 return 0 2438 return 0
1974 } 2439 }
1975 2440
1976 1 2441 1
… …
1996 glDisable GL_TEXTURE_2D; 2461 glDisable GL_TEXTURE_2D;
1997} 2462}
1998 2463
1999############################################################################# 2464#############################################################################
2000 2465
2001package CFClient::UI::Image; 2466package CFPlus::UI::Image;
2002 2467
2003our @ISA = CFClient::UI::Base::; 2468our @ISA = CFPlus::UI::Base::;
2004 2469
2005use CFClient::OpenGL; 2470use CFPlus::OpenGL;
2006use Carp qw/confess/;
2007 2471
2008our %loaded_images; 2472our %texture_cache;
2009 2473
2010sub new { 2474sub new {
2011 my $class = shift; 2475 my $class = shift;
2012 2476
2013 my $self = $class->SUPER::new (can_events => 0, @_); 2477 my $self = $class->SUPER::new (
2478 can_events => 0,
2479 @_,
2480 );
2014 2481
2015 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2482 $self->{path} || $self->{tex}
2483 or Carp::croak "'path' or 'tex' attributes required";
2016 2484
2017 $loaded_images{$self->{image}} ||= 2485 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2018 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2486 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2019 2487
2020 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2488 CFPlus::weaken $texture_cache{$self->{path}};
2021 2489
2022 Scalar::Util::weaken $loaded_images{$self->{image}}; 2490 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2023
2024 $self->{aspect} = $tex->{w} / $tex->{h};
2025 2491
2026 $self 2492 $self
2027} 2493}
2028 2494
2495sub STORABLE_freeze {
2496 my ($self, $cloning) = @_;
2497
2498 $self->{path}
2499 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2500
2501 $self->{path}
2502}
2503
2504sub STORABLE_attach {
2505 my ($self, $cloning, $path) = @_;
2506
2507 $self->new (path => $path)
2508}
2509
2029sub size_request { 2510sub size_request {
2030 my ($self) = @_; 2511 my ($self) = @_;
2031 2512
2032 ($self->{tex}->{w}, $self->{tex}->{h}) 2513 ($self->{tex}{w}, $self->{tex}{h})
2033} 2514}
2034 2515
2035sub _draw { 2516sub _draw {
2036 my ($self) = @_; 2517 my ($self) = @_;
2037 2518
… …
2047 } 2528 }
2048 2529
2049 glEnable GL_TEXTURE_2D; 2530 glEnable GL_TEXTURE_2D;
2050 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2051 2532
2052 $tex->draw_quad_alpha (0, 0, $w, $h); 2533 $tex->draw_quad (0, 0, $w, $h);
2053 2534
2054 glDisable GL_TEXTURE_2D; 2535 glDisable GL_TEXTURE_2D;
2055} 2536}
2056 2537
2057############################################################################# 2538#############################################################################
2058 2539
2540package CFPlus::UI::ImageButton;
2541
2542our @ISA = CFPlus::UI::Image::;
2543
2544use CFPlus::OpenGL;
2545
2546my %textures;
2547
2548sub new {
2549 my $class = shift;
2550
2551 my $self = $class->SUPER::new (
2552 padding_x => 4,
2553 padding_y => 4,
2554 fg => [1, 1, 1],
2555 active_fg => [0, 0, 1],
2556 can_hover => 1,
2557 align => 0,
2558 valign => 0,
2559 can_events => 1,
2560 @_
2561 );
2562}
2563
2564sub invoke_button_up {
2565 my ($self, $ev, $x, $y) = @_;
2566
2567 $self->emit ("activate")
2568 if $x >= 0 && $x < $self->{w}
2569 && $y >= 0 && $y < $self->{h};
2570
2571 1
2572}
2573
2574#############################################################################
2575
2059package CFClient::UI::VGauge; 2576package CFPlus::UI::VGauge;
2060 2577
2061our @ISA = CFClient::UI::Base::; 2578our @ISA = CFPlus::UI::Base::;
2062 2579
2063use List::Util qw(min max); 2580use List::Util qw(min max);
2064 2581
2065use CFClient::OpenGL; 2582use CFPlus::OpenGL;
2066 2583
2067my %tex = ( 2584my %tex = (
2068 food => [ 2585 food => [
2069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2586 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2070 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2587 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2071 ], 2588 ],
2072 grace => [ 2589 grace => [
2073 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2590 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/ 2591 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2075 ], 2592 ],
2076 hp => [ 2593 hp => [
2077 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2594 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2078 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2595 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2079 ], 2596 ],
2080 mana => [ 2597 mana => [
2081 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2598 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/ 2599 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2083 ], 2600 ],
2084); 2601);
2085 2602
2086# eg. VGauge->new (gauge => 'food'), default gauge: food 2603# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2146 my $ycut1 = max 0, min 1, $ycut; 2663 my $ycut1 = max 0, min 1, $ycut;
2147 my $ycut2 = max 0, min 1, $ycut - 1; 2664 my $ycut2 = max 0, min 1, $ycut - 1;
2148 2665
2149 my $h1 = $self->{h} * (1 - $ycut1); 2666 my $h1 = $self->{h} * (1 - $ycut1);
2150 my $h2 = $self->{h} * (1 - $ycut2); 2667 my $h2 = $self->{h} * (1 - $ycut2);
2668 my $h3 = $self->{h};
2669
2670 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2151 2671
2152 glEnable GL_BLEND; 2672 glEnable GL_BLEND;
2153 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2673 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2674 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2154 glEnable GL_TEXTURE_2D; 2675 glEnable GL_TEXTURE_2D;
2155 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2156 2677
2157 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2678 glBindTexture GL_TEXTURE_2D, $t1->{name};
2158 glBegin GL_QUADS; 2679 glBegin GL_QUADS;
… …
2173 2694
2174 if ($t3) { 2695 if ($t3) {
2175 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2696 glBindTexture GL_TEXTURE_2D, $t3->{name};
2176 glBegin GL_QUADS; 2697 glBegin GL_QUADS;
2177 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2698 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2178 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2699 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2179 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2700 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2180 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2701 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2181 glEnd; 2702 glEnd;
2182 } 2703 }
2183 2704
2184 glDisable GL_BLEND; 2705 glDisable GL_BLEND;
2185 glDisable GL_TEXTURE_2D; 2706 glDisable GL_TEXTURE_2D;
2186} 2707}
2187 2708
2188############################################################################# 2709#############################################################################
2189 2710
2190package CFClient::UI::Gauge; 2711package CFPlus::UI::Gauge;
2191 2712
2192our @ISA = CFClient::UI::VBox::; 2713our @ISA = CFPlus::UI::VBox::;
2193 2714
2194sub new { 2715sub new {
2195 my ($class, %arg) = @_; 2716 my ($class, %arg) = @_;
2196 2717
2197 my $self = $class->SUPER::new ( 2718 my $self = $class->SUPER::new (
… …
2199 can_hover => 1, 2720 can_hover => 1,
2200 can_events => 1, 2721 can_events => 1,
2201 %arg, 2722 %arg,
2202 ); 2723 );
2203 2724
2204 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2725 $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); 2726 $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"); 2727 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2207 2728
2208 $self 2729 $self
2209} 2730}
2210 2731
2211sub set_fontsize { 2732sub set_fontsize {
… …
2232 $self->{value}->set_text ($val); 2753 $self->{value}->set_text ($val);
2233} 2754}
2234 2755
2235############################################################################# 2756#############################################################################
2236 2757
2237package CFClient::UI::Slider; 2758package CFPlus::UI::Slider;
2238 2759
2239use strict; 2760use strict;
2240 2761
2241use CFClient::OpenGL; 2762use CFPlus::OpenGL;
2242 2763
2243our @ISA = CFClient::UI::DrawBG::; 2764our @ISA = CFPlus::UI::DrawBG::;
2244 2765
2245my @tex = 2766my @tex =
2246 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2767 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2247 qw(s1_slider.png s1_slider_bg.png); 2768 qw(s1_slider.png s1_slider_bg.png);
2248 2769
2249sub new { 2770sub new {
2250 my $class = shift; 2771 my $class = shift;
2251 2772
… …
2272 $self->update; 2793 $self->update;
2273 2794
2274 $self 2795 $self
2275} 2796}
2276 2797
2277sub changed { }
2278
2279sub set_range { 2798sub set_range {
2280 my ($self, $range) = @_; 2799 my ($self, $range) = @_;
2281 2800
2282 ($range, $self->{range}) = ($self->{range}, $range); 2801 ($range, $self->{range}) = ($self->{range}, $range);
2283 2802
2284 $self->update
2285 if "@$range" ne "@{$self->{range}}"; 2803 if ("@$range" ne "@{$self->{range}}") {
2804 $self->update;
2805 $self->set_value ($self->{range}[0]);
2806 }
2286} 2807}
2287 2808
2288sub set_value { 2809sub set_value {
2289 my ($self, $value) = @_; 2810 my ($self, $value) = @_;
2290 2811
… …
2301 if $unit; 2822 if $unit;
2302 2823
2303 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2824 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2304 2825
2305 if ($value != $old_value) { 2826 if ($value != $old_value) {
2306 $self->_emit (changed => $value); 2827 $self->emit (changed => $value);
2307 $self->update; 2828 $self->update;
2308 } 2829 }
2309} 2830}
2310 2831
2311sub size_request { 2832sub size_request {
2312 my ($self) = @_; 2833 my ($self) = @_;
2313 2834
2314 ($self->{req_w}, $self->{req_h}) 2835 ($self->{req_w}, $self->{req_h})
2315} 2836}
2316 2837
2317sub button_down { 2838sub invoke_button_down {
2318 my ($self, $ev, $x, $y) = @_; 2839 my ($self, $ev, $x, $y) = @_;
2319 2840
2320 $self->SUPER::button_down ($ev, $x, $y); 2841 $self->SUPER::invoke_button_down ($ev, $x, $y);
2321 2842
2322 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2843 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2323 2844
2324 $self->mouse_motion ($ev, $x, $y) 2845 $self->invoke_mouse_motion ($ev, $x, $y)
2325} 2846}
2326 2847
2327sub mouse_motion { 2848sub invoke_mouse_motion {
2328 my ($self, $ev, $x, $y) = @_; 2849 my ($self, $ev, $x, $y) = @_;
2329 2850
2330 if ($GRAB == $self) { 2851 if ($GRAB == $self) {
2331 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2852 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2332 2853
… …
2338 } else { 2859 } else {
2339 return 0; 2860 return 0;
2340 } 2861 }
2341 2862
2342 1 2863 1
2864}
2865
2866sub invoke_mouse_wheel {
2867 my ($self, $ev) = @_;
2868
2869 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2870
2871 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2872
2873 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2874
2875 ! ! $delta
2343} 2876}
2344 2877
2345sub update { 2878sub update {
2346 my ($self) = @_; 2879 my ($self) = @_;
2347 2880
… …
2396 glDisable GL_TEXTURE_2D; 2929 glDisable GL_TEXTURE_2D;
2397} 2930}
2398 2931
2399############################################################################# 2932#############################################################################
2400 2933
2401package CFClient::UI::ValSlider; 2934package CFPlus::UI::ValSlider;
2402 2935
2403our @ISA = CFClient::UI::HBox::; 2936our @ISA = CFPlus::UI::HBox::;
2404 2937
2405sub new { 2938sub new {
2406 my ($class, %arg) = @_; 2939 my ($class, %arg) = @_;
2407 2940
2408 my $range = delete $arg{range}; 2941 my $range = delete $arg{range};
2409 2942
2410 my $self = $class->SUPER::new ( 2943 my $self = $class->SUPER::new (
2411 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2944 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2412 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2945 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2413 to_value => sub { shift }, 2946 to_value => sub { shift },
2414 from_value => sub { shift }, 2947 from_value => sub { shift },
2415 %arg, 2948 %arg,
2416 ); 2949 );
2417 2950
… …
2437sub set_range { shift->{slider}->set_range (@_) } 2970sub set_range { shift->{slider}->set_range (@_) }
2438sub set_value { shift->{slider}->set_value (@_) } 2971sub set_value { shift->{slider}->set_value (@_) }
2439 2972
2440############################################################################# 2973#############################################################################
2441 2974
2442package CFClient::UI::TextView; 2975package CFPlus::UI::TextScroller;
2443 2976
2444our @ISA = CFClient::UI::HBox::; 2977our @ISA = CFPlus::UI::HBox::;
2445 2978
2446use CFClient::OpenGL; 2979use CFPlus::OpenGL;
2447 2980
2448sub new { 2981sub new {
2449 my $class = shift; 2982 my $class = shift;
2450 2983
2451 my $self = $class->SUPER::new ( 2984 my $self = $class->SUPER::new (
2452 fontsize => 1, 2985 fontsize => 1,
2453 can_events => 0, 2986 can_events => 1,
2987 indent => 0,
2454 #font => default_font 2988 #font => default_font
2455 @_, 2989 @_,
2456 2990
2457 layout => (new CFClient::Layout 1), 2991 layout => (new CFPlus::Layout),
2458 par => [], 2992 par => [],
2993 max_par => 0,
2459 height => 0, 2994 height => 0,
2460 children => [ 2995 children => [
2461 (new CFClient::UI::Empty expand => 1), 2996 (new CFPlus::UI::Empty expand => 1),
2462 (new CFClient::UI::Slider vertical => 1), 2997 (new CFPlus::UI::Slider vertical => 1),
2463 ], 2998 ],
2464 ); 2999 );
2465 3000
2466 $self->{children}[1]->connect (changed => sub { $self->update }); 3001 $self->{children}[1]->connect (changed => sub { $self->update });
2467 3002
… …
2473 3008
2474 $self->{fontsize} = $fontsize; 3009 $self->{fontsize} = $fontsize;
2475 $self->reflow; 3010 $self->reflow;
2476} 3011}
2477 3012
3013sub size_request {
3014 my ($self) = @_;
3015
3016 my ($empty, $slider) = @{ $self->{children} };
3017
3018 local $self->{children} = [$empty, $slider];
3019 $self->SUPER::size_request
3020}
3021
2478sub size_allocate { 3022sub invoke_size_allocate {
2479 my ($self, $w, $h) = @_; 3023 my ($self, $w, $h) = @_;
2480 3024
2481 $self->SUPER::size_allocate ($w, $h); 3025 my ($empty, $slider, @other) = @{ $self->{children} };
3026 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2482 3027
2483 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3028 $self->{layout}->set_font ($self->{font}) if $self->{font};
2484 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3029 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2485 $self->{layout}->set_width ($self->{children}[0]{w}); 3030 $self->{layout}->set_width ($empty->{w});
3031 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2486 3032
2487 $self->reflow; 3033 $self->reflow;
2488}
2489 3034
2490sub text_size { 3035 local $self->{children} = [$empty, $slider];
3036 $self->SUPER::invoke_size_allocate ($w, $h)
3037}
3038
3039sub invoke_mouse_wheel {
2491 my ($self, $text, $indent) = @_; 3040 my ($self, $ev) = @_;
3041
3042 return 0 unless $ev->{dy}; # only vertical movements
3043
3044 $self->{children}[1]->emit (mouse_wheel => $ev);
3045
3046 1
3047}
3048
3049sub get_layout {
3050 my ($self, $para) = @_;
2492 3051
2493 my $layout = $self->{layout}; 3052 my $layout = $self->{layout};
2494 3053
3054 $layout->set_font ($self->{font}) if $self->{font};
3055 $layout->set_foreground (@{$para->{fg}});
2495 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3056 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2496 $layout->set_width ($self->{children}[0]{w} - $indent); 3057 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3058 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2497 $layout->set_markup ($text); 3059 $layout->set_markup ($para->{markup});
3060
3061 $layout->set_shapes (
3062 map
3063 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3064 @{$para->{widget}}
2498 3065 );
3066
2499 $layout->size 3067 $layout
2500} 3068}
2501 3069
2502sub reflow { 3070sub reflow {
2503 my ($self) = @_; 3071 my ($self) = @_;
2504 3072
… …
2511 3079
2512 # todo: base offset on lines or so, not on pixels 3080 # todo: base offset on lines or so, not on pixels
2513 $self->{children}[1]->set_value ($offset); 3081 $self->{children}[1]->set_value ($offset);
2514} 3082}
2515 3083
3084sub current_paragraph {
3085 my ($self) = @_;
3086
3087 $self->{top_paragraph} - 1
3088}
3089
3090sub scroll_to {
3091 my ($self, $para) = @_;
3092
3093 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3094
3095 $self->{scroll_to} = $para;
3096 $self->update;
3097}
3098
2516sub clear { 3099sub clear {
2517 my ($self) = @_; 3100 my ($self) = @_;
3101
3102 my (undef, undef, @other) = @{ $self->{children} };
3103 $self->remove ($_) for @other;
2518 3104
2519 $self->{par} = []; 3105 $self->{par} = [];
2520 $self->{height} = 0; 3106 $self->{height} = 0;
2521 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3107 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2522} 3108}
2523 3109
2524sub add_paragraph { 3110sub add_paragraph {
2525 my ($self, $color, $text, $indent) = @_; 3111 my $self = shift;
2526 3112
2527 for my $line (split /\n/, $text) { 3113 for my $para (@_) {
2528 my ($w, $h) = $self->text_size ($line); 3114 $para = {
3115 fg => [1, 1, 1, 1],
3116 indent => 0,
3117 markup => "",
3118 widget => [],
3119 ref $para ? %$para : (markup => $para),
3120 w => 1e10,
3121 wrapped => 1,
3122 };
3123
3124 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3125 push @{$self->{par}}, $para;
3126 }
3127
3128 if (my $max = $self->{max_par}) {
3129 shift @{$self->{par}} while @{$self->{par}} > $max;
3130 }
3131
3132 $self->{need_reflow}++;
3133 $self->update;
3134}
3135
3136sub scroll_to_bottom {
3137 my ($self) = @_;
3138
3139 $self->{scroll_to} = $#{$self->{par}};
3140 $self->update;
3141}
3142
3143sub force_uptodate {
3144 my ($self) = @_;
3145
3146 if (delete $self->{need_reflow}) {
3147 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3148
3149 my $height = 0;
3150
3151 for my $para (@{$self->{par}}) {
3152 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3153 my $layout = $self->get_layout ($para);
3154 my ($w, $h) = $layout->size;
3155
3156 $para->{w} = $w + $para->{indent};
3157 $para->{h} = $h;
3158 $para->{wrapped} = $layout->has_wrapped;
3159 }
3160
3161 $para->{y} = $height;
3162 $height += $para->{h};
3163 }
3164
2529 $self->{height} += $h; 3165 $self->{height} = $height;
2530 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3166 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2531 }
2532 3167
2533 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3168 delete $self->{texture};
3169 }
3170
3171 if (my $paridx = delete $self->{scroll_to}) {
3172 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3173 }
2534} 3174}
2535 3175
2536sub update { 3176sub update {
2537 my ($self) = @_; 3177 my ($self) = @_;
2538 3178
… …
2540 3180
2541 return unless $self->{h} > 0; 3181 return unless $self->{h} > 0;
2542 3182
2543 delete $self->{texture}; 3183 delete $self->{texture};
2544 3184
2545 $ROOT->on_post_alloc ($self, sub { 3185 $ROOT->on_post_alloc ($self => sub {
3186 $self->force_uptodate;
3187
2546 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3188 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2547 3189
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 { 3190 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2575 glClearColor 0.5, 0.5, 0.5, 0; 3191 glClearColor 0, 0, 0, 0;
2576 glClear GL_COLOR_BUFFER_BIT; 3192 glClear GL_COLOR_BUFFER_BIT;
2577 3193
3194 package CFPlus::UI::Base;
3195 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3196 (0, 0, $self->{w}, $self->{h});
3197
3198 my $top = int $self->{children}[1]{range}[0];
3199
3200 my $paridx = 0;
3201 my $top_paragraph;
2578 my $top = int $self->{children}[1]{range}[0]; 3202 my $top = int $self->{children}[1]{range}[0];
2579 3203
2580 my $y0 = $top; 3204 my $y0 = $top;
2581 my $y1 = $top + $H; 3205 my $y1 = $top + $H;
2582 3206
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}}) { 3207 for my $para (@{$self->{par}}) {
2594 my $h = $par->[1]; 3208 my $h = $para->{h};
3209 my $y = $para->{y};
2595 3210
2596 if ($y0 < $y + $h && $y < $y1) { 3211 if ($y0 < $y + $h && $y < $y1) {
2597 $layout->set_foreground (@{ $par->[2] }); 3212 my $layout = $self->get_layout ($para);
2598 $layout->set_width ($W - $par->[3]);
2599 $layout->set_markup ($par->[4]);
2600 3213
2601 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3214 $layout->render ($para->{indent}, $y - $y0);
2602 3215
2603 glRasterPos $par->[3], $y - $y0; 3216 if (my @w = @{ $para->{widget} }) {
2604 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3217 my @s = $layout->get_shapes;
3218
3219 for (@w) {
3220 my ($dx, $dy) = splice @s, 0, 2, ();
3221
3222 $_->{x} = $dx + $para->{indent};
3223 $_->{y} = $dy + $y - $y0;
3224
3225 $_->draw;
3226 }
3227 }
2605 } 3228 }
2606 3229
2607 $y += $h; 3230 $paridx++;
3231 $top_paragraph ||= $paridx if $y >= $top;
2608 } 3232 }
2609 3233
2610 glDisable GL_BLEND; 3234 $self->{top_paragraph} = $top_paragraph;
2611 }; 3235 };
2612 }); 3236 });
2613} 3237}
2614 3238
3239sub reconfigure {
3240 my ($self) = @_;
3241
3242 $self->SUPER::reconfigure;
3243
3244 $_->{w} = 1e10 for @{ $self->{par} };
3245 $self->reflow;
3246}
3247
2615sub _draw { 3248sub _draw {
2616 my ($self) = @_; 3249 my ($self) = @_;
2617 3250
2618 glEnable GL_TEXTURE_2D; 3251 glEnable GL_TEXTURE_2D;
2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3252 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2620 glColor 1, 1, 1, 1; 3253 glColor 0, 0, 0, 1;
2621 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3254 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2622 glDisable GL_TEXTURE_2D; 3255 glDisable GL_TEXTURE_2D;
2623 3256
2624 $self->{children}[1]->draw; 3257 $self->{children}[1]->draw;
2625
2626} 3258}
2627 3259
2628############################################################################# 3260#############################################################################
2629 3261
2630package CFClient::UI::Animator; 3262package CFPlus::UI::Animator;
2631 3263
2632use CFClient::OpenGL; 3264use CFPlus::OpenGL;
2633 3265
2634our @ISA = CFClient::UI::Bin::; 3266our @ISA = CFPlus::UI::Bin::;
2635 3267
2636sub moveto { 3268sub moveto {
2637 my ($self, $x, $y) = @_; 3269 my ($self, $x, $y) = @_;
2638 3270
2639 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3271 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2667 glPopMatrix; 3299 glPopMatrix;
2668} 3300}
2669 3301
2670############################################################################# 3302#############################################################################
2671 3303
2672package CFClient::UI::Flopper; 3304package CFPlus::UI::Flopper;
2673 3305
2674our @ISA = CFClient::UI::Button::; 3306our @ISA = CFPlus::UI::Button::;
2675 3307
2676sub new { 3308sub new {
2677 my $class = shift; 3309 my $class = shift;
2678 3310
2679 my $self = $class->SUPER::new ( 3311 my $self = $class->SUPER::new (
… …
2691 $self->{other}->toggle_visibility; 3323 $self->{other}->toggle_visibility;
2692} 3324}
2693 3325
2694############################################################################# 3326#############################################################################
2695 3327
2696package CFClient::UI::Tooltip; 3328package CFPlus::UI::Tooltip;
2697 3329
2698our @ISA = CFClient::UI::Bin::; 3330our @ISA = CFPlus::UI::Bin::;
2699 3331
2700use CFClient::OpenGL; 3332use CFPlus::OpenGL;
2701 3333
2702sub new { 3334sub new {
2703 my $class = shift; 3335 my $class = shift;
2704 3336
2705 $class->SUPER::new ( 3337 $class->SUPER::new (
… …
2708 ) 3340 )
2709} 3341}
2710 3342
2711sub set_tooltip_from { 3343sub set_tooltip_from {
2712 my ($self, $widget) = @_; 3344 my ($self, $widget) = @_;
3345
3346 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3347 if $widget->{tooltip} =~ /^#(.*)$/;
2713 3348
2714 my $tooltip = $widget->{tooltip}; 3349 my $tooltip = $widget->{tooltip};
2715 3350
2716 if ($ENV{CFPLUS_DEBUG} & 2) { 3351 if ($ENV{CFPLUS_DEBUG} & 2) {
2717 $tooltip .= "\n\n" . (ref $widget) . "\n" 3352 $tooltip .= "\n\n" . (ref $widget) . "\n"
2718 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3353 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2719 . "req $widget->{req_w} $widget->{req_h}\n" 3354 . "req $widget->{req_w} $widget->{req_h}\n"
2720 . "visible $widget->{visible}"; 3355 . "visible $widget->{visible}";
2721 } 3356 }
2722 3357
3358 $tooltip =~ s/^\n+//;
3359 $tooltip =~ s/\n+$//;
3360
2723 $self->add (new CFClient::UI::Label 3361 $self->add (new CFPlus::UI::Label
2724 markup => $tooltip, 3362 markup => $tooltip,
2725 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3363 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2726 fontsize => 0.8, 3364 fontsize => 0.8,
2727 fg => [0, 0, 0, 1], 3365 style => 1, # FLAG_INVERSE
2728 ellipsise => 0, 3366 ellipsise => 0,
2729 font => ($widget->{tooltip_font} || $::FONT_PROP), 3367 font => ($widget->{tooltip_font} || $::FONT_PROP),
2730 ); 3368 );
2731} 3369}
2732 3370
… …
2736 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3374 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2737 3375
2738 ($w + 4, $h + 4) 3376 ($w + 4, $h + 4)
2739} 3377}
2740 3378
2741sub size_allocate { 3379sub invoke_size_allocate {
2742 my ($self, $w, $h) = @_; 3380 my ($self, $w, $h) = @_;
2743 3381
2744 $self->SUPER::size_allocate ($w - 4, $h - 4); 3382 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2745} 3383}
2746 3384
2747sub visibility_change { 3385sub invoke_visibility_change {
2748 my ($self, $visible) = @_; 3386 my ($self, $visible) = @_;
2749 3387
2750 return unless $visible; 3388 return unless $visible;
2751 3389
2752 $self->{root}->on_post_alloc ("move_$self" => sub { 3390 $self->{root}->on_post_alloc ("move_$self" => sub {
2753 my $widget = $self->{owner} 3391 my $widget = $self->{owner}
2754 or return; 3392 or return;
2755 3393
3394 if ($widget->{visible}) {
2756 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3395 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2757 3396
2758 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3397 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2759 if $x + $self->{w} > $::WIDTH; 3398 if $x + $self->{w} > $self->{root}{w};
2760 3399
2761 $self->move_abs ($x, $y); 3400 $self->move_abs ($x, $y);
3401 } else {
3402 $self->hide;
3403 }
2762 }); 3404 });
2763} 3405}
2764 3406
2765sub _draw { 3407sub _draw {
2766 my ($self) = @_; 3408 my ($self) = @_;
… …
2790 $self->SUPER::_draw; 3432 $self->SUPER::_draw;
2791} 3433}
2792 3434
2793############################################################################# 3435#############################################################################
2794 3436
2795package CFClient::UI::Face; 3437package CFPlus::UI::Face;
2796 3438
2797our @ISA = CFClient::UI::Base::; 3439our @ISA = CFPlus::UI::DrawBG::;
2798 3440
2799use CFClient::OpenGL; 3441use CFPlus::OpenGL;
2800 3442
2801sub new { 3443sub new {
2802 my $class = shift; 3444 my $class = shift;
2803 3445
2804 my $self = $class->SUPER::new ( 3446 my $self = $class->SUPER::new (
3447 size_w => 32,
3448 size_h => 8,
2805 aspect => 1, 3449 aspect => 1,
2806 can_events => 0, 3450 can_events => 0,
2807 @_, 3451 @_,
2808 ); 3452 );
2809 3453
2810 if ($self->{anim} && $self->{animspeed}) { 3454 if ($self->{anim} && $self->{animspeed}) {
2811 Scalar::Util::weaken (my $widget = $self); 3455 CFPlus::weaken (my $widget = $self);
2812 3456
3457 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3458 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2813 $self->{timer} = Event->timer ( 3459 $self->{timer} = Event->timer (
2814 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2815 hard => 1, 3460 parked => 1,
2816 interval => $self->{animspeed},
2817 cb => sub { 3461 cb => sub {
3462 return unless $::CONN && $widget;
3463
2818 ++$widget->{frame}; 3464 ++$widget->{frame};
3465 $widget->update_face;
2819 $widget->update; 3466 $widget->update;
3467
3468 $widget->update_timer;
2820 }, 3469 },
2821 ); 3470 );
3471
3472 $self->update_face;
3473 $self->update_timer;
2822 } 3474 }
2823 3475
2824 $self 3476 $self
2825} 3477}
2826 3478
3479sub update_timer {
3480 my ($self) = @_;
3481
3482 return unless $self->{timer};
3483
3484 if ($self->{visible}) {
3485 $self->{timer}->at (
3486 $self->{anim_start}
3487 + $self->{animspeed}
3488 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3489 );
3490 $self->{timer}->start;
3491 } else {
3492 $self->{timer}->stop;
3493 }
3494}
3495
3496sub update_face {
3497 my ($self) = @_;
3498
3499 return unless $::CONN;
3500
3501 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3502 if ($anim && @$anim) {
3503 delete $self->{wait_face};
3504 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3505 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3506 }
3507 }
3508}
3509
2827sub size_request { 3510sub size_request {
2828 (32, 8) 3511 my ($self) = @_;
3512
3513 if ($::CONN) {
3514 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3515 if (my $tex = $::CONN->{texture}[$faceid]) {
3516 $self->{tex} = $tex;
3517 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3518 } else {
3519 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3520 $self->realloc;
3521 });
3522 }
3523 }
3524 }
3525
3526 ($self->{size_w} || 8, $self->{size_h} || 8)
2829} 3527}
2830 3528
2831sub update { 3529sub update {
2832 my ($self) = @_; 3530 my ($self) = @_;
2833 3531
2834 return unless $self->{visible}; 3532 return unless $self->{visible};
2835 3533
2836 $self->SUPER::update; 3534 $self->SUPER::update;
2837} 3535}
2838 3536
3537sub invoke_visibility_change {
3538 my ($self) = @_;
3539
3540 $self->update_timer;
3541
3542 0
3543}
3544
2839sub _draw { 3545sub _draw {
2840 my ($self) = @_; 3546 my ($self) = @_;
2841 3547
2842 return unless $::CONN; 3548 $self->SUPER::_draw;
2843 3549
2844 my $face; 3550 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; 3551 glEnable GL_TEXTURE_2D;
2857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2858 glColor 1, 1, 1, 1; 3553 glColor 0, 0, 0, 1;
2859 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3554 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2860 glDisable GL_TEXTURE_2D; 3555 glDisable GL_TEXTURE_2D;
2861 } 3556 }
2862} 3557}
2863 3558
2864sub DESTROY { 3559sub destroy {
2865 my ($self) = @_; 3560 my ($self) = @_;
2866 3561
2867 $self->{timer}->cancel 3562 (delete $self->{timer})->cancel
2868 if $self->{timer}; 3563 if $self->{timer};
2869 3564
2870 $self->SUPER::DESTROY; 3565 $self->SUPER::destroy;
2871} 3566}
2872 3567
2873############################################################################# 3568#############################################################################
2874 3569
2875package CFClient::UI::Buttonbar; 3570package CFPlus::UI::Buttonbar;
2876 3571
2877our @ISA = CFClient::UI::HBox::; 3572our @ISA = CFPlus::UI::HBox::;
2878 3573
2879# TODO: should actualyl wrap buttons and other goodies. 3574# TODO: should actually wrap buttons and other goodies.
2880 3575
2881############################################################################# 3576#############################################################################
2882 3577
2883package CFClient::UI::Menu; 3578package CFPlus::UI::Menu;
2884 3579
2885our @ISA = CFClient::UI::FancyFrame::; 3580our @ISA = CFPlus::UI::Toplevel::;
2886 3581
2887use CFClient::OpenGL; 3582use CFPlus::OpenGL;
2888 3583
2889sub new { 3584sub new {
2890 my $class = shift; 3585 my $class = shift;
2891 3586
2892 my $self = $class->SUPER::new ( 3587 my $self = $class->SUPER::new (
2893 items => [], 3588 items => [],
2894 z => 100, 3589 z => 100,
2895 @_, 3590 @_,
2896 ); 3591 );
2897 3592
2898 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3593 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2899 3594
2900 for my $item (@{ $self->{items} }) { 3595 for my $item (@{ $self->{items} }) {
2901 my ($widget, $cb) = @$item; 3596 my ($widget, $cb, $tooltip) = @$item;
2902 3597
2903 # handle various types of items, only text for now 3598 # handle various types of items, only text for now
2904 if (!ref $widget) { 3599 if (!ref $widget) {
3600 if ($widget =~ /\t/) {
3601 my ($left, $right) = split /\t/, $widget, 2;
3602
2905 $widget = new CFClient::UI::Label 3603 $widget = new CFPlus::UI::HBox
2906 can_hover => 1, 3604 can_hover => 1,
2907 can_events => 1, 3605 can_events => 1,
3606 tooltip => $tooltip,
3607 children => [
3608 (new CFPlus::UI::Label markup => $left, expand => 1),
3609 (new CFPlus::UI::Label markup => $right, align => +1),
3610 ],
3611 ;
3612
3613 } else {
3614 $widget = new CFPlus::UI::Label
3615 can_hover => 1,
3616 can_events => 1,
2908 text => $widget; 3617 markup => $widget,
3618 tooltip => $tooltip;
3619 }
2909 } 3620 }
2910 3621
2911 $self->{item}{$widget} = $item; 3622 $self->{item}{$widget} = $item;
2912 3623
2913 $self->{vbox}->add ($widget); 3624 $self->{vbox}->add ($widget);
… …
2918 3629
2919# popup given the event (must be a mouse button down event currently) 3630# popup given the event (must be a mouse button down event currently)
2920sub popup { 3631sub popup {
2921 my ($self, $ev) = @_; 3632 my ($self, $ev) = @_;
2922 3633
2923 $self->_emit ("popdown"); 3634 $self->emit ("popdown");
2924 3635
2925 # maybe save $GRAB? must be careful about events... 3636 # maybe save $GRAB? must be careful about events...
2926 $GRAB = $self; 3637 $GRAB = $self;
2927 $self->{button} = $ev->{button}; 3638 $self->{button} = $ev->{button};
2928 3639
2929 $self->show; 3640 $self->show;
2930 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3641 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2931} 3642}
2932 3643
2933sub mouse_motion { 3644sub invoke_mouse_motion {
2934 my ($self, $ev, $x, $y) = @_; 3645 my ($self, $ev, $x, $y) = @_;
2935 3646
2936 # TODO: should use vbox->find_widget or so 3647 # TODO: should use vbox->find_widget or so
2937 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3648 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2938 $self->{hover} = $self->{item}{$HOVER}; 3649 $self->{hover} = $self->{item}{$HOVER};
2939 3650
2940 0 3651 0
2941} 3652}
2942 3653
2943sub button_up { 3654sub invoke_button_up {
2944 my ($self, $ev, $x, $y) = @_; 3655 my ($self, $ev, $x, $y) = @_;
2945 3656
2946 if ($ev->{button} == $self->{button}) { 3657 if ($ev->{button} == $self->{button}) {
2947 undef $GRAB; 3658 undef $GRAB;
2948 $self->hide; 3659 $self->hide;
2949 3660
2950 $self->_emit ("popdown"); 3661 $self->emit ("popdown");
2951 $self->{hover}[1]->() if $self->{hover}; 3662 $self->{hover}[1]->() if $self->{hover};
2952 } else { 3663 } else {
2953 return 0 3664 return 0
2954 } 3665 }
2955 3666
2956 1 3667 1
2957} 3668}
2958 3669
2959############################################################################# 3670#############################################################################
2960 3671
2961package CFClient::UI::Multiplexer; 3672package CFPlus::UI::Multiplexer;
2962 3673
2963our @ISA = CFClient::UI::Container::; 3674our @ISA = CFPlus::UI::Container::;
2964 3675
2965sub new { 3676sub new {
2966 my $class = shift; 3677 my $class = shift;
2967 3678
2968 my $self = $class->SUPER::new ( 3679 my $self = $class->SUPER::new (
… …
2982 3693
2983 $self->{current} = $self->{children}[0] 3694 $self->{current} = $self->{children}[0]
2984 if @{ $self->{children} }; 3695 if @{ $self->{children} };
2985} 3696}
2986 3697
3698sub get_current_page {
3699 my ($self) = @_;
3700
3701 $self->{current}
3702}
3703
2987sub set_current_page { 3704sub set_current_page {
2988 my ($self, $page_or_widget) = @_; 3705 my ($self, $page_or_widget) = @_;
2989 3706
2990 my $widget = ref $page_or_widget 3707 my $widget = ref $page_or_widget
2991 ? $page_or_widget 3708 ? $page_or_widget
2992 : $self->{children}[$page_or_widget]; 3709 : $self->{children}[$page_or_widget];
2993 3710
2994 $self->{current} = $widget; 3711 $self->{current} = $widget;
2995 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3712 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2996 3713
2997 $self->_emit (page_changed => $self->{current}); 3714 $self->emit (page_changed => $self->{current});
2998 3715
2999 $self->realloc; 3716 $self->realloc;
3000} 3717}
3001 3718
3002sub visible_children { 3719sub visible_children {
… …
3007 my ($self) = @_; 3724 my ($self) = @_;
3008 3725
3009 $self->{current}->size_request 3726 $self->{current}->size_request
3010} 3727}
3011 3728
3012sub size_allocate { 3729sub invoke_size_allocate {
3013 my ($self, $w, $h) = @_; 3730 my ($self, $w, $h) = @_;
3014 3731
3015 $self->{current}->configure (0, 0, $w, $h); 3732 $self->{current}->configure (0, 0, $w, $h);
3733
3734 1
3016} 3735}
3017 3736
3018sub _draw { 3737sub _draw {
3019 my ($self) = @_; 3738 my ($self) = @_;
3020 3739
3021 $self->{current}->draw; 3740 $self->{current}->draw;
3022} 3741}
3023 3742
3024############################################################################# 3743#############################################################################
3025 3744
3026package CFClient::UI::Notebook; 3745package CFPlus::UI::Notebook;
3027 3746
3028our @ISA = CFClient::UI::VBox::; 3747our @ISA = CFPlus::UI::VBox::;
3029 3748
3030sub new { 3749sub new {
3031 my $class = shift; 3750 my $class = shift;
3032 3751
3033 my $self = $class->SUPER::new ( 3752 my $self = $class->SUPER::new (
3034 buttonbar => (new CFClient::UI::Buttonbar), 3753 buttonbar => (new CFPlus::UI::Buttonbar),
3035 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3754 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3036 # filter => # will be put between multiplexer and $self 3755 # filter => # will be put between multiplexer and $self
3037 @_, 3756 @_,
3038 ); 3757 );
3039 3758
3040 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3759 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3044} 3763}
3045 3764
3046sub add { 3765sub add {
3047 my ($self, $title, $widget, $tooltip) = @_; 3766 my ($self, $title, $widget, $tooltip) = @_;
3048 3767
3049 Scalar::Util::weaken $self; 3768 CFPlus::weaken $self;
3050 3769
3051 $self->{buttonbar}->add (new CFClient::UI::Button 3770 $self->{buttonbar}->add (new CFPlus::UI::Button
3052 markup => $title, 3771 markup => $title,
3053 tooltip => $tooltip, 3772 tooltip => $tooltip,
3054 on_activate => sub { $self->set_current_page ($widget) }, 3773 on_activate => sub { $self->set_current_page ($widget) },
3055 ); 3774 );
3056 3775
3057 $self->{multiplexer}->add ($widget); 3776 $self->{multiplexer}->add ($widget);
3058} 3777}
3059 3778
3779sub get_current_page {
3780 my ($self) = @_;
3781
3782 $self->{multiplexer}->get_current_page
3783}
3784
3060sub set_current_page { 3785sub set_current_page {
3061 my ($self, $page) = @_; 3786 my ($self, $page) = @_;
3062 3787
3063 $self->{multiplexer}->set_current_page ($page); 3788 $self->{multiplexer}->set_current_page ($page);
3064 $self->_emit (page_changed => $self->{multiplexer}{current}); 3789 $self->emit (page_changed => $self->{multiplexer}{current});
3065} 3790}
3066 3791
3067############################################################################# 3792#############################################################################
3068 3793
3069package CFClient::UI::Statusbox; 3794package CFPlus::UI::Selector;
3070 3795
3796use utf8;
3797
3071our @ISA = CFClient::UI::VBox::; 3798our @ISA = CFPlus::UI::Button::;
3072 3799
3073sub new { 3800sub new {
3074 my $class = shift; 3801 my $class = shift;
3075 3802
3076 $class->SUPER::new ( 3803 my $self = $class->SUPER::new (
3804 options => [], # [value, title, longdesc], ...
3805 value => undef,
3806 @_,
3807 );
3808
3809 $self->_set_value ($self->{value});
3810
3811 $self
3812}
3813
3814sub invoke_button_down {
3815 my ($self, $ev) = @_;
3816
3817 my @menu_items;
3818
3819 for (@{ $self->{options} }) {
3820 my ($value, $title, $tooltip) = @$_;
3821
3822 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3823 }
3824
3825 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3826}
3827
3828sub _set_value {
3829 my ($self, $value) = @_;
3830
3831 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3832 or return;
3833
3834 $self->{value} = $item->[0];
3835 $self->set_markup ("$item->[1] ⇓");
3836 $self->set_tooltip ($item->[2]);
3837}
3838
3839sub set_value {
3840 my ($self, $value) = @_;
3841
3842 return unless $self->{value} ne $value;
3843
3844 $self->_set_value ($value);
3845 $self->emit (changed => $value);
3846}
3847
3848#############################################################################
3849
3850package CFPlus::UI::Statusbox;
3851
3852our @ISA = CFPlus::UI::VBox::;
3853
3854sub new {
3855 my $class = shift;
3856
3857 my $self = $class->SUPER::new (
3077 fontsize => 0.8, 3858 fontsize => 0.8,
3078 @_, 3859 @_,
3079 ) 3860 );
3861
3862 CFPlus::weaken (my $this = $self);
3863
3864 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3865
3866 $self
3080} 3867}
3081 3868
3082sub reorder { 3869sub reorder {
3083 my ($self) = @_; 3870 my ($self) = @_;
3084 my $NOW = time; 3871 my $NOW = Time::HiRes::time;
3872
3873 # freeze display when hovering over any label
3874 return if $CFPlus::UI::TOOLTIP->{owner}
3875 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3876 values %{ $self->{item} };
3085 3877
3086 while (my ($k, $v) = each %{ $self->{item} }) { 3878 while (my ($k, $v) = each %{ $self->{item} }) {
3087 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3879 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3088 } 3880 }
3089 3881
… …
3092 my @items = sort { 3884 my @items = sort {
3093 $a->{pri} <=> $b->{pri} 3885 $a->{pri} <=> $b->{pri}
3094 or $b->{id} <=> $a->{id} 3886 or $b->{id} <=> $a->{id}
3095 } values %{ $self->{item} }; 3887 } values %{ $self->{item} };
3096 3888
3889 $self->{timer}->interval (1);
3890
3097 my $count = 10 + 1; 3891 my $count = 10 + 1;
3098 for my $item (@items) { 3892 for my $item (@items) {
3099 last unless --$count; 3893 last unless --$count;
3100 3894
3101 push @widgets, $item->{label} ||= do { 3895 my $label = $item->{label} ||= do {
3102 # TODO: doesn't handle markup well (read as: at all) 3896 # TODO: doesn't handle markup well (read as: at all)
3103 my $short = $item->{count} > 1 3897 my $short = $item->{count} > 1
3104 ? "<b>$item->{count} ×</b> $item->{text}" 3898 ? "<b>$item->{count} ×</b> $item->{text}"
3105 : $item->{text}; 3899 : $item->{text};
3106 3900
3107 for ($short) { 3901 for ($short) {
3108 s/^\s+//; 3902 s/^\s+//;
3109 s/\s+/ /g; 3903 s/\s+/ /g;
3110 } 3904 }
3111 3905
3112 new CFClient::UI::Label 3906 new CFPlus::UI::Label
3113 markup => $short, 3907 markup => $short,
3114 tooltip => $item->{tooltip}, 3908 tooltip => $item->{tooltip},
3115 tooltip_font => $::FONT_PROP, 3909 tooltip_font => $::FONT_PROP,
3116 tooltip_width => 0.67, 3910 tooltip_width => 0.67,
3117 fontsize => $item->{fontsize} || $self->{fontsize}, 3911 fontsize => $item->{fontsize} || $self->{fontsize},
3118 max_w => $::WIDTH * 0.44, 3912 max_w => $::WIDTH * 0.44,
3119 fg => $item->{fg}, 3913 fg => [@{ $item->{fg} }],
3120 can_events => 1, 3914 can_events => 1,
3121 can_hover => 1 3915 can_hover => 1
3122 }; 3916 };
3917
3918 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3919 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3920 $label->update;
3921 $label->set_max_size (undef, $label->{req_h} * $diff)
3922 if $diff < 1;
3923 $self->{timer}->interval (1/30);
3924 } else {
3925 $label->{fg}[3] = $item->{fg}[3] || 1;
3926 }
3927
3928 push @widgets, $label;
3123 } 3929 }
3124 3930
3125 $self->clear; 3931 $self->clear;
3126 $self->SUPER::add (reverse @widgets); 3932 $self->SUPER::add (reverse @widgets);
3127} 3933}
… …
3132 $text =~ s/^\s+//; 3938 $text =~ s/^\s+//;
3133 $text =~ s/\s+$//; 3939 $text =~ s/\s+$//;
3134 3940
3135 return unless $text; 3941 return unless $text;
3136 3942
3137 my $timeout = time + ((delete $arg{timeout}) || 60); 3943 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3138 3944
3139 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3945 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3140 3946
3141 if (my $item = $self->{item}{$group}) { 3947 if (my $item = $self->{item}{$group}) {
3142 if ($item->{text} eq $text) { 3948 if ($item->{text} eq $text) {
3143 $item->{count}++; 3949 $item->{count}++;
3144 } else { 3950 } else {
3145 $item->{count} = 1; 3951 $item->{count} = 1;
3146 $item->{text} = $item->{tooltip} = $text; 3952 $item->{text} = $item->{tooltip} = $text;
3147 } 3953 }
3148 $item->{id} = ++$self->{id}; 3954 $item->{id} += 0.2;#d#
3149 $item->{timeout} = $timeout; 3955 $item->{timeout} = $timeout;
3150 delete $item->{label}; 3956 delete $item->{label};
3151 } else { 3957 } else {
3152 $self->{item}{$group} = { 3958 $self->{item}{$group} = {
3153 id => ++$self->{id}, 3959 id => ++$self->{id},
… …
3159 count => 1, 3965 count => 1,
3160 %arg, 3966 %arg,
3161 }; 3967 };
3162 } 3968 }
3163 3969
3970 $ROOT->on_refresh (reorder => sub {
3164 $self->reorder; 3971 $self->reorder;
3972 });
3165} 3973}
3166 3974
3167sub reconfigure { 3975sub reconfigure {
3168 my ($self) = @_; 3976 my ($self) = @_;
3169 3977
… …
3172 3980
3173 $self->reorder; 3981 $self->reorder;
3174 $self->SUPER::reconfigure; 3982 $self->SUPER::reconfigure;
3175} 3983}
3176 3984
3985sub destroy {
3986 my ($self) = @_;
3987
3988 $self->{timer}->cancel;
3989
3990 $self->SUPER::destroy;
3991}
3992
3177############################################################################# 3993#############################################################################
3178 3994
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; 3995package CFPlus::UI::Root;
3475 3996
3476our @ISA = CFClient::UI::Container::; 3997our @ISA = CFPlus::UI::Container::;
3477 3998
3999use List::Util qw(min max);
4000
3478use CFClient::OpenGL; 4001use CFPlus::OpenGL;
3479 4002
3480sub new { 4003sub new {
3481 my $class = shift; 4004 my $class = shift;
3482 4005
3483 my $self = $class->SUPER::new ( 4006 my $self = $class->SUPER::new (
3484 visible => 1, 4007 visible => 1,
3485 @_, 4008 @_,
3486 ); 4009 );
3487 4010
3488 Scalar::Util::weaken ($self->{root} = $self); 4011 CFPlus::weaken ($self->{root} = $self);
3489 4012
3490 $self 4013 $self
3491} 4014}
3492 4015
3493sub size_request { 4016sub size_request {
… …
3508 $coord = $max - $size if $coord > $max - $size; 4031 $coord = $max - $size if $coord > $max - $size;
3509 4032
3510 int $coord + 0.5 4033 int $coord + 0.5
3511} 4034}
3512 4035
3513sub size_allocate { 4036sub invoke_size_allocate {
3514 my ($self, $w, $h) = @_; 4037 my ($self, $w, $h) = @_;
3515 4038
3516 for my $child ($self->children) { 4039 for my $child ($self->children) {
3517 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4040 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3518 4041
… …
3522 $X = _to_pixel $X, $W, $self->{w}; 4045 $X = _to_pixel $X, $W, $self->{w};
3523 $Y = _to_pixel $Y, $H, $self->{h}; 4046 $Y = _to_pixel $Y, $H, $self->{h};
3524 4047
3525 $child->configure ($X, $Y, $W, $H); 4048 $child->configure ($X, $Y, $W, $H);
3526 } 4049 }
4050
4051 1
3527} 4052}
3528 4053
3529sub coord2local { 4054sub coord2local {
3530 my ($self, $x, $y) = @_; 4055 my ($self, $x, $y) = @_;
3531 4056
… …
3586 while ($self->{refresh_hook}) { 4111 while ($self->{refresh_hook}) {
3587 $_->() 4112 $_->()
3588 for values %{delete $self->{refresh_hook}}; 4113 for values %{delete $self->{refresh_hook}};
3589 } 4114 }
3590 4115
3591 if ($self->{realloc}) { 4116 while ($self->{realloc}) {
3592 my %queue; 4117 my %queue;
3593 my @queue; 4118 my @queue;
3594 my $widget; 4119 my $widget;
3595 4120
3596 outer: 4121 outer:
… …
3616 4141
3617 delete $queue{$widget+0}; 4142 delete $queue{$widget+0};
3618 4143
3619 my ($w, $h) = $widget->size_request; 4144 my ($w, $h) = $widget->size_request;
3620 4145
3621 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4146 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3622 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4147 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4148
4149 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4150 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3623 4151
3624 $w = $widget->{force_w} if exists $widget->{force_w}; 4152 $w = $widget->{force_w} if exists $widget->{force_w};
3625 $h = $widget->{force_h} if exists $widget->{force_h}; 4153 $h = $widget->{force_h} if exists $widget->{force_h};
3626 4154
3627 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4155 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3640 } 4168 }
3641 } 4169 }
3642 4170
3643 delete $self->{realloc}{$widget+0}; 4171 delete $self->{realloc}{$widget+0};
3644 } 4172 }
3645 }
3646 4173
3647 while (my $size_alloc = delete $self->{size_alloc}) { 4174 while (my $size_alloc = delete $self->{size_alloc}) {
3648 my @queue = sort { $b->{visible} <=> $a->{visible} } 4175 my @queue = sort { $a->{visible} <=> $b->{visible} }
3649 values %$size_alloc; 4176 values %$size_alloc;
3650 4177
3651 while () { 4178 while () {
3652 my $widget = pop @queue || last; 4179 my $widget = pop @queue || last;
3653 4180
3654 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4181 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3655 4182
3656 $w = 0 if $w < 0; 4183 $w = max $widget->{min_w}, $w;
3657 $h = 0 if $h < 0; 4184 $h = max $widget->{min_h}, $h;
3658 4185
4186# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4187# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4188
4189 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4190 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4191
3659 $w = int $w + 0.5; 4192 $w = int $w + 0.5;
3660 $h = int $h + 0.5; 4193 $h = int $h + 0.5;
3661 4194
3662 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4195 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3663 $widget->{old_w} = $widget->{w}; 4196 $widget->{old_w} = $widget->{w};
3664 $widget->{old_h} = $widget->{h}; 4197 $widget->{old_h} = $widget->{h};
3665 4198
3666 $widget->{w} = $w; 4199 $widget->{w} = $w;
3667 $widget->{h} = $h; 4200 $widget->{h} = $h;
3668 4201
3669 $widget->emit (size_allocate => $w, $h); 4202 $widget->emit (size_allocate => $w, $h);
4203 }
3670 } 4204 }
3671 } 4205 }
3672 } 4206 }
3673 4207
3674 while ($self->{post_alloc_hook}) { 4208 while ($self->{post_alloc_hook}) {
3675 $_->() 4209 $_->()
3676 for values %{delete $self->{post_alloc_hook}}; 4210 for values %{delete $self->{post_alloc_hook}};
3677 } 4211 }
3678
3679 4212
3680 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4213 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3681 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4214 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3682 glClear GL_COLOR_BUFFER_BIT; 4215 glClear GL_COLOR_BUFFER_BIT;
3683 4216
… …
3686 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4219 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3687 glMatrixMode GL_MODELVIEW; 4220 glMatrixMode GL_MODELVIEW;
3688 glLoadIdentity; 4221 glLoadIdentity;
3689 4222
3690 { 4223 {
3691 package CFClient::UI::Base; 4224 package CFPlus::UI::Base;
3692 4225
3693 ($draw_x, $draw_y, $draw_w, $draw_h) = 4226 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3694 (0, 0, $self->{w}, $self->{h}); 4227 (0, 0, $self->{w}, $self->{h});
3695 }
3696 4228
3697 $self->_draw; 4229 $self->_draw;
4230 }
3698} 4231}
3699 4232
3700############################################################################# 4233#############################################################################
3701 4234
3702package CFClient::UI; 4235package CFPlus::UI;
3703 4236
3704$ROOT = new CFClient::UI::Root; 4237$ROOT = new CFPlus::UI::Root;
3705$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4238$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3706 4239
37071 42401
3708 4241

Diff Legend

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