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

Diff Legend

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