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.266 by root, Thu Jun 1 03:42:58 2006 UTC vs.
Revision 1.401 by root, Sat Jul 21 20:05:37 2007 UTC

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

Diff Legend

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