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

Diff Legend

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