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

Diff Legend

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