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

Diff Legend

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