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.246 by root, Sun May 28 00:40:51 2006 UTC vs.
Revision 1.306 by root, Sun Jun 18 17:39:36 2006 UTC

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

Diff Legend

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