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.306 by root, Sun Jun 18 17:39:36 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 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before
476 ($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
478}
455 479
456sub find_widget { 480sub find_widget {
457 my ($self, $x, $y) = @_; 481 my ($self, $x, $y) = @_;
458 482
459 return () unless $self->{can_events}; 483 return () unless $self->{can_events};
… …
467 491
468sub set_parent { 492sub set_parent {
469 my ($self, $parent) = @_; 493 my ($self, $parent) = @_;
470 494
471 Scalar::Util::weaken ($self->{parent} = $parent); 495 Scalar::Util::weaken ($self->{parent} = $parent);
472
473 $self->set_visible if $parent->{visible}; 496 $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} 497}
500 498
501sub realloc { 499sub realloc {
502 my ($self) = @_; 500 my ($self) = @_;
503 501
504 return unless $self->{visible}; 502 if ($self->{visible}) {
505
506 return if $self->{root}{realloc}{$self}; 503 return if $self->{root}{realloc}{$self+0};
507 504
508 $self->{root}{realloc}{$self} = $self; 505 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update; 506 $self->{root}->update;
507 } else {
508 delete $self->{req_w};
509 delete $self->{req_h};
510 }
510} 511}
511 512
512sub update { 513sub update {
513 my ($self) = @_; 514 my ($self) = @_;
514 515
515 $self->{parent}->update 516 $self->{parent}->update
516 if $self->{parent}; 517 if $self->{parent};
517} 518}
518 519
520sub reconfigure {
521 my ($self) = @_;
522
523 $self->realloc;
524 $self->update;
525}
526
527# using global variables seems a bit hacky, but passing through all drawing
528# functions seems pointless.
529our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
530
519sub draw { 531sub draw {
520 my ($self) = @_; 532 my ($self) = @_;
521 533
522 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
535
536 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541
542 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
523 545
524 glPushMatrix; 546 glPushMatrix;
525 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
526 $self->_draw;
527 glPopMatrix;
528 548
529 if ($self == $HOVER && $self->{can_hover}) { 549 if ($self == $HOVER && $self->{can_hover}) {
530 my ($x, $y) = @$self{qw(x y)};
531
532 glColor 1, 0.8, 0.5, 0.2; 550 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
533 glEnable GL_BLEND; 551 glEnable GL_BLEND;
534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 552 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
535 glBegin GL_QUADS; 553 glBegin GL_QUADS;
536 glVertex $x , $y; 554 glVertex 0 , 0;
537 glVertex $x + $self->{w}, $y; 555 glVertex $self->{w}, 0;
538 glVertex $x + $self->{w}, $y + $self->{h}; 556 glVertex $self->{w}, $self->{h};
539 glVertex $x , $y + $self->{h}; 557 glVertex 0 , $self->{h};
540 glEnd; 558 glEnd;
541 glDisable GL_BLEND; 559 glDisable GL_BLEND;
542 } 560 }
543 561
544 if ($ENV{PCLIENT_DEBUG}) { 562 if ($ENV{CFPLUS_DEBUG} & 1) {
545 glPushMatrix; 563 glPushMatrix;
546 glColor 1, 1, 0, 1; 564 glColor 1, 1, 0, 1;
547 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 565 glTranslate 0.375, 0.375;
548 glBegin GL_LINE_LOOP; 566 glBegin GL_LINE_LOOP;
549 glVertex 0 , 0; 567 glVertex 0 , 0;
550 glVertex $self->{w} - 1, 0; 568 glVertex $self->{w} - 1, 0;
551 glVertex $self->{w} - 1, $self->{h} - 1; 569 glVertex $self->{w} - 1, $self->{h} - 1;
552 glVertex 0 , $self->{h} - 1; 570 glVertex 0 , $self->{h} - 1;
553 glEnd; 571 glEnd;
554 glPopMatrix; 572 glPopMatrix;
555 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 573 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
556 } 574 }
575
576 $self->_draw;
577 glPopMatrix;
557} 578}
558 579
559sub _draw { 580sub _draw {
560 my ($self) = @_; 581 my ($self) = @_;
561 582
… …
564 585
565sub DESTROY { 586sub DESTROY {
566 my ($self) = @_; 587 my ($self) = @_;
567 588
568 delete $WIDGET{$self+0}; 589 delete $WIDGET{$self+0};
569 #$self->deactivate; 590
591 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
570} 593}
571 594
572############################################################################# 595#############################################################################
573 596
574package CFClient::UI::DrawBG; 597package CFClient::UI::DrawBG;
… …
599 622
600 if ($color && (@$color < 4 || $color->[3])) { 623 if ($color && (@$color < 4 || $color->[3])) {
601 my ($w, $h) = @$self{qw(w h)}; 624 my ($w, $h) = @$self{qw(w h)};
602 625
603 glEnable GL_BLEND; 626 glEnable GL_BLEND;
604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
605 glColor @$color; 628 glColor_premultiply @$color;
606 629
607 glBegin GL_QUADS; 630 glBegin GL_QUADS;
608 glVertex 0 , 0; 631 glVertex 0 , 0;
609 glVertex 0 , $h; 632 glVertex 0 , $h;
610 glVertex $w, $h; 633 glVertex $w, $h;
… …
625 my ($class, %arg) = @_; 648 my ($class, %arg) = @_;
626 $class->SUPER::new (can_events => 0, %arg); 649 $class->SUPER::new (can_events => 0, %arg);
627} 650}
628 651
629sub size_request { 652sub size_request {
630 (0, 0) 653 my ($self) = @_;
654
655 ($self->{w} + 0, $self->{h} + 0)
631} 656}
632 657
633sub draw { } 658sub draw { }
634 659
635############################################################################# 660#############################################################################
… …
639our @ISA = CFClient::UI::Base::; 664our @ISA = CFClient::UI::Base::;
640 665
641sub new { 666sub new {
642 my ($class, %arg) = @_; 667 my ($class, %arg) = @_;
643 668
644 my $children = delete $arg{children} || []; 669 my $children = delete $arg{children};
645 670
646 my $self = $class->SUPER::new ( 671 my $self = $class->SUPER::new (
647 children => [], 672 children => [],
648 can_events => 0, 673 can_events => 0,
649 %arg, 674 %arg,
650 ); 675 );
676
651 $self->add ($_) for @$children; 677 $self->add (@$children)
678 if $children;
652 679
653 $self 680 $self
654} 681}
655 682
656sub add { 683sub add {
… …
704 $x -= $self->{x}; 731 $x -= $self->{x};
705 $y -= $self->{y}; 732 $y -= $self->{y};
706 733
707 my $res; 734 my $res;
708 735
709 for (reverse @{ $self->{children} }) { 736 for (reverse $self->visible_children) {
710 $res = $_->find_widget ($x, $y) 737 $res = $_->find_widget ($x, $y)
711 and return $res; 738 and return $res;
712 } 739 }
713 740
714 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 741 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
735} 762}
736 763
737sub add { 764sub add {
738 my ($self, $child) = @_; 765 my ($self, $child) = @_;
739 766
740 $self->{children} = []; 767 $self->SUPER::remove ($_) for @{ $self->{children} };
741
742 $self->SUPER::add ($child); 768 $self->SUPER::add ($child);
743} 769}
744 770
745sub remove { 771sub remove {
746 my ($self, $widget) = @_; 772 my ($self, $widget) = @_;
… …
755 781
756sub size_request { 782sub size_request {
757 $_[0]{children}[0]->size_request 783 $_[0]{children}[0]->size_request
758} 784}
759 785
760sub size_allocate { 786sub invoke_size_allocate {
761 my ($self, $w, $h, $changed) = @_; 787 my ($self, $w, $h) = @_;
762 788
763 $self->{children}[0]->configure (0, 0, $w, $h); 789 $self->{children}[0]->configure (0, 0, $w, $h);
790
791 1
764} 792}
765 793
766############################################################################# 794#############################################################################
795
796# back-buffered drawing area
767 797
768package CFClient::UI::Window; 798package CFClient::UI::Window;
769 799
770our @ISA = CFClient::UI::Bin::; 800our @ISA = CFClient::UI::Bin::;
771 801
… …
782 812
783 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 813 $ROOT->on_post_alloc ($self => sub { $self->render_child });
784 $self->SUPER::update; 814 $self->SUPER::update;
785} 815}
786 816
787sub size_allocate { 817sub invoke_size_allocate {
788 my ($self, $w, $h, $changed) = @_; 818 my ($self, $w, $h) = @_;
789 819
790 $self->SUPER::size_allocate ($w, $h, $changed);
791 $self->update 820 $self->update;
792 if $changed; 821
822 $self->SUPER::invoke_size_allocate ($w, $h)
793} 823}
794 824
795sub _render { 825sub _render {
826 my ($self) = @_;
827
796 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
797} 829}
798 830
799sub render_child { 831sub render_child {
800 my ($self) = @_; 832 my ($self) = @_;
801 833
802 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
803 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
804 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
805 837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
806 $self->_render; 845 $self->_render;
807 }; 846 };
808} 847}
809 848
810sub _draw { 849sub _draw {
811 my ($self) = @_; 850 my ($self) = @_;
812 851
813 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
814 853
815 my $tex = $self->{texture} 854 my $tex = $self->{texture}
816 or return; 855 or return;
817 856
818 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
820 glColor 1, 1, 1, 1; 859 glColor 0, 0, 0, 1;
821 860
822 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
823 862
824 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
825} 864}
… …
841} 880}
842 881
843sub size_request { 882sub size_request {
844 my ($self) = @_; 883 my ($self) = @_;
845 884
846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
847 886
848 $w = 10 if $self->{scroll_x}; 887 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y}; 888 $h = 10 if $self->{scroll_y};
850 889
851 ($w, $h) 890 ($w, $h)
852} 891}
853 892
854sub size_allocate { 893sub invoke_size_allocate {
855 my ($self, $w, $h, $changed) = @_; 894 my ($self, $w, $h) = @_;
856 895
896 my $child = $self->child;
897
857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859 900
860 $self->child->configure (0, 0, $w, $h); 901 $self->child->configure (0, 0, $w, $h);
861 $self->update; 902 $self->update;
903
904 1
862} 905}
863 906
864sub set_offset { 907sub set_offset {
865 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
866 909
… …
899} 942}
900 943
901sub _render { 944sub _render {
902 my ($self) = @_; 945 my ($self) = @_;
903 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
904 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905 951
906 $self->SUPER::_render; 952 $self->SUPER::_render;
907} 953}
908 954
… …
911package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
912 958
913our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
914 960
915sub new { 961sub new {
916 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
917 965
918 my $self; 966 my $self;
919 967
920 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
921 vertical => 1, 969 vertical => 1,
… …
926 ; 974 ;
927 975
928 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
929 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
930 slider => $slider, 978 slider => $slider,
931 @_, 979 %arg,
932 ); 980 );
933 981
934 $self->{vp}->add ($self->{scrolled});
935 $self->add ($self->{vp});
936 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
937 984
938 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
939} 992}
940 993
941sub update { 994sub update {
942 my ($self) = @_; 995 my ($self) = @_;
943 996
… …
946 # todo: overwrite size_allocate of child 999 # todo: overwrite size_allocate of child
947 my $child = $self->{vp}->child; 1000 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949} 1002}
950 1003
951sub size_allocate { 1004sub invoke_size_allocate {
952 my ($self, $w, $h, $changed) = @_; 1005 my ($self, $w, $h) = @_;
953
954 $self->SUPER::size_allocate ($w, $h, $changed);
955 1006
956 my $child = $self->{vp}->child; 1007 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009
1010 $self->SUPER::invoke_size_allocate ($w, $h)
958} 1011}
959 1012
960#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
961# update viewport offset on scroll 1014# update viewport offset on scroll
962 1015
… …
982 1035
983 if ($self->{bg}) { 1036 if ($self->{bg}) {
984 my ($w, $h) = @$self{qw(w h)}; 1037 my ($w, $h) = @$self{qw(w h)};
985 1038
986 glEnable GL_BLEND; 1039 glEnable GL_BLEND;
987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1040 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
988 glColor @{ $self->{bg} }; 1041 glColor_premultiply @{ $self->{bg} };
989 1042
990 glBegin GL_QUADS; 1043 glBegin GL_QUADS;
991 glVertex 0 , 0; 1044 glVertex 0 , 0;
992 glVertex 0 , $h; 1045 glVertex 0 , $h;
993 glVertex $w, $h; 1046 glVertex $w, $h;
… …
1006 1059
1007our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
1008 1061
1009use CFClient::OpenGL; 1062use CFClient::OpenGL;
1010 1063
1011my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 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); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1014 1071
1015sub new { 1072sub new {
1016 my $class = shift; 1073 my ($class, %arg) = @_;
1017 1074
1018 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
1019 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
1020 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
1021 border => 0.6, 1078 border => 0.6,
1022 is_toplevel => 1,
1023 can_events => 1, 1079 can_events => 1,
1024 @_ 1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
1025 ); 1083 );
1026 1084
1027 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title_widget} = new CFClient::UI::Label
1028 align => 0, 1086 align => 0,
1029 valign => 1, 1087 valign => 1,
1030 text => $self->{title}, 1088 text => $self->{title},
1031 fontsize => $self->{border}; 1089 fontsize => $self->{border},
1090 if exists $self->{title};
1091
1092 if ($self->{has_close_button}) {
1093 $self->{close_button} =
1094 new CFClient::UI::ImageButton
1095 image => 'x1_close.png',
1096 on_activate => sub { $self->hide };
1097
1098 $self->CFClient::UI::Container::add ($self->{close_button});
1099 }
1032 1100
1033 $self 1101 $self
1102}
1103
1104sub add {
1105 my ($self, @widgets) = @_;
1106
1107 $self->SUPER::add (@widgets);
1108 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1109 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1034} 1110}
1035 1111
1036sub border { 1112sub border {
1037 int $_[0]{border} * $::FONTSIZE 1113 int $_[0]{border} * $::FONTSIZE
1038} 1114}
1039 1115
1040sub size_request { 1116sub size_request {
1041 my ($self) = @_; 1117 my ($self) = @_;
1118
1119 $self->{title_widget}->size_request
1120 if $self->{title_widget};
1121
1122 $self->{close_button}->size_request
1123 if $self->{close_button};
1042 1124
1043 my ($w, $h) = $self->SUPER::size_request; 1125 my ($w, $h) = $self->SUPER::size_request;
1044 1126
1045 ( 1127 (
1046 $w + $self->border * 2, 1128 $w + $self->border * 2,
1047 $h + $self->border * 2, 1129 $h + $self->border * 2,
1048 ) 1130 )
1049} 1131}
1050 1132
1051sub size_allocate { 1133sub invoke_size_allocate {
1052 my ($self, $w, $h, $changed) = @_; 1134 my ($self, $w, $h) = @_;
1053 1135
1054 return unless $changed; 1136 if ($self->{title_widget}) {
1137 $self->{title_widget}{w} = $w;
1138 $self->{title_widget}{h} = $h;
1139 $self->{title_widget}->invoke_size_allocate ($w, $h);
1140 }
1055 1141
1142 my $border = $self->border;
1143
1056 $h -= List::Util::max 0, $self->border * 2; 1144 $h -= List::Util::max 0, $border * 2;
1057 $w -= List::Util::max 0, $self->border * 2; 1145 $w -= List::Util::max 0, $border * 2;
1058 1146
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); 1147 $self->child->configure ($border, $border, $w, $h);
1063}
1064 1148
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button};
1151
1152 1
1153}
1154
1065sub button_down { 1155sub invoke_button_down {
1066 my ($self, $ev, $x, $y) = @_; 1156 my ($self, $ev, $x, $y) = @_;
1067 1157
1068 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
1069 my $border = $self->border; 1159 my $border = $self->border;
1070 1160
… …
1083 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
1084 1174
1085 my $dx = $ev->{x} - $ox; 1175 my $dx = $ev->{x} - $ox;
1086 my $dy = $ev->{y} - $oy; 1176 my $dy = $ev->{y} - $oy;
1087 1177
1088 $self->{user_x} = $wx + $dx * $mx;
1089 $self->{user_y} = $wy + $dy * $my;
1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1178 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1179 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1092 $self->move ($self->{user_x}, $self->{user_y}); 1180
1181 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1093 $self->realloc; 1182 $self->realloc;
1094 }; 1183 };
1095 1184
1096 } elsif ($lr ^ $td) { 1185 } elsif ($lr ^ $td) {
1097 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1186 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1100 $self->{motion} = sub { 1189 $self->{motion} = sub {
1101 my ($ev, $x, $y) = @_; 1190 my ($ev, $x, $y) = @_;
1102 1191
1103 ($x, $y) = ($ev->{x}, $ev->{y}); 1192 ($x, $y) = ($ev->{x}, $ev->{y});
1104 1193
1105 $self->{user_x} = $bx + $x - $ox; 1194 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1106 $self->{user_y} = $by + $y - $oy; 1195 # HACK: the next line is required to enforce placement
1107 1196 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1108 $self->move ($self->{user_x}, $self->{user_y});
1109 $self->realloc;
1110 }; 1197 };
1198 } else {
1199 return 0;
1200 }
1201
1111 } 1202 1
1112} 1203}
1113 1204
1114sub button_up { 1205sub invoke_button_up {
1115 my ($self, $ev, $x, $y) = @_; 1206 my ($self, $ev, $x, $y) = @_;
1116 1207
1117 delete $self->{motion}; 1208 ! ! delete $self->{motion}
1118} 1209}
1119 1210
1120sub mouse_motion { 1211sub invoke_mouse_motion {
1121 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1122 1213
1123 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1214 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215
1216 ! ! $self->{motion}
1124} 1217}
1125 1218
1126sub _draw { 1219sub _draw {
1127 my ($self) = @_; 1220 my ($self) = @_;
1128 1221
1222 my $child = $self->{children}[0];
1223
1129 my ($w, $h ) = ($self->{w}, $self->{h}); 1224 my ($w, $h ) = ($self->{w}, $self->{h});
1130 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1225 my ($cw, $ch) = ($child->{w}, $child->{h});
1131 1226
1132 glEnable GL_TEXTURE_2D; 1227 glEnable GL_TEXTURE_2D;
1133 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1134 1229
1135 my $border = $self->border; 1230 my $border = $self->border;
1136 1231
1137 glColor @{ $self->{border_bg} }; 1232 glColor @{ $self->{border_bg} };
1138 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1233 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1139 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1234 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1140 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1235 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1141 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1236 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1142 1237
1143 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1238 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1144 my $bg = $tex[0]; 1239 glColor @{ $self->{bg} };
1145 1240
1146 # TODO: repeat texture not scale 1241 # TODO: repeat texture not scale
1242 # solve this better(?)
1147 my $rep_x = $cw / $bg->{w}; 1243 $bg->{s} = $cw / $bg->{w};
1148 my $rep_y = $ch / $bg->{h}; 1244 $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); 1245 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1156 } 1246 }
1157 1247
1158 glDisable GL_TEXTURE_2D; 1248 glDisable GL_TEXTURE_2D;
1159 1249
1160 $self->{title}->draw if $self->{title};
1161
1162 $self->child->draw; 1250 $child->draw;
1251
1252 if ($self->{title_widget}) {
1253 glTranslate 0, $border - $self->{h};
1254 $self->{title_widget}->_draw;
1255
1256 glTranslate 0, - ($border - $self->{h});
1257 }
1258
1259 $self->{close_button}->draw
1260 if $self->{close_button};
1163} 1261}
1164 1262
1165############################################################################# 1263#############################################################################
1166 1264
1167package CFClient::UI::Table; 1265package CFClient::UI::Table;
… …
1190 1288
1191 $child->set_parent ($self); 1289 $child->set_parent ($self);
1192 $self->{children}[$y][$x] = $child; 1290 $self->{children}[$y][$x] = $child;
1193 1291
1194 $self->realloc; 1292 $self->realloc;
1293}
1294
1295sub remove {
1296 my ($self, $child) = @_;
1297
1298 # TODO: not yet implemented
1195} 1299}
1196 1300
1197# TODO: move to container class maybe? send children a signal on removal? 1301# TODO: move to container class maybe? send children a signal on removal?
1198sub clear { 1302sub clear {
1199 my ($self) = @_; 1303 my ($self) = @_;
… …
1240 (sum @$ws), 1344 (sum @$ws),
1241 (sum @$hs), 1345 (sum @$hs),
1242 ) 1346 )
1243} 1347}
1244 1348
1245sub size_allocate { 1349sub invoke_size_allocate {
1246 my ($self, $w, $h, $changed) = @_; 1350 my ($self, $w, $h) = @_;
1247 1351
1248 my ($ws, $hs) = $self->get_wh; 1352 my ($ws, $hs) = $self->get_wh;
1249 1353
1250 my $req_w = (sum @$ws) || 1; 1354 my $req_w = (sum @$ws) || 1;
1251 my $req_h = (sum @$hs) || 1; 1355 my $req_h = (sum @$hs) || 1;
… …
1282 } 1386 }
1283 1387
1284 $y += $row_h; 1388 $y += $row_h;
1285 } 1389 }
1286 1390
1391 1
1287} 1392}
1288 1393
1289sub find_widget { 1394sub find_widget {
1290 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1291 1396
… …
1328 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1433 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1329 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1434 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1330 ) 1435 )
1331} 1436}
1332 1437
1333sub size_allocate { 1438sub invoke_size_allocate {
1334 my ($self, $w, $h, $changed) = @_; 1439 my ($self, $w, $h) = @_;
1335 1440
1336 my $space = $self->{vertical} ? $h : $w; 1441 my $space = $self->{vertical} ? $h : $w;
1337 my $children = $self->{children}; 1442 my $children = $self->{children};
1338 1443
1339 my @req; 1444 my @req;
… …
1422 ellipsise => 3, # end 1527 ellipsise => 3, # end
1423 layout => (new CFClient::Layout), 1528 layout => (new CFClient::Layout),
1424 fontsize => 1, 1529 fontsize => 1,
1425 align => -1, 1530 align => -1,
1426 valign => -1, 1531 valign => -1,
1427 padding => 2, 1532 padding_x => 2,
1533 padding_y => 2,
1428 can_events => 0, 1534 can_events => 0,
1429 %arg 1535 %arg
1430 ); 1536 );
1431 1537
1432 if (exists $self->{template}) { 1538 if (exists $self->{template}) {
… …
1459 1565
1460 delete $self->{texture}; 1566 delete $self->{texture};
1461 $self->SUPER::update; 1567 $self->SUPER::update;
1462} 1568}
1463 1569
1570sub realloc {
1571 my ($self) = @_;
1572
1573 delete $self->{ox};
1574 $self->SUPER::realloc;
1575}
1576
1464sub set_text { 1577sub set_text {
1465 my ($self, $text) = @_; 1578 my ($self, $text) = @_;
1466 1579
1467 return if $self->{text} eq "T$text"; 1580 return if $self->{text} eq "T$text";
1468 $self->{text} = "T$text"; 1581 $self->{text} = "T$text";
1469 1582
1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1471 $self->{layout}->set_text ($text); 1584 $self->{layout}->set_text ($text);
1472 1585
1586 delete $self->{size_req};
1473 $self->realloc; 1587 $self->realloc;
1588 $self->update;
1474} 1589}
1475 1590
1476sub set_markup { 1591sub set_markup {
1477 my ($self, $markup) = @_; 1592 my ($self, $markup) = @_;
1478 1593
… …
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1597 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1598
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1600 $self->{layout}->set_markup ($markup);
1486 1601
1602 delete $self->{size_req};
1487 $self->realloc; 1603 $self->realloc;
1604 $self->update;
1488} 1605}
1489 1606
1490sub size_request { 1607sub size_request {
1491 my ($self) = @_; 1608 my ($self) = @_;
1492 1609
1610 $self->{size_req} ||= do {
1493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1611 $self->{layout}->set_font ($self->{font}) if $self->{font};
1494 $self->{layout}->set_width ($self->{max_w} || -1); 1612 $self->{layout}->set_width ($self->{max_w} || -1);
1495 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1613 $self->{layout}->set_ellipsise ($self->{ellipsise});
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1614 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498 1616
1499 my ($w, $h) = $self->{layout}->size; 1617 my ($w, $h) = $self->{layout}->size;
1500 1618
1501 if (exists $self->{template}) { 1619 if (exists $self->{template}) {
1502 $self->{template}->set_font ($self->{font}) if $self->{font}; 1620 $self->{template}->set_font ($self->{font}) if $self->{font};
1503 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1504 1622
1505 my ($w2, $h2) = $self->{template}->size; 1623 my ($w2, $h2) = $self->{template}->size;
1506 1624
1507 $w = List::Util::max $w, $w2; 1625 $w = List::Util::max $w, $w2;
1508 $h = List::Util::max $h, $h2; 1626 $h = List::Util::max $h, $h2;
1627 }
1628
1629 [$w, $h]
1509 } 1630 };
1510 1631
1511 ( 1632 @{ $self->{size_req} }
1512 $w + $self->{padding} * 2,
1513 $h + $self->{padding} * 2,
1514 )
1515} 1633}
1516 1634
1517sub size_allocate { 1635sub invoke_size_allocate {
1518 my ($self, $w, $h, $changed) = @_; 1636 my ($self, $w, $h) = @_;
1637
1638 delete $self->{ox};
1519 1639
1520 delete $self->{texture} 1640 delete $self->{texture}
1521 if $changed; 1641 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1642
1643 1
1522} 1644}
1523 1645
1524sub set_fontsize { 1646sub set_fontsize {
1525 my ($self, $fontsize) = @_; 1647 my ($self, $fontsize) = @_;
1526 1648
1527 $self->{fontsize} = $fontsize; 1649 $self->{fontsize} = $fontsize;
1528 delete $self->{texture}; 1650 delete $self->{texture};
1529 1651
1530 $self->realloc; 1652 $self->realloc;
1653}
1654
1655sub reconfigure {
1656 my ($self) = @_;
1657
1658 delete $self->{size_req};
1659
1660 $self->SUPER::reconfigure;
1531} 1661}
1532 1662
1533sub _draw { 1663sub _draw {
1534 my ($self) = @_; 1664 my ($self) = @_;
1535 1665
… …
1541 $self->{layout}->set_width ($self->{w}); 1671 $self->{layout}->set_width ($self->{w});
1542 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1672 $self->{layout}->set_ellipsise ($self->{ellipsise});
1543 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545 1675
1546 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1676 new_from_layout CFClient::Texture $self->{layout}
1677 };
1547 1678
1679 unless (exists $self->{ox}) {
1548 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550 : ($self->{w} - $tex->{w}) * 0.5); 1682 : ($self->{w} - $tex->{w}) * 0.5);
1551 1683
1552 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554 : ($self->{h} - $tex->{h}) * 0.5); 1686 : ($self->{h} - $tex->{h}) * 0.5);
1555
1556 $tex
1557 }; 1687 };
1558 1688
1559 glEnable GL_TEXTURE_2D; 1689 glEnable GL_TEXTURE_2D;
1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1561 1693
1562 if ($tex->{format} == GL_ALPHA) { 1694 if ($tex->{format} == GL_ALPHA) {
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1563 glColor @{$self->{fg}}; 1696 glColor @{$self->{fg}};
1564 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1565 } else { 1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1566 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1567 } 1701 }
1568 1702
1569 glDisable GL_TEXTURE_2D; 1703 glDisable GL_TEXTURE_2D;
1570} 1704}
1571 1705
… …
1588 can_hover => 1, 1722 can_hover => 1,
1589 can_focus => 1, 1723 can_focus => 1,
1590 valign => 0, 1724 valign => 0,
1591 can_events => 1, 1725 can_events => 1,
1592 #text => ... 1726 #text => ...
1727 #hidden => "*",
1593 @_ 1728 @_
1594 ) 1729 )
1595} 1730}
1596 1731
1597sub _set_text { 1732sub _set_text {
… …
1599 1734
1600 delete $self->{cur_h}; 1735 delete $self->{cur_h};
1601 1736
1602 return if $self->{text} eq $text; 1737 return if $self->{text} eq $text;
1603 1738
1604 delete $self->{texture};
1605
1606 $self->{last_activity} = $::NOW; 1739 $self->{last_activity} = $::NOW;
1607 $self->{text} = $text; 1740 $self->{text} = $text;
1608 1741
1609 $text =~ s/./*/g if $self->{hidden}; 1742 $text =~ s/./*/g if $self->{hidden};
1610 $self->{layout}->set_text ("$text "); 1743 $self->{layout}->set_text ("$text ");
1744 delete $self->{size_req};
1611 1745
1612 $self->_emit (changed => $self->{text}); 1746 $self->emit (changed => $self->{text});
1747
1748 $self->realloc;
1749 $self->update;
1613} 1750}
1614 1751
1615sub set_text { 1752sub set_text {
1616 my ($self, $text) = @_; 1753 my ($self, $text) = @_;
1617 1754
1618 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1619 $self->_set_text ($text); 1756 $self->_set_text ($text);
1620
1621 $self->realloc;
1622} 1757}
1623 1758
1624sub get_text { 1759sub get_text {
1625 $_[0]{text} 1760 $_[0]{text}
1626} 1761}
… …
1631 my ($w, $h) = $self->SUPER::size_request; 1766 my ($w, $h) = $self->SUPER::size_request;
1632 1767
1633 ($w + 1, $h) # add 1 for cursor 1768 ($w + 1, $h) # add 1 for cursor
1634} 1769}
1635 1770
1636sub key_down { 1771sub invoke_key_down {
1637 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1638 1773
1639 my $mod = $ev->{mod}; 1774 my $mod = $ev->{mod};
1640 my $sym = $ev->{sym}; 1775 my $sym = $ev->{sym};
1641 my $uni = $ev->{unicode}; 1776 my $uni = $ev->{unicode};
… …
1653 } elsif ($sym == CFClient::SDLK_HOME) { 1788 } elsif ($sym == CFClient::SDLK_HOME) {
1654 $self->{cursor} = 0; 1789 $self->{cursor} = 0;
1655 } elsif ($sym == CFClient::SDLK_END) { 1790 } elsif ($sym == CFClient::SDLK_END) {
1656 $self->{cursor} = length $text; 1791 $self->{cursor} = length $text;
1657 } elsif ($uni == 27) { 1792 } elsif ($uni == 27) {
1658 $self->_emit ('escape'); 1793 $self->emit ('escape');
1659 } elsif ($uni) { 1794 } elsif ($uni) {
1660 substr $text, $self->{cursor}++, 0, chr $uni; 1795 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else {
1797 return 0;
1661 } 1798 }
1662 1799
1663 $self->_set_text ($text); 1800 $self->_set_text ($text);
1664 1801
1665 $self->realloc; 1802 $self->realloc;
1666}
1667 1803
1804 1
1805}
1806
1668sub focus_in { 1807sub invoke_focus_in {
1669 my ($self) = @_; 1808 my ($self) = @_;
1670 1809
1671 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1672 1811
1673 $self->SUPER::focus_in; 1812 $self->SUPER::invoke_focus_in
1674} 1813}
1675 1814
1676sub button_down { 1815sub invoke_button_down {
1677 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1678 1817
1679 $self->SUPER::button_down ($ev, $x, $y); 1818 $self->SUPER::invoke_button_down ($ev, $x, $y);
1680 1819
1681 my $idx = $self->{layout}->xy_to_index ($x, $y); 1820 my $idx = $self->{layout}->xy_to_index ($x, $y);
1682 1821
1683 # byte-index to char-index 1822 # byte-index to char-index
1684 my $text = $self->{text}; 1823 my $text = $self->{text};
1685 utf8::encode $text; 1824 utf8::encode $text;
1686 $self->{cursor} = length substr $text, 0, $idx; 1825 $self->{cursor} = length substr $text, 0, $idx;
1687 1826
1688 $self->_set_text ($self->{text}); 1827 $self->_set_text ($self->{text});
1689 $self->update; 1828 $self->update;
1829
1830 1
1690} 1831}
1691 1832
1692sub mouse_motion { 1833sub invoke_mouse_motion {
1693 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1694# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1835# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1836
1837 1
1695} 1838}
1696 1839
1697sub _draw { 1840sub _draw {
1698 my ($self) = @_; 1841 my ($self) = @_;
1699 1842
1700 local $self->{fg} = $self->{fg}; 1843 local $self->{fg} = $self->{fg};
1701 1844
1702 if ($FOCUS == $self) { 1845 if ($FOCUS == $self) {
1703 glColor @{$self->{active_bg}}; 1846 glColor_premultiply @{$self->{active_bg}};
1704 $self->{fg} = $self->{active_fg}; 1847 $self->{fg} = $self->{active_fg};
1705 } else { 1848 } else {
1706 glColor @{$self->{bg}}; 1849 glColor_premultiply @{$self->{bg}};
1707 } 1850 }
1708 1851
1709 glEnable GL_BLEND; 1852 glEnable GL_BLEND;
1710 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1853 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1711 glBegin GL_QUADS; 1854 glBegin GL_QUADS;
1712 glVertex 0 , 0; 1855 glVertex 0 , 0;
1713 glVertex 0 , $self->{h}; 1856 glVertex 0 , $self->{h};
1714 glVertex $self->{w}, $self->{h}; 1857 glVertex $self->{w}, $self->{h};
1715 glVertex $self->{w}, 0; 1858 glVertex $self->{w}, 0;
… …
1740 1883
1741our @ISA = CFClient::UI::EntryBase::; 1884our @ISA = CFClient::UI::EntryBase::;
1742 1885
1743use CFClient::OpenGL; 1886use CFClient::OpenGL;
1744 1887
1745sub key_down { 1888sub invoke_key_down {
1746 my ($self, $ev) = @_; 1889 my ($self, $ev) = @_;
1747 1890
1748 my $sym = $ev->{sym}; 1891 my $sym = $ev->{sym};
1749 1892
1750 if ($sym == 13) { 1893 if ($sym == 13) {
1751 unshift @{$self->{history}}, 1894 unshift @{$self->{history}},
1752 my $txt = $self->get_text; 1895 my $txt = $self->get_text;
1896
1753 $self->{history_pointer} = -1; 1897 $self->{history_pointer} = -1;
1754 $self->{history_saveback} = ''; 1898 $self->{history_saveback} = '';
1755 $self->_emit (activate => $txt); 1899 $self->emit (activate => $txt);
1756 $self->update; 1900 $self->update;
1757 1901
1758 } elsif ($sym == CFClient::SDLK_UP) { 1902 } elsif ($sym == CFClient::SDLK_UP) {
1759 if ($self->{history_pointer} < 0) { 1903 if ($self->{history_pointer} < 0) {
1760 $self->{history_saveback} = $self->get_text; 1904 $self->{history_saveback} = $self->get_text;
… …
1776 } else { 1920 } else {
1777 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1778 } 1922 }
1779 1923
1780 } else { 1924 } else {
1781 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::invoke_key_down ($ev)
1926 }
1927
1782 } 1928 1
1783
1784} 1929}
1785 1930
1786############################################################################# 1931#############################################################################
1787 1932
1788package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1797 1942
1798sub new { 1943sub new {
1799 my $class = shift; 1944 my $class = shift;
1800 1945
1801 $class->SUPER::new ( 1946 $class->SUPER::new (
1802 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1803 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1804 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1805 can_hover => 1, 1951 can_hover => 1,
1806 align => 0, 1952 align => 0,
1807 valign => 0, 1953 valign => 0,
1808 can_events => 1, 1954 can_events => 1,
1809 @_ 1955 @_
1810 ) 1956 )
1811} 1957}
1812 1958
1813sub activate { }
1814
1815sub button_up { 1959sub invoke_button_up {
1816 my ($self, $ev, $x, $y) = @_; 1960 my ($self, $ev, $x, $y) = @_;
1817 1961
1818 $self->emit ("activate") 1962 $self->emit ("activate")
1819 if $x >= 0 && $x < $self->{w} 1963 if $x >= 0 && $x < $self->{w}
1820 && $y >= 0 && $y < $self->{h}; 1964 && $y >= 0 && $y < $self->{h};
1965
1966 1
1821} 1967}
1822 1968
1823sub _draw { 1969sub _draw {
1824 my ($self) = @_; 1970 my ($self) = @_;
1825 1971
1826 local $self->{fg} = $self->{fg}; 1972 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1827
1828 if ($GRAB == $self) {
1829 $self->{fg} = $self->{active_fg};
1830 }
1831 1973
1832 glEnable GL_TEXTURE_2D; 1974 glEnable GL_TEXTURE_2D;
1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1975 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834 glColor 0, 0, 0, 1; 1976 glColor 0, 0, 0, 1;
1835 1977
… …
1840 $self->SUPER::_draw; 1982 $self->SUPER::_draw;
1841} 1983}
1842 1984
1843############################################################################# 1985#############################################################################
1844 1986
1987package CFClient::UI::ImageButton;
1988
1989our @ISA = CFClient::UI::Image::;
1990
1991use CFClient::OpenGL;
1992
1993my %textures;
1994
1995sub new {
1996 my $class = shift;
1997
1998 my $self = $class->SUPER::new (
1999 padding_x => 4,
2000 padding_y => 4,
2001 fg => [1, 1, 1],
2002 active_fg => [0, 0, 1],
2003 can_hover => 1,
2004 align => 0,
2005 valign => 0,
2006 can_events => 1,
2007 @_
2008 );
2009}
2010
2011sub invoke_button_up {
2012 my ($self, $ev, $x, $y) = @_;
2013
2014 $self->emit ("activate")
2015 if $x >= 0 && $x < $self->{w}
2016 && $y >= 0 && $y < $self->{h};
2017
2018 1
2019}
2020
2021#############################################################################
2022
1845package CFClient::UI::CheckBox; 2023package CFClient::UI::CheckBox;
1846 2024
1847our @ISA = CFClient::UI::DrawBG::; 2025our @ISA = CFClient::UI::DrawBG::;
1848 2026
1849my @tex = 2027my @tex =
… …
1854 2032
1855sub new { 2033sub new {
1856 my $class = shift; 2034 my $class = shift;
1857 2035
1858 $class->SUPER::new ( 2036 $class->SUPER::new (
1859 padding => 2, 2037 padding_x => 2,
2038 padding_y => 2,
1860 fg => [1, 1, 1], 2039 fg => [1, 1, 1],
1861 active_fg => [1, 1, 0], 2040 active_fg => [1, 1, 0],
1862 bg => [0, 0, 0, 0.2], 2041 bg => [0, 0, 0, 0.2],
1863 active_bg => [1, 1, 1, 0.5], 2042 active_bg => [1, 1, 1, 0.5],
1864 state => 0, 2043 state => 0,
… …
1868} 2047}
1869 2048
1870sub size_request { 2049sub size_request {
1871 my ($self) = @_; 2050 my ($self) = @_;
1872 2051
1873 ($self->{padding} * 2 + 6) x 2 2052 (6) x 2
1874} 2053}
1875 2054
1876sub button_down { 2055sub invoke_button_down {
1877 my ($self, $ev, $x, $y) = @_; 2056 my ($self, $ev, $x, $y) = @_;
1878 2057
1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2058 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2059 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881 $self->{state} = !$self->{state}; 2060 $self->{state} = !$self->{state};
1882 $self->_emit (changed => $self->{state}); 2061 $self->emit (changed => $self->{state});
2062 } else {
2063 return 0
2064 }
2065
1883 } 2066 1
1884} 2067}
1885 2068
1886sub _draw { 2069sub _draw {
1887 my ($self) = @_; 2070 my ($self) = @_;
1888 2071
1889 $self->SUPER::_draw; 2072 $self->SUPER::_draw;
1890 2073
1891 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2074 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892 2075
1893 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2076 my ($w, $h) = @$self{qw(w h)};
2077
2078 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894 2079
1895 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2080 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896 2081
1897 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2082 my $tex = $self->{state} ? $tex[1] : $tex[0];
1898 2083
… …
2053 2238
2054 my $h1 = $self->{h} * (1 - $ycut1); 2239 my $h1 = $self->{h} * (1 - $ycut1);
2055 my $h2 = $self->{h} * (1 - $ycut2); 2240 my $h2 = $self->{h} * (1 - $ycut2);
2056 2241
2057 glEnable GL_BLEND; 2242 glEnable GL_BLEND;
2058 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2243 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2244 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2059 glEnable GL_TEXTURE_2D; 2245 glEnable GL_TEXTURE_2D;
2060 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2246 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2061 2247
2062 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2248 glBindTexture GL_TEXTURE_2D, $t1->{name};
2063 glBegin GL_QUADS; 2249 glBegin GL_QUADS;
… …
2163 fg => [1, 1, 1], 2349 fg => [1, 1, 1],
2164 active_fg => [0, 0, 0], 2350 active_fg => [0, 0, 0],
2165 bg => [0, 0, 0, 0.2], 2351 bg => [0, 0, 0, 0.2],
2166 active_bg => [1, 1, 1, 0.5], 2352 active_bg => [1, 1, 1, 0.5],
2167 range => [0, 0, 100, 10, 0], 2353 range => [0, 0, 100, 10, 0],
2168 req_w => $::WIDTH / 80, 2354 min_w => $::WIDTH / 80,
2169 req_h => $::WIDTH / 80, 2355 min_h => $::WIDTH / 80,
2170 vertical => 0, 2356 vertical => 0,
2171 can_hover => 1, 2357 can_hover => 1,
2172 inner_pad => 0.02, 2358 inner_pad => 0.02,
2173 @_ 2359 @_
2174 ); 2360 );
… …
2177 $self->update; 2363 $self->update;
2178 2364
2179 $self 2365 $self
2180} 2366}
2181 2367
2182sub changed { }
2183
2184sub set_range { 2368sub set_range {
2185 my ($self, $range) = @_; 2369 my ($self, $range) = @_;
2186 2370
2187 ($range, $self->{range}) = ($self->{range}, $range); 2371 ($range, $self->{range}) = ($self->{range}, $range);
2188 2372
2189 $self->update
2190 if "@$range" ne "@{$self->{range}}"; 2373 if ("@$range" ne "@{$self->{range}}") {
2374 $self->update;
2375 $self->set_value ($self->{range}[0]);
2376 }
2191} 2377}
2192 2378
2193sub set_value { 2379sub set_value {
2194 my ($self, $value) = @_; 2380 my ($self, $value) = @_;
2195 2381
… …
2206 if $unit; 2392 if $unit;
2207 2393
2208 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2394 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2209 2395
2210 if ($value != $old_value) { 2396 if ($value != $old_value) {
2211 $self->_emit (changed => $value); 2397 $self->emit (changed => $value);
2212 $self->update; 2398 $self->update;
2213 } 2399 }
2214} 2400}
2215 2401
2216sub size_request { 2402sub size_request {
2217 my ($self) = @_; 2403 my ($self) = @_;
2218 2404
2219 my $w = $self->{req_w}; 2405 ($self->{req_w}, $self->{req_h})
2220 my $h = $self->{req_h};
2221
2222 $self->{vertical} ? ($h, $w) : ($w, $h)
2223} 2406}
2224 2407
2225sub button_down { 2408sub invoke_button_down {
2226 my ($self, $ev, $x, $y) = @_; 2409 my ($self, $ev, $x, $y) = @_;
2227 2410
2228 $self->SUPER::button_down ($ev, $x, $y); 2411 $self->SUPER::invoke_button_down ($ev, $x, $y);
2229 2412
2230 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2413 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2231 2414
2232 $self->mouse_motion ($ev, $x, $y); 2415 $self->mouse_motion ($ev, $x, $y)
2233} 2416}
2234 2417
2235sub mouse_motion { 2418sub invoke_mouse_motion {
2236 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2237 2420
2238 if ($GRAB == $self) { 2421 if ($GRAB == $self) {
2239 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2422 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2240 2423
2241 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2424 my (undef, $lo, $hi, $page) = @{$self->{range}};
2242 2425
2243 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2426 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2244 2427
2245 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2428 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2429 } else {
2430 return 0;
2431 }
2432
2246 } 2433 1
2247} 2434}
2248 2435
2249sub update { 2436sub update {
2250 my ($self) = @_; 2437 my ($self) = @_;
2251 2438
2252 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2439 delete $self->{knob_w};
2440 $self->SUPER::update;
2441}
2442
2443sub _draw {
2444 my ($self) = @_;
2445
2446 unless ($self->{knob_w}) {
2253 $self->set_value ($self->{range}[0]); 2447 $self->set_value ($self->{range}[0]);
2254 2448
2255 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2449 my ($value, $lo, $hi, $page) = @{$self->{range}};
2256 my $range = ($hi - $page - $lo) || 1e-100; 2450 my $range = ($hi - $page - $lo) || 1e-100;
2257 2451
… …
2263 $value = ($value - $lo) / $range; 2457 $value = ($value - $lo) / $range;
2264 $value = $value * $self->{scale} + $self->{offset}; 2458 $value = $value * $self->{scale} + $self->{offset};
2265 2459
2266 $self->{knob_x} = $value - $knob_w * 0.5; 2460 $self->{knob_x} = $value - $knob_w * 0.5;
2267 $self->{knob_w} = $knob_w; 2461 $self->{knob_w} = $knob_w;
2268 }); 2462 }
2269
2270 $self->SUPER::update;
2271}
2272
2273sub _draw {
2274 my ($self) = @_;
2275 2463
2276 $self->SUPER::_draw (); 2464 $self->SUPER::_draw ();
2277 2465
2278 glScale $self->{w}, $self->{h}; 2466 glScale $self->{w}, $self->{h};
2279 2467
… …
2340sub set_range { shift->{slider}->set_range (@_) } 2528sub set_range { shift->{slider}->set_range (@_) }
2341sub set_value { shift->{slider}->set_value (@_) } 2529sub set_value { shift->{slider}->set_value (@_) }
2342 2530
2343############################################################################# 2531#############################################################################
2344 2532
2345package CFClient::UI::TextView; 2533package CFClient::UI::TextScroller;
2346 2534
2347our @ISA = CFClient::UI::HBox::; 2535our @ISA = CFClient::UI::HBox::;
2348 2536
2349use CFClient::OpenGL; 2537use CFClient::OpenGL;
2350 2538
… …
2352 my $class = shift; 2540 my $class = shift;
2353 2541
2354 my $self = $class->SUPER::new ( 2542 my $self = $class->SUPER::new (
2355 fontsize => 1, 2543 fontsize => 1,
2356 can_events => 0, 2544 can_events => 0,
2545 indent => 0,
2357 #font => default_font 2546 #font => default_font
2358 @_, 2547 @_,
2359 2548
2360 layout => (new CFClient::Layout 1), 2549 layout => (new CFClient::Layout 1),
2361 par => [], 2550 par => [],
… …
2376 2565
2377 $self->{fontsize} = $fontsize; 2566 $self->{fontsize} = $fontsize;
2378 $self->reflow; 2567 $self->reflow;
2379} 2568}
2380 2569
2381sub size_allocate { 2570sub invoke_size_allocate {
2382 my ($self, $w, $h, $changed) = @_; 2571 my ($self, $w, $h) = @_;
2383
2384 $self->SUPER::size_allocate ($w, $h, $changed);
2385
2386 return unless $changed;
2387 2572
2388 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2573 $self->{layout}->set_font ($self->{font}) if $self->{font};
2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2574 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2390 $self->{layout}->set_width ($self->{children}[0]{w}); 2575 $self->{layout}->set_width ($self->{children}[0]{w});
2576 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2391 2577
2392 $self->reflow; 2578 $self->reflow;
2579
2580 $self->SUPER::invoke_size_allocate ($w, $h)
2393} 2581}
2394 2582
2395sub text_size { 2583sub text_size {
2396 my ($self, $text, $indent) = @_; 2584 my ($self, $text, $indent) = @_;
2397 2585
2398 my $layout = $self->{layout}; 2586 my $layout = $self->{layout};
2399 2587
2400 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2588 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2401 $layout->set_width ($self->{children}[0]{w} - $indent); 2589 $layout->set_width ($self->{children}[0]{w} - $indent);
2590 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2402 $layout->set_markup ($text); 2591 $layout->set_markup ($text);
2403 2592
2404 $layout->size 2593 $layout->size
2405} 2594}
2406 2595
… …
2445 2634
2446 return unless $self->{h} > 0; 2635 return unless $self->{h} > 0;
2447 2636
2448 delete $self->{texture}; 2637 delete $self->{texture};
2449 2638
2450 $ROOT->on_post_alloc ($self, sub { 2639 $ROOT->on_post_alloc ($self => sub {
2451 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2640 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2452 2641
2453 if (delete $self->{need_reflow}) { 2642 if (delete $self->{need_reflow}) {
2454 my $height = 0; 2643 my $height = 0;
2455 2644
… …
2458 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2647 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2459 2648
2460 for (@{$self->{par}}) { 2649 for (@{$self->{par}}) {
2461 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2650 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2462 $layout->set_width ($W - $_->[3]); 2651 $layout->set_width ($W - $_->[3]);
2652 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2463 $layout->set_markup ($_->[4]); 2653 $layout->set_markup ($_->[4]);
2464 my ($w, $h) = $layout->size; 2654 my ($w, $h) = $layout->size;
2465 $_->[0] = $w + $_->[3]; 2655 $_->[0] = $w + $_->[3];
2466 $_->[1] = $h; 2656 $_->[1] = $h;
2467 } 2657 }
… …
2470 } 2660 }
2471 2661
2472 $self->{height} = $height; 2662 $self->{height} = $height;
2473 2663
2474 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2664 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2475 2665
2476 delete $self->{texture}; 2666 delete $self->{texture};
2477 } 2667 }
2478 2668
2479 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2669 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2480 glClearColor 0.5, 0.5, 0.5, 0; 2670 glClearColor 0, 0, 0, 0;
2481 glClear GL_COLOR_BUFFER_BIT; 2671 glClear GL_COLOR_BUFFER_BIT;
2482 2672
2483 my $top = int $self->{children}[1]{range}[0]; 2673 my $top = int $self->{children}[1]{range}[0];
2484 2674
2485 my $y0 = $top; 2675 my $y0 = $top;
… …
2499 my $h = $par->[1]; 2689 my $h = $par->[1];
2500 2690
2501 if ($y0 < $y + $h && $y < $y1) { 2691 if ($y0 < $y + $h && $y < $y1) {
2502 $layout->set_foreground (@{ $par->[2] }); 2692 $layout->set_foreground (@{ $par->[2] });
2503 $layout->set_width ($W - $par->[3]); 2693 $layout->set_width ($W - $par->[3]);
2694 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2504 $layout->set_markup ($par->[4]); 2695 $layout->set_markup ($par->[4]);
2505 2696
2506 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2697 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2507 2698
2508 glRasterPos $par->[3], $y - $y0; 2699 glRasterPos $par->[3], $y - $y0;
… …
2520sub _draw { 2711sub _draw {
2521 my ($self) = @_; 2712 my ($self) = @_;
2522 2713
2523 glEnable GL_TEXTURE_2D; 2714 glEnable GL_TEXTURE_2D;
2524 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2525 glColor 1, 1, 1, 1; 2716 glColor 0, 0, 0, 1;
2526 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2717 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2527 glDisable GL_TEXTURE_2D; 2718 glDisable GL_TEXTURE_2D;
2528 2719
2529 $self->{children}[1]->draw; 2720 $self->{children}[1]->draw;
2530 2721
2531} 2722}
… …
2614} 2805}
2615 2806
2616sub set_tooltip_from { 2807sub set_tooltip_from {
2617 my ($self, $widget) = @_; 2808 my ($self, $widget) = @_;
2618 2809
2810 my $tooltip = $widget->{tooltip};
2811
2812 if ($ENV{CFPLUS_DEBUG} & 2) {
2813 $tooltip .= "\n\n" . (ref $widget) . "\n"
2814 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2815 . "req $widget->{req_w} $widget->{req_h}\n"
2816 . "visible $widget->{visible}";
2817 }
2818
2819 $tooltip =~ s/^\n+//;
2820 $tooltip =~ s/\n+$//;
2821
2619 $self->add (new CFClient::UI::Label 2822 $self->add (new CFClient::UI::Label
2620 markup => $widget->{tooltip}, 2823 markup => $tooltip,
2621 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2824 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2622 fontsize => 0.8, 2825 fontsize => 0.8,
2623 fg => [0, 0, 0, 1], 2826 fg => [0, 0, 0, 1],
2624 ellipsise => 0, 2827 ellipsise => 0,
2625 font => ($widget->{tooltip_font} || $::FONT_PROP), 2828 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2632 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2835 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2633 2836
2634 ($w + 4, $h + 4) 2837 ($w + 4, $h + 4)
2635} 2838}
2636 2839
2637sub size_allocate { 2840sub invoke_size_allocate {
2638 my ($self, $w, $h, $changed) = @_; 2841 my ($self, $w, $h) = @_;
2639 2842
2640 return unless $changed;
2641
2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2843 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2844}
2845
2846sub invoke_visibility_change {
2847 my ($self, $visible) = @_;
2848
2849 return unless $visible;
2850
2851 $self->{root}->on_post_alloc ("move_$self" => sub {
2852 my $widget = $self->{owner}
2853 or return;
2854
2855 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2856
2857 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2858 if $x + $self->{w} > $self->{root}{w};
2859
2860 $self->move_abs ($x, $y);
2861 });
2643} 2862}
2644 2863
2645sub _draw { 2864sub _draw {
2646 my ($self) = @_; 2865 my ($self) = @_;
2647 2866
… …
2664 glVertex $w, $h; 2883 glVertex $w, $h;
2665 glVertex $w, 0; 2884 glVertex $w, 0;
2666 glEnd; 2885 glEnd;
2667 2886
2668 glTranslate 2 - 0.375, 2 - 0.375; 2887 glTranslate 2 - 0.375, 2 - 0.375;
2888
2669 $self->SUPER::_draw; 2889 $self->SUPER::_draw;
2670} 2890}
2671 2891
2672############################################################################# 2892#############################################################################
2673 2893
… …
2732 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2952 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2733 2953
2734 if ($tex) { 2954 if ($tex) {
2735 glEnable GL_TEXTURE_2D; 2955 glEnable GL_TEXTURE_2D;
2736 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2737 glColor 1, 1, 1, 1; 2957 glColor 0, 0, 0, 1;
2738 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2958 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2739 glDisable GL_TEXTURE_2D; 2959 glDisable GL_TEXTURE_2D;
2740 } 2960 }
2741} 2961}
2742 2962
2743sub DESTROY { 2963sub destroy {
2744 my ($self) = @_; 2964 my ($self) = @_;
2745 2965
2746 $self->{timer}->cancel 2966 $self->{timer}->cancel
2747 if $self->{timer}; 2967 if $self->{timer};
2748 2968
2749 $self->SUPER::DESTROY; 2969 $self->SUPER::destroy;
2750} 2970}
2751 2971
2752############################################################################# 2972#############################################################################
2753 2973
2754package CFClient::UI::Inventory; 2974package CFClient::UI::Buttonbar;
2755 2975
2756our @ISA = CFClient::UI::ScrolledWindow::; 2976our @ISA = CFClient::UI::HBox::;
2757 2977
2758sub new { 2978# 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 2979
2794############################################################################# 2980#############################################################################
2795 2981
2796package CFClient::UI::Menu; 2982package CFClient::UI::Menu;
2797 2983
… …
2809 ); 2995 );
2810 2996
2811 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2997 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2812 2998
2813 for my $item (@{ $self->{items} }) { 2999 for my $item (@{ $self->{items} }) {
2814 my ($widget, $cb) = @$item; 3000 my ($widget, $cb, $tooltip) = @$item;
2815 3001
2816 # handle various types of items, only text for now 3002 # handle various types of items, only text for now
2817 if (!ref $widget) { 3003 if (!ref $widget) {
2818 $widget = new CFClient::UI::Label 3004 $widget = new CFClient::UI::Label
2819 can_hover => 1, 3005 can_hover => 1,
2820 can_events => 1, 3006 can_events => 1,
2821 text => $widget; 3007 markup => $widget,
3008 tooltip => $tooltip
2822 } 3009 }
2823 3010
2824 $self->{item}{$widget} = $item; 3011 $self->{item}{$widget} = $item;
2825 3012
2826 $self->{vbox}->add ($widget); 3013 $self->{vbox}->add ($widget);
… …
2831 3018
2832# popup given the event (must be a mouse button down event currently) 3019# popup given the event (must be a mouse button down event currently)
2833sub popup { 3020sub popup {
2834 my ($self, $ev) = @_; 3021 my ($self, $ev) = @_;
2835 3022
2836 $self->_emit ("popdown"); 3023 $self->emit ("popdown");
2837 3024
2838 # maybe save $GRAB? must be careful about events... 3025 # maybe save $GRAB? must be careful about events...
2839 $GRAB = $self; 3026 $GRAB = $self;
2840 $self->{button} = $ev->{button}; 3027 $self->{button} = $ev->{button};
2841 3028
2842 $self->show; 3029 $self->show;
2843 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3030 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2844} 3031}
2845 3032
2846sub mouse_motion { 3033sub invoke_mouse_motion {
2847 my ($self, $ev, $x, $y) = @_; 3034 my ($self, $ev, $x, $y) = @_;
2848 3035
2849 # TODO: should use vbox->find_widget or so 3036 # TODO: should use vbox->find_widget or so
2850 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3037 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2851 $self->{hover} = $self->{item}{$HOVER}; 3038 $self->{hover} = $self->{item}{$HOVER};
2852}
2853 3039
3040 0
3041}
3042
2854sub button_up { 3043sub invoke_button_up {
2855 my ($self, $ev, $x, $y) = @_; 3044 my ($self, $ev, $x, $y) = @_;
2856 3045
2857 if ($ev->{button} == $self->{button}) { 3046 if ($ev->{button} == $self->{button}) {
2858 undef $GRAB; 3047 undef $GRAB;
2859 $self->hide; 3048 $self->hide;
2860 3049
2861 $self->_emit ("popdown"); 3050 $self->emit ("popdown");
2862 $self->{hover}[1]->() if $self->{hover}; 3051 $self->{hover}[1]->() if $self->{hover};
3052 } else {
3053 return 0
3054 }
3055
2863 } 3056 1
2864} 3057}
2865 3058
2866############################################################################# 3059#############################################################################
2867 3060
2868package CFClient::UI::Statusbox; 3061package CFClient::UI::Multiplexer;
2869 3062
2870our @ISA = CFClient::UI::VBox::; 3063our @ISA = CFClient::UI::Container::;
2871 3064
2872sub new { 3065sub new {
2873 my $class = shift; 3066 my $class = shift;
2874 3067
2875 $class->SUPER::new ( 3068 my $self = $class->SUPER::new (
3069 @_,
3070 );
3071
3072 $self->{current} = $self->{children}[0]
3073 if @{ $self->{children} };
3074
3075 $self
3076}
3077
3078sub add {
3079 my ($self, @widgets) = @_;
3080
3081 $self->SUPER::add (@widgets);
3082
3083 $self->{current} = $self->{children}[0]
3084 if @{ $self->{children} };
3085}
3086
3087sub set_current_page {
3088 my ($self, $page_or_widget) = @_;
3089
3090 my $widget = ref $page_or_widget
3091 ? $page_or_widget
3092 : $self->{children}[$page_or_widget];
3093
3094 $self->{current} = $widget;
3095 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3096
3097 $self->emit (page_changed => $self->{current});
3098
3099 $self->realloc;
3100}
3101
3102sub visible_children {
3103 $_[0]{current}
3104}
3105
3106sub size_request {
3107 my ($self) = @_;
3108
3109 $self->{current}->size_request
3110}
3111
3112sub invoke_size_allocate {
3113 my ($self, $w, $h) = @_;
3114
3115 $self->{current}->configure (0, 0, $w, $h);
3116
3117 1
3118}
3119
3120sub _draw {
3121 my ($self) = @_;
3122
3123 $self->{current}->draw;
3124}
3125
3126#############################################################################
3127
3128package CFClient::UI::Notebook;
3129
3130our @ISA = CFClient::UI::VBox::;
3131
3132sub new {
3133 my $class = shift;
3134
3135 my $self = $class->SUPER::new (
3136 buttonbar => (new CFClient::UI::Buttonbar),
3137 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3138 # filter => # will be put between multiplexer and $self
3139 @_,
3140 );
3141
3142 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3143 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3144
3145 $self
3146}
3147
3148sub add {
3149 my ($self, $title, $widget, $tooltip) = @_;
3150
3151 Scalar::Util::weaken $self;
3152
3153 $self->{buttonbar}->add (new CFClient::UI::Button
3154 markup => $title,
3155 tooltip => $tooltip,
3156 on_activate => sub { $self->set_current_page ($widget) },
3157 );
3158
3159 $self->{multiplexer}->add ($widget);
3160}
3161
3162sub set_current_page {
3163 my ($self, $page) = @_;
3164
3165 $self->{multiplexer}->set_current_page ($page);
3166 $self->emit (page_changed => $self->{multiplexer}{current});
3167}
3168
3169#############################################################################
3170
3171package CFClient::UI::Combobox;
3172
3173use utf8;
3174
3175our @ISA = CFClient::UI::Button::;
3176
3177sub new {
3178 my $class = shift;
3179
3180 my $self = $class->SUPER::new (
3181 options => [], # [value, title, longdesc], ...
3182 value => undef,
3183 @_,
3184 );
3185
3186 $self->_set_value ($self->{value});
3187
3188 $self
3189}
3190
3191sub invoke_button_down {
3192 my ($self, $ev) = @_;
3193
3194 my @menu_items;
3195
3196 for (@{ $self->{options} }) {
3197 my ($value, $title, $tooltip) = @$_;
3198
3199 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3200 }
3201
3202 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3203}
3204
3205sub _set_value {
3206 my ($self, $value) = @_;
3207
3208 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3209 or return;
3210
3211 $self->{value} = $item->[0];
3212 $self->set_markup ("$item->[1] ⇓");
3213 $self->set_tooltip ($item->[2]);
3214}
3215
3216sub set_value {
3217 my ($self, $value) = @_;
3218
3219 return unless $self->{value} ne $value;
3220
3221 $self->_set_value ($value);
3222 $self->emit (changed => $value);
3223}
3224
3225#############################################################################
3226
3227package CFClient::UI::Statusbox;
3228
3229our @ISA = CFClient::UI::VBox::;
3230
3231sub new {
3232 my $class = shift;
3233
3234 my $self = $class->SUPER::new (
2876 fontsize => 0.8, 3235 fontsize => 0.8,
2877 @_, 3236 @_,
2878 ) 3237 );
3238
3239 Scalar::Util::weaken (my $this = $self);
3240
3241 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3242
3243 $self
2879} 3244}
2880 3245
2881sub reorder { 3246sub reorder {
2882 my ($self) = @_; 3247 my ($self) = @_;
2883 my $NOW = time; 3248 my $NOW = Time::HiRes::time;
3249
3250 # freeze display when hovering over any label
3251 return if $CFClient::UI::TOOLTIP->{owner}
3252 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3253 values %{ $self->{item} };
2884 3254
2885 while (my ($k, $v) = each %{ $self->{item} }) { 3255 while (my ($k, $v) = each %{ $self->{item} }) {
2886 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3256 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2887 } 3257 }
2888 3258
… …
2891 my @items = sort { 3261 my @items = sort {
2892 $a->{pri} <=> $b->{pri} 3262 $a->{pri} <=> $b->{pri}
2893 or $b->{id} <=> $a->{id} 3263 or $b->{id} <=> $a->{id}
2894 } values %{ $self->{item} }; 3264 } values %{ $self->{item} };
2895 3265
3266 $self->{timer}->interval (1);
3267
2896 my $count = 10 + 1; 3268 my $count = 10 + 1;
2897 for my $item (@items) { 3269 for my $item (@items) {
2898 last unless --$count; 3270 last unless --$count;
2899 3271
2900 push @widgets, $item->{label} ||= do { 3272 my $label = $item->{label} ||= do {
2901 # TODO: doesn't handle markup well (read as: at all) 3273 # TODO: doesn't handle markup well (read as: at all)
2902 my $short = $item->{count} > 1 3274 my $short = $item->{count} > 1
2903 ? "<b>$item->{count} ×</b> $item->{text}" 3275 ? "<b>$item->{count} ×</b> $item->{text}"
2904 : $item->{text}; 3276 : $item->{text};
2905 3277
… …
2913 tooltip => $item->{tooltip}, 3285 tooltip => $item->{tooltip},
2914 tooltip_font => $::FONT_PROP, 3286 tooltip_font => $::FONT_PROP,
2915 tooltip_width => 0.67, 3287 tooltip_width => 0.67,
2916 fontsize => $item->{fontsize} || $self->{fontsize}, 3288 fontsize => $item->{fontsize} || $self->{fontsize},
2917 max_w => $::WIDTH * 0.44, 3289 max_w => $::WIDTH * 0.44,
2918 fg => $item->{fg}, 3290 fg => [@{ $item->{fg} }],
2919 can_events => 1, 3291 can_events => 1,
2920 can_hover => 1 3292 can_hover => 1
2921 }; 3293 };
3294
3295 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3296 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3297 $label->update;
3298 $label->set_max_size (undef, $label->{req_h} * $diff)
3299 if $diff < 1;
3300 $self->{timer}->interval (1/30);
3301 } else {
3302 $label->{fg}[3] = $item->{fg}[3] || 1;
3303 }
3304
3305 push @widgets, $label;
2922 } 3306 }
2923 3307
2924 $self->clear; 3308 $self->clear;
2925 $self->SUPER::add (reverse @widgets); 3309 $self->SUPER::add (reverse @widgets);
2926} 3310}
… …
2931 $text =~ s/^\s+//; 3315 $text =~ s/^\s+//;
2932 $text =~ s/\s+$//; 3316 $text =~ s/\s+$//;
2933 3317
2934 return unless $text; 3318 return unless $text;
2935 3319
2936 my $timeout = time + ((delete $arg{timeout}) || 60); 3320 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2937 3321
2938 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3322 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2939 3323
2940 if (my $item = $self->{item}{$group}) { 3324 if (my $item = $self->{item}{$group}) {
2941 if ($item->{text} eq $text) { 3325 if ($item->{text} eq $text) {
2942 $item->{count}++; 3326 $item->{count}++;
2943 } else { 3327 } else {
2944 $item->{count} = 1; 3328 $item->{count} = 1;
2945 $item->{text} = $item->{tooltip} = $text; 3329 $item->{text} = $item->{tooltip} = $text;
2946 } 3330 }
2947 $item->{id} = ++$self->{id}; 3331 $item->{id} += 0.2;#d#
2948 $item->{timeout} = $timeout; 3332 $item->{timeout} = $timeout;
2949 delete $item->{label}; 3333 delete $item->{label};
2950 } else { 3334 } else {
2951 $self->{item}{$group} = { 3335 $self->{item}{$group} = {
2952 id => ++$self->{id}, 3336 id => ++$self->{id},
… …
2971 3355
2972 $self->reorder; 3356 $self->reorder;
2973 $self->SUPER::reconfigure; 3357 $self->SUPER::reconfigure;
2974} 3358}
2975 3359
3360sub destroy {
3361 my ($self) = @_;
3362
3363 $self->{timer}->cancel;
3364
3365 $self->SUPER::destroy;
3366}
3367
2976############################################################################# 3368#############################################################################
2977 3369
3370package CFClient::UI::Inventory;
3371
3372our @ISA = CFClient::UI::ScrolledWindow::;
3373
3374sub new {
3375 my $class = shift;
3376
3377 my $self = $class->SUPER::new (
3378 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3379 @_,
3380 );
3381
3382 $self
3383}
3384
3385sub set_items {
3386 my ($self, $items) = @_;
3387
3388 $self->{child}->clear;
3389 return unless $items;
3390
3391 my @items = sort {
3392 ($a->{type} <=> $b->{type})
3393 or ($a->{name} cmp $b->{name})
3394 } @$items;
3395
3396 $self->{real_items} = \@items;
3397
3398 my $row = 0;
3399 for my $item (@items) {
3400 CFClient::Item::update_widgets $item;
3401
3402 $self->{child}->add (0, $row, $item->{face_widget});
3403 $self->{child}->add (1, $row, $item->{desc_widget});
3404 $self->{child}->add (2, $row, $item->{weight_widget});
3405
3406 $row++;
3407 }
3408}
3409
3410#############################################################################
3411
3412package CFClient::UI::BindEditor;
3413
3414our @ISA = CFClient::UI::FancyFrame::;
3415
3416sub new {
3417 my $class = shift;
3418
3419 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3420
3421 $self->add (my $vb = new CFClient::UI::VBox);
3422
3423
3424 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3425 text => "start recording",
3426 tooltip => "Start/Stops recording of actions."
3427 ."All subsequent actions after the recording started will be captured."
3428 ."The actions are displayed after the record was stopped."
3429 ."To bind the action you have to click on the 'Bind' button",
3430 on_activate => sub {
3431 unless ($self->{recording}) {
3432 $self->start;
3433 } else {
3434 $self->stop;
3435 }
3436 });
3437
3438 $vb->add (new CFClient::UI::Label text => "Actions:");
3439 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3440
3441 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3442 $vb->add (my $hb = new CFClient::UI::HBox);
3443 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3444 $hb->add (new CFClient::UI::Button
3445 text => "bind",
3446 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3447 on_activate => sub {
3448 $self->ask_for_bind;
3449 });
3450
3451 $vb->add (my $hb = new CFClient::UI::HBox);
3452 $hb->add (new CFClient::UI::Button
3453 text => "ok",
3454 expand => 1,
3455 tooltip => "This closes the binding editor and saves the binding",
3456 on_activate => sub {
3457 $self->hide;
3458 $self->commit;
3459 });
3460
3461 $hb->add (new CFClient::UI::Button
3462 text => "cancel",
3463 expand => 1,
3464 tooltip => "This closes the binding editor without saving",
3465 on_activate => sub {
3466 $self->hide;
3467 $self->{binding_cancel}->()
3468 if $self->{binding_cancel};
3469 });
3470
3471 $self->update_binding_widgets;
3472
3473 $self
3474}
3475
3476sub commit {
3477 my ($self) = @_;
3478 my ($mod, $sym, $cmds) = $self->get_binding;
3479 if ($sym != 0 && @$cmds > 0) {
3480 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3481 ."'. Don't forget 'Save Config'!");
3482 $self->{binding_change}->($mod, $sym, $cmds)
3483 if $self->{binding_change};
3484 } else {
3485 $::STATUSBOX->add ("No action bound, no key or action specified!");
3486 $self->{binding_cancel}->()
3487 if $self->{binding_cancel};
3488 }
3489}
3490
3491sub start {
3492 my ($self) = @_;
3493
3494 $self->{rec_btn}->set_text ("stop recording");
3495 $self->{recording} = 1;
3496 $self->clear_command_list;
3497 $::CONN->start_record if $::CONN;
3498}
3499
3500sub stop {
3501 my ($self) = @_;
3502
3503 $self->{rec_btn}->set_text ("start recording");
3504 $self->{recording} = 0;
3505
3506 my $rec;
3507 $rec = $::CONN->stop_record if $::CONN;
3508 return unless ref $rec eq 'ARRAY';
3509 $self->set_command_list ($rec);
3510}
3511
3512
3513sub ask_for_bind_and_commit {
3514 my ($self) = @_;
3515 $self->ask_for_bind (1);
3516}
3517
3518sub ask_for_bind {
3519 my ($self, $commit, $end_cb) = @_;
3520
3521 CFClient::Binder::open_binding_dialog (sub {
3522 my ($mod, $sym) = @_;
3523 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3524 $self->update_binding_widgets;
3525 $self->commit if $commit;
3526 $end_cb->() if $end_cb;
3527 });
3528}
3529
3530# $mod and $sym are the modifiers and key symbol
3531# $cmds is a array ref of strings (the commands)
3532# $cb is the callback that is executed on OK
3533# $ccb is the callback that is executed on CANCEL and
3534# when the binding was unsuccessful on OK
3535sub set_binding {
3536 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3537
3538 $self->clear_command_list;
3539 $self->{recording} = 0;
3540 $self->{rec_btn}->set_text ("start recording");
3541
3542 $self->{binding} = [$mod, $sym];
3543 $self->{commands} = $cmds;
3544
3545 $self->{binding_change} = $cb;
3546 $self->{binding_cancel} = $ccb;
3547
3548 $self->update_binding_widgets;
3549}
3550
3551# this is a shortcut method that asks for a binding
3552# and then just binds it.
3553sub do_quick_binding {
3554 my ($self, $cmds, $end_cb) = @_;
3555 $self->set_binding (undef, undef, $cmds, sub {
3556 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3557 });
3558 $self->ask_for_bind (1, $end_cb);
3559}
3560
3561sub update_binding_widgets {
3562 my ($self) = @_;
3563 my ($mod, $sym, $cmds) = $self->get_binding;
3564 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3565 $self->set_command_list ($cmds);
3566}
3567
3568sub get_binding {
3569 my ($self) = @_;
3570 return (
3571 $self->{binding}->[0],
3572 $self->{binding}->[1],
3573 [ grep { defined $_ } @{$self->{commands}} ]
3574 );
3575}
3576
3577sub clear_command_list {
3578 my ($self) = @_;
3579 $self->{cmdbox}->clear ();
3580}
3581
3582sub set_command_list {
3583 my ($self, $cmds) = @_;
3584
3585 $self->{cmdbox}->clear ();
3586 $self->{commands} = $cmds;
3587
3588 my $idx = 0;
3589
3590 for (@$cmds) {
3591 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3592
3593 my $i = $idx;
3594 $hb->add (new CFClient::UI::Label text => $_);
3595 $hb->add (new CFClient::UI::Button
3596 text => "delete",
3597 tooltip => "Deletes the action from the record",
3598 on_activate => sub {
3599 $self->{cmdbox}->remove ($hb);
3600 $cmds->[$i] = undef;
3601 });
3602
3603
3604 $idx++
3605 }
3606}
3607
3608#############################################################################
3609
3610package CFClient::UI::SpellList;
3611
3612our @ISA = CFClient::UI::Table::;
3613
3614sub new {
3615 my $class = shift;
3616
3617 my $self = $class->SUPER::new (
3618 binding => [],
3619 commands => [],
3620 @_,
3621 )
3622}
3623
3624my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3625
3626my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3627 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3628my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3629 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3630my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3631 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3632my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3634my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3636
3637sub rebuild_spell_list {
3638 my ($self) = @_;
3639
3640 $CFClient::UI::ROOT->on_refresh ($self => sub {
3641 $self->clear;
3642
3643 return unless $::CONN;
3644
3645 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3646 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3647 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3648 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3649 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3650
3651 my $row = 0;
3652
3653 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3654 my $spell = $self->{spell}{$_};
3655
3656 $row++;
3657
3658 my $spell_cb = sub {
3659 my ($widget, $ev) = @_;
3660
3661 if ($ev->{button} == 1) {
3662 $::CONN->user_send ("cast $spell->{name}");
3663 } elsif ($ev->{button} == 2) {
3664 $::CONN->user_send ("invoke $spell->{name}");
3665 } elsif ($ev->{button} == 3) {
3666 (new CFClient::UI::Menu
3667 items => [
3668 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3669 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3670 ],
3671 )->popup ($ev);
3672 } else {
3673 return 0;
3674 }
3675
3676 1
3677 };
3678
3679 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3680
3681 #TODO: add path info to tooltip
3682 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3683
3684 $self->add (0, $row, new CFClient::UI::Face
3685 face => $spell->{face},
3686 can_hover => 1,
3687 can_events => 1,
3688 tooltip => $tooltip,
3689 on_button_down => $spell_cb,
3690 );
3691
3692 $self->add (1, $row, new CFClient::UI::Label
3693 expand => 1,
3694 text => $spell->{name},
3695 can_hover => 1,
3696 can_events => 1,
3697 tooltip => $tooltip,
3698 on_button_down => $spell_cb,
3699 );
3700
3701 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3702 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3703 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3704 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3705 }
3706 });
3707}
3708
3709sub add_spell {
3710 my ($self, $spell) = @_;
3711
3712 $self->{spell}->{$spell->{name}} = $spell;
3713 $self->rebuild_spell_list;
3714}
3715
3716sub remove_spell {
3717 my ($self, $spell) = @_;
3718
3719 delete $self->{spell}->{$spell->{name}};
3720 $self->rebuild_spell_list;
3721}
3722
3723sub clear_spells {
3724 my ($self) = @_;
3725
3726 $self->{spell} = {};
3727 $self->rebuild_spell_list;
3728}
3729
3730#############################################################################
3731
2978package CFClient::UI::Root; 3732package CFClient::UI::Root;
2979 3733
2980our @ISA = CFClient::UI::Container::; 3734our @ISA = CFClient::UI::Container::;
3735
3736use List::Util qw(min max);
2981 3737
2982use CFClient::OpenGL; 3738use CFClient::OpenGL;
2983 3739
2984sub new { 3740sub new {
2985 my $class = shift; 3741 my $class = shift;
… …
2992 Scalar::Util::weaken ($self->{root} = $self); 3748 Scalar::Util::weaken ($self->{root} = $self);
2993 3749
2994 $self 3750 $self
2995} 3751}
2996 3752
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 { 3753sub size_request {
3014 my ($self) = @_; 3754 my ($self) = @_;
3015 3755
3016 ($self->{w}, $self->{h}) 3756 ($self->{w}, $self->{h})
3017} 3757}
3018 3758
3759sub _to_pixel {
3760 my ($coord, $size, $max) = @_;
3761
3762 $coord =
3763 $coord eq "center" ? ($max - $size) * 0.5
3764 : $coord eq "max" ? $max
3765 : $coord;
3766
3767 $coord = 0 if $coord < 0;
3768 $coord = $max - $size if $coord > $max - $size;
3769
3770 int $coord + 0.5
3771}
3772
3019sub size_allocate { 3773sub invoke_size_allocate {
3020 my ($self, $w, $h, $changed) = @_; 3774 my ($self, $w, $h) = @_;
3021 3775
3022 for my $child ($self->children) { 3776 for my $child ($self->children) {
3023 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3777 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3024 3778
3025 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3779 $X = $child->{force_x} if exists $child->{force_x};
3026 if exists $child->{req_x}; 3780 $Y = $child->{force_y} if exists $child->{force_y};
3027 3781
3028 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3782 $X = _to_pixel $X, $W, $self->{w};
3029 if exists $child->{req_y}; 3783 $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 3784
3036 $child->configure ($X, $Y, $W, $H); 3785 $child->configure ($X, $Y, $W, $H);
3037 } 3786 }
3787
3788 1
3038} 3789}
3039 3790
3040sub coord2local { 3791sub coord2local {
3041 my ($self, $x, $y) = @_; 3792 my ($self, $x, $y) = @_;
3042 3793
… …
3056} 3807}
3057 3808
3058sub add { 3809sub add {
3059 my ($self, @children) = @_; 3810 my ($self, @children) = @_;
3060 3811
3061 for my $child (@children) {
3062 $child->{is_toplevel} = 1; 3812 $_->{is_toplevel} = 1
3063 3813 for @children;
3064 # integerise window positions
3065 $child->{x} = int $child->{x};
3066 $child->{y} = int $child->{y};
3067 }
3068 3814
3069 $self->SUPER::add (@children); 3815 $self->SUPER::add (@children);
3070} 3816}
3071 3817
3072sub remove { 3818sub remove {
3073 my ($self, @children) = @_; 3819 my ($self, @children) = @_;
3074 3820
3075 $self->SUPER::remove (@children); 3821 $self->SUPER::remove (@children);
3822
3823 delete $self->{is_toplevel}
3824 for @children;
3076 3825
3077 while (@children) { 3826 while (@children) {
3078 my $w = pop @children; 3827 my $w = pop @children;
3079 push @children, $w->children; 3828 push @children, $w->children;
3080 $w->set_invisible; 3829 $w->set_invisible;
… …
3100 $_->() 3849 $_->()
3101 for values %{delete $self->{refresh_hook}}; 3850 for values %{delete $self->{refresh_hook}};
3102 } 3851 }
3103 3852
3104 if ($self->{realloc}) { 3853 if ($self->{realloc}) {
3854 my %queue;
3105 my @queue; 3855 my @queue;
3856 my $widget;
3106 3857
3858 outer:
3107 while () { 3859 while () {
3108 if ($self->{realloc}) { 3860 if (my $realloc = delete $self->{realloc}) {
3109 #TODO use array-of-depth approach 3861 for $widget (values %$realloc) {
3862 $widget->{visible} or next; # do not resize invisible widgets
3110 3863
3111 @queue = sort { $a->{visible} <=> $b->{visible} } 3864 $queue{$widget+0}++ and next; # duplicates are common
3112 @queue, values %{delete $self->{realloc}}; 3865
3866 push @{ $queue[$widget->{visible}] }, $widget;
3867 }
3113 } 3868 }
3114 3869
3870 while () {
3871 @queue or last outer;
3872
3873 $widget = pop @{ $queue[-1] || [] }
3874 and last;
3875
3876 pop @queue;
3877 }
3878
3879 delete $queue{$widget+0};
3880
3881 my ($w, $h) = $widget->size_request;
3882
3883 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3884 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3885
3886 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3887 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3888
3889 $w = $widget->{force_w} if exists $widget->{force_w};
3890 $h = $widget->{force_h} if exists $widget->{force_h};
3891
3892 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3893 || delete $widget->{force_realloc}) {
3894 $widget->{req_w} = $w;
3895 $widget->{req_h} = $h;
3896
3897 $self->{size_alloc}{$widget+0} = $widget;
3898
3899 if (my $parent = $widget->{parent}) {
3900 $self->{realloc}{$parent+0} = $parent
3901 unless $queue{$parent+0};
3902
3903 $parent->{force_size_alloc} = 1;
3904 $self->{size_alloc}{$parent+0} = $parent;
3905 }
3906 }
3907
3908 delete $self->{realloc}{$widget+0};
3909 }
3910 }
3911
3912 while (my $size_alloc = delete $self->{size_alloc}) {
3913 my @queue = sort { $b->{visible} <=> $a->{visible} }
3914 values %$size_alloc;
3915
3916 while () {
3115 my $widget = pop @queue || last; 3917 my $widget = pop @queue || last;
3116 3918
3117 $widget->{visible} or last; # do not resize invisible widgets 3919 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 3920
3142 $w = 0 if $w < 0; 3921 $w = 0 if $w < 0;
3143 $h = 0 if $h < 0; 3922 $h = 0 if $h < 0;
3144 3923
3924 $w = int $w + 0.5;
3925 $h = int $h + 0.5;
3926
3927 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3928 $widget->{old_w} = $widget->{w};
3929 $widget->{old_h} = $widget->{h};
3930
3145 $widget->{w} = $w; 3931 $widget->{w} = $w;
3146 $widget->{h} = $h; 3932 $widget->{h} = $h;
3933
3147 $widget->emit (size_allocate => $w, $h, 1); 3934 $widget->emit (size_allocate => $w, $h);
3935 }
3148 } 3936 }
3149 } 3937 }
3150 3938
3151 while ($self->{post_alloc_hook}) { 3939 while ($self->{post_alloc_hook}) {
3152 $_->() 3940 $_->()
3153 for values %{delete $self->{post_alloc_hook}}; 3941 for values %{delete $self->{post_alloc_hook}};
3154 } 3942 }
3943
3155 3944
3156 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3945 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3157 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3946 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3158 glClear GL_COLOR_BUFFER_BIT; 3947 glClear GL_COLOR_BUFFER_BIT;
3159 3948
… …
3161 glLoadIdentity; 3950 glLoadIdentity;
3162 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3951 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3163 glMatrixMode GL_MODELVIEW; 3952 glMatrixMode GL_MODELVIEW;
3164 glLoadIdentity; 3953 glLoadIdentity;
3165 3954
3955 {
3956 package CFClient::UI::Base;
3957
3958 ($draw_x, $draw_y, $draw_w, $draw_h) =
3959 (0, 0, $self->{w}, $self->{h});
3960 }
3961
3166 $self->_draw; 3962 $self->_draw;
3167} 3963}
3168 3964
3169############################################################################# 3965#############################################################################
3170 3966

Diff Legend

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