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.251 by root, Sun May 28 22:24:24 2006 UTC vs.
Revision 1.310 by root, Fri Jun 23 20:28:20 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
45 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
46 32
47 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
48 34
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 36
51 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 38 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->realloc;
61 } 39 }
62 40
63 return; 41 return;
64 } 42 }
65 } 43 }
66 } 44 }
67 45
68 $TOOLTIP->hide; 46 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
70} 71}
71 72
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
171sub rescale_widgets { 172sub rescale_widgets {
172 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
173 174
174 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
176 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
178 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
179 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
180 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
181 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
182 } 190 }
183 } 191 }
184 192
185 reconfigure_widgets; 193 reconfigure_widgets;
186} 194}
… …
195 203
196sub new { 204sub new {
197 my $class = shift; 205 my $class = shift;
198 206
199 my $self = bless { 207 my $self = bless {
200 x => 0, 208 x => "center",
201 y => 0, 209 y => "center",
202 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
203 can_events => 1, 213 can_events => 1,
204 @_ 214 @_
205 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
206 218
207 for (keys %$self) { 219 for (keys %$self) {
208 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
209 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
210 } 222 }
211 } 223 }
212 224
213 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
214
215 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
216 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
217 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
218 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
219 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
220 } 235 }
221 236
222 $self 237 $self
223} 238}
224 239
… …
235 return if $self->{parent}; 250 return if $self->{parent};
236 251
237 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
238} 253}
239 254
240sub center {
241 my ($self) = @_;
242
243 $CFClient::UI::ROOT->on_post_alloc (
244 "center_$self" => sub {
245 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
246 },
247 );
248
249 $self->update;
250}
251
252sub set_visible { 255sub set_visible {
253 my ($self) = @_; 256 my ($self) = @_;
254 257
255 return if $self->{visible}; 258 return if $self->{visible};
256 259
257 $self->{root} = $self->{parent}{root}; 260 $self->{root} = $self->{parent}{root};
258 $self->{visible} = $self->{parent}{visible} + 1; 261 $self->{visible} = $self->{parent}{visible} + 1;
259 262
260 $self->emit (visibility_change => 1); 263 $self->emit (visibility_change => 1);
261 264
262 $self->realloc unless exists $self->{req_w}; 265 $self->realloc if !exists $self->{req_w};
263 266
264 $_->set_visible for $self->children; 267 $_->set_visible for $self->children;
265} 268}
266 269
267sub set_invisible { 270sub set_invisible {
… …
269 272
270 return unless $self->{visible}; 273 return unless $self->{visible};
271 274
272 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
273 276
277 delete $self->{visible};
274 delete $self->{root}; 278 delete $self->{root};
275 delete $self->{visible};
276 279
277 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
278 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
279 282
280 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
281 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
282 285
283 $self->focus_out; 286 $self->emit ("focus_out");
284
285 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
286} 288}
287 289
288sub set_visibility { 290sub set_visibility {
289 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
309 311
310 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
311 if $self->{parent}; 313 if $self->{parent};
312} 314}
313 315
314sub move { 316sub move_abs {
315 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
316 318
317 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
318 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
319 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
320 322
321 $self->update; 323 $self->update;
322} 324}
323 325
324sub set_size { 326sub set_size {
325 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
326 328
327 $self->{def_w} = $w; 329 $self->{force_w} = $w;
328 $self->{def_h} = $h; 330 $self->{force_h} = $h;
329 331
330 $self->realloc; 332 $self->realloc;
331} 333}
332 334
333sub size_request { 335sub size_request {
… …
337 339
338sub configure { 340sub configure {
339 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
340 342
341 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
342 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
343 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
344 348
345 # use alignment to adjust x, y 349 # use alignment to adjust x, y
346 350
347 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
348 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
349
350 ($w, $h) = ($w2, $h2);
351 } 353 }
352 354
353 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
354 $self->{x} = $x; 356 $self->{x} = $x;
355 $self->{y} = $y; 357 $self->{y} = $y;
356 $self->update; 358 $self->update;
357 } 359 }
358 360
359 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
360 return unless $self->{visible}; 362 return unless $self->{visible};
361 363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
362 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 367 $self->{root}{size_alloc}{$self+0} = $self;
363 } 368 }
364}
365
366sub size_allocate {
367 # nothing to be done
368} 369}
369 370
370sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
371} 377}
372 378
373sub set_max_size { 379sub set_max_size {
374 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
375 381
376 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
377 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
378} 386}
379 387
380sub set_tooltip { 388sub set_tooltip {
381 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
382 390
… …
387 395
388 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
389 397
390 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
391 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
392 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
393 } 401 }
394} 402}
395 403
396# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
397sub coord2local { 405sub coord2local {
… …
405 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
406 414
407 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
408} 416}
409 417
410sub focus_in { 418sub invoke_focus_in {
411 my ($self) = @_; 419 my ($self) = @_;
412 420
413 return if $FOCUS == $self; 421 return if $FOCUS == $self;
414 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
415 423
416 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
417 425
418 $self->_emit (focus_in => $focus);
419
420 $focus->update if $focus; 426 $focus->update if $focus;
421 $FOCUS->update; 427 $FOCUS->update;
422}
423 428
429 0
430}
431
424sub focus_out { 432sub invoke_focus_out {
425 my ($self) = @_; 433 my ($self) = @_;
426 434
427 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
428 436
429 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
430 438
431 $self->_emit (focus_out => $focus);
432
433 $focus->update if $focus; #? 439 $focus->update if $focus; #?
434 440
435 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
436 unless $FOCUS; 442 unless $FOCUS;
437}
438 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
439sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
440sub button_up { } 454sub invoke_button_up { 1 }
441sub key_down { } 455sub invoke_key_down { 1 }
442sub key_up { } 456sub invoke_key_up { 1 }
443 457
444sub button_down { 458sub invoke_button_down {
445 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
446 460
447 $self->focus_in; 461 $self->grab_focus;
448}
449 462
450sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
451sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
452sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
453sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
454sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
479}
455 480
456sub find_widget { 481sub find_widget {
457 my ($self, $x, $y) = @_; 482 my ($self, $x, $y) = @_;
458 483
459 return () unless $self->{can_events}; 484 return () unless $self->{can_events};
… …
467 492
468sub set_parent { 493sub set_parent {
469 my ($self, $parent) = @_; 494 my ($self, $parent) = @_;
470 495
471 Scalar::Util::weaken ($self->{parent} = $parent); 496 Scalar::Util::weaken ($self->{parent} = $parent);
472
473 $self->set_visible if $parent->{visible}; 497 $self->set_visible if $parent->{visible};
474
475 $self->realloc;
476}
477
478sub connect {
479 my ($self, $signal, $cb) = @_;
480
481 push @{ $self->{signal_cb}{$signal} }, $cb;
482}
483
484sub _emit {
485 my ($self, $signal, @args) = @_;
486
487 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
488}
489
490sub emit {
491 my ($self, $signal, @args) = @_;
492
493 $self->_emit ($signal, @args)
494 || $self->$signal (@args);
495}
496
497sub visibility_change {
498 #my ($self, $visible) = @_;
499} 498}
500 499
501sub realloc { 500sub realloc {
502 my ($self) = @_; 501 my ($self) = @_;
503 502
504 return unless $self->{visible}; 503 if ($self->{visible}) {
505
506 return if $self->{root}{realloc}{$self}; 504 return if $self->{root}{realloc}{$self+0};
507 505
508 $self->{root}{realloc}{$self} = $self; 506 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update; 507 $self->{root}->update;
508 } else {
509 delete $self->{req_w};
510 delete $self->{req_h};
511 }
510} 512}
511 513
512sub update { 514sub update {
513 my ($self) = @_; 515 my ($self) = @_;
514 516
515 $self->{parent}->update 517 $self->{parent}->update
516 if $self->{parent}; 518 if $self->{parent};
517} 519}
518 520
521sub reconfigure {
522 my ($self) = @_;
523
524 $self->realloc;
525 $self->update;
526}
527
528# using global variables seems a bit hacky, but passing through all drawing
529# functions seems pointless.
530our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
531
519sub draw { 532sub draw {
520 my ($self) = @_; 533 my ($self) = @_;
521 534
522 return unless $self->{h} && $self->{w}; 535 return unless $self->{h} && $self->{w};
536
537 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542
543 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
523 546
524 glPushMatrix; 547 glPushMatrix;
525 glTranslate $self->{x}, $self->{y}, 0; 548 glTranslate $self->{x}, $self->{y}, 0;
526 $self->_draw;
527 glPopMatrix;
528 549
529 if ($self == $HOVER && $self->{can_hover}) { 550 if ($self == $HOVER && $self->{can_hover}) {
530 my ($x, $y) = @$self{qw(x y)};
531
532 glColor 1, 0.8, 0.5, 0.2; 551 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
533 glEnable GL_BLEND; 552 glEnable GL_BLEND;
534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 553 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
535 glBegin GL_QUADS; 554 glBegin GL_QUADS;
536 glVertex $x , $y; 555 glVertex 0 , 0;
537 glVertex $x + $self->{w}, $y; 556 glVertex $self->{w}, 0;
538 glVertex $x + $self->{w}, $y + $self->{h}; 557 glVertex $self->{w}, $self->{h};
539 glVertex $x , $y + $self->{h}; 558 glVertex 0 , $self->{h};
540 glEnd; 559 glEnd;
541 glDisable GL_BLEND; 560 glDisable GL_BLEND;
542 } 561 }
543 562
544 if ($ENV{PCLIENT_DEBUG}) { 563 if ($ENV{CFPLUS_DEBUG} & 1) {
545 glPushMatrix; 564 glPushMatrix;
546 glColor 1, 1, 0, 1; 565 glColor 1, 1, 0, 1;
547 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 566 glTranslate 0.375, 0.375;
548 glBegin GL_LINE_LOOP; 567 glBegin GL_LINE_LOOP;
549 glVertex 0 , 0; 568 glVertex 0 , 0;
550 glVertex $self->{w} - 1, 0; 569 glVertex $self->{w} - 1, 0;
551 glVertex $self->{w} - 1, $self->{h} - 1; 570 glVertex $self->{w} - 1, $self->{h} - 1;
552 glVertex 0 , $self->{h} - 1; 571 glVertex 0 , $self->{h} - 1;
553 glEnd; 572 glEnd;
554 glPopMatrix; 573 glPopMatrix;
555 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 574 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
556 } 575 }
576
577 $self->_draw;
578 glPopMatrix;
557} 579}
558 580
559sub _draw { 581sub _draw {
560 my ($self) = @_; 582 my ($self) = @_;
561 583
… …
564 586
565sub DESTROY { 587sub DESTROY {
566 my ($self) = @_; 588 my ($self) = @_;
567 589
568 delete $WIDGET{$self+0}; 590 delete $WIDGET{$self+0};
569 #$self->deactivate; 591
592 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
570} 594}
571 595
572############################################################################# 596#############################################################################
573 597
574package CFClient::UI::DrawBG; 598package CFClient::UI::DrawBG;
… …
599 623
600 if ($color && (@$color < 4 || $color->[3])) { 624 if ($color && (@$color < 4 || $color->[3])) {
601 my ($w, $h) = @$self{qw(w h)}; 625 my ($w, $h) = @$self{qw(w h)};
602 626
603 glEnable GL_BLEND; 627 glEnable GL_BLEND;
604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 628 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
605 glColor @$color; 629 glColor_premultiply @$color;
606 630
607 glBegin GL_QUADS; 631 glBegin GL_QUADS;
608 glVertex 0 , 0; 632 glVertex 0 , 0;
609 glVertex 0 , $h; 633 glVertex 0 , $h;
610 glVertex $w, $h; 634 glVertex $w, $h;
… …
625 my ($class, %arg) = @_; 649 my ($class, %arg) = @_;
626 $class->SUPER::new (can_events => 0, %arg); 650 $class->SUPER::new (can_events => 0, %arg);
627} 651}
628 652
629sub size_request { 653sub size_request {
630 (0, 0) 654 my ($self) = @_;
655
656 ($self->{w} + 0, $self->{h} + 0)
631} 657}
632 658
633sub draw { } 659sub draw { }
634 660
635############################################################################# 661#############################################################################
… …
639our @ISA = CFClient::UI::Base::; 665our @ISA = CFClient::UI::Base::;
640 666
641sub new { 667sub new {
642 my ($class, %arg) = @_; 668 my ($class, %arg) = @_;
643 669
644 my $children = delete $arg{children} || []; 670 my $children = delete $arg{children};
645 671
646 my $self = $class->SUPER::new ( 672 my $self = $class->SUPER::new (
647 children => [], 673 children => [],
648 can_events => 0, 674 can_events => 0,
649 %arg, 675 %arg,
650 ); 676 );
677
651 $self->add ($_) for @$children; 678 $self->add (@$children)
679 if $children;
652 680
653 $self 681 $self
654} 682}
655 683
656sub add { 684sub add {
… …
704 $x -= $self->{x}; 732 $x -= $self->{x};
705 $y -= $self->{y}; 733 $y -= $self->{y};
706 734
707 my $res; 735 my $res;
708 736
709 for (reverse @{ $self->{children} }) { 737 for (reverse $self->visible_children) {
710 $res = $_->find_widget ($x, $y) 738 $res = $_->find_widget ($x, $y)
711 and return $res; 739 and return $res;
712 } 740 }
713 741
714 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 742 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
735} 763}
736 764
737sub add { 765sub add {
738 my ($self, $child) = @_; 766 my ($self, $child) = @_;
739 767
740 $self->{children} = []; 768 $self->SUPER::remove ($_) for @{ $self->{children} };
741
742 $self->SUPER::add ($child); 769 $self->SUPER::add ($child);
743} 770}
744 771
745sub remove { 772sub remove {
746 my ($self, $widget) = @_; 773 my ($self, $widget) = @_;
… …
755 782
756sub size_request { 783sub size_request {
757 $_[0]{children}[0]->size_request 784 $_[0]{children}[0]->size_request
758} 785}
759 786
760sub size_allocate { 787sub invoke_size_allocate {
761 my ($self, $w, $h, $changed) = @_; 788 my ($self, $w, $h) = @_;
762 789
763 $self->{children}[0]->configure (0, 0, $w, $h); 790 $self->{children}[0]->configure (0, 0, $w, $h);
791
792 1
764} 793}
765 794
766############################################################################# 795#############################################################################
796
797# back-buffered drawing area
767 798
768package CFClient::UI::Window; 799package CFClient::UI::Window;
769 800
770our @ISA = CFClient::UI::Bin::; 801our @ISA = CFClient::UI::Bin::;
771 802
… …
782 813
783 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
784 $self->SUPER::update; 815 $self->SUPER::update;
785} 816}
786 817
787sub size_allocate { 818sub invoke_size_allocate {
788 my ($self, $w, $h, $changed) = @_; 819 my ($self, $w, $h) = @_;
789 820
790 $self->SUPER::size_allocate ($w, $h, $changed);
791 $self->update 821 $self->update;
792 if $changed; 822
823 $self->SUPER::invoke_size_allocate ($w, $h)
793} 824}
794 825
795sub _render { 826sub _render {
827 my ($self) = @_;
828
796 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
797} 830}
798 831
799sub render_child { 832sub render_child {
800 my ($self) = @_; 833 my ($self) = @_;
801 834
802 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
803 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
804 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
805 838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
806 $self->_render; 846 $self->_render;
807 }; 847 };
808} 848}
809 849
810sub _draw { 850sub _draw {
811 my ($self) = @_; 851 my ($self) = @_;
812 852
813 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
814 854
815 my $tex = $self->{texture} 855 my $tex = $self->{texture}
816 or return; 856 or return;
817 857
818 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
820 glColor 1, 1, 1, 1; 860 glColor 0, 0, 0, 1;
821 861
822 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
823 863
824 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
825} 865}
… …
841} 881}
842 882
843sub size_request { 883sub size_request {
844 my ($self) = @_; 884 my ($self) = @_;
845 885
846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
847 887
848 $w = 10 if $self->{scroll_x}; 888 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y}; 889 $h = 10 if $self->{scroll_y};
850 890
851 ($w, $h) 891 ($w, $h)
852} 892}
853 893
854sub size_allocate { 894sub invoke_size_allocate {
855 my ($self, $w, $h, $changed) = @_; 895 my ($self, $w, $h) = @_;
856 896
897 my $child = $self->child;
898
857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859 901
860 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
861 $self->update; 903 $self->update;
904
905 1
862} 906}
863 907
864sub set_offset { 908sub set_offset {
865 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
866 910
… …
899} 943}
900 944
901sub _render { 945sub _render {
902 my ($self) = @_; 946 my ($self) = @_;
903 947
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
950
904 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905 952
906 $self->SUPER::_render; 953 $self->SUPER::_render;
907} 954}
908 955
… …
911package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
912 959
913our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
914 961
915sub new { 962sub new {
916 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
917 966
918 my $self; 967 my $self;
919 968
920 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
921 vertical => 1, 970 vertical => 1,
… …
926 ; 975 ;
927 976
928 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
929 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
930 slider => $slider, 979 slider => $slider,
931 @_, 980 %arg,
932 ); 981 );
933 982
934 $self->{vp}->add ($self->{scrolled});
935 $self->add ($self->{vp});
936 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
937 985
938 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
939} 993}
940 994
941sub update { 995sub update {
942 my ($self) = @_; 996 my ($self) = @_;
943 997
… …
946 # todo: overwrite size_allocate of child 1000 # todo: overwrite size_allocate of child
947 my $child = $self->{vp}->child; 1001 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949} 1003}
950 1004
951sub size_allocate { 1005sub invoke_size_allocate {
952 my ($self, $w, $h, $changed) = @_; 1006 my ($self, $w, $h) = @_;
953
954 $self->SUPER::size_allocate ($w, $h, $changed);
955 1007
956 my $child = $self->{vp}->child; 1008 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011 $self->SUPER::invoke_size_allocate ($w, $h)
958} 1012}
959 1013
960#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
961# update viewport offset on scroll 1015# update viewport offset on scroll
962 1016
… …
982 1036
983 if ($self->{bg}) { 1037 if ($self->{bg}) {
984 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
985 1039
986 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
988 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
989 1043
990 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
991 glVertex 0 , 0; 1045 glVertex 0 , 0;
992 glVertex 0 , $h; 1046 glVertex 0 , $h;
993 glVertex $w, $h; 1047 glVertex $w, $h;
… …
1006 1060
1007our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
1008 1062
1009use CFClient::OpenGL; 1063use CFClient::OpenGL;
1010 1064
1011my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1013 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1014 1072
1015sub new { 1073sub new {
1016 my $class = shift; 1074 my ($class, %arg) = @_;
1017 1075
1018 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
1019 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
1020 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
1021 border => 0.6, 1079 border => 0.6,
1022 is_toplevel => 1,
1023 can_events => 1, 1080 can_events => 1,
1024 @_ 1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
1025 ); 1084 );
1026 1085
1027 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title_widget} = new CFClient::UI::Label
1028 align => 0, 1087 align => 0,
1029 valign => 1, 1088 valign => 1,
1030 text => $self->{title}, 1089 text => $self->{title},
1031 fontsize => $self->{border}; 1090 fontsize => $self->{border},
1091 if exists $self->{title};
1092
1093 if ($self->{has_close_button}) {
1094 $self->{close_button} =
1095 new CFClient::UI::ImageButton
1096 path => 'x1_close.png',
1097 on_activate => sub { $self->hide };
1098
1099 $self->CFClient::UI::Container::add ($self->{close_button});
1100 }
1032 1101
1033 $self 1102 $self
1103}
1104
1105sub add {
1106 my ($self, @widgets) = @_;
1107
1108 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1034} 1111}
1035 1112
1036sub border { 1113sub border {
1037 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
1038} 1115}
1039 1116
1040sub size_request { 1117sub size_request {
1041 my ($self) = @_; 1118 my ($self) = @_;
1119
1120 $self->{title_widget}->size_request
1121 if $self->{title_widget};
1122
1123 $self->{close_button}->size_request
1124 if $self->{close_button};
1042 1125
1043 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
1044 1127
1045 ( 1128 (
1046 $w + $self->border * 2, 1129 $w + $self->border * 2,
1047 $h + $self->border * 2, 1130 $h + $self->border * 2,
1048 ) 1131 )
1049} 1132}
1050 1133
1051sub size_allocate { 1134sub invoke_size_allocate {
1052 my ($self, $w, $h, $changed) = @_; 1135 my ($self, $w, $h) = @_;
1053 1136
1054 return unless $changed; 1137 if ($self->{title_widget}) {
1138 $self->{title_widget}{w} = $w;
1139 $self->{title_widget}{h} = $h;
1140 $self->{title_widget}->invoke_size_allocate ($w, $h);
1141 }
1055 1142
1143 my $border = $self->border;
1144
1056 $h -= List::Util::max 0, $self->border * 2; 1145 $h -= List::Util::max 0, $border * 2;
1057 $w -= List::Util::max 0, $self->border * 2; 1146 $w -= List::Util::max 0, $border * 2;
1058 1147
1059 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1060 if $self->{title};
1061
1062 $self->child->configure ($self->border, $self->border, $w, $h); 1148 $self->child->configure ($border, $border, $w, $h);
1063}
1064 1149
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button};
1152
1153 1
1154}
1155
1065sub button_down { 1156sub invoke_button_down {
1066 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1067 1158
1068 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
1069 my $border = $self->border; 1160 my $border = $self->border;
1070 1161
… …
1083 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1084 1175
1085 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
1086 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1087 1178
1088 $self->{user_x} = $wx + $dx * $mx;
1089 $self->{user_y} = $wy + $dy * $my;
1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1092 $self->move ($self->{user_x}, $self->{user_y}); 1181
1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1093 $self->realloc; 1183 $self->realloc;
1094 }; 1184 };
1095 1185
1096 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1097 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1100 $self->{motion} = sub { 1190 $self->{motion} = sub {
1101 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1102 1192
1103 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1104 1194
1105 $self->{user_x} = $bx + $x - $ox; 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1106 $self->{user_y} = $by + $y - $oy; 1196 # HACK: the next line is required to enforce placement
1107 1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1108 $self->move ($self->{user_x}, $self->{user_y});
1109 $self->realloc;
1110 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
1111 } 1203 1
1112} 1204}
1113 1205
1114sub button_up { 1206sub invoke_button_up {
1115 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1116 1208
1117 delete $self->{motion}; 1209 ! ! delete $self->{motion}
1118} 1210}
1119 1211
1120sub mouse_motion { 1212sub invoke_mouse_motion {
1121 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
1122 1214
1123 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216
1217 ! ! $self->{motion}
1124} 1218}
1125 1219
1126sub _draw { 1220sub _draw {
1127 my ($self) = @_; 1221 my ($self) = @_;
1128 1222
1223 my $child = $self->{children}[0];
1224
1129 my ($w, $h ) = ($self->{w}, $self->{h}); 1225 my ($w, $h ) = ($self->{w}, $self->{h});
1130 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1226 my ($cw, $ch) = ($child->{w}, $child->{h});
1131 1227
1132 glEnable GL_TEXTURE_2D; 1228 glEnable GL_TEXTURE_2D;
1133 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1134 1230
1135 my $border = $self->border; 1231 my $border = $self->border;
1136 1232
1137 glColor @{ $self->{border_bg} }; 1233 glColor @{ $self->{border_bg} };
1138 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1234 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1139 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1235 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1140 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1236 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1141 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1237 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1142 1238
1143 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1239 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1144 my $bg = $tex[0]; 1240 glColor @{ $self->{bg} };
1145 1241
1146 # TODO: repeat texture not scale 1242 # TODO: repeat texture not scale
1243 # solve this better(?)
1147 my $rep_x = $cw / $bg->{w}; 1244 $bg->{s} = $cw / $bg->{w};
1148 my $rep_y = $ch / $bg->{h}; 1245 $bg->{t} = $ch / $bg->{h};
1149
1150 glColor @{ $self->{bg} };
1151
1152 $bg->{s} = $rep_x;
1153 $bg->{t} = $rep_y;
1154 $bg->{wrap_mode} = 1;
1155 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1246 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1156 } 1247 }
1157 1248
1158 glDisable GL_TEXTURE_2D; 1249 glDisable GL_TEXTURE_2D;
1159 1250
1160 $self->{title}->draw if $self->{title};
1161
1162 $self->child->draw; 1251 $child->draw;
1252
1253 if ($self->{title_widget}) {
1254 glTranslate 0, $border - $self->{h};
1255 $self->{title_widget}->_draw;
1256
1257 glTranslate 0, - ($border - $self->{h});
1258 }
1259
1260 $self->{close_button}->draw
1261 if $self->{close_button};
1163} 1262}
1164 1263
1165############################################################################# 1264#############################################################################
1166 1265
1167package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
1190 1289
1191 $child->set_parent ($self); 1290 $child->set_parent ($self);
1192 $self->{children}[$y][$x] = $child; 1291 $self->{children}[$y][$x] = $child;
1193 1292
1194 $self->realloc; 1293 $self->realloc;
1294}
1295
1296sub remove {
1297 my ($self, $child) = @_;
1298
1299 # TODO: not yet implemented
1195} 1300}
1196 1301
1197# TODO: move to container class maybe? send children a signal on removal? 1302# TODO: move to container class maybe? send children a signal on removal?
1198sub clear { 1303sub clear {
1199 my ($self) = @_; 1304 my ($self) = @_;
… …
1240 (sum @$ws), 1345 (sum @$ws),
1241 (sum @$hs), 1346 (sum @$hs),
1242 ) 1347 )
1243} 1348}
1244 1349
1245sub size_allocate { 1350sub invoke_size_allocate {
1246 my ($self, $w, $h, $changed) = @_; 1351 my ($self, $w, $h) = @_;
1247 1352
1248 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1249 1354
1250 my $req_w = (sum @$ws) || 1; 1355 my $req_w = (sum @$ws) || 1;
1251 my $req_h = (sum @$hs) || 1; 1356 my $req_h = (sum @$hs) || 1;
… …
1282 } 1387 }
1283 1388
1284 $y += $row_h; 1389 $y += $row_h;
1285 } 1390 }
1286 1391
1392 1
1287} 1393}
1288 1394
1289sub find_widget { 1395sub find_widget {
1290 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1291 1397
… …
1328 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1434 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1329 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1435 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1330 ) 1436 )
1331} 1437}
1332 1438
1333sub size_allocate { 1439sub invoke_size_allocate {
1334 my ($self, $w, $h, $changed) = @_; 1440 my ($self, $w, $h) = @_;
1335 1441
1336 my $space = $self->{vertical} ? $h : $w; 1442 my $space = $self->{vertical} ? $h : $w;
1337 my $children = $self->{children}; 1443 my @children = $self->visible_children;
1338 1444
1339 my @req; 1445 my @req;
1340 1446
1341 if ($self->{homogeneous}) { 1447 if ($self->{homogeneous}) {
1342 @req = ($space / (@$children || 1)) x @$children; 1448 @req = ($space / (@children || 1)) x @children;
1343 } else { 1449 } else {
1344 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1345 my $req = List::Util::sum @req; 1451 my $req = List::Util::sum @req;
1346 1452
1347 if ($req > $space) { 1453 if ($req > $space) {
1348 # ah well, not enough space 1454 # ah well, not enough space
1349 $_ *= $space / $req for @req; 1455 $_ *= $space / $req for @req;
1350 } else { 1456 } else {
1351 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1457 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1352 1458
1353 $space = ($space - $req) / $expand; # remaining space to give away 1459 $space = ($space - $req) / $expand; # remaining space to give away
1354 1460
1355 $req[$_] += $space * $children->[$_]{expand} 1461 $req[$_] += $space * $children[$_]{expand}
1356 for 0 .. $#$children; 1462 for 0 .. $#children;
1357 } 1463 }
1358 } 1464 }
1359 1465
1360 CFClient::UI::harmonize \@req; 1466 CFClient::UI::harmonize \@req;
1361 1467
1362 my $pos = 0; 1468 my $pos = 0;
1363 for (0 .. $#$children) { 1469 for (0 .. $#children) {
1364 my $alloc = $req[$_]; 1470 my $alloc = $req[$_];
1365 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1471 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1366 1472
1367 $pos += $alloc; 1473 $pos += $alloc;
1368 } 1474 }
1369 1475
1370 1 1476 1
… …
1422 ellipsise => 3, # end 1528 ellipsise => 3, # end
1423 layout => (new CFClient::Layout), 1529 layout => (new CFClient::Layout),
1424 fontsize => 1, 1530 fontsize => 1,
1425 align => -1, 1531 align => -1,
1426 valign => -1, 1532 valign => -1,
1427 padding => 2, 1533 padding_x => 2,
1534 padding_y => 2,
1428 can_events => 0, 1535 can_events => 0,
1429 %arg 1536 %arg
1430 ); 1537 );
1431 1538
1432 if (exists $self->{template}) { 1539 if (exists $self->{template}) {
… …
1459 1566
1460 delete $self->{texture}; 1567 delete $self->{texture};
1461 $self->SUPER::update; 1568 $self->SUPER::update;
1462} 1569}
1463 1570
1571sub realloc {
1572 my ($self) = @_;
1573
1574 delete $self->{ox};
1575 $self->SUPER::realloc;
1576}
1577
1464sub set_text { 1578sub set_text {
1465 my ($self, $text) = @_; 1579 my ($self, $text) = @_;
1466 1580
1467 return if $self->{text} eq "T$text"; 1581 return if $self->{text} eq "T$text";
1468 $self->{text} = "T$text"; 1582 $self->{text} = "T$text";
1469 1583
1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1471 $self->{layout}->set_text ($text); 1585 $self->{layout}->set_text ($text);
1472 1586
1587 delete $self->{size_req};
1473 $self->realloc; 1588 $self->realloc;
1589 $self->update;
1474} 1590}
1475 1591
1476sub set_markup { 1592sub set_markup {
1477 my ($self, $markup) = @_; 1593 my ($self, $markup) = @_;
1478 1594
… …
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1598 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1599
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1601 $self->{layout}->set_markup ($markup);
1486 1602
1603 delete $self->{size_req};
1487 $self->realloc; 1604 $self->realloc;
1605 $self->update;
1488} 1606}
1489 1607
1490sub size_request { 1608sub size_request {
1491 my ($self) = @_; 1609 my ($self) = @_;
1492 1610
1611 $self->{size_req} ||= do {
1493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1612 $self->{layout}->set_font ($self->{font}) if $self->{font};
1494 $self->{layout}->set_width ($self->{max_w} || -1); 1613 $self->{layout}->set_width ($self->{max_w} || -1);
1495 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1614 $self->{layout}->set_ellipsise ($self->{ellipsise});
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1615 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498 1617
1499 my ($w, $h) = $self->{layout}->size; 1618 my ($w, $h) = $self->{layout}->size;
1500 1619
1501 if (exists $self->{template}) { 1620 if (exists $self->{template}) {
1502 $self->{template}->set_font ($self->{font}) if $self->{font}; 1621 $self->{template}->set_font ($self->{font}) if $self->{font};
1503 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1504 1623
1505 my ($w2, $h2) = $self->{template}->size; 1624 my ($w2, $h2) = $self->{template}->size;
1506 1625
1507 $w = List::Util::max $w, $w2; 1626 $w = List::Util::max $w, $w2;
1508 $h = List::Util::max $h, $h2; 1627 $h = List::Util::max $h, $h2;
1628 }
1629
1630 [$w, $h]
1509 } 1631 };
1510 1632
1511 ( 1633 @{ $self->{size_req} }
1512 $w + $self->{padding} * 2,
1513 $h + $self->{padding} * 2,
1514 )
1515} 1634}
1516 1635
1517sub size_allocate { 1636sub invoke_size_allocate {
1518 my ($self, $w, $h, $changed) = @_; 1637 my ($self, $w, $h) = @_;
1638
1639 delete $self->{ox};
1519 1640
1520 delete $self->{texture} 1641 delete $self->{texture}
1521 if $changed; 1642 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1643
1644 1
1522} 1645}
1523 1646
1524sub set_fontsize { 1647sub set_fontsize {
1525 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1526 1649
1527 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1528 delete $self->{texture}; 1651 delete $self->{texture};
1529 1652
1530 $self->realloc; 1653 $self->realloc;
1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1531} 1662}
1532 1663
1533sub _draw { 1664sub _draw {
1534 my ($self) = @_; 1665 my ($self) = @_;
1535 1666
… …
1541 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1542 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1543 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545 1676
1546 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1547 1679
1680 unless (exists $self->{ox}) {
1548 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1551 1684
1552 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1555
1556 $tex
1557 }; 1688 };
1558 1689
1559 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1561 1694
1562 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1563 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1564 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1565 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1566 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1567 } 1702 }
1568 1703
1569 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1570} 1705}
1571 1706
… …
1588 can_hover => 1, 1723 can_hover => 1,
1589 can_focus => 1, 1724 can_focus => 1,
1590 valign => 0, 1725 valign => 0,
1591 can_events => 1, 1726 can_events => 1,
1592 #text => ... 1727 #text => ...
1728 #hidden => "*",
1593 @_ 1729 @_
1594 ) 1730 )
1595} 1731}
1596 1732
1597sub _set_text { 1733sub _set_text {
… …
1599 1735
1600 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1601 1737
1602 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1603 1739
1604 delete $self->{texture};
1605
1606 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1607 $self->{text} = $text; 1741 $self->{text} = $text;
1608 1742
1609 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1610 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1611 1746
1612 $self->_emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1613} 1751}
1614 1752
1615sub set_text { 1753sub set_text {
1616 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1617 1755
1618 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1619 $self->_set_text ($text); 1757 $self->_set_text ($text);
1620
1621 $self->realloc;
1622} 1758}
1623 1759
1624sub get_text { 1760sub get_text {
1625 $_[0]{text} 1761 $_[0]{text}
1626} 1762}
… …
1631 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1632 1768
1633 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1634} 1770}
1635 1771
1636sub key_down { 1772sub invoke_key_down {
1637 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1638 1774
1639 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1640 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1641 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1653 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1654 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1655 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1656 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1657 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1658 $self->_emit ('escape'); 1794 $self->emit ('escape');
1659 } elsif ($uni) { 1795 } elsif ($uni) {
1660 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1661 } 1799 }
1662 1800
1663 $self->_set_text ($text); 1801 $self->_set_text ($text);
1664 1802
1665 $self->realloc; 1803 $self->realloc;
1666}
1667 1804
1805 1
1806}
1807
1668sub focus_in { 1808sub invoke_focus_in {
1669 my ($self) = @_; 1809 my ($self) = @_;
1670 1810
1671 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1672 1812
1673 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1674} 1814}
1675 1815
1676sub button_down { 1816sub invoke_button_down {
1677 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1678 1818
1679 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1680 1820
1681 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1682 1822
1683 # byte-index to char-index 1823 # byte-index to char-index
1684 my $text = $self->{text}; 1824 my $text = $self->{text};
1685 utf8::encode $text; 1825 utf8::encode $text;
1686 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1687 1827
1688 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1689 $self->update; 1829 $self->update;
1830
1831 1
1690} 1832}
1691 1833
1692sub mouse_motion { 1834sub invoke_mouse_motion {
1693 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1694# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 1
1695} 1839}
1696 1840
1697sub _draw { 1841sub _draw {
1698 my ($self) = @_; 1842 my ($self) = @_;
1699 1843
1700 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1701 1845
1702 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1703 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1704 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1705 } else { 1849 } else {
1706 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1707 } 1851 }
1708 1852
1709 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1710 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1711 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1712 glVertex 0 , 0; 1856 glVertex 0 , 0;
1713 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1714 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1715 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1740 1884
1741our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1742 1886
1743use CFClient::OpenGL; 1887use CFClient::OpenGL;
1744 1888
1745sub key_down { 1889sub invoke_key_down {
1746 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1747 1891
1748 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1749 1893
1750 if ($sym == 13) { 1894 if ($sym == 13) {
1751 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1752 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1753 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1754 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1755 $self->_emit (activate => $txt); 1900 $self->emit (activate => $txt);
1756 $self->update; 1901 $self->update;
1757 1902
1758 } elsif ($sym == CFClient::SDLK_UP) { 1903 } elsif ($sym == CFClient::SDLK_UP) {
1759 if ($self->{history_pointer} < 0) { 1904 if ($self->{history_pointer} < 0) {
1760 $self->{history_saveback} = $self->get_text; 1905 $self->{history_saveback} = $self->get_text;
… …
1776 } else { 1921 } else {
1777 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1778 } 1923 }
1779 1924
1780 } else { 1925 } else {
1781 $self->SUPER::key_down ($ev); 1926 return $self->SUPER::invoke_key_down ($ev)
1927 }
1928
1782 } 1929 1
1783
1784} 1930}
1785 1931
1786############################################################################# 1932#############################################################################
1787 1933
1788package CFClient::UI::Button; 1934package CFClient::UI::Button;
… …
1797 1943
1798sub new { 1944sub new {
1799 my $class = shift; 1945 my $class = shift;
1800 1946
1801 $class->SUPER::new ( 1947 $class->SUPER::new (
1802 padding => 4, 1948 padding_x => 4,
1949 padding_y => 4,
1803 fg => [1, 1, 1], 1950 fg => [1, 1, 1],
1804 active_fg => [0, 0, 1], 1951 active_fg => [0, 0, 1],
1805 can_hover => 1, 1952 can_hover => 1,
1806 align => 0, 1953 align => 0,
1807 valign => 0, 1954 valign => 0,
1808 can_events => 1, 1955 can_events => 1,
1809 @_ 1956 @_
1810 ) 1957 )
1811} 1958}
1812 1959
1813sub activate { }
1814
1815sub button_up { 1960sub invoke_button_up {
1816 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1817 1962
1818 $self->emit ("activate") 1963 $self->emit ("activate")
1819 if $x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1820 && $y >= 0 && $y < $self->{h}; 1965 && $y >= 0 && $y < $self->{h};
1966
1967 1
1821} 1968}
1822 1969
1823sub _draw { 1970sub _draw {
1824 my ($self) = @_; 1971 my ($self) = @_;
1825 1972
1826 local $self->{fg} = $self->{fg}; 1973 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1827
1828 if ($GRAB == $self) {
1829 $self->{fg} = $self->{active_fg};
1830 }
1831 1974
1832 glEnable GL_TEXTURE_2D; 1975 glEnable GL_TEXTURE_2D;
1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834 glColor 0, 0, 0, 1; 1977 glColor 0, 0, 0, 1;
1835 1978
… …
1840 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1841} 1984}
1842 1985
1843############################################################################# 1986#############################################################################
1844 1987
1988package CFClient::UI::ImageButton;
1989
1990our @ISA = CFClient::UI::Image::;
1991
1992use CFClient::OpenGL;
1993
1994my %textures;
1995
1996sub new {
1997 my $class = shift;
1998
1999 my $self = $class->SUPER::new (
2000 padding_x => 4,
2001 padding_y => 4,
2002 fg => [1, 1, 1],
2003 active_fg => [0, 0, 1],
2004 can_hover => 1,
2005 align => 0,
2006 valign => 0,
2007 can_events => 1,
2008 @_
2009 );
2010}
2011
2012sub invoke_button_up {
2013 my ($self, $ev, $x, $y) = @_;
2014
2015 $self->emit ("activate")
2016 if $x >= 0 && $x < $self->{w}
2017 && $y >= 0 && $y < $self->{h};
2018
2019 1
2020}
2021
2022#############################################################################
2023
1845package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
1846 2025
1847our @ISA = CFClient::UI::DrawBG::; 2026our @ISA = CFClient::UI::DrawBG::;
1848 2027
1849my @tex = 2028my @tex =
… …
1854 2033
1855sub new { 2034sub new {
1856 my $class = shift; 2035 my $class = shift;
1857 2036
1858 $class->SUPER::new ( 2037 $class->SUPER::new (
1859 padding => 2, 2038 padding_x => 2,
2039 padding_y => 2,
1860 fg => [1, 1, 1], 2040 fg => [1, 1, 1],
1861 active_fg => [1, 1, 0], 2041 active_fg => [1, 1, 0],
1862 bg => [0, 0, 0, 0.2], 2042 bg => [0, 0, 0, 0.2],
1863 active_bg => [1, 1, 1, 0.5], 2043 active_bg => [1, 1, 1, 0.5],
1864 state => 0, 2044 state => 0,
… …
1868} 2048}
1869 2049
1870sub size_request { 2050sub size_request {
1871 my ($self) = @_; 2051 my ($self) = @_;
1872 2052
1873 ($self->{padding} * 2 + 6) x 2 2053 (6) x 2
1874} 2054}
1875 2055
1876sub button_down { 2056sub invoke_button_down {
1877 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1878 2058
1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1882 $self->_emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
2063 } else {
2064 return 0
2065 }
2066
1883 } 2067 1
1884} 2068}
1885 2069
1886sub _draw { 2070sub _draw {
1887 my ($self) = @_; 2071 my ($self) = @_;
1888 2072
1889 $self->SUPER::_draw; 2073 $self->SUPER::_draw;
1890 2074
1891 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2075 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892 2076
1893 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2077 my ($w, $h) = @$self{qw(w h)};
2078
2079 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894 2080
1895 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2081 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896 2082
1897 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2083 my $tex = $self->{state} ? $tex[1] : $tex[0];
1898 2084
… …
1906package CFClient::UI::Image; 2092package CFClient::UI::Image;
1907 2093
1908our @ISA = CFClient::UI::Base::; 2094our @ISA = CFClient::UI::Base::;
1909 2095
1910use CFClient::OpenGL; 2096use CFClient::OpenGL;
1911use Carp qw/confess/;
1912 2097
1913our %loaded_images; 2098our %texture_cache;
1914 2099
1915sub new { 2100sub new {
1916 my $class = shift; 2101 my $class = shift;
1917 2102
1918 my $self = $class->SUPER::new (can_events => 0, @_); 2103 my $self = $class->SUPER::new (
2104 can_events => 0,
2105 @_,
2106 );
1919 2107
1920 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2108 $self->{path}
2109 or Carp::croak "required attribute 'path' not set";
1921 2110
1922 $loaded_images{$self->{image}} ||= 2111 $self->{tex} = $texture_cache{$self->{path}} ||=
1923 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1924 2113
1925 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2114 Scalar::Util::weaken $texture_cache{$self->{path}};
1926 2115
1927 Scalar::Util::weaken $loaded_images{$self->{image}}; 2116 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1928
1929 $self->{aspect} = $tex->{w} / $tex->{h};
1930 2117
1931 $self 2118 $self
1932} 2119}
1933 2120
1934sub size_request { 2121sub size_request {
1935 my ($self) = @_; 2122 my ($self) = @_;
1936 2123
1937 ($self->{tex}->{w}, $self->{tex}->{h}) 2124 ($self->{tex}{w}, $self->{tex}{h})
1938} 2125}
1939 2126
1940sub _draw { 2127sub _draw {
1941 my ($self) = @_; 2128 my ($self) = @_;
1942 2129
… …
2053 2240
2054 my $h1 = $self->{h} * (1 - $ycut1); 2241 my $h1 = $self->{h} * (1 - $ycut1);
2055 my $h2 = $self->{h} * (1 - $ycut2); 2242 my $h2 = $self->{h} * (1 - $ycut2);
2056 2243
2057 glEnable GL_BLEND; 2244 glEnable GL_BLEND;
2058 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2245 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2059 glEnable GL_TEXTURE_2D; 2247 glEnable GL_TEXTURE_2D;
2060 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2248 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2061 2249
2062 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2250 glBindTexture GL_TEXTURE_2D, $t1->{name};
2063 glBegin GL_QUADS; 2251 glBegin GL_QUADS;
… …
2163 fg => [1, 1, 1], 2351 fg => [1, 1, 1],
2164 active_fg => [0, 0, 0], 2352 active_fg => [0, 0, 0],
2165 bg => [0, 0, 0, 0.2], 2353 bg => [0, 0, 0, 0.2],
2166 active_bg => [1, 1, 1, 0.5], 2354 active_bg => [1, 1, 1, 0.5],
2167 range => [0, 0, 100, 10, 0], 2355 range => [0, 0, 100, 10, 0],
2168 req_w => $::WIDTH / 80, 2356 min_w => $::WIDTH / 80,
2169 req_h => $::WIDTH / 80, 2357 min_h => $::WIDTH / 80,
2170 vertical => 0, 2358 vertical => 0,
2171 can_hover => 1, 2359 can_hover => 1,
2172 inner_pad => 0.02, 2360 inner_pad => 0.02,
2173 @_ 2361 @_
2174 ); 2362 );
… …
2177 $self->update; 2365 $self->update;
2178 2366
2179 $self 2367 $self
2180} 2368}
2181 2369
2182sub changed { }
2183
2184sub set_range { 2370sub set_range {
2185 my ($self, $range) = @_; 2371 my ($self, $range) = @_;
2186 2372
2187 ($range, $self->{range}) = ($self->{range}, $range); 2373 ($range, $self->{range}) = ($self->{range}, $range);
2188 2374
2189 $self->update
2190 if "@$range" ne "@{$self->{range}}"; 2375 if ("@$range" ne "@{$self->{range}}") {
2376 $self->update;
2377 $self->set_value ($self->{range}[0]);
2378 }
2191} 2379}
2192 2380
2193sub set_value { 2381sub set_value {
2194 my ($self, $value) = @_; 2382 my ($self, $value) = @_;
2195 2383
… …
2206 if $unit; 2394 if $unit;
2207 2395
2208 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2396 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2209 2397
2210 if ($value != $old_value) { 2398 if ($value != $old_value) {
2211 $self->_emit (changed => $value); 2399 $self->emit (changed => $value);
2212 $self->update; 2400 $self->update;
2213 } 2401 }
2214} 2402}
2215 2403
2216sub size_request { 2404sub size_request {
2217 my ($self) = @_; 2405 my ($self) = @_;
2218 2406
2219 my $w = $self->{req_w}; 2407 ($self->{req_w}, $self->{req_h})
2220 my $h = $self->{req_h};
2221
2222 $self->{vertical} ? ($h, $w) : ($w, $h)
2223} 2408}
2224 2409
2225sub button_down { 2410sub invoke_button_down {
2226 my ($self, $ev, $x, $y) = @_; 2411 my ($self, $ev, $x, $y) = @_;
2227 2412
2228 $self->SUPER::button_down ($ev, $x, $y); 2413 $self->SUPER::invoke_button_down ($ev, $x, $y);
2229 2414
2230 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2415 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2231 2416
2232 $self->mouse_motion ($ev, $x, $y); 2417 $self->invoke_mouse_motion ($ev, $x, $y)
2233} 2418}
2234 2419
2235sub mouse_motion { 2420sub invoke_mouse_motion {
2236 my ($self, $ev, $x, $y) = @_; 2421 my ($self, $ev, $x, $y) = @_;
2237 2422
2238 if ($GRAB == $self) { 2423 if ($GRAB == $self) {
2239 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2424 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2240 2425
2241 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2426 my (undef, $lo, $hi, $page) = @{$self->{range}};
2242 2427
2243 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2428 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2244 2429
2245 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2430 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2431 } else {
2432 return 0;
2433 }
2434
2246 } 2435 1
2247} 2436}
2248 2437
2249sub update { 2438sub update {
2250 my ($self) = @_; 2439 my ($self) = @_;
2251 2440
2252 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2441 delete $self->{knob_w};
2442 $self->SUPER::update;
2443}
2444
2445sub _draw {
2446 my ($self) = @_;
2447
2448 unless ($self->{knob_w}) {
2253 $self->set_value ($self->{range}[0]); 2449 $self->set_value ($self->{range}[0]);
2254 2450
2255 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2451 my ($value, $lo, $hi, $page) = @{$self->{range}};
2256 my $range = ($hi - $page - $lo) || 1e-100; 2452 my $range = ($hi - $page - $lo) || 1e-100;
2257 2453
… …
2263 $value = ($value - $lo) / $range; 2459 $value = ($value - $lo) / $range;
2264 $value = $value * $self->{scale} + $self->{offset}; 2460 $value = $value * $self->{scale} + $self->{offset};
2265 2461
2266 $self->{knob_x} = $value - $knob_w * 0.5; 2462 $self->{knob_x} = $value - $knob_w * 0.5;
2267 $self->{knob_w} = $knob_w; 2463 $self->{knob_w} = $knob_w;
2268 }); 2464 }
2269
2270 $self->SUPER::update;
2271}
2272
2273sub _draw {
2274 my ($self) = @_;
2275 2465
2276 $self->SUPER::_draw (); 2466 $self->SUPER::_draw ();
2277 2467
2278 glScale $self->{w}, $self->{h}; 2468 glScale $self->{w}, $self->{h};
2279 2469
… …
2340sub set_range { shift->{slider}->set_range (@_) } 2530sub set_range { shift->{slider}->set_range (@_) }
2341sub set_value { shift->{slider}->set_value (@_) } 2531sub set_value { shift->{slider}->set_value (@_) }
2342 2532
2343############################################################################# 2533#############################################################################
2344 2534
2345package CFClient::UI::TextView; 2535package CFClient::UI::TextScroller;
2346 2536
2347our @ISA = CFClient::UI::HBox::; 2537our @ISA = CFClient::UI::HBox::;
2348 2538
2349use CFClient::OpenGL; 2539use CFClient::OpenGL;
2350 2540
… …
2352 my $class = shift; 2542 my $class = shift;
2353 2543
2354 my $self = $class->SUPER::new ( 2544 my $self = $class->SUPER::new (
2355 fontsize => 1, 2545 fontsize => 1,
2356 can_events => 0, 2546 can_events => 0,
2547 indent => 0,
2357 #font => default_font 2548 #font => default_font
2358 @_, 2549 @_,
2359 2550
2360 layout => (new CFClient::Layout 1), 2551 layout => (new CFClient::Layout 1),
2361 par => [], 2552 par => [],
… …
2376 2567
2377 $self->{fontsize} = $fontsize; 2568 $self->{fontsize} = $fontsize;
2378 $self->reflow; 2569 $self->reflow;
2379} 2570}
2380 2571
2572sub visible_children {
2573 my ($self) = @_;
2574
2575 @{$self->{children}}[0,1]
2576}
2577
2381sub size_allocate { 2578sub invoke_size_allocate {
2382 my ($self, $w, $h, $changed) = @_; 2579 my ($self, $w, $h) = @_;
2383 2580
2384 $self->SUPER::size_allocate ($w, $h, $changed); 2581 my (undef, undef, @other) = @{ $self->{children} };
2385 2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2386 return unless $changed;
2387 2583
2388 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2584 $self->{layout}->set_font ($self->{font}) if $self->{font};
2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2390 $self->{layout}->set_width ($self->{children}[0]{w}); 2586 $self->{layout}->set_width ($self->{children}[0]{w});
2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2391 2588
2392 $self->reflow; 2589 $self->reflow;
2393}
2394 2590
2395sub text_size { 2591 $self->SUPER::invoke_size_allocate ($w, $h)
2396 my ($self, $text, $indent) = @_; 2592}
2593
2594sub get_layout {
2595 my ($self, $para) = @_;
2397 2596
2398 my $layout = $self->{layout}; 2597 my $layout = $self->{layout};
2399 2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2400 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2401 $layout->set_width ($self->{children}[0]{w} - $indent); 2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2402 $layout->set_markup ($text); 2603 $layout->set_markup ($para->{markup});
2403 2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}});
2605
2404 $layout->size 2606 $layout
2405} 2607}
2406 2608
2407sub reflow { 2609sub reflow {
2408 my ($self) = @_; 2610 my ($self) = @_;
2409 2611
… …
2418 $self->{children}[1]->set_value ($offset); 2620 $self->{children}[1]->set_value ($offset);
2419} 2621}
2420 2622
2421sub clear { 2623sub clear {
2422 my ($self) = @_; 2624 my ($self) = @_;
2625
2626 my (undef, undef, @other) = @{ $self->{children} };
2627 $self->remove ($_) for @other;
2423 2628
2424 $self->{par} = []; 2629 $self->{par} = [];
2425 $self->{height} = 0; 2630 $self->{height} = 0;
2426 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2631 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2427} 2632}
2428 2633
2429sub add_paragraph { 2634sub add_paragraph {
2430 my ($self, $color, $text, $indent) = @_; 2635 my ($self, $color, $para, $indent) = @_;
2431 2636
2432 for my $line (split /\n/, $text) { 2637 my ($text, @w) = ref $para ? @$para : $para;
2433 my ($w, $h) = $self->text_size ($line); 2638
2434 $self->{height} += $h; 2639 $para = {
2435 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2640 w => 1e10,
2641 wrapped => 1,
2642 fg => $color,
2643 indent => $indent,
2644 markup => $text,
2645 widget => \@w,
2436 } 2646 };
2437 2647
2438 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2648 $self->add (@w) if @w;
2649 push @{$self->{par}}, $para;
2650
2651 $self->{need_reflow}++;
2652 $self->update;
2653}
2654
2655sub scroll_to_bottom {
2656 my ($self) = @_;
2657
2658 $self->{scroll_to_bottom} = 1;
2659 $self->update;
2439} 2660}
2440 2661
2441sub update { 2662sub update {
2442 my ($self) = @_; 2663 my ($self) = @_;
2443 2664
… …
2445 2666
2446 return unless $self->{h} > 0; 2667 return unless $self->{h} > 0;
2447 2668
2448 delete $self->{texture}; 2669 delete $self->{texture};
2449 2670
2450 $ROOT->on_post_alloc ($self, sub { 2671 $ROOT->on_post_alloc ($self => sub {
2451 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2672 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2452 2673
2453 if (delete $self->{need_reflow}) { 2674 if (delete $self->{need_reflow}) {
2454 my $height = 0; 2675 my $height = 0;
2455 2676
2456 my $layout = $self->{layout};
2457
2458 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2459
2460 for (@{$self->{par}}) { 2677 for my $para (@{$self->{par}}) {
2461 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2678 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2462 $layout->set_width ($W - $_->[3]); 2679 my $layout = $self->get_layout ($para);
2463 $layout->set_markup ($_->[4]);
2464 my ($w, $h) = $layout->size; 2680 my ($w, $h) = $layout->size;
2465 $_->[0] = $w + $_->[3]; 2681
2682 $para->{w} = $w + $para->{indent};
2466 $_->[1] = $h; 2683 $para->{h} = $h;
2684 $para->{wrapped} = $layout->has_wrapped;
2467 } 2685 }
2468 2686
2469 $height += $_->[1]; 2687 $height += $para->{h};
2470 } 2688 }
2471 2689
2472 $self->{height} = $height; 2690 $self->{height} = $height;
2473 2691
2474 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2692 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2475 2693
2476 delete $self->{texture}; 2694 delete $self->{texture};
2477 } 2695 }
2478 2696
2697 if (delete $self->{scroll_to_bottom}) {
2698 $self->{children}[1]->set_value (1e10);
2699 }
2700
2479 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2701 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2480 glClearColor 0.5, 0.5, 0.5, 0; 2702 glClearColor 0, 0, 0, 0;
2481 glClear GL_COLOR_BUFFER_BIT; 2703 glClear GL_COLOR_BUFFER_BIT;
2482 2704
2483 my $top = int $self->{children}[1]{range}[0]; 2705 my $top = int $self->{children}[1]{range}[0];
2484 2706
2485 my $y0 = $top; 2707 my $y0 = $top;
2486 my $y1 = $top + $H; 2708 my $y1 = $top + $H;
2487 2709
2488 my $y = 0; 2710 my $y = 0;
2489
2490 my $layout = $self->{layout};
2491
2492 $layout->set_font ($self->{font}) if $self->{font};
2493 2711
2494 glEnable GL_BLEND; 2712 glEnable GL_BLEND;
2495 #TODO# not correct in windows where rgba is forced off 2713 #TODO# not correct in windows where rgba is forced off
2496 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2714 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2497 2715
2498 for my $par (@{$self->{par}}) { 2716 for my $para (@{$self->{par}}) {
2499 my $h = $par->[1]; 2717 my $h = $para->{h};
2500 2718
2501 if ($y0 < $y + $h && $y < $y1) { 2719 if ($y0 < $y + $h && $y < $y1) {
2502 $layout->set_foreground (@{ $par->[2] }); 2720
2503 $layout->set_width ($W - $par->[3]); 2721 my $layout = $self->get_layout ($para);
2504 $layout->set_markup ($par->[4]);
2505 2722
2506 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2507 2724
2508 glRasterPos $par->[3], $y - $y0; 2725 glRasterPos $para->{indent}, $y - $y0;
2509 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2726 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727
2728 if (my @w = @{ $para->{widget} }) {
2729 my @s = $layout->get_shapes;
2730
2731 for (@w) {
2732 my ($dx, $dy) = splice @s, 0, 2, ();
2733
2734 $_->{x} = $dx + $para->{indent};
2735 $_->{y} = $dy + $y - $y0;
2736
2737 $_->draw;
2738 }
2739 }
2510 } 2740 }
2511 2741
2512 $y += $h; 2742 $y += $h;
2513 } 2743 }
2514 2744
2515 glDisable GL_BLEND; 2745 glDisable GL_BLEND;
2516 }; 2746 };
2517 }); 2747 });
2518} 2748}
2519 2749
2750sub reconfigure {
2751 my ($self) = @_;
2752
2753 $self->SUPER::reconfigure;
2754
2755 $_->{w} = 1e10 for @{ $self->{par} };
2756 $self->reflow;
2757}
2758
2520sub _draw { 2759sub _draw {
2521 my ($self) = @_; 2760 my ($self) = @_;
2522 2761
2523 glEnable GL_TEXTURE_2D; 2762 glEnable GL_TEXTURE_2D;
2524 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2763 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2525 glColor 1, 1, 1, 1; 2764 glColor 0, 0, 0, 1;
2526 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2765 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2527 glDisable GL_TEXTURE_2D; 2766 glDisable GL_TEXTURE_2D;
2528 2767
2529 $self->{children}[1]->draw; 2768 $self->{children}[1]->draw;
2530
2531} 2769}
2532 2770
2533############################################################################# 2771#############################################################################
2534 2772
2535package CFClient::UI::Animator; 2773package CFClient::UI::Animator;
… …
2614} 2852}
2615 2853
2616sub set_tooltip_from { 2854sub set_tooltip_from {
2617 my ($self, $widget) = @_; 2855 my ($self, $widget) = @_;
2618 2856
2857 my $tooltip = $widget->{tooltip};
2858
2859 if ($ENV{CFPLUS_DEBUG} & 2) {
2860 $tooltip .= "\n\n" . (ref $widget) . "\n"
2861 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2862 . "req $widget->{req_w} $widget->{req_h}\n"
2863 . "visible $widget->{visible}";
2864 }
2865
2866 $tooltip =~ s/^\n+//;
2867 $tooltip =~ s/\n+$//;
2868
2619 $self->add (new CFClient::UI::Label 2869 $self->add (new CFClient::UI::Label
2620 markup => $widget->{tooltip}, 2870 markup => $tooltip,
2621 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2871 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2622 fontsize => 0.8, 2872 fontsize => 0.8,
2623 fg => [0, 0, 0, 1], 2873 fg => [0, 0, 0, 1],
2624 ellipsise => 0, 2874 ellipsise => 0,
2625 font => ($widget->{tooltip_font} || $::FONT_PROP), 2875 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2632 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2882 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2633 2883
2634 ($w + 4, $h + 4) 2884 ($w + 4, $h + 4)
2635} 2885}
2636 2886
2637sub size_allocate { 2887sub invoke_size_allocate {
2638 my ($self, $w, $h, $changed) = @_; 2888 my ($self, $w, $h) = @_;
2639 2889
2640 return unless $changed;
2641
2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2890 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2891}
2892
2893sub invoke_visibility_change {
2894 my ($self, $visible) = @_;
2895
2896 return unless $visible;
2897
2898 $self->{root}->on_post_alloc ("move_$self" => sub {
2899 my $widget = $self->{owner}
2900 or return;
2901
2902 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2903
2904 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2905 if $x + $self->{w} > $self->{root}{w};
2906
2907 $self->move_abs ($x, $y);
2908 });
2643} 2909}
2644 2910
2645sub _draw { 2911sub _draw {
2646 my ($self) = @_; 2912 my ($self) = @_;
2647 2913
… …
2664 glVertex $w, $h; 2930 glVertex $w, $h;
2665 glVertex $w, 0; 2931 glVertex $w, 0;
2666 glEnd; 2932 glEnd;
2667 2933
2668 glTranslate 2 - 0.375, 2 - 0.375; 2934 glTranslate 2 - 0.375, 2 - 0.375;
2935
2669 $self->SUPER::_draw; 2936 $self->SUPER::_draw;
2670} 2937}
2671 2938
2672############################################################################# 2939#############################################################################
2673 2940
… …
2732 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2999 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2733 3000
2734 if ($tex) { 3001 if ($tex) {
2735 glEnable GL_TEXTURE_2D; 3002 glEnable GL_TEXTURE_2D;
2736 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3003 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2737 glColor 1, 1, 1, 1; 3004 glColor 0, 0, 0, 1;
2738 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3005 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2739 glDisable GL_TEXTURE_2D; 3006 glDisable GL_TEXTURE_2D;
2740 } 3007 }
2741} 3008}
2742 3009
2743sub DESTROY { 3010sub destroy {
2744 my ($self) = @_; 3011 my ($self) = @_;
2745 3012
2746 $self->{timer}->cancel 3013 $self->{timer}->cancel
2747 if $self->{timer}; 3014 if $self->{timer};
2748 3015
2749 $self->SUPER::DESTROY; 3016 $self->SUPER::destroy;
2750} 3017}
2751 3018
2752############################################################################# 3019#############################################################################
2753 3020
2754package CFClient::UI::Inventory; 3021package CFClient::UI::Buttonbar;
2755 3022
2756our @ISA = CFClient::UI::ScrolledWindow::; 3023our @ISA = CFClient::UI::HBox::;
2757 3024
2758sub new { 3025# TODO: should actualyl wrap buttons and other goodies.
2759 my $class = shift;
2760
2761 my $self = $class->SUPER::new (
2762 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2763 @_,
2764 );
2765
2766 $self
2767}
2768
2769sub set_items {
2770 my ($self, $items) = @_;
2771
2772 $self->{scrolled}->clear;
2773 return unless $items;
2774
2775 my @items = sort {
2776 ($a->{type} <=> $b->{type})
2777 or ($a->{name} cmp $b->{name})
2778 } @$items;
2779
2780 $self->{real_items} = \@items;
2781
2782 my $row = 0;
2783 for my $item (@items) {
2784 CFClient::Item::update_widgets $item;
2785
2786 $self->{scrolled}->add (0, $row, $item->{face_widget});
2787 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2788 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2789
2790 $row++;
2791 }
2792}
2793 3026
2794############################################################################# 3027#############################################################################
2795 3028
2796package CFClient::UI::Menu; 3029package CFClient::UI::Menu;
2797 3030
… …
2809 ); 3042 );
2810 3043
2811 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3044 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2812 3045
2813 for my $item (@{ $self->{items} }) { 3046 for my $item (@{ $self->{items} }) {
2814 my ($widget, $cb) = @$item; 3047 my ($widget, $cb, $tooltip) = @$item;
2815 3048
2816 # handle various types of items, only text for now 3049 # handle various types of items, only text for now
2817 if (!ref $widget) { 3050 if (!ref $widget) {
2818 $widget = new CFClient::UI::Label 3051 $widget = new CFClient::UI::Label
2819 can_hover => 1, 3052 can_hover => 1,
2820 can_events => 1, 3053 can_events => 1,
2821 text => $widget; 3054 markup => $widget,
3055 tooltip => $tooltip
2822 } 3056 }
2823 3057
2824 $self->{item}{$widget} = $item; 3058 $self->{item}{$widget} = $item;
2825 3059
2826 $self->{vbox}->add ($widget); 3060 $self->{vbox}->add ($widget);
… …
2831 3065
2832# popup given the event (must be a mouse button down event currently) 3066# popup given the event (must be a mouse button down event currently)
2833sub popup { 3067sub popup {
2834 my ($self, $ev) = @_; 3068 my ($self, $ev) = @_;
2835 3069
2836 $self->_emit ("popdown"); 3070 $self->emit ("popdown");
2837 3071
2838 # maybe save $GRAB? must be careful about events... 3072 # maybe save $GRAB? must be careful about events...
2839 $GRAB = $self; 3073 $GRAB = $self;
2840 $self->{button} = $ev->{button}; 3074 $self->{button} = $ev->{button};
2841 3075
2842 $self->show; 3076 $self->show;
2843 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3077 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2844} 3078}
2845 3079
2846sub mouse_motion { 3080sub invoke_mouse_motion {
2847 my ($self, $ev, $x, $y) = @_; 3081 my ($self, $ev, $x, $y) = @_;
2848 3082
2849 # TODO: should use vbox->find_widget or so 3083 # TODO: should use vbox->find_widget or so
2850 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3084 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2851 $self->{hover} = $self->{item}{$HOVER}; 3085 $self->{hover} = $self->{item}{$HOVER};
2852}
2853 3086
3087 0
3088}
3089
2854sub button_up { 3090sub invoke_button_up {
2855 my ($self, $ev, $x, $y) = @_; 3091 my ($self, $ev, $x, $y) = @_;
2856 3092
2857 if ($ev->{button} == $self->{button}) { 3093 if ($ev->{button} == $self->{button}) {
2858 undef $GRAB; 3094 undef $GRAB;
2859 $self->hide; 3095 $self->hide;
2860 3096
2861 $self->_emit ("popdown"); 3097 $self->emit ("popdown");
2862 $self->{hover}[1]->() if $self->{hover}; 3098 $self->{hover}[1]->() if $self->{hover};
3099 } else {
3100 return 0
3101 }
3102
2863 } 3103 1
2864} 3104}
2865 3105
2866############################################################################# 3106#############################################################################
2867 3107
2868package CFClient::UI::Statusbox; 3108package CFClient::UI::Multiplexer;
2869 3109
2870our @ISA = CFClient::UI::VBox::; 3110our @ISA = CFClient::UI::Container::;
2871 3111
2872sub new { 3112sub new {
2873 my $class = shift; 3113 my $class = shift;
2874 3114
2875 $class->SUPER::new ( 3115 my $self = $class->SUPER::new (
3116 @_,
3117 );
3118
3119 $self->{current} = $self->{children}[0]
3120 if @{ $self->{children} };
3121
3122 $self
3123}
3124
3125sub add {
3126 my ($self, @widgets) = @_;
3127
3128 $self->SUPER::add (@widgets);
3129
3130 $self->{current} = $self->{children}[0]
3131 if @{ $self->{children} };
3132}
3133
3134sub set_current_page {
3135 my ($self, $page_or_widget) = @_;
3136
3137 my $widget = ref $page_or_widget
3138 ? $page_or_widget
3139 : $self->{children}[$page_or_widget];
3140
3141 $self->{current} = $widget;
3142 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3143
3144 $self->emit (page_changed => $self->{current});
3145
3146 $self->realloc;
3147}
3148
3149sub visible_children {
3150 $_[0]{current}
3151}
3152
3153sub size_request {
3154 my ($self) = @_;
3155
3156 $self->{current}->size_request
3157}
3158
3159sub invoke_size_allocate {
3160 my ($self, $w, $h) = @_;
3161
3162 $self->{current}->configure (0, 0, $w, $h);
3163
3164 1
3165}
3166
3167sub _draw {
3168 my ($self) = @_;
3169
3170 $self->{current}->draw;
3171}
3172
3173#############################################################################
3174
3175package CFClient::UI::Notebook;
3176
3177our @ISA = CFClient::UI::VBox::;
3178
3179sub new {
3180 my $class = shift;
3181
3182 my $self = $class->SUPER::new (
3183 buttonbar => (new CFClient::UI::Buttonbar),
3184 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3185 # filter => # will be put between multiplexer and $self
3186 @_,
3187 );
3188
3189 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3190 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3191
3192 $self
3193}
3194
3195sub add {
3196 my ($self, $title, $widget, $tooltip) = @_;
3197
3198 Scalar::Util::weaken $self;
3199
3200 $self->{buttonbar}->add (new CFClient::UI::Button
3201 markup => $title,
3202 tooltip => $tooltip,
3203 on_activate => sub { $self->set_current_page ($widget) },
3204 );
3205
3206 $self->{multiplexer}->add ($widget);
3207}
3208
3209sub set_current_page {
3210 my ($self, $page) = @_;
3211
3212 $self->{multiplexer}->set_current_page ($page);
3213 $self->emit (page_changed => $self->{multiplexer}{current});
3214}
3215
3216#############################################################################
3217
3218package CFClient::UI::Combobox;
3219
3220use utf8;
3221
3222our @ISA = CFClient::UI::Button::;
3223
3224sub new {
3225 my $class = shift;
3226
3227 my $self = $class->SUPER::new (
3228 options => [], # [value, title, longdesc], ...
3229 value => undef,
3230 @_,
3231 );
3232
3233 $self->_set_value ($self->{value});
3234
3235 $self
3236}
3237
3238sub invoke_button_down {
3239 my ($self, $ev) = @_;
3240
3241 my @menu_items;
3242
3243 for (@{ $self->{options} }) {
3244 my ($value, $title, $tooltip) = @$_;
3245
3246 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3247 }
3248
3249 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3250}
3251
3252sub _set_value {
3253 my ($self, $value) = @_;
3254
3255 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3256 or return;
3257
3258 $self->{value} = $item->[0];
3259 $self->set_markup ("$item->[1] ⇓");
3260 $self->set_tooltip ($item->[2]);
3261}
3262
3263sub set_value {
3264 my ($self, $value) = @_;
3265
3266 return unless $self->{value} ne $value;
3267
3268 $self->_set_value ($value);
3269 $self->emit (changed => $value);
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::Statusbox;
3275
3276our @ISA = CFClient::UI::VBox::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (
2876 fontsize => 0.8, 3282 fontsize => 0.8,
2877 @_, 3283 @_,
2878 ) 3284 );
3285
3286 Scalar::Util::weaken (my $this = $self);
3287
3288 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3289
3290 $self
2879} 3291}
2880 3292
2881sub reorder { 3293sub reorder {
2882 my ($self) = @_; 3294 my ($self) = @_;
2883 my $NOW = time; 3295 my $NOW = Time::HiRes::time;
3296
3297 # freeze display when hovering over any label
3298 return if $CFClient::UI::TOOLTIP->{owner}
3299 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3300 values %{ $self->{item} };
2884 3301
2885 while (my ($k, $v) = each %{ $self->{item} }) { 3302 while (my ($k, $v) = each %{ $self->{item} }) {
2886 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3303 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2887 } 3304 }
2888 3305
… …
2891 my @items = sort { 3308 my @items = sort {
2892 $a->{pri} <=> $b->{pri} 3309 $a->{pri} <=> $b->{pri}
2893 or $b->{id} <=> $a->{id} 3310 or $b->{id} <=> $a->{id}
2894 } values %{ $self->{item} }; 3311 } values %{ $self->{item} };
2895 3312
3313 $self->{timer}->interval (1);
3314
2896 my $count = 10 + 1; 3315 my $count = 10 + 1;
2897 for my $item (@items) { 3316 for my $item (@items) {
2898 last unless --$count; 3317 last unless --$count;
2899 3318
2900 push @widgets, $item->{label} ||= do { 3319 my $label = $item->{label} ||= do {
2901 # TODO: doesn't handle markup well (read as: at all) 3320 # TODO: doesn't handle markup well (read as: at all)
2902 my $short = $item->{count} > 1 3321 my $short = $item->{count} > 1
2903 ? "<b>$item->{count} ×</b> $item->{text}" 3322 ? "<b>$item->{count} ×</b> $item->{text}"
2904 : $item->{text}; 3323 : $item->{text};
2905 3324
… …
2913 tooltip => $item->{tooltip}, 3332 tooltip => $item->{tooltip},
2914 tooltip_font => $::FONT_PROP, 3333 tooltip_font => $::FONT_PROP,
2915 tooltip_width => 0.67, 3334 tooltip_width => 0.67,
2916 fontsize => $item->{fontsize} || $self->{fontsize}, 3335 fontsize => $item->{fontsize} || $self->{fontsize},
2917 max_w => $::WIDTH * 0.44, 3336 max_w => $::WIDTH * 0.44,
2918 fg => $item->{fg}, 3337 fg => [@{ $item->{fg} }],
2919 can_events => 1, 3338 can_events => 1,
2920 can_hover => 1 3339 can_hover => 1
2921 }; 3340 };
3341
3342 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3343 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3344 $label->update;
3345 $label->set_max_size (undef, $label->{req_h} * $diff)
3346 if $diff < 1;
3347 $self->{timer}->interval (1/30);
3348 } else {
3349 $label->{fg}[3] = $item->{fg}[3] || 1;
3350 }
3351
3352 push @widgets, $label;
2922 } 3353 }
2923 3354
2924 $self->clear; 3355 $self->clear;
2925 $self->SUPER::add (reverse @widgets); 3356 $self->SUPER::add (reverse @widgets);
2926} 3357}
… …
2931 $text =~ s/^\s+//; 3362 $text =~ s/^\s+//;
2932 $text =~ s/\s+$//; 3363 $text =~ s/\s+$//;
2933 3364
2934 return unless $text; 3365 return unless $text;
2935 3366
2936 my $timeout = time + ((delete $arg{timeout}) || 60); 3367 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2937 3368
2938 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3369 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2939 3370
2940 if (my $item = $self->{item}{$group}) { 3371 if (my $item = $self->{item}{$group}) {
2941 if ($item->{text} eq $text) { 3372 if ($item->{text} eq $text) {
2942 $item->{count}++; 3373 $item->{count}++;
2943 } else { 3374 } else {
2944 $item->{count} = 1; 3375 $item->{count} = 1;
2945 $item->{text} = $item->{tooltip} = $text; 3376 $item->{text} = $item->{tooltip} = $text;
2946 } 3377 }
2947 $item->{id} = ++$self->{id}; 3378 $item->{id} += 0.2;#d#
2948 $item->{timeout} = $timeout; 3379 $item->{timeout} = $timeout;
2949 delete $item->{label}; 3380 delete $item->{label};
2950 } else { 3381 } else {
2951 $self->{item}{$group} = { 3382 $self->{item}{$group} = {
2952 id => ++$self->{id}, 3383 id => ++$self->{id},
… …
2971 3402
2972 $self->reorder; 3403 $self->reorder;
2973 $self->SUPER::reconfigure; 3404 $self->SUPER::reconfigure;
2974} 3405}
2975 3406
3407sub destroy {
3408 my ($self) = @_;
3409
3410 $self->{timer}->cancel;
3411
3412 $self->SUPER::destroy;
3413}
3414
2976############################################################################# 3415#############################################################################
2977 3416
3417package CFClient::UI::Inventory;
3418
3419our @ISA = CFClient::UI::ScrolledWindow::;
3420
3421sub new {
3422 my $class = shift;
3423
3424 my $self = $class->SUPER::new (
3425 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3426 @_,
3427 );
3428
3429 $self
3430}
3431
3432sub set_items {
3433 my ($self, $items) = @_;
3434
3435 $self->{child}->clear;
3436 return unless $items;
3437
3438 my @items = sort {
3439 ($a->{type} <=> $b->{type})
3440 or ($a->{name} cmp $b->{name})
3441 } @$items;
3442
3443 $self->{real_items} = \@items;
3444
3445 my $row = 0;
3446 for my $item (@items) {
3447 CFClient::Item::update_widgets $item;
3448
3449 $self->{child}->add (0, $row, $item->{face_widget});
3450 $self->{child}->add (1, $row, $item->{desc_widget});
3451 $self->{child}->add (2, $row, $item->{weight_widget});
3452
3453 $row++;
3454 }
3455}
3456
3457#############################################################################
3458
3459package CFClient::UI::BindEditor;
3460
3461our @ISA = CFClient::UI::FancyFrame::;
3462
3463sub new {
3464 my $class = shift;
3465
3466 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3467
3468 $self->add (my $vb = new CFClient::UI::VBox);
3469
3470
3471 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3472 text => "start recording",
3473 tooltip => "Start/Stops recording of actions."
3474 ."All subsequent actions after the recording started will be captured."
3475 ."The actions are displayed after the record was stopped."
3476 ."To bind the action you have to click on the 'Bind' button",
3477 on_activate => sub {
3478 unless ($self->{recording}) {
3479 $self->start;
3480 } else {
3481 $self->stop;
3482 }
3483 });
3484
3485 $vb->add (new CFClient::UI::Label text => "Actions:");
3486 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3487
3488 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3489 $vb->add (my $hb = new CFClient::UI::HBox);
3490 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3491 $hb->add (new CFClient::UI::Button
3492 text => "bind",
3493 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3494 on_activate => sub {
3495 $self->ask_for_bind;
3496 });
3497
3498 $vb->add (my $hb = new CFClient::UI::HBox);
3499 $hb->add (new CFClient::UI::Button
3500 text => "ok",
3501 expand => 1,
3502 tooltip => "This closes the binding editor and saves the binding",
3503 on_activate => sub {
3504 $self->hide;
3505 $self->commit;
3506 });
3507
3508 $hb->add (new CFClient::UI::Button
3509 text => "cancel",
3510 expand => 1,
3511 tooltip => "This closes the binding editor without saving",
3512 on_activate => sub {
3513 $self->hide;
3514 $self->{binding_cancel}->()
3515 if $self->{binding_cancel};
3516 });
3517
3518 $self->update_binding_widgets;
3519
3520 $self
3521}
3522
3523sub cfg_bind {
3524 my ($self, $mod, $sym, $cmds) = @_;
3525 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3526 ::update_bindings ();
3527}
3528
3529sub cfg_unbind {
3530 my ($self, $mod, $sym, $cmds) = @_;
3531 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3532 ::update_bindings ();
3533}
3534
3535sub commit {
3536 my ($self) = @_;
3537 my ($mod, $sym, $cmds) = $self->get_binding;
3538 if ($sym != 0 && @$cmds > 0) {
3539 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3540 ."'. Don't forget 'Save Config'!");
3541 $self->{binding_change}->($mod, $sym, $cmds)
3542 if $self->{binding_change};
3543 } else {
3544 $::STATUSBOX->add ("No action bound, no key or action specified!");
3545 $self->{binding_cancel}->()
3546 if $self->{binding_cancel};
3547 }
3548}
3549
3550sub start {
3551 my ($self) = @_;
3552
3553 $self->{rec_btn}->set_text ("stop recording");
3554 $self->{recording} = 1;
3555 $self->clear_command_list;
3556 $::CONN->start_record if $::CONN;
3557}
3558
3559sub stop {
3560 my ($self) = @_;
3561
3562 $self->{rec_btn}->set_text ("start recording");
3563 $self->{recording} = 0;
3564
3565 my $rec;
3566 $rec = $::CONN->stop_record if $::CONN;
3567 return unless ref $rec eq 'ARRAY';
3568 $self->set_command_list ($rec);
3569}
3570
3571
3572sub ask_for_bind_and_commit {
3573 my ($self) = @_;
3574 $self->ask_for_bind (1);
3575}
3576
3577sub ask_for_bind {
3578 my ($self, $commit, $end_cb) = @_;
3579
3580 CFClient::Binder::open_binding_dialog (sub {
3581 my ($mod, $sym) = @_;
3582 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3583 $self->update_binding_widgets;
3584 $self->commit if $commit;
3585 $end_cb->() if $end_cb;
3586 });
3587}
3588
3589# $mod and $sym are the modifiers and key symbol
3590# $cmds is a array ref of strings (the commands)
3591# $cb is the callback that is executed on OK
3592# $ccb is the callback that is executed on CANCEL and
3593# when the binding was unsuccessful on OK
3594sub set_binding {
3595 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3596
3597 $self->clear_command_list;
3598 $self->{recording} = 0;
3599 $self->{rec_btn}->set_text ("start recording");
3600
3601 $self->{binding} = [$mod, $sym];
3602 $self->{commands} = $cmds;
3603
3604 $self->{binding_change} = $cb;
3605 $self->{binding_cancel} = $ccb;
3606
3607 $self->update_binding_widgets;
3608}
3609
3610# this is a shortcut method that asks for a binding
3611# and then just binds it.
3612sub do_quick_binding {
3613 my ($self, $cmds, $end_cb) = @_;
3614 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3615 $self->ask_for_bind (1, $end_cb);
3616}
3617
3618sub update_binding_widgets {
3619 my ($self) = @_;
3620 my ($mod, $sym, $cmds) = $self->get_binding;
3621 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3622 $self->set_command_list ($cmds);
3623}
3624
3625sub get_binding {
3626 my ($self) = @_;
3627 return (
3628 $self->{binding}->[0],
3629 $self->{binding}->[1],
3630 [ grep { defined $_ } @{$self->{commands}} ]
3631 );
3632}
3633
3634sub clear_command_list {
3635 my ($self) = @_;
3636 $self->{cmdbox}->clear ();
3637}
3638
3639sub set_command_list {
3640 my ($self, $cmds) = @_;
3641
3642 $self->{cmdbox}->clear ();
3643 $self->{commands} = $cmds;
3644
3645 my $idx = 0;
3646
3647 for (@$cmds) {
3648 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3649
3650 my $i = $idx;
3651 $hb->add (new CFClient::UI::Label text => $_);
3652 $hb->add (new CFClient::UI::Button
3653 text => "delete",
3654 tooltip => "Deletes the action from the record",
3655 on_activate => sub {
3656 $self->{cmdbox}->remove ($hb);
3657 $cmds->[$i] = undef;
3658 });
3659
3660
3661 $idx++
3662 }
3663}
3664
3665#############################################################################
3666
3667package CFClient::UI::SpellList;
3668
3669our @ISA = CFClient::UI::Table::;
3670
3671sub new {
3672 my $class = shift;
3673
3674 my $self = $class->SUPER::new (
3675 binding => [],
3676 commands => [],
3677 @_,
3678 )
3679}
3680
3681my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3682
3683my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3684 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3685my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3686 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3687my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3688 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3689my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3690 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3691my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3692 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3693
3694sub rebuild_spell_list {
3695 my ($self) = @_;
3696
3697 $CFClient::UI::ROOT->on_refresh ($self => sub {
3698 $self->clear;
3699
3700 return unless $::CONN;
3701
3702 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3703 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3704 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3705 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3706 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3707
3708 my $row = 0;
3709
3710 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3711 my $spell = $self->{spell}{$_};
3712
3713 $row++;
3714
3715 my $spell_cb = sub {
3716 my ($widget, $ev) = @_;
3717
3718 if ($ev->{button} == 1) {
3719 $::CONN->user_send ("cast $spell->{name}");
3720 } elsif ($ev->{button} == 2) {
3721 $::CONN->user_send ("invoke $spell->{name}");
3722 } elsif ($ev->{button} == 3) {
3723 (new CFClient::UI::Menu
3724 items => [
3725 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3726 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727 ],
3728 )->popup ($ev);
3729 } else {
3730 return 0;
3731 }
3732
3733 1
3734 };
3735
3736 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3737
3738 #TODO: add path info to tooltip
3739 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3740
3741 $self->add (0, $row, new CFClient::UI::Face
3742 face => $spell->{face},
3743 can_hover => 1,
3744 can_events => 1,
3745 tooltip => $tooltip,
3746 on_button_down => $spell_cb,
3747 );
3748
3749 $self->add (1, $row, new CFClient::UI::Label
3750 expand => 1,
3751 text => $spell->{name},
3752 can_hover => 1,
3753 can_events => 1,
3754 tooltip => $tooltip,
3755 on_button_down => $spell_cb,
3756 );
3757
3758 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3759 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3760 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3761 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3762 }
3763 });
3764}
3765
3766sub add_spell {
3767 my ($self, $spell) = @_;
3768
3769 $self->{spell}->{$spell->{name}} = $spell;
3770 $self->rebuild_spell_list;
3771}
3772
3773sub remove_spell {
3774 my ($self, $spell) = @_;
3775
3776 delete $self->{spell}->{$spell->{name}};
3777 $self->rebuild_spell_list;
3778}
3779
3780sub clear_spells {
3781 my ($self) = @_;
3782
3783 $self->{spell} = {};
3784 $self->rebuild_spell_list;
3785}
3786
3787#############################################################################
3788
2978package CFClient::UI::Root; 3789package CFClient::UI::Root;
2979 3790
2980our @ISA = CFClient::UI::Container::; 3791our @ISA = CFClient::UI::Container::;
3792
3793use List::Util qw(min max);
2981 3794
2982use CFClient::OpenGL; 3795use CFClient::OpenGL;
2983 3796
2984sub new { 3797sub new {
2985 my $class = shift; 3798 my $class = shift;
… …
2992 Scalar::Util::weaken ($self->{root} = $self); 3805 Scalar::Util::weaken ($self->{root} = $self);
2993 3806
2994 $self 3807 $self
2995} 3808}
2996 3809
2997sub configure {
2998 my ($self, $x, $y, $w, $h) = @_;
2999
3000 $self->{w} = $w;
3001 $self->{h} = $h;
3002}
3003
3004sub reconfigure {
3005 my ($self) = @_;
3006
3007 $self->SUPER::reconfigure;
3008
3009 $self->size_allocate ($self->{w}, $self->{h}, 1)
3010 if $self->{w};
3011}
3012
3013sub size_request { 3810sub size_request {
3014 my ($self) = @_; 3811 my ($self) = @_;
3015 3812
3016 ($self->{w}, $self->{h}) 3813 ($self->{w}, $self->{h})
3017} 3814}
3018 3815
3816sub _to_pixel {
3817 my ($coord, $size, $max) = @_;
3818
3819 $coord =
3820 $coord eq "center" ? ($max - $size) * 0.5
3821 : $coord eq "max" ? $max
3822 : $coord;
3823
3824 $coord = 0 if $coord < 0;
3825 $coord = $max - $size if $coord > $max - $size;
3826
3827 int $coord + 0.5
3828}
3829
3019sub size_allocate { 3830sub invoke_size_allocate {
3020 my ($self, $w, $h, $changed) = @_; 3831 my ($self, $w, $h) = @_;
3021 3832
3022 for my $child ($self->children) { 3833 for my $child ($self->children) {
3023 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3834 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3024 3835
3025 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3836 $X = $child->{force_x} if exists $child->{force_x};
3026 if exists $child->{req_x}; 3837 $Y = $child->{force_y} if exists $child->{force_y};
3027 3838
3028 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3839 $X = _to_pixel $X, $W, $self->{w};
3029 if exists $child->{req_y}; 3840 $Y = _to_pixel $Y, $H, $self->{h};
3030
3031 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3032
3033 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3034 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035 3841
3036 $child->configure ($X, $Y, $W, $H); 3842 $child->configure ($X, $Y, $W, $H);
3037 } 3843 }
3844
3845 1
3038} 3846}
3039 3847
3040sub coord2local { 3848sub coord2local {
3041 my ($self, $x, $y) = @_; 3849 my ($self, $x, $y) = @_;
3042 3850
… …
3056} 3864}
3057 3865
3058sub add { 3866sub add {
3059 my ($self, @children) = @_; 3867 my ($self, @children) = @_;
3060 3868
3061 for my $child (@children) {
3062 $child->{is_toplevel} = 1; 3869 $_->{is_toplevel} = 1
3063 3870 for @children;
3064 # integerise window positions
3065 $child->{x} = int $child->{x};
3066 $child->{y} = int $child->{y};
3067 }
3068 3871
3069 $self->SUPER::add (@children); 3872 $self->SUPER::add (@children);
3070} 3873}
3071 3874
3072sub remove { 3875sub remove {
3073 my ($self, @children) = @_; 3876 my ($self, @children) = @_;
3074 3877
3075 $self->SUPER::remove (@children); 3878 $self->SUPER::remove (@children);
3879
3880 delete $self->{is_toplevel}
3881 for @children;
3076 3882
3077 while (@children) { 3883 while (@children) {
3078 my $w = pop @children; 3884 my $w = pop @children;
3079 push @children, $w->children; 3885 push @children, $w->children;
3080 $w->set_invisible; 3886 $w->set_invisible;
… …
3100 $_->() 3906 $_->()
3101 for values %{delete $self->{refresh_hook}}; 3907 for values %{delete $self->{refresh_hook}};
3102 } 3908 }
3103 3909
3104 if ($self->{realloc}) { 3910 if ($self->{realloc}) {
3911 my %queue;
3105 my @queue; 3912 my @queue;
3913 my $widget;
3106 3914
3915 outer:
3107 while () { 3916 while () {
3108 if ($self->{realloc}) { 3917 if (my $realloc = delete $self->{realloc}) {
3109 #TODO use array-of-depth approach 3918 for $widget (values %$realloc) {
3919 $widget->{visible} or next; # do not resize invisible widgets
3110 3920
3111 @queue = sort { $a->{visible} <=> $b->{visible} } 3921 $queue{$widget+0}++ and next; # duplicates are common
3112 @queue, values %{delete $self->{realloc}}; 3922
3923 push @{ $queue[$widget->{visible}] }, $widget;
3924 }
3113 } 3925 }
3114 3926
3927 while () {
3928 @queue or last outer;
3929
3930 $widget = pop @{ $queue[-1] || [] }
3931 and last;
3932
3933 pop @queue;
3934 }
3935
3936 delete $queue{$widget+0};
3937
3938 my ($w, $h) = $widget->size_request;
3939
3940 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3941 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3942
3943 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3944 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3945
3946 $w = $widget->{force_w} if exists $widget->{force_w};
3947 $h = $widget->{force_h} if exists $widget->{force_h};
3948
3949 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3950 || delete $widget->{force_realloc}) {
3951 $widget->{req_w} = $w;
3952 $widget->{req_h} = $h;
3953
3954 $self->{size_alloc}{$widget+0} = $widget;
3955
3956 if (my $parent = $widget->{parent}) {
3957 $self->{realloc}{$parent+0} = $parent
3958 unless $queue{$parent+0};
3959
3960 $parent->{force_size_alloc} = 1;
3961 $self->{size_alloc}{$parent+0} = $parent;
3962 }
3963 }
3964
3965 delete $self->{realloc}{$widget+0};
3966 }
3967 }
3968
3969 while (my $size_alloc = delete $self->{size_alloc}) {
3970 my @queue = sort { $b->{visible} <=> $a->{visible} }
3971 values %$size_alloc;
3972
3973 while () {
3115 my $widget = pop @queue || last; 3974 my $widget = pop @queue || last;
3116 3975
3117 $widget->{visible} or last; # do not resize invisible widgets 3976 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3118
3119 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3120 ? @$widget{qw(def_w def_h)}
3121 : $widget->size_request;
3122
3123 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3124
3125 $widget->{req_w} = $w;
3126 $widget->{req_h} = $h;
3127
3128 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3129
3130 push @queue, $widget->{parent}
3131 if $widget->{parent};
3132 }
3133 }
3134
3135 while (my $size_alloc = delete $self->{size_alloc}) {
3136 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3137 values %$size_alloc;
3138
3139 while () {
3140 my ($widget, $w, $h) = @{ pop @queue or last };
3141 3977
3142 $w = 0 if $w < 0; 3978 $w = 0 if $w < 0;
3143 $h = 0 if $h < 0; 3979 $h = 0 if $h < 0;
3144 3980
3981 $w = int $w + 0.5;
3982 $h = int $h + 0.5;
3983
3984 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3985 $widget->{old_w} = $widget->{w};
3986 $widget->{old_h} = $widget->{h};
3987
3145 $widget->{w} = $w; 3988 $widget->{w} = $w;
3146 $widget->{h} = $h; 3989 $widget->{h} = $h;
3990
3147 $widget->emit (size_allocate => $w, $h, 1); 3991 $widget->emit (size_allocate => $w, $h);
3992 }
3148 } 3993 }
3149 } 3994 }
3150 3995
3151 while ($self->{post_alloc_hook}) { 3996 while ($self->{post_alloc_hook}) {
3152 $_->() 3997 $_->()
3153 for values %{delete $self->{post_alloc_hook}}; 3998 for values %{delete $self->{post_alloc_hook}};
3154 } 3999 }
4000
3155 4001
3156 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4002 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3157 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4003 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3158 glClear GL_COLOR_BUFFER_BIT; 4004 glClear GL_COLOR_BUFFER_BIT;
3159 4005
… …
3161 glLoadIdentity; 4007 glLoadIdentity;
3162 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4008 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3163 glMatrixMode GL_MODELVIEW; 4009 glMatrixMode GL_MODELVIEW;
3164 glLoadIdentity; 4010 glLoadIdentity;
3165 4011
4012 {
4013 package CFClient::UI::Base;
4014
4015 ($draw_x, $draw_y, $draw_w, $draw_h) =
4016 (0, 0, $self->{w}, $self->{h});
4017 }
4018
3166 $self->_draw; 4019 $self->_draw;
3167} 4020}
3168 4021
3169############################################################################# 4022#############################################################################
3170 4023

Diff Legend

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