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

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

Diff Legend

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