ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.248 by root, Sun May 28 01:37:45 2006 UTC vs.
Revision 1.288 by root, Mon Jun 5 21:14:40 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
45 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
46 32
47 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
48 34
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 36
51 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 38 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 39 }
63 40
64 return; 41 return;
65 } 42 }
66 } 43 }
67 } 44 }
68 45
69 $TOOLTIP->hide; 46 $TOOLTIP->hide;
70 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
71} 71}
72 72
73# class methods for events 73# class methods for events
74sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
75 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
89 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
90 90
91 $GRAB = $widget; 91 $GRAB = $widget;
92 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
93 93
94 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
95 } 95 }
96 96
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 98
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
114 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 116 $grab->update if $grab;
117 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
118 118
119 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
120 } 120 }
121} 121}
122 122
123sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
124 my ($ev) = @_; 124 my ($ev) = @_;
… …
130 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
131 131
132 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
133 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134 134
135 check_tooltip; 135 $TOOLTIP_WATCHER->start;
136 } 136 }
137 137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 139 if $HOVER;
140} 140}
… …
172sub rescale_widgets { 172sub rescale_widgets {
173 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
174 174
175 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
183 } 190 }
184 } 191 }
185 192
186 reconfigure_widgets; 193 reconfigure_widgets;
187} 194}
… …
196 203
197sub new { 204sub new {
198 my $class = shift; 205 my $class = shift;
199 206
200 my $self = bless { 207 my $self = bless {
201 x => 0, 208 x => "center",
202 y => 0, 209 y => "center",
203 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
204 can_events => 1, 213 can_events => 1,
205 @_ 214 @_
206 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207 218
208 for (keys %$self) { 219 for (keys %$self) {
209 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
210 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
211 } 222 }
212 } 223 }
213 224
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
221 } 235 }
222 236
223 $self 237 $self
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234} 238}
235 239
236sub destroy { 240sub destroy {
237 my ($self) = @_; 241 my ($self) = @_;
238 242
… …
246 return if $self->{parent}; 250 return if $self->{parent};
247 251
248 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
249} 253}
250 254
251sub center {
252 my ($self) = @_;
253
254 $CFClient::UI::ROOT->on_post_alloc (
255 "center_$self" => sub {
256 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
257 },
258 );
259
260 $self->update;
261}
262
263sub set_visible { 255sub set_visible {
264 my ($self) = @_; 256 my ($self) = @_;
265 257
266 return if $self->{visible}; 258 return if $self->{visible};
267 259
268 $self->{root} = $self->{parent}{root}; 260 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1; 261 $self->{visible} = $self->{parent}{visible} + 1;
270 262
271 $self->emit (visibility_change => 1); 263 $self->emit (visibility_change => 1);
264
265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
272} 268}
273 269
274sub set_invisible { 270sub set_invisible {
275 my ($self) = @_; 271 my ($self) = @_;
276 272
277 return unless $self->{visible}; 273 return unless $self->{visible};
278 274
279 # broken show/hide model 275 $_->set_invisible for $self->children;
280 276
281 delete $self->{root}; 277 delete $self->{root};
282 delete $self->{visible}; 278 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->focus_out;
291 287
292 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
293} 306}
294 307
295sub hide { 308sub hide {
296 my ($self) = @_; 309 my ($self) = @_;
297 310
… …
299 312
300 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
301 if $self->{parent}; 314 if $self->{parent};
302} 315}
303 316
304sub move { 317sub move_abs {
305 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
306 319
307 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
308 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
309 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
310 323
311 $self->update; 324 $self->update;
312} 325}
313 326
314sub set_size { 327sub set_size {
315 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
316 329
317 $self->{def_w} = $w; 330 $self->{force_w} = $w;
318 $self->{def_h} = $h; 331 $self->{force_h} = $h;
319 332
320 $self->check_size; 333 $self->realloc;
321} 334}
322 335
323sub size_request { 336sub size_request {
324 require Carp; 337 require Carp;
325 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
327 340
328sub configure { 341sub configure {
329 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
330 343
331 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
332 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
333 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
334 349
335 # use alignment to adjust x, y 350 # use alignment to adjust x, y
336 351
337 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
338 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
339
340 ($w, $h) = ($w2, $h2);
341 } 354 }
342 355
343 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
344 $self->{x} = $x; 357 $self->{x} = $x;
345 $self->{y} = $y; 358 $self->{y} = $y;
346 $self->update; 359 $self->update;
347 } 360 }
348 361
349 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
350 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 return unless $self->{visible};
364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
368 $self->{root}{size_alloc}{$self+0} = $self;
351 } 369 }
352} 370}
353 371
354sub size_allocate { 372sub size_allocate {
355 # nothing to be done 373 # nothing to be done
356} 374}
357 375
358sub reconfigure {
359 my ($self) = @_;
360
361 $self->check_size (1);
362 $self->update;
363}
364
365sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
366} 382}
367 383
368sub set_max_size { 384sub set_max_size {
369 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
370 386
371 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
372 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
373} 391}
374 392
375sub set_tooltip { 393sub set_tooltip {
376 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
377 395
… …
382 400
383 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
384 402
385 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
386 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
387 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
388 } 406 }
389} 407}
390 408
391# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
392sub coord2local { 410sub coord2local {
… …
429 447
430 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
431 unless $FOCUS; 449 unless $FOCUS;
432} 450}
433 451
434sub mouse_motion { } 452sub mouse_motion { 0 }
435sub button_up { } 453sub button_up { 0 }
436sub key_down { } 454sub key_down { 0 }
437sub key_up { } 455sub key_up { 0 }
438 456
439sub button_down { 457sub button_down {
440 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
441 459
442 $self->focus_in; 460 $self->focus_in;
443}
444 461
445sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
446sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
447sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
448sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
449sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
527
528sub reconfigure {
529 my ($self) = @_;
530
531 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
534
535 $self->realloc;
536 $self->update;
537}
538
539# using global variables seems a bit hacky, but passing through all drawing
540# functions seems pointless.
541our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
450 542
451sub draw { 543sub draw {
452 my ($self) = @_; 544 my ($self) = @_;
453 545
454 return unless $self->{h} && $self->{w}; 546 return unless $self->{h} && $self->{w};
547
548 # update screen rectangle
549 local $draw_x = $draw_x + $self->{x};
550 local $draw_y = $draw_y + $self->{y};
551 local $draw_w = $draw_x + $self->{w};
552 local $draw_h = $draw_y + $self->{h};
553
554 # skip widgets that are entirely outside the drawing area
555 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
556 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
455 557
456 glPushMatrix; 558 glPushMatrix;
457 glTranslate $self->{x}, $self->{y}, 0; 559 glTranslate $self->{x}, $self->{y}, 0;
458 $self->_draw;
459 glPopMatrix;
460 560
461 if ($self == $HOVER && $self->{can_hover}) { 561 if ($self == $HOVER && $self->{can_hover}) {
462 my ($x, $y) = @$self{qw(x y)};
463
464 glColor 1, 0.8, 0.5, 0.2; 562 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
465 glEnable GL_BLEND; 563 glEnable GL_BLEND;
466 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 564 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
467 glBegin GL_QUADS; 565 glBegin GL_QUADS;
468 glVertex $x , $y; 566 glVertex 0 , 0;
469 glVertex $x + $self->{w}, $y; 567 glVertex $self->{w}, 0;
470 glVertex $x + $self->{w}, $y + $self->{h}; 568 glVertex $self->{w}, $self->{h};
471 glVertex $x , $y + $self->{h}; 569 glVertex 0 , $self->{h};
472 glEnd; 570 glEnd;
473 glDisable GL_BLEND; 571 glDisable GL_BLEND;
474 } 572 }
475 573
476 if ($ENV{PCLIENT_DEBUG}) { 574 if ($ENV{CFPLUS_DEBUG} & 1) {
477 glPushMatrix; 575 glPushMatrix;
478 glColor 1, 1, 0, 1; 576 glColor 1, 1, 0, 1;
479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 577 glTranslate 0.375, 0.375;
480 glBegin GL_LINE_LOOP; 578 glBegin GL_LINE_LOOP;
481 glVertex 0 , 0; 579 glVertex 0 , 0;
482 glVertex $self->{w} - 1, 0; 580 glVertex $self->{w} - 1, 0;
483 glVertex $self->{w} - 1, $self->{h} - 1; 581 glVertex $self->{w} - 1, $self->{h} - 1;
484 glVertex 0 , $self->{h} - 1; 582 glVertex 0 , $self->{h} - 1;
485 glEnd; 583 glEnd;
486 glPopMatrix; 584 glPopMatrix;
487 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 585 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
488 } 586 }
587
588 $self->_draw;
589 glPopMatrix;
489} 590}
490 591
491sub _draw { 592sub _draw {
492 my ($self) = @_; 593 my ($self) = @_;
493 594
494 warn "no draw defined for $self\n"; 595 warn "no draw defined for $self\n";
495}
496
497sub find_widget {
498 my ($self, $x, $y) = @_;
499
500 return () unless $self->{can_events};
501
502 return $self
503 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
504 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
505
506 ()
507}
508
509sub set_parent {
510 my ($self, $parent) = @_;
511
512 Scalar::Util::weaken ($self->{parent} = $parent);
513
514 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
515
516 $self->check_size;
517}
518
519sub check_size {
520 my ($self, $forced) = @_;
521
522 $self->{force_alloc} = 1 if $forced;
523 $CFClient::UI::ROOT->{check_size}{$self} = $self;
524}
525
526sub update {
527 my ($self) = @_;
528
529 $self->{parent}->update
530 if $self->{parent};
531}
532
533sub connect {
534 my ($self, $signal, $cb) = @_;
535
536 push @{ $self->{signal_cb}{$signal} }, $cb;
537}
538
539sub _emit {
540 my ($self, $signal, @args) = @_;
541
542 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
543}
544
545sub emit {
546 my ($self, $signal, @args) = @_;
547
548 $self->_emit ($signal, @args)
549 || $self->$signal (@args);
550}
551
552sub visibility_change {
553 #my ($self, $visible) = @_;
554} 596}
555 597
556sub DESTROY { 598sub DESTROY {
557 my ($self) = @_; 599 my ($self) = @_;
558 600
… …
590 632
591 if ($color && (@$color < 4 || $color->[3])) { 633 if ($color && (@$color < 4 || $color->[3])) {
592 my ($w, $h) = @$self{qw(w h)}; 634 my ($w, $h) = @$self{qw(w h)};
593 635
594 glEnable GL_BLEND; 636 glEnable GL_BLEND;
595 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 637 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
596 glColor @$color; 638 glColor_premultiply @$color;
597 639
598 glBegin GL_QUADS; 640 glBegin GL_QUADS;
599 glVertex 0 , 0; 641 glVertex 0 , 0;
600 glVertex 0 , $h; 642 glVertex 0 , $h;
601 glVertex $w, $h; 643 glVertex $w, $h;
… …
616 my ($class, %arg) = @_; 658 my ($class, %arg) = @_;
617 $class->SUPER::new (can_events => 0, %arg); 659 $class->SUPER::new (can_events => 0, %arg);
618} 660}
619 661
620sub size_request { 662sub size_request {
621 (0, 0) 663 my ($self) = @_;
664
665 ($self->{w} + 0, $self->{h} + 0)
622} 666}
623 667
624sub draw { } 668sub draw { }
625 669
626############################################################################# 670#############################################################################
… …
630our @ISA = CFClient::UI::Base::; 674our @ISA = CFClient::UI::Base::;
631 675
632sub new { 676sub new {
633 my ($class, %arg) = @_; 677 my ($class, %arg) = @_;
634 678
635 my $children = delete $arg{children} || []; 679 my $children = delete $arg{children};
636 680
637 my $self = $class->SUPER::new ( 681 my $self = $class->SUPER::new (
638 children => [], 682 children => [],
639 can_events => 0, 683 can_events => 0,
640 %arg, 684 %arg,
641 ); 685 );
686
642 $self->add ($_) for @$children; 687 $self->add (@$children)
688 if $children;
643 689
644 $self 690 $self
645} 691}
646 692
647sub add { 693sub add {
… …
655 $self->{children} = [ 701 $self->{children} = [
656 sort { $a->{z} <=> $b->{z} } 702 sort { $a->{z} <=> $b->{z} }
657 @{$self->{children}}, @widgets 703 @{$self->{children}}, @widgets
658 ]; 704 ];
659 705
660 $self->check_size (1); 706 $self->realloc;
661 $self->update;
662} 707}
663 708
664sub children { 709sub children {
665 @{ $_[0]{children} } 710 @{ $_[0]{children} }
666} 711}
… …
671 delete $child->{parent}; 716 delete $child->{parent};
672 $child->hide; 717 $child->hide;
673 718
674 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 719 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
675 720
676 $self->check_size (1); 721 $self->realloc;
677 $self->update;
678} 722}
679 723
680sub clear { 724sub clear {
681 my ($self) = @_; 725 my ($self) = @_;
682 726
… …
686 for (@$children) { 730 for (@$children) {
687 delete $_->{parent}; 731 delete $_->{parent};
688 $_->hide; 732 $_->hide;
689 } 733 }
690 734
691 $self->check_size; 735 $self->realloc;
692 $self->update;
693} 736}
694 737
695sub find_widget { 738sub find_widget {
696 my ($self, $x, $y) = @_; 739 my ($self, $x, $y) = @_;
697 740
698 $x -= $self->{x}; 741 $x -= $self->{x};
699 $y -= $self->{y}; 742 $y -= $self->{y};
700 743
701 my $res; 744 my $res;
702 745
703 for (reverse @{ $self->{children} }) { 746 for (reverse $self->visible_children) {
704 $res = $_->find_widget ($x, $y) 747 $res = $_->find_widget ($x, $y)
705 and return $res; 748 and return $res;
706 } 749 }
707 750
708 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 751 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
757 $self->{children}[0]->configure (0, 0, $w, $h); 800 $self->{children}[0]->configure (0, 0, $w, $h);
758} 801}
759 802
760############################################################################# 803#############################################################################
761 804
805# back-buffered drawing area
806
762package CFClient::UI::Window; 807package CFClient::UI::Window;
763 808
764our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
765 810
766use CFClient::OpenGL; 811use CFClient::OpenGL;
… …
784 $self->SUPER::size_allocate ($w, $h); 829 $self->SUPER::size_allocate ($w, $h);
785 $self->update; 830 $self->update;
786} 831}
787 832
788sub _render { 833sub _render {
834 my ($self) = @_;
835
789 $_[0]{children}[0]->draw; 836 $self->{children}[0]->draw;
790} 837}
791 838
792sub render_child { 839sub render_child {
793 my ($self) = @_; 840 my ($self) = @_;
794 841
795 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 842 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
796 glClearColor 0, 0, 0, 0; 843 glClearColor 0, 0, 0, 0;
797 glClear GL_COLOR_BUFFER_BIT; 844 glClear GL_COLOR_BUFFER_BIT;
798 845
846 {
847 package CFClient::UI::Base;
848
849 ($draw_x, $draw_y, $draw_w, $draw_h) =
850 (0, 0, $self->{w}, $self->{h});
851 }
852
799 $self->_render; 853 $self->_render;
800 }; 854 };
801} 855}
802 856
803sub _draw { 857sub _draw {
804 my ($self) = @_; 858 my ($self) = @_;
805 859
806 my ($w, $h) = ($self->w, $self->h); 860 my ($w, $h) = @$self{qw(w h)};
807 861
808 my $tex = $self->{texture} 862 my $tex = $self->{texture}
809 or return; 863 or return;
810 864
811 glEnable GL_TEXTURE_2D; 865 glEnable GL_TEXTURE_2D;
812 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
813 glColor 1, 1, 1, 1; 867 glColor 0, 0, 0, 1;
814 868
815 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 869 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
816 870
817 glDisable GL_TEXTURE_2D; 871 glDisable GL_TEXTURE_2D;
818} 872}
… …
834} 888}
835 889
836sub size_request { 890sub size_request {
837 my ($self) = @_; 891 my ($self) = @_;
838 892
839 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 893 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
840 894
841 $w = 10 if $self->{scroll_x}; 895 $w = 10 if $self->{scroll_x};
842 $h = 10 if $self->{scroll_y}; 896 $h = 10 if $self->{scroll_y};
843 897
844 ($w, $h) 898 ($w, $h)
845} 899}
846 900
847sub size_allocate { 901sub size_allocate {
848 my ($self, $w, $h) = @_; 902 my ($self, $w, $h) = @_;
849 903
904 my $child = $self->child;
905
850 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 906 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
851 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 907 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
852 908
853 $self->child->configure (0, 0, $w, $h); 909 $self->child->configure (0, 0, $w, $h);
854 $self->update; 910 $self->update;
855} 911}
856 912
… …
892} 948}
893 949
894sub _render { 950sub _render {
895 my ($self) = @_; 951 my ($self) = @_;
896 952
953 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
954 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
955
897 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 956 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
898 957
899 $self->SUPER::_render; 958 $self->SUPER::_render;
900} 959}
901 960
… …
904package CFClient::UI::ScrolledWindow; 963package CFClient::UI::ScrolledWindow;
905 964
906our @ISA = CFClient::UI::HBox::; 965our @ISA = CFClient::UI::HBox::;
907 966
908sub new { 967sub new {
909 my $class = shift; 968 my ($class, %arg) = @_;
969
970 my $child = delete $arg{child};
910 971
911 my $self; 972 my $self;
912 973
913 my $slider = new CFClient::UI::Slider 974 my $slider = new CFClient::UI::Slider
914 vertical => 1, 975 vertical => 1,
… …
919 ; 980 ;
920 981
921 $self = $class->SUPER::new ( 982 $self = $class->SUPER::new (
922 vp => (new CFClient::UI::ViewPort expand => 1), 983 vp => (new CFClient::UI::ViewPort expand => 1),
923 slider => $slider, 984 slider => $slider,
924 @_, 985 %arg,
925 ); 986 );
926 987
927 $self->{vp}->add ($self->{scrolled});
928 $self->add ($self->{vp});
929 $self->add ($self->{slider}); 988 $self->SUPER::add ($self->{vp}, $self->{slider});
989 $self->add ($child) if $child;
930 990
931 $self 991 $self
992}
993
994sub add {
995 my ($self, $widget) = @_;
996
997 $self->{vp}->add ($self->{child} = $widget);
932} 998}
933 999
934sub update { 1000sub update {
935 my ($self) = @_; 1001 my ($self) = @_;
936 1002
… …
975 1041
976 if ($self->{bg}) { 1042 if ($self->{bg}) {
977 my ($w, $h) = @$self{qw(w h)}; 1043 my ($w, $h) = @$self{qw(w h)};
978 1044
979 glEnable GL_BLEND; 1045 glEnable GL_BLEND;
980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1046 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
981 glColor @{ $self->{bg} }; 1047 glColor_premultiply @{ $self->{bg} };
982 1048
983 glBegin GL_QUADS; 1049 glBegin GL_QUADS;
984 glVertex 0 , 0; 1050 glVertex 0 , 0;
985 glVertex 0 , $h; 1051 glVertex 0 , $h;
986 glVertex $w, $h; 1052 glVertex $w, $h;
… …
999 1065
1000our @ISA = CFClient::UI::Bin::; 1066our @ISA = CFClient::UI::Bin::;
1001 1067
1002use CFClient::OpenGL; 1068use CFClient::OpenGL;
1003 1069
1004my @tex = 1070my $bg =
1071 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1072 mipmap => 1, wrap => 1;
1073
1074my @border =
1005 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1075 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1006 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1076 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1007 1077
1008sub new { 1078sub new {
1009 my $class = shift; 1079 my ($class, %arg) = @_;
1080
1081 my $title = delete $arg{title};
1010 1082
1011 my $self = $class->SUPER::new ( 1083 my $self = $class->SUPER::new (
1012 bg => [1, 1, 1, 1], 1084 bg => [1, 1, 1, 1],
1013 border_bg => [1, 1, 1, 1], 1085 border_bg => [1, 1, 1, 1],
1014 border => 0.6, 1086 border => 0.6,
1015 is_toplevel => 1,
1016 can_events => 1, 1087 can_events => 1,
1017 @_ 1088 min_w => 16,
1089 min_h => 16,
1090 %arg,
1018 ); 1091 );
1019 1092
1020 $self->{title} &&= new CFClient::UI::Label 1093 $self->{title} = new CFClient::UI::Label
1021 align => 0, 1094 align => 0,
1022 valign => 1, 1095 valign => 1,
1023 text => $self->{title}, 1096 text => $title,
1024 fontsize => $self->{border}; 1097 fontsize => $self->{border}
1098 if defined $title;
1025 1099
1026 $self 1100 $self
1101}
1102
1103sub add {
1104 my ($self, @widgets) = @_;
1105
1106 $self->SUPER::add (@widgets);
1107 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1027} 1108}
1028 1109
1029sub border { 1110sub border {
1030 int $_[0]{border} * $::FONTSIZE 1111 int $_[0]{border} * $::FONTSIZE
1031} 1112}
1032 1113
1033sub size_request { 1114sub size_request {
1034 my ($self) = @_; 1115 my ($self) = @_;
1116
1117 $self->{title}->size_request
1118 if $self->{title};
1035 1119
1036 my ($w, $h) = $self->SUPER::size_request; 1120 my ($w, $h) = $self->SUPER::size_request;
1037 1121
1038 ( 1122 (
1039 $w + $self->border * 2, 1123 $w + $self->border * 2,
… …
1042} 1126}
1043 1127
1044sub size_allocate { 1128sub size_allocate {
1045 my ($self, $w, $h) = @_; 1129 my ($self, $w, $h) = @_;
1046 1130
1131 if ($self->{title}) {
1132 $self->{title}{w} = $w;
1133 $self->{title}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h);
1135 }
1136
1137 my $border = $self->border;
1138
1047 $h -= List::Util::max 0, $self->border * 2; 1139 $h -= List::Util::max 0, $border * 2;
1048 $w -= List::Util::max 0, $self->border * 2; 1140 $w -= List::Util::max 0, $border * 2;
1049 1141
1050 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1051 if $self->{title};
1052
1053 $self->child->configure ($self->border, $self->border, $w, $h); 1142 $self->child->configure ($border, $border, $w, $h);
1054} 1143}
1055 1144
1056sub button_down { 1145sub button_down {
1057 my ($self, $ev, $x, $y) = @_; 1146 my ($self, $ev, $x, $y) = @_;
1058 1147
… …
1074 my ($ev, $x, $y) = @_; 1163 my ($ev, $x, $y) = @_;
1075 1164
1076 my $dx = $ev->{x} - $ox; 1165 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy; 1166 my $dy = $ev->{y} - $oy;
1078 1167
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
1081 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1168 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1169 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y}); 1170
1084 $self->check_size; 1171 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1172 $self->realloc;
1085 }; 1173 };
1086 1174
1087 } elsif ($lr ^ $td) { 1175 } elsif ($lr ^ $td) {
1088 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1176 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089 my ($bx, $by) = ($self->{x}, $self->{y}); 1177 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1091 $self->{motion} = sub { 1179 $self->{motion} = sub {
1092 my ($ev, $x, $y) = @_; 1180 my ($ev, $x, $y) = @_;
1093 1181
1094 ($x, $y) = ($ev->{x}, $ev->{y}); 1182 ($x, $y) = ($ev->{x}, $ev->{y});
1095 1183
1096 $self->{user_x} = $bx + $x - $ox; 1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097 $self->{user_y} = $by + $y - $oy; 1185 # HACK: the next line is required to enforce placement
1098 1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1099 $self->move ($self->{user_x}, $self->{user_y});
1100 $self->update;
1101 }; 1187 };
1188 } else {
1189 return 0;
1190 }
1191
1102 } 1192 1
1103} 1193}
1104 1194
1105sub button_up { 1195sub button_up {
1106 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
1107 1197
1108 delete $self->{motion}; 1198 !!delete $self->{motion}
1109} 1199}
1110 1200
1111sub mouse_motion { 1201sub mouse_motion {
1112 my ($self, $ev, $x, $y) = @_; 1202 my ($self, $ev, $x, $y) = @_;
1113 1203
1114 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1204 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205
1206 !!$self->{motion}
1115} 1207}
1116 1208
1117sub _draw { 1209sub _draw {
1118 my ($self) = @_; 1210 my ($self) = @_;
1119 1211
1212 my $child = $self->{children}[0];
1213
1120 my ($w, $h ) = ($self->{w}, $self->{h}); 1214 my ($w, $h ) = ($self->{w}, $self->{h});
1121 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1215 my ($cw, $ch) = ($child->{w}, $child->{h});
1122 1216
1123 glEnable GL_TEXTURE_2D; 1217 glEnable GL_TEXTURE_2D;
1124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1125 1219
1126 my $border = $self->border; 1220 my $border = $self->border;
1127 1221
1128 glColor @{ $self->{border_bg} }; 1222 glColor @{ $self->{border_bg} };
1129 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1223 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1130 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1224 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1131 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1225 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1132 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1226 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1133 1227
1134 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1228 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1135 my $bg = $tex[0]; 1229 glColor @{ $self->{bg} };
1136 1230
1137 # TODO: repeat texture not scale 1231 # TODO: repeat texture not scale
1232 # solve this better(?)
1138 my $rep_x = $cw / $bg->{w}; 1233 $bg->{s} = $cw / $bg->{w};
1139 my $rep_y = $ch / $bg->{h}; 1234 $bg->{t} = $ch / $bg->{h};
1140
1141 glColor @{ $self->{bg} };
1142
1143 $bg->{s} = $rep_x;
1144 $bg->{t} = $rep_y;
1145 $bg->{wrap_mode} = 1;
1146 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1235 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1147 } 1236 }
1148 1237
1149 glDisable GL_TEXTURE_2D; 1238 glDisable GL_TEXTURE_2D;
1150 1239
1151 $self->{title}->draw if $self->{title};
1152
1153 $self->child->draw; 1240 $child->draw;
1241
1242 if ($self->{title}) {
1243 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw;
1245 }
1154} 1246}
1155 1247
1156############################################################################# 1248#############################################################################
1157 1249
1158package CFClient::UI::Table; 1250package CFClient::UI::Table;
… …
1180 my ($self, $x, $y, $child) = @_; 1272 my ($self, $x, $y, $child) = @_;
1181 1273
1182 $child->set_parent ($self); 1274 $child->set_parent ($self);
1183 $self->{children}[$y][$x] = $child; 1275 $self->{children}[$y][$x] = $child;
1184 1276
1185 $self->check_size (1); 1277 $self->realloc;
1186} 1278}
1187 1279
1188# TODO: move to container class maybe? send children a signal on removal? 1280# TODO: move to container class maybe? send children a signal on removal?
1189sub clear { 1281sub clear {
1190 my ($self) = @_; 1282 my ($self) = @_;
… …
1195 for (@children) { 1287 for (@children) {
1196 delete $_->{parent}; 1288 delete $_->{parent};
1197 $_->hide; 1289 $_->hide;
1198 } 1290 }
1199 1291
1200 $self->check_size (1); 1292 $self->realloc;
1201 $self->update;
1202} 1293}
1203 1294
1204sub get_wh { 1295sub get_wh {
1205 my ($self) = @_; 1296 my ($self) = @_;
1206 1297
… …
1414 ellipsise => 3, # end 1505 ellipsise => 3, # end
1415 layout => (new CFClient::Layout), 1506 layout => (new CFClient::Layout),
1416 fontsize => 1, 1507 fontsize => 1,
1417 align => -1, 1508 align => -1,
1418 valign => -1, 1509 valign => -1,
1419 padding => 2, 1510 padding_x => 2,
1511 padding_y => 2,
1420 can_events => 0, 1512 can_events => 0,
1421 %arg 1513 %arg
1422 ); 1514 );
1423 1515
1424 if (exists $self->{template}) { 1516 if (exists $self->{template}) {
… …
1451 1543
1452 delete $self->{texture}; 1544 delete $self->{texture};
1453 $self->SUPER::update; 1545 $self->SUPER::update;
1454} 1546}
1455 1547
1548sub realloc {
1549 my ($self) = @_;
1550
1551 delete $self->{ox};
1552 $self->SUPER::realloc;
1553}
1554
1456sub set_text { 1555sub set_text {
1457 my ($self, $text) = @_; 1556 my ($self, $text) = @_;
1458 1557
1459 return if $self->{text} eq "T$text"; 1558 return if $self->{text} eq "T$text";
1460 $self->{text} = "T$text"; 1559 $self->{text} = "T$text";
1461 1560
1462 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463 $self->{layout}->set_text ($text); 1562 $self->{layout}->set_text ($text);
1464 1563
1564 delete $self->{req_h};
1565 $self->realloc;
1465 $self->update; 1566 $self->update;
1466 $self->check_size;
1467} 1567}
1468 1568
1469sub set_markup { 1569sub set_markup {
1470 my ($self, $markup) = @_; 1570 my ($self, $markup) = @_;
1471 1571
… …
1475 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1575 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476 1576
1477 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1478 $self->{layout}->set_markup ($markup); 1578 $self->{layout}->set_markup ($markup);
1479 1579
1580 delete $self->{req_h};
1581 $self->realloc;
1480 $self->update; 1582 $self->update;
1481 $self->check_size;
1482} 1583}
1483 1584
1484sub size_request { 1585sub size_request {
1485 my ($self) = @_; 1586 my ($self) = @_;
1486 1587
1588 if (exists $self->{req_h}) {
1589 @$self{qw(req_w req_h)}
1590 } else {
1487 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1591 $self->{layout}->set_font ($self->{font}) if $self->{font};
1488 $self->{layout}->set_width ($self->{max_w} || -1); 1592 $self->{layout}->set_width ($self->{max_w} || -1);
1489 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1593 $self->{layout}->set_ellipsise ($self->{ellipsise});
1490 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1491 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1492 1596
1493 my ($w, $h) = $self->{layout}->size; 1597 my ($w, $h) = $self->{layout}->size;
1494 1598
1495 if (exists $self->{template}) { 1599 if (exists $self->{template}) {
1496 $self->{template}->set_font ($self->{font}) if $self->{font}; 1600 $self->{template}->set_font ($self->{font}) if $self->{font};
1497 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1498 1602
1499 my ($w2, $h2) = $self->{template}->size; 1603 my ($w2, $h2) = $self->{template}->size;
1500 1604
1501 $w = List::Util::max $w, $w2; 1605 $w = List::Util::max $w, $w2;
1502 $h = List::Util::max $h, $h2; 1606 $h = List::Util::max $h, $h2;
1503 } 1607 }
1504 1608
1609 ($w, $h)
1505 ( 1610 }
1506 $w + $self->{padding} * 2,
1507 $h + $self->{padding} * 2,
1508 )
1509} 1611}
1510 1612
1511sub size_allocate { 1613sub size_allocate {
1512 my ($self, $w, $h) = @_; 1614 my ($self, $w, $h) = @_;
1513 1615
1616 delete $self->{ox};
1617
1514 delete $self->{texture}; 1618 delete $self->{texture}
1619 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1515} 1620}
1516 1621
1517sub set_fontsize { 1622sub set_fontsize {
1518 my ($self, $fontsize) = @_; 1623 my ($self, $fontsize) = @_;
1519 1624
1520 $self->{fontsize} = $fontsize; 1625 $self->{fontsize} = $fontsize;
1521 delete $self->{texture}; 1626 delete $self->{texture};
1522 1627
1523 $self->update; 1628 $self->realloc;
1524 $self->check_size;
1525} 1629}
1526 1630
1527sub _draw { 1631sub _draw {
1528 my ($self) = @_; 1632 my ($self) = @_;
1529 1633
… …
1535 $self->{layout}->set_width ($self->{w}); 1639 $self->{layout}->set_width ($self->{w});
1536 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1640 $self->{layout}->set_ellipsise ($self->{ellipsise});
1537 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1538 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539 1643
1540 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1644 new_from_layout CFClient::Texture $self->{layout}
1645 };
1541 1646
1647 unless (exists $self->{ox}) {
1542 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1543 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1544 : ($self->{w} - $tex->{w}) * 0.5); 1650 : ($self->{w} - $tex->{w}) * 0.5);
1545 1651
1546 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1547 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1548 : ($self->{h} - $tex->{h}) * 0.5); 1654 : ($self->{h} - $tex->{h}) * 0.5);
1549
1550 $tex
1551 }; 1655 };
1552 1656
1553 glEnable GL_TEXTURE_2D; 1657 glEnable GL_TEXTURE_2D;
1554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1555 1658
1556 if ($tex->{format} == GL_ALPHA) { 1659 if ($tex->{format} == GL_ALPHA) {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1557 glColor @{$self->{fg}}; 1661 glColor @{$self->{fg}};
1558 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1559 } else { 1663 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1560 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1561 } 1666 }
1562 1667
1563 glDisable GL_TEXTURE_2D; 1668 glDisable GL_TEXTURE_2D;
1564} 1669}
… …
1593 1698
1594 delete $self->{cur_h}; 1699 delete $self->{cur_h};
1595 1700
1596 return if $self->{text} eq $text; 1701 return if $self->{text} eq $text;
1597 1702
1598 delete $self->{texture};
1599
1600 $self->{last_activity} = $::NOW; 1703 $self->{last_activity} = $::NOW;
1601 $self->{text} = $text; 1704 $self->{text} = $text;
1602 1705
1603 $text =~ s/./*/g if $self->{hidden}; 1706 $text =~ s/./*/g if $self->{hidden};
1604 $self->{layout}->set_text ("$text "); 1707 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h};
1605 1709
1606 $self->_emit (changed => $self->{text}); 1710 $self->_emit (changed => $self->{text});
1711
1712 $self->realloc;
1713 $self->update;
1607} 1714}
1608 1715
1609sub set_text { 1716sub set_text {
1610 my ($self, $text) = @_; 1717 my ($self, $text) = @_;
1611 1718
1612 $self->{cursor} = length $text; 1719 $self->{cursor} = length $text;
1613 $self->_set_text ($text); 1720 $self->_set_text ($text);
1614 $self->update;
1615 $self->check_size;
1616} 1721}
1617 1722
1618sub get_text { 1723sub get_text {
1619 $_[0]{text} 1724 $_[0]{text}
1620} 1725}
… …
1650 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1651 } elsif ($uni == 27) { 1756 } elsif ($uni == 27) {
1652 $self->_emit ('escape'); 1757 $self->_emit ('escape');
1653 } elsif ($uni) { 1758 } elsif ($uni) {
1654 substr $text, $self->{cursor}++, 0, chr $uni; 1759 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else {
1761 return 0;
1655 } 1762 }
1656 1763
1657 $self->_set_text ($text); 1764 $self->_set_text ($text);
1658 $self->update; 1765
1659 $self->check_size; 1766 $self->realloc;
1767
1768 1
1660} 1769}
1661 1770
1662sub focus_in { 1771sub focus_in {
1663 my ($self) = @_; 1772 my ($self) = @_;
1664 1773
… …
1679 utf8::encode $text; 1788 utf8::encode $text;
1680 $self->{cursor} = length substr $text, 0, $idx; 1789 $self->{cursor} = length substr $text, 0, $idx;
1681 1790
1682 $self->_set_text ($self->{text}); 1791 $self->_set_text ($self->{text});
1683 $self->update; 1792 $self->update;
1793
1794 1
1684} 1795}
1685 1796
1686sub mouse_motion { 1797sub mouse_motion {
1687 my ($self, $ev, $x, $y) = @_; 1798 my ($self, $ev, $x, $y) = @_;
1688# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1799# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1800
1801 0
1689} 1802}
1690 1803
1691sub _draw { 1804sub _draw {
1692 my ($self) = @_; 1805 my ($self) = @_;
1693 1806
1694 local $self->{fg} = $self->{fg}; 1807 local $self->{fg} = $self->{fg};
1695 1808
1696 if ($FOCUS == $self) { 1809 if ($FOCUS == $self) {
1697 glColor @{$self->{active_bg}}; 1810 glColor_premultiply @{$self->{active_bg}};
1698 $self->{fg} = $self->{active_fg}; 1811 $self->{fg} = $self->{active_fg};
1699 } else { 1812 } else {
1700 glColor @{$self->{bg}}; 1813 glColor_premultiply @{$self->{bg}};
1701 } 1814 }
1702 1815
1703 glEnable GL_BLEND; 1816 glEnable GL_BLEND;
1704 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1817 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1705 glBegin GL_QUADS; 1818 glBegin GL_QUADS;
1706 glVertex 0 , 0; 1819 glVertex 0 , 0;
1707 glVertex 0 , $self->{h}; 1820 glVertex 0 , $self->{h};
1708 glVertex $self->{w}, $self->{h}; 1821 glVertex $self->{w}, $self->{h};
1709 glVertex $self->{w}, 0; 1822 glVertex $self->{w}, 0;
… …
1770 } else { 1883 } else {
1771 $self->set_text ($self->{history_saveback}); 1884 $self->set_text ($self->{history_saveback});
1772 } 1885 }
1773 1886
1774 } else { 1887 } else {
1775 $self->SUPER::key_down ($ev); 1888 return $self->SUPER::key_down ($ev)
1889 }
1890
1776 } 1891 1
1777
1778} 1892}
1779 1893
1780############################################################################# 1894#############################################################################
1781 1895
1782package CFClient::UI::Button; 1896package CFClient::UI::Button;
… …
1791 1905
1792sub new { 1906sub new {
1793 my $class = shift; 1907 my $class = shift;
1794 1908
1795 $class->SUPER::new ( 1909 $class->SUPER::new (
1796 padding => 4, 1910 padding_x => 4,
1911 padding_y => 4,
1797 fg => [1, 1, 1], 1912 fg => [1, 1, 1],
1798 active_fg => [0, 0, 1], 1913 active_fg => [0, 0, 1],
1799 can_hover => 1, 1914 can_hover => 1,
1800 align => 0, 1915 align => 0,
1801 valign => 0, 1916 valign => 0,
… …
1810 my ($self, $ev, $x, $y) = @_; 1925 my ($self, $ev, $x, $y) = @_;
1811 1926
1812 $self->emit ("activate") 1927 $self->emit ("activate")
1813 if $x >= 0 && $x < $self->{w} 1928 if $x >= 0 && $x < $self->{w}
1814 && $y >= 0 && $y < $self->{h}; 1929 && $y >= 0 && $y < $self->{h};
1930
1931 1
1815} 1932}
1816 1933
1817sub _draw { 1934sub _draw {
1818 my ($self) = @_; 1935 my ($self) = @_;
1819 1936
1820 local $self->{fg} = $self->{fg}; 1937 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1821
1822 if ($GRAB == $self) {
1823 $self->{fg} = $self->{active_fg};
1824 }
1825 1938
1826 glEnable GL_TEXTURE_2D; 1939 glEnable GL_TEXTURE_2D;
1827 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1940 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1828 glColor 0, 0, 0, 1; 1941 glColor 0, 0, 0, 1;
1829 1942
… …
1848 1961
1849sub new { 1962sub new {
1850 my $class = shift; 1963 my $class = shift;
1851 1964
1852 $class->SUPER::new ( 1965 $class->SUPER::new (
1853 padding => 2, 1966 padding_x => 2,
1967 padding_y => 2,
1854 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1855 active_fg => [1, 1, 0], 1969 active_fg => [1, 1, 0],
1856 bg => [0, 0, 0, 0.2], 1970 bg => [0, 0, 0, 0.2],
1857 active_bg => [1, 1, 1, 0.5], 1971 active_bg => [1, 1, 1, 0.5],
1858 state => 0, 1972 state => 0,
… …
1862} 1976}
1863 1977
1864sub size_request { 1978sub size_request {
1865 my ($self) = @_; 1979 my ($self) = @_;
1866 1980
1867 ($self->{padding} * 2 + 6) x 2 1981 (6) x 2
1868} 1982}
1869 1983
1870sub button_down { 1984sub button_down {
1871 my ($self, $ev, $x, $y) = @_; 1985 my ($self, $ev, $x, $y) = @_;
1872 1986
1873 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1874 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1875 $self->{state} = !$self->{state}; 1989 $self->{state} = !$self->{state};
1876 $self->_emit (changed => $self->{state}); 1990 $self->_emit (changed => $self->{state});
1991 } else {
1992 return 0
1993 }
1994
1877 } 1995 1
1878} 1996}
1879 1997
1880sub _draw { 1998sub _draw {
1881 my ($self) = @_; 1999 my ($self) = @_;
1882 2000
1883 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
1884 2002
1885 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2003 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1886 2004
1887 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2005 my ($w, $h) = @$self{qw(w h)};
2006
2007 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1888 2008
1889 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2009 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1890 2010
1891 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2011 my $tex = $self->{state} ? $tex[1] : $tex[0];
1892 2012
… …
2047 2167
2048 my $h1 = $self->{h} * (1 - $ycut1); 2168 my $h1 = $self->{h} * (1 - $ycut1);
2049 my $h2 = $self->{h} * (1 - $ycut2); 2169 my $h2 = $self->{h} * (1 - $ycut2);
2050 2170
2051 glEnable GL_BLEND; 2171 glEnable GL_BLEND;
2052 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2053 glEnable GL_TEXTURE_2D; 2174 glEnable GL_TEXTURE_2D;
2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2175 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055 2176
2056 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2177 glBindTexture GL_TEXTURE_2D, $t1->{name};
2057 glBegin GL_QUADS; 2178 glBegin GL_QUADS;
… …
2157 fg => [1, 1, 1], 2278 fg => [1, 1, 1],
2158 active_fg => [0, 0, 0], 2279 active_fg => [0, 0, 0],
2159 bg => [0, 0, 0, 0.2], 2280 bg => [0, 0, 0, 0.2],
2160 active_bg => [1, 1, 1, 0.5], 2281 active_bg => [1, 1, 1, 0.5],
2161 range => [0, 0, 100, 10, 0], 2282 range => [0, 0, 100, 10, 0],
2162 req_w => $::WIDTH / 80, 2283 min_w => $::WIDTH / 80,
2163 req_h => $::WIDTH / 80, 2284 min_h => $::WIDTH / 80,
2164 vertical => 0, 2285 vertical => 0,
2165 can_hover => 1, 2286 can_hover => 1,
2166 inner_pad => 0.02, 2287 inner_pad => 0.02,
2167 @_ 2288 @_
2168 ); 2289 );
… …
2171 $self->update; 2292 $self->update;
2172 2293
2173 $self 2294 $self
2174} 2295}
2175 2296
2297sub changed { }
2298
2176sub set_range { 2299sub set_range {
2177 my ($self, $range) = @_; 2300 my ($self, $range) = @_;
2178 2301
2179 ($range, $self->{range}) = ($self->{range}, $range); 2302 ($range, $self->{range}) = ($self->{range}, $range);
2180 2303
… …
2206} 2329}
2207 2330
2208sub size_request { 2331sub size_request {
2209 my ($self) = @_; 2332 my ($self) = @_;
2210 2333
2211 my $w = $self->{req_w}; 2334 ($self->{req_w}, $self->{req_h})
2212 my $h = $self->{req_h};
2213
2214 $self->{vertical} ? ($h, $w) : ($w, $h)
2215} 2335}
2216 2336
2217sub button_down { 2337sub button_down {
2218 my ($self, $ev, $x, $y) = @_; 2338 my ($self, $ev, $x, $y) = @_;
2219 2339
2220 $self->SUPER::button_down ($ev, $x, $y); 2340 $self->SUPER::button_down ($ev, $x, $y);
2221 2341
2222 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2223 2343
2224 $self->mouse_motion ($ev, $x, $y); 2344 $self->mouse_motion ($ev, $x, $y)
2225} 2345}
2226 2346
2227sub mouse_motion { 2347sub mouse_motion {
2228 my ($self, $ev, $x, $y) = @_; 2348 my ($self, $ev, $x, $y) = @_;
2229 2349
… …
2233 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2353 my (undef, $lo, $hi, $page) = @{$self->{range}};
2234 2354
2235 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2355 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2236 2356
2237 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2357 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2358 } else {
2359 return 0;
2360 }
2361
2238 } 2362 1
2239} 2363}
2240 2364
2241sub update { 2365sub update {
2242 my ($self) = @_; 2366 my ($self) = @_;
2243 2367
2244 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2368 delete $self->{knob_w};
2369 $self->SUPER::update;
2370}
2371
2372sub _draw {
2373 my ($self) = @_;
2374
2375 unless ($self->{knob_w}) {
2245 $self->set_value ($self->{range}[0]); 2376 $self->set_value ($self->{range}[0]);
2246 2377
2247 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2378 my ($value, $lo, $hi, $page) = @{$self->{range}};
2248 my $range = ($hi - $page - $lo) || 1e-100; 2379 my $range = ($hi - $page - $lo) || 1e-100;
2249 2380
… …
2255 $value = ($value - $lo) / $range; 2386 $value = ($value - $lo) / $range;
2256 $value = $value * $self->{scale} + $self->{offset}; 2387 $value = $value * $self->{scale} + $self->{offset};
2257 2388
2258 $self->{knob_x} = $value - $knob_w * 0.5; 2389 $self->{knob_x} = $value - $knob_w * 0.5;
2259 $self->{knob_w} = $knob_w; 2390 $self->{knob_w} = $knob_w;
2260 }); 2391 }
2261
2262 $self->SUPER::update;
2263}
2264
2265sub _draw {
2266 my ($self) = @_;
2267 2392
2268 $self->SUPER::_draw (); 2393 $self->SUPER::_draw ();
2269 2394
2270 glScale $self->{w}, $self->{h}; 2395 glScale $self->{w}, $self->{h};
2271 2396
… …
2465 2590
2466 delete $self->{texture}; 2591 delete $self->{texture};
2467 } 2592 }
2468 2593
2469 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2470 glClearColor 0.5, 0.5, 0.5, 0; 2595 glClearColor 0, 0, 0, 0;
2471 glClear GL_COLOR_BUFFER_BIT; 2596 glClear GL_COLOR_BUFFER_BIT;
2472 2597
2473 my $top = int $self->{children}[1]{range}[0]; 2598 my $top = int $self->{children}[1]{range}[0];
2474 2599
2475 my $y0 = $top; 2600 my $y0 = $top;
… …
2510sub _draw { 2635sub _draw {
2511 my ($self) = @_; 2636 my ($self) = @_;
2512 2637
2513 glEnable GL_TEXTURE_2D; 2638 glEnable GL_TEXTURE_2D;
2514 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2515 glColor 1, 1, 1, 1; 2640 glColor 0, 0, 0, 1;
2516 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2641 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2517 glDisable GL_TEXTURE_2D; 2642 glDisable GL_TEXTURE_2D;
2518 2643
2519 $self->{children}[1]->draw; 2644 $self->{children}[1]->draw;
2520 2645
2521} 2646}
… …
2604} 2729}
2605 2730
2606sub set_tooltip_from { 2731sub set_tooltip_from {
2607 my ($self, $widget) = @_; 2732 my ($self, $widget) = @_;
2608 2733
2734 my $tooltip = $widget->{tooltip};
2735
2736 if ($ENV{CFPLUS_DEBUG} & 2) {
2737 $tooltip .= "\n\n" . (ref $widget) . "\n"
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}";
2741 }
2742
2609 $self->add (new CFClient::UI::Label 2743 $self->add (new CFClient::UI::Label
2610 markup => $widget->{tooltip}, 2744 markup => $tooltip,
2611 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2612 fontsize => 0.8, 2746 fontsize => 0.8,
2613 fg => [0, 0, 0, 1], 2747 fg => [0, 0, 0, 1],
2614 ellipsise => 0, 2748 ellipsise => 0,
2615 font => ($widget->{tooltip_font} || $::FONT_PROP), 2749 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2626 2760
2627sub size_allocate { 2761sub size_allocate {
2628 my ($self, $w, $h) = @_; 2762 my ($self, $w, $h) = @_;
2629 2763
2630 $self->SUPER::size_allocate ($w - 4, $h - 4); 2764 $self->SUPER::size_allocate ($w - 4, $h - 4);
2765}
2766
2767sub visibility_change {
2768 my ($self, $visible) = @_;
2769
2770 return unless $visible;
2771
2772 $self->{root}->on_post_alloc ("move_$self" => sub {
2773 my $widget = $self->{owner}
2774 or return;
2775
2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777
2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779 if $x + $self->{w} > $::WIDTH;
2780
2781 $self->move_abs ($x, $y);
2782 });
2631} 2783}
2632 2784
2633sub _draw { 2785sub _draw {
2634 my ($self) = @_; 2786 my ($self) = @_;
2635 2787
… …
2652 glVertex $w, $h; 2804 glVertex $w, $h;
2653 glVertex $w, 0; 2805 glVertex $w, 0;
2654 glEnd; 2806 glEnd;
2655 2807
2656 glTranslate 2 - 0.375, 2 - 0.375; 2808 glTranslate 2 - 0.375, 2 - 0.375;
2809
2657 $self->SUPER::_draw; 2810 $self->SUPER::_draw;
2658} 2811}
2659 2812
2660############################################################################# 2813#############################################################################
2661 2814
… …
2720 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2873 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2721 2874
2722 if ($tex) { 2875 if ($tex) {
2723 glEnable GL_TEXTURE_2D; 2876 glEnable GL_TEXTURE_2D;
2724 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2877 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2725 glColor 1, 1, 1, 1; 2878 glColor 0, 0, 0, 1;
2726 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2727 glDisable GL_TEXTURE_2D; 2880 glDisable GL_TEXTURE_2D;
2728 } 2881 }
2729} 2882}
2730 2883
… …
2737 $self->SUPER::DESTROY; 2890 $self->SUPER::DESTROY;
2738} 2891}
2739 2892
2740############################################################################# 2893#############################################################################
2741 2894
2742package CFClient::UI::Inventory; 2895package CFClient::UI::Buttonbar;
2743 2896
2744our @ISA = CFClient::UI::ScrolledWindow::; 2897our @ISA = CFClient::UI::HBox::;
2745 2898
2746sub new { 2899# TODO: should actualyl wrap buttons and other goodies.
2747 my $class = shift;
2748
2749 my $self = $class->SUPER::new (
2750 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2751 @_,
2752 );
2753
2754 $self
2755}
2756
2757sub set_items {
2758 my ($self, $items) = @_;
2759
2760 $self->{scrolled}->clear;
2761 return unless $items;
2762
2763 my @items = sort {
2764 ($a->{type} <=> $b->{type})
2765 or ($a->{name} cmp $b->{name})
2766 } @$items;
2767
2768 $self->{real_items} = \@items;
2769
2770 my $row = 0;
2771 for my $item (@items) {
2772 CFClient::Item::update_widgets $item;
2773
2774 $self->{scrolled}->add (0, $row, $item->{face_widget});
2775 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2776 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2777
2778 $row++;
2779 }
2780}
2781 2900
2782############################################################################# 2901#############################################################################
2783 2902
2784package CFClient::UI::Menu; 2903package CFClient::UI::Menu;
2785 2904
… …
2826 # maybe save $GRAB? must be careful about events... 2945 # maybe save $GRAB? must be careful about events...
2827 $GRAB = $self; 2946 $GRAB = $self;
2828 $self->{button} = $ev->{button}; 2947 $self->{button} = $ev->{button};
2829 2948
2830 $self->show; 2949 $self->show;
2831 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2950 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2832} 2951}
2833 2952
2834sub mouse_motion { 2953sub mouse_motion {
2835 my ($self, $ev, $x, $y) = @_; 2954 my ($self, $ev, $x, $y) = @_;
2836 2955
2837 # TODO: should use vbox->find_widget or so 2956 # TODO: should use vbox->find_widget or so
2838 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2839 $self->{hover} = $self->{item}{$HOVER}; 2958 $self->{hover} = $self->{item}{$HOVER};
2959
2960 0
2840} 2961}
2841 2962
2842sub button_up { 2963sub button_up {
2843 my ($self, $ev, $x, $y) = @_; 2964 my ($self, $ev, $x, $y) = @_;
2844 2965
… …
2846 undef $GRAB; 2967 undef $GRAB;
2847 $self->hide; 2968 $self->hide;
2848 2969
2849 $self->_emit ("popdown"); 2970 $self->_emit ("popdown");
2850 $self->{hover}[1]->() if $self->{hover}; 2971 $self->{hover}[1]->() if $self->{hover};
2972 } else {
2973 return 0
2974 }
2975
2851 } 2976 1
2852} 2977}
2853 2978
2854############################################################################# 2979#############################################################################
2855 2980
2856package CFClient::UI::Statusbox; 2981package CFClient::UI::Multiplexer;
2857 2982
2858our @ISA = CFClient::UI::VBox::; 2983our @ISA = CFClient::UI::Container::;
2859 2984
2860sub new { 2985sub new {
2861 my $class = shift; 2986 my $class = shift;
2862 2987
2863 $class->SUPER::new ( 2988 my $self = $class->SUPER::new (
2989 @_,
2990 );
2991
2992 $self->{current} = $self->{children}[0]
2993 if @{ $self->{children} };
2994
2995 $self
2996}
2997
2998sub add {
2999 my ($self, @widgets) = @_;
3000
3001 $self->SUPER::add (@widgets);
3002
3003 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} };
3005}
3006
3007sub set_current_page {
3008 my ($self, $page_or_widget) = @_;
3009
3010 my $widget = ref $page_or_widget
3011 ? $page_or_widget
3012 : $self->{children}[$page_or_widget];
3013
3014 $self->{current} = $widget;
3015 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016
3017 $self->_emit (page_changed => $self->{current});
3018
3019 $self->realloc;
3020}
3021
3022sub visible_children {
3023 $_[0]{current}
3024}
3025
3026sub size_request {
3027 my ($self) = @_;
3028
3029 $self->{current}->size_request
3030}
3031
3032sub size_allocate {
3033 my ($self, $w, $h) = @_;
3034
3035 $self->{current}->configure (0, 0, $w, $h);
3036}
3037
3038sub _draw {
3039 my ($self) = @_;
3040
3041 $self->{current}->draw;
3042}
3043
3044#############################################################################
3045
3046package CFClient::UI::Notebook;
3047
3048our @ISA = CFClient::UI::VBox::;
3049
3050sub new {
3051 my $class = shift;
3052
3053 my $self = $class->SUPER::new (
3054 buttonbar => (new CFClient::UI::Buttonbar),
3055 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3056 # filter => # will be put between multiplexer and $self
3057 @_,
3058 );
3059
3060 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3061 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3062
3063 $self
3064}
3065
3066sub add {
3067 my ($self, $title, $widget, $tooltip) = @_;
3068
3069 Scalar::Util::weaken $self;
3070
3071 $self->{buttonbar}->add (new CFClient::UI::Button
3072 markup => $title,
3073 tooltip => $tooltip,
3074 on_activate => sub { $self->set_current_page ($widget) },
3075 );
3076
3077 $self->{multiplexer}->add ($widget);
3078}
3079
3080sub set_current_page {
3081 my ($self, $page) = @_;
3082
3083 $self->{multiplexer}->set_current_page ($page);
3084 $self->_emit (page_changed => $self->{multiplexer}{current});
3085}
3086
3087#############################################################################
3088
3089package CFClient::UI::Statusbox;
3090
3091our @ISA = CFClient::UI::VBox::;
3092
3093sub new {
3094 my $class = shift;
3095
3096 my $self = $class->SUPER::new (
2864 fontsize => 0.8, 3097 fontsize => 0.8,
2865 @_, 3098 @_,
2866 ) 3099 );
3100
3101 Scalar::Util::weaken (my $this = $self);
3102
3103 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3104
3105 $self
2867} 3106}
2868 3107
2869sub reorder { 3108sub reorder {
2870 my ($self) = @_; 3109 my ($self) = @_;
2871 my $NOW = time; 3110 my $NOW = Time::HiRes::time;
3111
3112 # freeze display when hovering over any label
3113 return if $CFClient::UI::TOOLTIP->{owner}
3114 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3115 values %{ $self->{item} };
2872 3116
2873 while (my ($k, $v) = each %{ $self->{item} }) { 3117 while (my ($k, $v) = each %{ $self->{item} }) {
2874 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3118 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2875 } 3119 }
2876 3120
… …
2879 my @items = sort { 3123 my @items = sort {
2880 $a->{pri} <=> $b->{pri} 3124 $a->{pri} <=> $b->{pri}
2881 or $b->{id} <=> $a->{id} 3125 or $b->{id} <=> $a->{id}
2882 } values %{ $self->{item} }; 3126 } values %{ $self->{item} };
2883 3127
3128 $self->{timer}->interval (1);
3129
2884 my $count = 10 + 1; 3130 my $count = 10 + 1;
2885 for my $item (@items) { 3131 for my $item (@items) {
2886 last unless --$count; 3132 last unless --$count;
2887 3133
2888 push @widgets, $item->{label} ||= do { 3134 my $label = $item->{label} ||= do {
2889 # TODO: doesn't handle markup well (read as: at all) 3135 # TODO: doesn't handle markup well (read as: at all)
2890 my $short = $item->{count} > 1 3136 my $short = $item->{count} > 1
2891 ? "<b>$item->{count} ×</b> $item->{text}" 3137 ? "<b>$item->{count} ×</b> $item->{text}"
2892 : $item->{text}; 3138 : $item->{text};
2893 3139
… …
2901 tooltip => $item->{tooltip}, 3147 tooltip => $item->{tooltip},
2902 tooltip_font => $::FONT_PROP, 3148 tooltip_font => $::FONT_PROP,
2903 tooltip_width => 0.67, 3149 tooltip_width => 0.67,
2904 fontsize => $item->{fontsize} || $self->{fontsize}, 3150 fontsize => $item->{fontsize} || $self->{fontsize},
2905 max_w => $::WIDTH * 0.44, 3151 max_w => $::WIDTH * 0.44,
2906 fg => $item->{fg}, 3152 fg => [@{ $item->{fg} }],
2907 can_events => 1, 3153 can_events => 1,
2908 can_hover => 1 3154 can_hover => 1
2909 }; 3155 };
3156
3157 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3158 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3159 $label->update;
3160 $label->set_max_size (undef, $label->{req_h} * $diff)
3161 if $diff < 1;
3162 $self->{timer}->interval (1/30);
3163 } else {
3164 $label->{fg}[3] = $item->{fg}[3] || 1;
3165 }
3166
3167 push @widgets, $label;
2910 } 3168 }
2911 3169
2912 $self->clear; 3170 $self->clear;
2913 $self->SUPER::add (reverse @widgets); 3171 $self->SUPER::add (reverse @widgets);
2914} 3172}
… …
2919 $text =~ s/^\s+//; 3177 $text =~ s/^\s+//;
2920 $text =~ s/\s+$//; 3178 $text =~ s/\s+$//;
2921 3179
2922 return unless $text; 3180 return unless $text;
2923 3181
2924 my $timeout = time + ((delete $arg{timeout}) || 60); 3182 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2925 3183
2926 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3184 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2927 3185
2928 if (my $item = $self->{item}{$group}) { 3186 if (my $item = $self->{item}{$group}) {
2929 if ($item->{text} eq $text) { 3187 if ($item->{text} eq $text) {
… …
2959 3217
2960 $self->reorder; 3218 $self->reorder;
2961 $self->SUPER::reconfigure; 3219 $self->SUPER::reconfigure;
2962} 3220}
2963 3221
3222sub DESTROY {
3223 my ($self) = @_;
3224
3225 $self->{timer}->cancel;
3226
3227 $self->SUPER::DESTROY;
3228}
3229
2964############################################################################# 3230#############################################################################
2965 3231
2966package CFClient::UI::Root; 3232package CFClient::UI::Inventory;
2967 3233
2968our @ISA = CFClient::UI::Container::; 3234our @ISA = CFClient::UI::ScrolledWindow::;
2969
2970use CFClient::OpenGL;
2971 3235
2972sub new { 3236sub new {
2973 my $class = shift; 3237 my $class = shift;
2974 3238
2975 $class->SUPER::new ( 3239 my $self = $class->SUPER::new (
3240 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3241 @_,
3242 );
3243
3244 $self
3245}
3246
3247sub set_items {
3248 my ($self, $items) = @_;
3249
3250 $self->{child}->clear;
3251 return unless $items;
3252
3253 my @items = sort {
3254 ($a->{type} <=> $b->{type})
3255 or ($a->{name} cmp $b->{name})
3256 } @$items;
3257
3258 $self->{real_items} = \@items;
3259
3260 my $row = 0;
3261 for my $item (@items) {
3262 CFClient::Item::update_widgets $item;
3263
3264 $self->{child}->add (0, $row, $item->{face_widget});
3265 $self->{child}->add (1, $row, $item->{desc_widget});
3266 $self->{child}->add (2, $row, $item->{weight_widget});
3267
3268 $row++;
3269 }
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::BindEditor;
3275
3276our @ISA = CFClient::UI::FancyFrame::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3282
3283 $self->add (my $vb = new CFClient::UI::VBox);
3284
3285
3286 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3287 text => "start recording",
3288 tooltip => "Start/Stops recording of actions."
3289 ."All subsequent actions after the recording started will be captured."
3290 ."The actions are displayed after the record was stopped."
3291 ."To bind the action you have to click on the 'Bind' button",
3292 on_activate => sub {
3293 unless ($self->{recording}) {
3294 $self->start;
3295 } else {
3296 $self->stop;
3297 }
3298 });
3299
3300 $vb->add (new CFClient::UI::Label text => "Actions:");
3301 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3302
3303 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3304 $vb->add (my $hb = new CFClient::UI::HBox);
3305 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3306 $hb->add (new CFClient::UI::Button
3307 text => "bind",
3308 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3309 on_activate => sub {
3310 $self->ask_for_bind;
3311 });
3312
3313 $vb->add (my $hb = new CFClient::UI::HBox);
3314 $hb->add (new CFClient::UI::Button
3315 text => "ok",
3316 expand => 1,
3317 tooltip => "This closes the binding editor and saves the binding",
3318 on_activate => sub {
3319 $self->hide;
3320 $self->commit;
3321 });
3322
3323 $hb->add (new CFClient::UI::Button
3324 text => "cancel",
3325 expand => 1,
3326 tooltip => "This closes the binding editor without saving",
3327 on_activate => sub {
3328 $self->hide;
3329 $self->{binding_cancel}->()
3330 if $self->{binding_cancel};
3331 });
3332
3333 $self->update_binding_widgets;
3334
3335 $self
3336}
3337
3338sub commit {
3339 my ($self) = @_;
3340 my ($mod, $sym, $cmds) = $self->get_binding;
3341 if ($sym != 0 && @$cmds > 0) {
3342 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3343 ."'. Don't forget 'Save Config'!");
3344 $self->{binding_change}->($mod, $sym, $cmds)
3345 if $self->{binding_change};
3346 } else {
3347 $::STATUSBOX->add ("No action bound, no key or action specified!");
3348 $self->{binding_cancel}->()
3349 if $self->{binding_cancel};
3350 }
3351}
3352
3353sub start {
3354 my ($self) = @_;
3355
3356 $self->{rec_btn}->set_text ("stop recording");
3357 $self->{recording} = 1;
3358 $self->clear_command_list;
3359 $::CONN->start_record if $::CONN;
3360}
3361
3362sub stop {
3363 my ($self) = @_;
3364
3365 $self->{rec_btn}->set_text ("start recording");
3366 $self->{recording} = 0;
3367
3368 my $rec;
3369 $rec = $::CONN->stop_record if $::CONN;
3370 return unless ref $rec eq 'ARRAY';
3371 $self->set_command_list ($rec);
3372}
3373
3374
3375sub ask_for_bind_and_commit {
3376 my ($self) = @_;
3377 $self->ask_for_bind (1);
3378}
3379
3380sub ask_for_bind {
3381 my ($self, $commit) = @_;
3382
3383 CFClient::Binder::open_binding_dialog (sub {
3384 my ($mod, $sym) = @_;
3385 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3386 $self->update_binding_widgets;
3387 $self->commit if $commit;
3388 });
3389}
3390
3391# $mod and $sym are the modifiers and key symbol
3392# $cmds is a array ref of strings (the commands)
3393# $cb is the callback that is executed on OK
3394# $ccb is the callback that is executed on CANCEL and
3395# when the binding was unsuccessful on OK
3396sub set_binding {
3397 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3398
3399 $self->clear_command_list;
3400 $self->{recording} = 0;
3401 $self->{rec_btn}->set_text ("start recording");
3402
3403 $self->{binding} = [$mod, $sym];
3404 $self->{commands} = $cmds;
3405
3406 $self->{binding_change} = $cb;
3407 $self->{binding_cancel} = $ccb;
3408
3409 $self->update_binding_widgets;
3410}
3411
3412# this is a shortcut method that asks for a binding
3413# and then just binds it.
3414sub do_quick_binding {
3415 my ($self, $cmds) = @_;
3416 $self->set_binding (undef, undef, $cmds, sub {
3417 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3418 });
3419 $self->ask_for_bind (1);
3420}
3421
3422sub update_binding_widgets {
3423 my ($self) = @_;
3424 my ($mod, $sym, $cmds) = $self->get_binding;
3425 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3426 $self->set_command_list ($cmds);
3427}
3428
3429sub get_binding {
3430 my ($self) = @_;
3431 return (
3432 $self->{binding}->[0],
3433 $self->{binding}->[1],
3434 [ grep { defined $_ } @{$self->{commands}} ]
3435 );
3436}
3437
3438sub clear_command_list {
3439 my ($self) = @_;
3440 $self->{cmdbox}->clear ();
3441}
3442
3443sub set_command_list {
3444 my ($self, $cmds) = @_;
3445
3446 $self->{cmdbox}->clear ();
3447 $self->{commands} = $cmds;
3448
3449 my $idx = 0;
3450
3451 for (@$cmds) {
3452 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3453
3454 my $i = $idx;
3455 $hb->add (new CFClient::UI::Label text => $_);
3456 $hb->add (new CFClient::UI::Button
3457 text => "delete",
3458 tooltip => "Deletes the action from the record",
3459 on_activate => sub {
3460 $self->{cmdbox}->remove ($hb);
3461 $cmds->[$i] = undef;
3462 });
3463
3464
3465 $idx++
3466 }
3467}
3468
3469#############################################################################
3470
3471package CFClient::UI::SpellList;
3472
3473our @ISA = CFClient::UI::Table::;
3474
3475sub new {
3476 my $class = shift;
3477
3478 my $self = $class->SUPER::new (
3479 binding => [],
3480 commands => [],
3481 @_,
3482 )
3483}
3484
3485# XXX: Do sorting? Argl...
3486sub add_spell {
3487 my ($self, $spell) = @_;
3488 $self->{spells}->{$spell->{name}} = $spell;
3489
3490 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3491 face => $spell->{face},
3492 can_hover => 1,
3493 can_events => 1,
3494 tooltip => $spell->{message});
3495
3496 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => $spell->{name},
3498 can_hover => 1,
3499 can_events => 1,
3500 tooltip => $spell->{message},
3501 expand => 1);
3502
3503 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3504 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3505 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3506 expand => 1);
3507
3508 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3509 text => "bind to key",
3510 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3511}
3512
3513sub rebuild_spell_list {
3514 my ($self) = @_;
3515 $self->{tbl_idx} = 0;
3516 $self->add_spell ($_) for values %{$self->{spells}};
3517}
3518
3519sub remove_spell {
3520 my ($self, $spell) = @_;
3521 delete $self->{spells}->{$spell->{name}};
3522 $self->rebuild_spell_list;
3523}
3524
3525#############################################################################
3526
3527package CFClient::UI::Root;
3528
3529our @ISA = CFClient::UI::Container::;
3530
3531use List::Util qw(min max);
3532
3533use CFClient::OpenGL;
3534
3535sub new {
3536 my $class = shift;
3537
3538 my $self = $class->SUPER::new (
2976 visible => 1, 3539 visible => 1,
2977 @_, 3540 @_,
2978 ) 3541 );
2979}
2980 3542
2981sub configure { 3543 Scalar::Util::weaken ($self->{root} = $self);
2982 my ($self, $x, $y, $w, $h) = @_;
2983 3544
2984 $self->{w} = $w; 3545 $self
2985 $self->{h} = $h;
2986}
2987
2988sub check_size {
2989 my ($self) = @_;
2990
2991 $self->size_allocate ($self->{w}, $self->{h})
2992 if $self->{w};
2993} 3546}
2994 3547
2995sub size_request { 3548sub size_request {
2996 my ($self) = @_; 3549 my ($self) = @_;
2997 3550
2998 ($self->{w}, $self->{h}) 3551 ($self->{w}, $self->{h})
3552}
3553
3554sub _to_pixel {
3555 my ($coord, $size, $max) = @_;
3556
3557 $coord =
3558 $coord eq "center" ? ($max - $size) * 0.5
3559 : $coord eq "max" ? $max
3560 : $coord;
3561
3562 $coord = 0 if $coord < 0;
3563 $coord = $max - $size if $coord > $max - $size;
3564
3565 int $coord + 0.5
2999} 3566}
3000 3567
3001sub size_allocate { 3568sub size_allocate {
3002 my ($self, $w, $h) = @_; 3569 my ($self, $w, $h) = @_;
3003 3570
3004 for my $child ($self->children) { 3571 for my $child ($self->children) {
3005 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3572 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3006 3573
3007 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3574 $X = $child->{force_x} if exists $child->{force_x};
3008 if exists $child->{req_x}; 3575 $Y = $child->{force_y} if exists $child->{force_y};
3009 3576
3010 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3577 $X = _to_pixel $X, $W, $self->{w};
3011 if exists $child->{req_y}; 3578 $Y = _to_pixel $Y, $H, $self->{h};
3012
3013 delete @$child{qw(req_x req_y)};
3014
3015 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3016 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3017 3579
3018 $child->configure ($X, $Y, $W, $H); 3580 $child->configure ($X, $Y, $W, $H);
3019 } 3581 }
3020} 3582}
3021 3583
… …
3032} 3594}
3033 3595
3034sub update { 3596sub update {
3035 my ($self) = @_; 3597 my ($self) = @_;
3036 3598
3037 $self->check_size;
3038 $::WANT_REFRESH++; 3599 $::WANT_REFRESH++;
3039} 3600}
3040 3601
3041sub add { 3602sub add {
3042 my ($self, @children) = @_; 3603 my ($self, @children) = @_;
3043 3604
3044 for my $child (@children) {
3045 $child->{is_toplevel} = 1; 3605 $_->{is_toplevel} = 1
3046 3606 for @children;
3047 # integerise window positions
3048 $child->{x} = int $child->{x};
3049 $child->{y} = int $child->{y};
3050 }
3051 3607
3052 $self->SUPER::add (@children); 3608 $self->SUPER::add (@children);
3053
3054 for (my @widgets = @children; my $w = pop @widgets; ) {
3055 push @widgets, $w->children;
3056 $w->set_visible;
3057 }
3058
3059} 3609}
3060 3610
3061sub remove { 3611sub remove {
3062 my ($self, @children) = @_; 3612 my ($self, @children) = @_;
3063 3613
3064 $self->SUPER::remove (@children); 3614 $self->SUPER::remove (@children);
3615
3616 delete $self->{is_toplevel}
3617 for @children;
3065 3618
3066 while (@children) { 3619 while (@children) {
3067 my $w = pop @children; 3620 my $w = pop @children;
3068 push @children, $w->children; 3621 push @children, $w->children;
3069 $w->set_invisible; 3622 $w->set_invisible;
… …
3088 while ($self->{refresh_hook}) { 3641 while ($self->{refresh_hook}) {
3089 $_->() 3642 $_->()
3090 for values %{delete $self->{refresh_hook}}; 3643 for values %{delete $self->{refresh_hook}};
3091 } 3644 }
3092 3645
3093 if ($self->{check_size}) { 3646 if ($self->{realloc}) {
3647 my %queue;
3094 my @queue; 3648 my @queue;
3649 my $widget;
3095 3650
3096 for (;;) { 3651 outer:
3097 if ($self->{check_size}) { 3652 while () {
3098 #TODO use array-of-depth approach 3653 if (my $realloc = delete $self->{realloc}) {
3654 for $widget (values %$realloc) {
3655 $widget->{visible} or next; # do not resize invisible widgets
3099 3656
3100 @queue = sort { $a->{visible} <=> $b->{visible} } 3657 $queue{$widget+0}++ and next; # duplicates are common
3101 @queue, values %{delete $self->{check_size}}; 3658
3659 push @{ $queue[$widget->{visible}] }, $widget;
3660 }
3102 } 3661 }
3103 3662
3663 while () {
3664 @queue or last outer;
3665
3104 my $widget = pop @queue || last; 3666 $widget = pop @{ $queue[-1] || [] }
3105 3667 and last;
3106 defined $widget->{visible} or last; # do not resize invisible widgets
3107
3108 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3109 ? @$widget{qw(def_w def_h)}
3110 : $widget->size_request;
3111
3112 if (delete $widget->{force_alloc}
3113 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3114 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3115 3668
3669 pop @queue;
3670 }
3671
3672 delete $queue{$widget+0};
3673
3674 my ($w, $h) = $widget->size_request;
3675
3676 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3677 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3678
3679 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3680 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3681
3682 $w = $widget->{force_w} if exists $widget->{force_w};
3683 $h = $widget->{force_h} if exists $widget->{force_h};
3684
3685 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3686 || delete $widget->{force_realloc}) {
3116 $widget->{req_w} = $w; 3687 $widget->{req_w} = $w;
3117 $widget->{req_h} = $h; 3688 $widget->{req_h} = $h;
3118 3689
3119 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3690 $self->{size_alloc}{$widget+0} = $widget;
3120 3691
3121 $widget->{parent}->check_size
3122 if $widget->{parent}; 3692 if (my $parent = $widget->{parent}) {
3693 $self->{realloc}{$parent+0} = $parent
3694 unless $queue{$parent+0};
3695
3696 $parent->{force_size_alloc} = 1;
3697 $self->{size_alloc}{$parent+0} = $parent;
3698 }
3123 } 3699 }
3700
3701 delete $self->{realloc}{$widget+0};
3124 } 3702 }
3125 } 3703 }
3126 3704
3127 while ($self->{size_alloc}) { 3705 while (my $size_alloc = delete $self->{size_alloc}) {
3128 for (values %{delete $self->{size_alloc}}) { 3706 my @queue = sort { $b->{visible} <=> $a->{visible} }
3129 my ($widget, $w, $h) = @$_; 3707 values %$size_alloc;
3708
3709 while () {
3710 my $widget = pop @queue || last;
3711
3712 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3130 3713
3131 $w = 0 if $w < 0; 3714 $w = 0 if $w < 0;
3132 $h = 0 if $h < 0; 3715 $h = 0 if $h < 0;
3133 3716
3717 $w = int $w + 0.5;
3718 $h = int $h + 0.5;
3719
3720 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3721 $widget->{old_w} = $widget->{w};
3722 $widget->{old_h} = $widget->{h};
3723
3134 $widget->{w} = $w; 3724 $widget->{w} = $w;
3135 $widget->{h} = $h; 3725 $widget->{h} = $h;
3726
3136 $widget->emit (size_allocate => $w, $h); 3727 $widget->emit (size_allocate => $w, $h);
3728 }
3137 } 3729 }
3138 } 3730 }
3139 3731
3140 while ($self->{post_alloc_hook}) { 3732 while ($self->{post_alloc_hook}) {
3141 $_->() 3733 $_->()
3142 for values %{delete $self->{post_alloc_hook}}; 3734 for values %{delete $self->{post_alloc_hook}};
3143 } 3735 }
3736
3144 3737
3145 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3738 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3146 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3739 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3147 glClear GL_COLOR_BUFFER_BIT; 3740 glClear GL_COLOR_BUFFER_BIT;
3148 3741
… …
3150 glLoadIdentity; 3743 glLoadIdentity;
3151 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3152 glMatrixMode GL_MODELVIEW; 3745 glMatrixMode GL_MODELVIEW;
3153 glLoadIdentity; 3746 glLoadIdentity;
3154 3747
3748 {
3749 package CFClient::UI::Base;
3750
3751 ($draw_x, $draw_y, $draw_w, $draw_h) =
3752 (0, 0, $self->{w}, $self->{h});
3753 }
3754
3155 $self->_draw; 3755 $self->_draw;
3156} 3756}
3157 3757
3158############################################################################# 3758#############################################################################
3159 3759

Diff Legend

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