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

Diff Legend

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