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.413 by root, Mon Jul 23 15:30:45 2007 UTC

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

Diff Legend

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