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

Diff Legend

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