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

Diff Legend

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