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.249 by root, Sun May 28 01:40:02 2006 UTC vs.
Revision 1.296 by root, Wed Jun 7 05:48:53 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, List::Util::min $self->{root}{w} - $self->{w}, int $x;
308 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, 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 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
450 538
451sub draw { 539sub draw {
452 my ($self) = @_; 540 my ($self) = @_;
453 541
454 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
455 553
456 glPushMatrix; 554 glPushMatrix;
457 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
458 $self->_draw;
459 glPopMatrix;
460 556
461 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
462 my ($x, $y) = @$self{qw(x y)};
463
464 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
465 glEnable GL_BLEND; 559 glEnable GL_BLEND;
466 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
467 glBegin GL_QUADS; 561 glBegin GL_QUADS;
468 glVertex $x , $y; 562 glVertex 0 , 0;
469 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
470 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
471 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
472 glEnd; 566 glEnd;
473 glDisable GL_BLEND; 567 glDisable GL_BLEND;
474 } 568 }
475 569
476 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
477 glPushMatrix; 571 glPushMatrix;
478 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
480 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
481 glVertex 0 , 0; 575 glVertex 0 , 0;
482 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
483 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
484 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
485 glEnd; 579 glEnd;
486 glPopMatrix; 580 glPopMatrix;
487 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
488 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
489} 586}
490 587
491sub _draw { 588sub _draw {
492 my ($self) = @_; 589 my ($self) = @_;
493 590
494 warn "no draw defined for $self\n"; 591 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} 592}
555 593
556sub DESTROY { 594sub DESTROY {
557 my ($self) = @_; 595 my ($self) = @_;
558 596
… …
590 628
591 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
592 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
593 631
594 glEnable GL_BLEND; 632 glEnable GL_BLEND;
595 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
596 glColor @$color; 634 glColor_premultiply @$color;
597 635
598 glBegin GL_QUADS; 636 glBegin GL_QUADS;
599 glVertex 0 , 0; 637 glVertex 0 , 0;
600 glVertex 0 , $h; 638 glVertex 0 , $h;
601 glVertex $w, $h; 639 glVertex $w, $h;
… …
616 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
617 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
618} 656}
619 657
620sub size_request { 658sub size_request {
621 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
622} 662}
623 663
624sub draw { } 664sub draw { }
625 665
626############################################################################# 666#############################################################################
… …
630our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
631 671
632sub new { 672sub new {
633 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
634 674
635 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
636 676
637 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
638 children => [], 678 children => [],
639 can_events => 0, 679 can_events => 0,
640 %arg, 680 %arg,
641 ); 681 );
682
642 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
643 685
644 $self 686 $self
645} 687}
646 688
647sub add { 689sub add {
… …
655 $self->{children} = [ 697 $self->{children} = [
656 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
657 @{$self->{children}}, @widgets 699 @{$self->{children}}, @widgets
658 ]; 700 ];
659 701
660 $self->check_size (1); 702 $self->realloc;
661 $self->update;
662} 703}
663 704
664sub children { 705sub children {
665 @{ $_[0]{children} } 706 @{ $_[0]{children} }
666} 707}
… …
671 delete $child->{parent}; 712 delete $child->{parent};
672 $child->hide; 713 $child->hide;
673 714
674 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
675 716
676 $self->check_size (1); 717 $self->realloc;
677 $self->update;
678} 718}
679 719
680sub clear { 720sub clear {
681 my ($self) = @_; 721 my ($self) = @_;
682 722
… …
686 for (@$children) { 726 for (@$children) {
687 delete $_->{parent}; 727 delete $_->{parent};
688 $_->hide; 728 $_->hide;
689 } 729 }
690 730
691 $self->check_size; 731 $self->realloc;
692 $self->update;
693} 732}
694 733
695sub find_widget { 734sub find_widget {
696 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
697 736
698 $x -= $self->{x}; 737 $x -= $self->{x};
699 $y -= $self->{y}; 738 $y -= $self->{y};
700 739
701 my $res; 740 my $res;
702 741
703 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
704 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
705 and return $res; 744 and return $res;
706 } 745 }
707 746
708 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
757 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
758} 797}
759 798
760############################################################################# 799#############################################################################
761 800
801# back-buffered drawing area
802
762package CFClient::UI::Window; 803package CFClient::UI::Window;
763 804
764our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
765 806
766use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
784 $self->SUPER::size_allocate ($w, $h); 825 $self->SUPER::size_allocate ($w, $h);
785 $self->update; 826 $self->update;
786} 827}
787 828
788sub _render { 829sub _render {
830 my ($self) = @_;
831
789 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
790} 833}
791 834
792sub render_child { 835sub render_child {
793 my ($self) = @_; 836 my ($self) = @_;
794 837
795 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
796 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
797 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
798 841
842 {
843 package CFClient::UI::Base;
844
845 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h});
847 }
848
799 $self->_render; 849 $self->_render;
800 }; 850 };
801} 851}
802 852
803sub _draw { 853sub _draw {
804 my ($self) = @_; 854 my ($self) = @_;
805 855
806 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
807 857
808 my $tex = $self->{texture} 858 my $tex = $self->{texture}
809 or return; 859 or return;
810 860
811 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
812 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
813 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
814 864
815 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
816 866
817 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
818} 868}
… …
834} 884}
835 885
836sub size_request { 886sub size_request {
837 my ($self) = @_; 887 my ($self) = @_;
838 888
839 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
840 890
841 $w = 10 if $self->{scroll_x}; 891 $w = 10 if $self->{scroll_x};
842 $h = 10 if $self->{scroll_y}; 892 $h = 10 if $self->{scroll_y};
843 893
844 ($w, $h) 894 ($w, $h)
845} 895}
846 896
847sub size_allocate { 897sub size_allocate {
848 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
849 899
900 my $child = $self->child;
901
850 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
851 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
852 904
853 $self->child->configure (0, 0, $w, $h); 905 $self->child->configure (0, 0, $w, $h);
854 $self->update; 906 $self->update;
855} 907}
856 908
… …
892} 944}
893 945
894sub _render { 946sub _render {
895 my ($self) = @_; 947 my ($self) = @_;
896 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
897 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
898 953
899 $self->SUPER::_render; 954 $self->SUPER::_render;
900} 955}
901 956
… …
904package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
905 960
906our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
907 962
908sub new { 963sub new {
909 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
910 967
911 my $self; 968 my $self;
912 969
913 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
914 vertical => 1, 971 vertical => 1,
… …
919 ; 976 ;
920 977
921 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
922 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
923 slider => $slider, 980 slider => $slider,
924 @_, 981 %arg,
925 ); 982 );
926 983
927 $self->{vp}->add ($self->{scrolled});
928 $self->add ($self->{vp});
929 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
930 986
931 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
932} 994}
933 995
934sub update { 996sub update {
935 my ($self) = @_; 997 my ($self) = @_;
936 998
… …
975 1037
976 if ($self->{bg}) { 1038 if ($self->{bg}) {
977 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
978 1040
979 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
981 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
982 1044
983 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
984 glVertex 0 , 0; 1046 glVertex 0 , 0;
985 glVertex 0 , $h; 1047 glVertex 0 , $h;
986 glVertex $w, $h; 1048 glVertex $w, $h;
… …
999 1061
1000our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
1001 1063
1002use CFClient::OpenGL; 1064use CFClient::OpenGL;
1003 1065
1004my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1005 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 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); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1007 1073
1008sub new { 1074sub new {
1009 my $class = shift; 1075 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1010 1078
1011 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
1012 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
1013 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
1014 border => 0.6, 1082 border => 0.6,
1015 is_toplevel => 1,
1016 can_events => 1, 1083 can_events => 1,
1017 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
1018 ); 1087 );
1019 1088
1020 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
1021 align => 0, 1090 align => 0,
1022 valign => 1, 1091 valign => 1,
1023 text => $self->{title}, 1092 text => $title,
1024 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
1025 1095
1026 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1027} 1104}
1028 1105
1029sub border { 1106sub border {
1030 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
1031} 1108}
1032 1109
1033sub size_request { 1110sub size_request {
1034 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
1035 1115
1036 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
1037 1117
1038 ( 1118 (
1039 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
1042} 1122}
1043 1123
1044sub size_allocate { 1124sub size_allocate {
1045 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
1046 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
1047 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
1048 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1049 1137
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); 1138 $self->child->configure ($border, $border, $w, $h);
1054} 1139}
1055 1140
1056sub button_down { 1141sub button_down {
1057 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1058 1143
… …
1074 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1075 1160
1076 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1078 1163
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
1081 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y}); 1166
1084 $self->check_size; 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1168 $self->realloc;
1085 }; 1169 };
1086 1170
1087 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1088 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1091 $self->{motion} = sub { 1175 $self->{motion} = sub {
1092 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1093 1177
1094 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1095 1179
1096 $self->{user_x} = $bx + $x - $ox; 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097 $self->{user_y} = $by + $y - $oy; 1181 # HACK: the next line is required to enforce placement
1098 1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1099 $self->move ($self->{user_x}, $self->{user_y});
1100 $self->update;
1101 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1102 } 1188 1
1103} 1189}
1104 1190
1105sub button_up { 1191sub button_up {
1106 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1107 1193
1108 delete $self->{motion}; 1194 !!delete $self->{motion}
1109} 1195}
1110 1196
1111sub mouse_motion { 1197sub mouse_motion {
1112 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1113 1199
1114 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1115} 1203}
1116 1204
1117sub _draw { 1205sub _draw {
1118 my ($self) = @_; 1206 my ($self) = @_;
1119 1207
1208 my $child = $self->{children}[0];
1209
1120 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1121 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1122 1212
1123 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1125 1215
1126 my $border = $self->border; 1216 my $border = $self->border;
1127 1217
1128 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1129 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1130 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1131 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1132 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1133 1223
1134 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1135 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1136 1226
1137 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1138 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1139 my $rep_y = $ch / $bg->{h}; 1230 $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); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1147 } 1232 }
1148 1233
1149 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1150 1235
1151 $self->{title}->draw if $self->{title};
1152
1153 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1154} 1242}
1155 1243
1156############################################################################# 1244#############################################################################
1157 1245
1158package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1180 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1181 1269
1182 $child->set_parent ($self); 1270 $child->set_parent ($self);
1183 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1184 1272
1185 $self->check_size (1); 1273 $self->realloc;
1186} 1274}
1187 1275
1188# TODO: move to container class maybe? send children a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
1189sub clear { 1277sub clear {
1190 my ($self) = @_; 1278 my ($self) = @_;
… …
1195 for (@children) { 1283 for (@children) {
1196 delete $_->{parent}; 1284 delete $_->{parent};
1197 $_->hide; 1285 $_->hide;
1198 } 1286 }
1199 1287
1200 $self->check_size (1); 1288 $self->realloc;
1201 $self->update;
1202} 1289}
1203 1290
1204sub get_wh { 1291sub get_wh {
1205 my ($self) = @_; 1292 my ($self) = @_;
1206 1293
… …
1414 ellipsise => 3, # end 1501 ellipsise => 3, # end
1415 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1416 fontsize => 1, 1503 fontsize => 1,
1417 align => -1, 1504 align => -1,
1418 valign => -1, 1505 valign => -1,
1419 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1420 can_events => 0, 1508 can_events => 0,
1421 %arg 1509 %arg
1422 ); 1510 );
1423 1511
1424 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1451 1539
1452 delete $self->{texture}; 1540 delete $self->{texture};
1453 $self->SUPER::update; 1541 $self->SUPER::update;
1454} 1542}
1455 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1456sub set_text { 1551sub set_text {
1457 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1458 1553
1459 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1460 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1461 1556
1462 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1464 1559
1560 delete $self->{size_req};
1561 $self->realloc;
1465 $self->update; 1562 $self->update;
1466 $self->check_size;
1467} 1563}
1468 1564
1469sub set_markup { 1565sub set_markup {
1470 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1471 1567
… …
1475 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476 1572
1477 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1478 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1479 1575
1576 delete $self->{size_req};
1577 $self->realloc;
1480 $self->update; 1578 $self->update;
1481 $self->check_size;
1482} 1579}
1483 1580
1484sub size_request { 1581sub size_request {
1485 my ($self) = @_; 1582 my ($self) = @_;
1486 1583
1584 $self->{size_req} ||= do {
1487 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1488 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1489 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1490 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1491 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1492 1590
1493 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1494 1592
1495 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1496 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1497 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1498 1596
1499 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1500 1598
1501 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1502 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1503 } 1604 };
1504 1605
1505 ( 1606 @{ $self->{size_req} }
1506 $w + $self->{padding} * 2,
1507 $h + $self->{padding} * 2,
1508 )
1509} 1607}
1510 1608
1511sub size_allocate { 1609sub size_allocate {
1512 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1513 1611
1612 delete $self->{ox};
1613
1514 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1515} 1616}
1516 1617
1517sub set_fontsize { 1618sub set_fontsize {
1518 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1519 1620
1520 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1521 delete $self->{texture}; 1622 delete $self->{texture};
1522 1623
1523 $self->update; 1624 $self->realloc;
1524 $self->check_size; 1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1525} 1633}
1526 1634
1527sub _draw { 1635sub _draw {
1528 my ($self) = @_; 1636 my ($self) = @_;
1529 1637
… …
1535 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1536 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1537 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1538 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539 1647
1540 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1649 };
1541 1650
1651 unless (exists $self->{ox}) {
1542 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1543 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1544 : ($self->{w} - $tex->{w}) * 0.5); 1654 : ($self->{w} - $tex->{w}) * 0.5);
1545 1655
1546 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1547 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1548 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1549
1550 $tex
1551 }; 1659 };
1552 1660
1553 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1662
1663 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1664 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1555 1665
1556 if ($tex->{format} == GL_ALPHA) { 1666 if ($tex->{format} == GL_ALPHA) {
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1557 glColor @{$self->{fg}}; 1668 glColor @{$self->{fg}};
1558 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1559 } else { 1670 } else {
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1560 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1561 } 1673 }
1562 1674
1563 glDisable GL_TEXTURE_2D; 1675 glDisable GL_TEXTURE_2D;
1564} 1676}
1565 1677
… …
1582 can_hover => 1, 1694 can_hover => 1,
1583 can_focus => 1, 1695 can_focus => 1,
1584 valign => 0, 1696 valign => 0,
1585 can_events => 1, 1697 can_events => 1,
1586 #text => ... 1698 #text => ...
1699 #hidden => "*",
1587 @_ 1700 @_
1588 ) 1701 )
1589} 1702}
1590 1703
1591sub _set_text { 1704sub _set_text {
… …
1593 1706
1594 delete $self->{cur_h}; 1707 delete $self->{cur_h};
1595 1708
1596 return if $self->{text} eq $text; 1709 return if $self->{text} eq $text;
1597 1710
1598 delete $self->{texture};
1599
1600 $self->{last_activity} = $::NOW; 1711 $self->{last_activity} = $::NOW;
1601 $self->{text} = $text; 1712 $self->{text} = $text;
1602 1713
1603 $text =~ s/./*/g if $self->{hidden}; 1714 $text =~ s/./*/g if $self->{hidden};
1604 $self->{layout}->set_text ("$text "); 1715 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req};
1605 1717
1606 $self->_emit (changed => $self->{text}); 1718 $self->_emit (changed => $self->{text});
1719
1720 $self->realloc;
1721 $self->update;
1607} 1722}
1608 1723
1609sub set_text { 1724sub set_text {
1610 my ($self, $text) = @_; 1725 my ($self, $text) = @_;
1611 1726
1612 $self->{cursor} = length $text; 1727 $self->{cursor} = length $text;
1613 $self->_set_text ($text); 1728 $self->_set_text ($text);
1614 $self->update;
1615 $self->check_size;
1616} 1729}
1617 1730
1618sub get_text { 1731sub get_text {
1619 $_[0]{text} 1732 $_[0]{text}
1620} 1733}
… …
1650 $self->{cursor} = length $text; 1763 $self->{cursor} = length $text;
1651 } elsif ($uni == 27) { 1764 } elsif ($uni == 27) {
1652 $self->_emit ('escape'); 1765 $self->_emit ('escape');
1653 } elsif ($uni) { 1766 } elsif ($uni) {
1654 substr $text, $self->{cursor}++, 0, chr $uni; 1767 substr $text, $self->{cursor}++, 0, chr $uni;
1768 } else {
1769 return 0;
1655 } 1770 }
1656 1771
1657 $self->_set_text ($text); 1772 $self->_set_text ($text);
1658 $self->update; 1773
1659 $self->check_size; 1774 $self->realloc;
1775
1776 1
1660} 1777}
1661 1778
1662sub focus_in { 1779sub focus_in {
1663 my ($self) = @_; 1780 my ($self) = @_;
1664 1781
… …
1679 utf8::encode $text; 1796 utf8::encode $text;
1680 $self->{cursor} = length substr $text, 0, $idx; 1797 $self->{cursor} = length substr $text, 0, $idx;
1681 1798
1682 $self->_set_text ($self->{text}); 1799 $self->_set_text ($self->{text});
1683 $self->update; 1800 $self->update;
1801
1802 1
1684} 1803}
1685 1804
1686sub mouse_motion { 1805sub mouse_motion {
1687 my ($self, $ev, $x, $y) = @_; 1806 my ($self, $ev, $x, $y) = @_;
1688# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1807# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1808
1809 0
1689} 1810}
1690 1811
1691sub _draw { 1812sub _draw {
1692 my ($self) = @_; 1813 my ($self) = @_;
1693 1814
1694 local $self->{fg} = $self->{fg}; 1815 local $self->{fg} = $self->{fg};
1695 1816
1696 if ($FOCUS == $self) { 1817 if ($FOCUS == $self) {
1697 glColor @{$self->{active_bg}}; 1818 glColor_premultiply @{$self->{active_bg}};
1698 $self->{fg} = $self->{active_fg}; 1819 $self->{fg} = $self->{active_fg};
1699 } else { 1820 } else {
1700 glColor @{$self->{bg}}; 1821 glColor_premultiply @{$self->{bg}};
1701 } 1822 }
1702 1823
1703 glEnable GL_BLEND; 1824 glEnable GL_BLEND;
1704 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1825 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1705 glBegin GL_QUADS; 1826 glBegin GL_QUADS;
1706 glVertex 0 , 0; 1827 glVertex 0 , 0;
1707 glVertex 0 , $self->{h}; 1828 glVertex 0 , $self->{h};
1708 glVertex $self->{w}, $self->{h}; 1829 glVertex $self->{w}, $self->{h};
1709 glVertex $self->{w}, 0; 1830 glVertex $self->{w}, 0;
… …
1770 } else { 1891 } else {
1771 $self->set_text ($self->{history_saveback}); 1892 $self->set_text ($self->{history_saveback});
1772 } 1893 }
1773 1894
1774 } else { 1895 } else {
1775 $self->SUPER::key_down ($ev); 1896 return $self->SUPER::key_down ($ev)
1897 }
1898
1776 } 1899 1
1777
1778} 1900}
1779 1901
1780############################################################################# 1902#############################################################################
1781 1903
1782package CFClient::UI::Button; 1904package CFClient::UI::Button;
… …
1791 1913
1792sub new { 1914sub new {
1793 my $class = shift; 1915 my $class = shift;
1794 1916
1795 $class->SUPER::new ( 1917 $class->SUPER::new (
1796 padding => 4, 1918 padding_x => 4,
1919 padding_y => 4,
1797 fg => [1, 1, 1], 1920 fg => [1, 1, 1],
1798 active_fg => [0, 0, 1], 1921 active_fg => [0, 0, 1],
1799 can_hover => 1, 1922 can_hover => 1,
1800 align => 0, 1923 align => 0,
1801 valign => 0, 1924 valign => 0,
… …
1810 my ($self, $ev, $x, $y) = @_; 1933 my ($self, $ev, $x, $y) = @_;
1811 1934
1812 $self->emit ("activate") 1935 $self->emit ("activate")
1813 if $x >= 0 && $x < $self->{w} 1936 if $x >= 0 && $x < $self->{w}
1814 && $y >= 0 && $y < $self->{h}; 1937 && $y >= 0 && $y < $self->{h};
1938
1939 1
1815} 1940}
1816 1941
1817sub _draw { 1942sub _draw {
1818 my ($self) = @_; 1943 my ($self) = @_;
1819 1944
1820 local $self->{fg} = $self->{fg}; 1945 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1821
1822 if ($GRAB == $self) {
1823 $self->{fg} = $self->{active_fg};
1824 }
1825 1946
1826 glEnable GL_TEXTURE_2D; 1947 glEnable GL_TEXTURE_2D;
1827 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1828 glColor 0, 0, 0, 1; 1949 glColor 0, 0, 0, 1;
1829 1950
… …
1848 1969
1849sub new { 1970sub new {
1850 my $class = shift; 1971 my $class = shift;
1851 1972
1852 $class->SUPER::new ( 1973 $class->SUPER::new (
1853 padding => 2, 1974 padding_x => 2,
1975 padding_y => 2,
1854 fg => [1, 1, 1], 1976 fg => [1, 1, 1],
1855 active_fg => [1, 1, 0], 1977 active_fg => [1, 1, 0],
1856 bg => [0, 0, 0, 0.2], 1978 bg => [0, 0, 0, 0.2],
1857 active_bg => [1, 1, 1, 0.5], 1979 active_bg => [1, 1, 1, 0.5],
1858 state => 0, 1980 state => 0,
… …
1862} 1984}
1863 1985
1864sub size_request { 1986sub size_request {
1865 my ($self) = @_; 1987 my ($self) = @_;
1866 1988
1867 ($self->{padding} * 2 + 6) x 2 1989 (6) x 2
1868} 1990}
1869 1991
1870sub button_down { 1992sub button_down {
1871 my ($self, $ev, $x, $y) = @_; 1993 my ($self, $ev, $x, $y) = @_;
1872 1994
1873 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1995 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1874 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1996 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1875 $self->{state} = !$self->{state}; 1997 $self->{state} = !$self->{state};
1876 $self->_emit (changed => $self->{state}); 1998 $self->_emit (changed => $self->{state});
1999 } else {
2000 return 0
2001 }
2002
1877 } 2003 1
1878} 2004}
1879 2005
1880sub _draw { 2006sub _draw {
1881 my ($self) = @_; 2007 my ($self) = @_;
1882 2008
1883 $self->SUPER::_draw; 2009 $self->SUPER::_draw;
1884 2010
1885 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2011 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1886 2012
1887 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2013 my ($w, $h) = @$self{qw(w h)};
2014
2015 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1888 2016
1889 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2017 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1890 2018
1891 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2019 my $tex = $self->{state} ? $tex[1] : $tex[0];
1892 2020
… …
2047 2175
2048 my $h1 = $self->{h} * (1 - $ycut1); 2176 my $h1 = $self->{h} * (1 - $ycut1);
2049 my $h2 = $self->{h} * (1 - $ycut2); 2177 my $h2 = $self->{h} * (1 - $ycut2);
2050 2178
2051 glEnable GL_BLEND; 2179 glEnable GL_BLEND;
2052 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2180 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2181 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2053 glEnable GL_TEXTURE_2D; 2182 glEnable GL_TEXTURE_2D;
2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2183 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055 2184
2056 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2185 glBindTexture GL_TEXTURE_2D, $t1->{name};
2057 glBegin GL_QUADS; 2186 glBegin GL_QUADS;
… …
2157 fg => [1, 1, 1], 2286 fg => [1, 1, 1],
2158 active_fg => [0, 0, 0], 2287 active_fg => [0, 0, 0],
2159 bg => [0, 0, 0, 0.2], 2288 bg => [0, 0, 0, 0.2],
2160 active_bg => [1, 1, 1, 0.5], 2289 active_bg => [1, 1, 1, 0.5],
2161 range => [0, 0, 100, 10, 0], 2290 range => [0, 0, 100, 10, 0],
2162 req_w => $::WIDTH / 80, 2291 min_w => $::WIDTH / 80,
2163 req_h => $::WIDTH / 80, 2292 min_h => $::WIDTH / 80,
2164 vertical => 0, 2293 vertical => 0,
2165 can_hover => 1, 2294 can_hover => 1,
2166 inner_pad => 0.02, 2295 inner_pad => 0.02,
2167 @_ 2296 @_
2168 ); 2297 );
… …
2171 $self->update; 2300 $self->update;
2172 2301
2173 $self 2302 $self
2174} 2303}
2175 2304
2305sub changed { }
2306
2176sub set_range { 2307sub set_range {
2177 my ($self, $range) = @_; 2308 my ($self, $range) = @_;
2178 2309
2179 ($range, $self->{range}) = ($self->{range}, $range); 2310 ($range, $self->{range}) = ($self->{range}, $range);
2180 2311
2181 $self->update
2182 if "@$range" ne "@{$self->{range}}"; 2312 if ("@$range" ne "@{$self->{range}}") {
2313 $self->update;
2314 $self->set_value ($self->{range}[0]);
2315 }
2183} 2316}
2184 2317
2185sub set_value { 2318sub set_value {
2186 my ($self, $value) = @_; 2319 my ($self, $value) = @_;
2187 2320
… …
2206} 2339}
2207 2340
2208sub size_request { 2341sub size_request {
2209 my ($self) = @_; 2342 my ($self) = @_;
2210 2343
2211 my $w = $self->{req_w}; 2344 ($self->{req_w}, $self->{req_h})
2212 my $h = $self->{req_h};
2213
2214 $self->{vertical} ? ($h, $w) : ($w, $h)
2215} 2345}
2216 2346
2217sub button_down { 2347sub button_down {
2218 my ($self, $ev, $x, $y) = @_; 2348 my ($self, $ev, $x, $y) = @_;
2219 2349
2220 $self->SUPER::button_down ($ev, $x, $y); 2350 $self->SUPER::button_down ($ev, $x, $y);
2221 2351
2222 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2352 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2223 2353
2224 $self->mouse_motion ($ev, $x, $y); 2354 $self->mouse_motion ($ev, $x, $y)
2225} 2355}
2226 2356
2227sub mouse_motion { 2357sub mouse_motion {
2228 my ($self, $ev, $x, $y) = @_; 2358 my ($self, $ev, $x, $y) = @_;
2229 2359
… …
2233 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2363 my (undef, $lo, $hi, $page) = @{$self->{range}};
2234 2364
2235 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2365 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2236 2366
2237 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2367 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2368 } else {
2369 return 0;
2370 }
2371
2238 } 2372 1
2239} 2373}
2240 2374
2241sub update { 2375sub update {
2242 my ($self) = @_; 2376 my ($self) = @_;
2243 2377
2244 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2378 delete $self->{knob_w};
2379 $self->SUPER::update;
2380}
2381
2382sub _draw {
2383 my ($self) = @_;
2384
2385 unless ($self->{knob_w}) {
2245 $self->set_value ($self->{range}[0]); 2386 $self->set_value ($self->{range}[0]);
2246 2387
2247 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2388 my ($value, $lo, $hi, $page) = @{$self->{range}};
2248 my $range = ($hi - $page - $lo) || 1e-100; 2389 my $range = ($hi - $page - $lo) || 1e-100;
2249 2390
… …
2255 $value = ($value - $lo) / $range; 2396 $value = ($value - $lo) / $range;
2256 $value = $value * $self->{scale} + $self->{offset}; 2397 $value = $value * $self->{scale} + $self->{offset};
2257 2398
2258 $self->{knob_x} = $value - $knob_w * 0.5; 2399 $self->{knob_x} = $value - $knob_w * 0.5;
2259 $self->{knob_w} = $knob_w; 2400 $self->{knob_w} = $knob_w;
2260 }); 2401 }
2261
2262 $self->SUPER::update;
2263}
2264
2265sub _draw {
2266 my ($self) = @_;
2267 2402
2268 $self->SUPER::_draw (); 2403 $self->SUPER::_draw ();
2269 2404
2270 glScale $self->{w}, $self->{h}; 2405 glScale $self->{w}, $self->{h};
2271 2406
… …
2344 my $class = shift; 2479 my $class = shift;
2345 2480
2346 my $self = $class->SUPER::new ( 2481 my $self = $class->SUPER::new (
2347 fontsize => 1, 2482 fontsize => 1,
2348 can_events => 0, 2483 can_events => 0,
2484 indent => 0,
2349 #font => default_font 2485 #font => default_font
2350 @_, 2486 @_,
2351 2487
2352 layout => (new CFClient::Layout 1), 2488 layout => (new CFClient::Layout 1),
2353 par => [], 2489 par => [],
… …
2376 $self->SUPER::size_allocate ($w, $h); 2512 $self->SUPER::size_allocate ($w, $h);
2377 2513
2378 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2514 $self->{layout}->set_font ($self->{font}) if $self->{font};
2379 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2380 $self->{layout}->set_width ($self->{children}[0]{w}); 2516 $self->{layout}->set_width ($self->{children}[0]{w});
2517 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2381 2518
2382 $self->reflow; 2519 $self->reflow;
2383} 2520}
2384 2521
2385sub text_size { 2522sub text_size {
… …
2387 2524
2388 my $layout = $self->{layout}; 2525 my $layout = $self->{layout};
2389 2526
2390 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2527 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2391 $layout->set_width ($self->{children}[0]{w} - $indent); 2528 $layout->set_width ($self->{children}[0]{w} - $indent);
2529 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2392 $layout->set_markup ($text); 2530 $layout->set_markup ($text);
2393 2531
2394 $layout->size 2532 $layout->size
2395} 2533}
2396 2534
… …
2435 2573
2436 return unless $self->{h} > 0; 2574 return unless $self->{h} > 0;
2437 2575
2438 delete $self->{texture}; 2576 delete $self->{texture};
2439 2577
2440 $ROOT->on_post_alloc ($self, sub { 2578 $ROOT->on_post_alloc ($self => sub {
2441 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2579 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2442 2580
2443 if (delete $self->{need_reflow}) { 2581 if (delete $self->{need_reflow}) {
2444 my $height = 0; 2582 my $height = 0;
2445 2583
… …
2448 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2586 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2449 2587
2450 for (@{$self->{par}}) { 2588 for (@{$self->{par}}) {
2451 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2589 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2452 $layout->set_width ($W - $_->[3]); 2590 $layout->set_width ($W - $_->[3]);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2453 $layout->set_markup ($_->[4]); 2592 $layout->set_markup ($_->[4]);
2454 my ($w, $h) = $layout->size; 2593 my ($w, $h) = $layout->size;
2455 $_->[0] = $w + $_->[3]; 2594 $_->[0] = $w + $_->[3];
2456 $_->[1] = $h; 2595 $_->[1] = $h;
2457 } 2596 }
… …
2460 } 2599 }
2461 2600
2462 $self->{height} = $height; 2601 $self->{height} = $height;
2463 2602
2464 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2603 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2465 2604
2466 delete $self->{texture}; 2605 delete $self->{texture};
2467 } 2606 }
2468 2607
2469 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2608 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2470 glClearColor 0.5, 0.5, 0.5, 0; 2609 glClearColor 0, 0, 0, 0;
2471 glClear GL_COLOR_BUFFER_BIT; 2610 glClear GL_COLOR_BUFFER_BIT;
2472 2611
2473 my $top = int $self->{children}[1]{range}[0]; 2612 my $top = int $self->{children}[1]{range}[0];
2474 2613
2475 my $y0 = $top; 2614 my $y0 = $top;
… …
2489 my $h = $par->[1]; 2628 my $h = $par->[1];
2490 2629
2491 if ($y0 < $y + $h && $y < $y1) { 2630 if ($y0 < $y + $h && $y < $y1) {
2492 $layout->set_foreground (@{ $par->[2] }); 2631 $layout->set_foreground (@{ $par->[2] });
2493 $layout->set_width ($W - $par->[3]); 2632 $layout->set_width ($W - $par->[3]);
2633 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2494 $layout->set_markup ($par->[4]); 2634 $layout->set_markup ($par->[4]);
2495 2635
2496 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2636 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2497 2637
2498 glRasterPos $par->[3], $y - $y0; 2638 glRasterPos $par->[3], $y - $y0;
… …
2510sub _draw { 2650sub _draw {
2511 my ($self) = @_; 2651 my ($self) = @_;
2512 2652
2513 glEnable GL_TEXTURE_2D; 2653 glEnable GL_TEXTURE_2D;
2514 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2515 glColor 1, 1, 1, 1; 2655 glColor 0, 0, 0, 1;
2516 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2656 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2517 glDisable GL_TEXTURE_2D; 2657 glDisable GL_TEXTURE_2D;
2518 2658
2519 $self->{children}[1]->draw; 2659 $self->{children}[1]->draw;
2520 2660
2521} 2661}
… …
2604} 2744}
2605 2745
2606sub set_tooltip_from { 2746sub set_tooltip_from {
2607 my ($self, $widget) = @_; 2747 my ($self, $widget) = @_;
2608 2748
2749 my $tooltip = $widget->{tooltip};
2750
2751 if ($ENV{CFPLUS_DEBUG} & 2) {
2752 $tooltip .= "\n\n" . (ref $widget) . "\n"
2753 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2754 . "req $widget->{req_w} $widget->{req_h}\n"
2755 . "visible $widget->{visible}";
2756 }
2757
2609 $self->add (new CFClient::UI::Label 2758 $self->add (new CFClient::UI::Label
2610 markup => $widget->{tooltip}, 2759 markup => $tooltip,
2611 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2760 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2612 fontsize => 0.8, 2761 fontsize => 0.8,
2613 fg => [0, 0, 0, 1], 2762 fg => [0, 0, 0, 1],
2614 ellipsise => 0, 2763 ellipsise => 0,
2615 font => ($widget->{tooltip_font} || $::FONT_PROP), 2764 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2626 2775
2627sub size_allocate { 2776sub size_allocate {
2628 my ($self, $w, $h) = @_; 2777 my ($self, $w, $h) = @_;
2629 2778
2630 $self->SUPER::size_allocate ($w - 4, $h - 4); 2779 $self->SUPER::size_allocate ($w - 4, $h - 4);
2780}
2781
2782sub visibility_change {
2783 my ($self, $visible) = @_;
2784
2785 return unless $visible;
2786
2787 $self->{root}->on_post_alloc ("move_$self" => sub {
2788 my $widget = $self->{owner}
2789 or return;
2790
2791 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2792
2793 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2794 if $x + $self->{w} > $self->{root}{w};
2795
2796 $self->move_abs ($x, $y);
2797 });
2631} 2798}
2632 2799
2633sub _draw { 2800sub _draw {
2634 my ($self) = @_; 2801 my ($self) = @_;
2635 2802
… …
2652 glVertex $w, $h; 2819 glVertex $w, $h;
2653 glVertex $w, 0; 2820 glVertex $w, 0;
2654 glEnd; 2821 glEnd;
2655 2822
2656 glTranslate 2 - 0.375, 2 - 0.375; 2823 glTranslate 2 - 0.375, 2 - 0.375;
2824
2657 $self->SUPER::_draw; 2825 $self->SUPER::_draw;
2658} 2826}
2659 2827
2660############################################################################# 2828#############################################################################
2661 2829
… …
2720 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2888 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2721 2889
2722 if ($tex) { 2890 if ($tex) {
2723 glEnable GL_TEXTURE_2D; 2891 glEnable GL_TEXTURE_2D;
2724 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2892 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2725 glColor 1, 1, 1, 1; 2893 glColor 0, 0, 0, 1;
2726 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2894 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2727 glDisable GL_TEXTURE_2D; 2895 glDisable GL_TEXTURE_2D;
2728 } 2896 }
2729} 2897}
2730 2898
… …
2737 $self->SUPER::DESTROY; 2905 $self->SUPER::DESTROY;
2738} 2906}
2739 2907
2740############################################################################# 2908#############################################################################
2741 2909
2742package CFClient::UI::Inventory; 2910package CFClient::UI::Buttonbar;
2743 2911
2744our @ISA = CFClient::UI::ScrolledWindow::; 2912our @ISA = CFClient::UI::HBox::;
2745 2913
2746sub new { 2914# 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 2915
2782############################################################################# 2916#############################################################################
2783 2917
2784package CFClient::UI::Menu; 2918package CFClient::UI::Menu;
2785 2919
… …
2797 ); 2931 );
2798 2932
2799 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2933 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2800 2934
2801 for my $item (@{ $self->{items} }) { 2935 for my $item (@{ $self->{items} }) {
2802 my ($widget, $cb) = @$item; 2936 my ($widget, $cb, $tooltip) = @$item;
2803 2937
2804 # handle various types of items, only text for now 2938 # handle various types of items, only text for now
2805 if (!ref $widget) { 2939 if (!ref $widget) {
2806 $widget = new CFClient::UI::Label 2940 $widget = new CFClient::UI::Label
2807 can_hover => 1, 2941 can_hover => 1,
2808 can_events => 1, 2942 can_events => 1,
2809 text => $widget; 2943 text => $widget,
2944 tooltip => $tooltip
2810 } 2945 }
2811 2946
2812 $self->{item}{$widget} = $item; 2947 $self->{item}{$widget} = $item;
2813 2948
2814 $self->{vbox}->add ($widget); 2949 $self->{vbox}->add ($widget);
… …
2826 # maybe save $GRAB? must be careful about events... 2961 # maybe save $GRAB? must be careful about events...
2827 $GRAB = $self; 2962 $GRAB = $self;
2828 $self->{button} = $ev->{button}; 2963 $self->{button} = $ev->{button};
2829 2964
2830 $self->show; 2965 $self->show;
2831 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2966 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2832} 2967}
2833 2968
2834sub mouse_motion { 2969sub mouse_motion {
2835 my ($self, $ev, $x, $y) = @_; 2970 my ($self, $ev, $x, $y) = @_;
2836 2971
2837 # TODO: should use vbox->find_widget or so 2972 # TODO: should use vbox->find_widget or so
2838 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2973 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2839 $self->{hover} = $self->{item}{$HOVER}; 2974 $self->{hover} = $self->{item}{$HOVER};
2975
2976 0
2840} 2977}
2841 2978
2842sub button_up { 2979sub button_up {
2843 my ($self, $ev, $x, $y) = @_; 2980 my ($self, $ev, $x, $y) = @_;
2844 2981
… …
2846 undef $GRAB; 2983 undef $GRAB;
2847 $self->hide; 2984 $self->hide;
2848 2985
2849 $self->_emit ("popdown"); 2986 $self->_emit ("popdown");
2850 $self->{hover}[1]->() if $self->{hover}; 2987 $self->{hover}[1]->() if $self->{hover};
2988 } else {
2989 return 0
2990 }
2991
2851 } 2992 1
2852} 2993}
2853 2994
2854############################################################################# 2995#############################################################################
2855 2996
2856package CFClient::UI::Statusbox; 2997package CFClient::UI::Multiplexer;
2857 2998
2858our @ISA = CFClient::UI::VBox::; 2999our @ISA = CFClient::UI::Container::;
2859 3000
2860sub new { 3001sub new {
2861 my $class = shift; 3002 my $class = shift;
2862 3003
2863 $class->SUPER::new ( 3004 my $self = $class->SUPER::new (
3005 @_,
3006 );
3007
3008 $self->{current} = $self->{children}[0]
3009 if @{ $self->{children} };
3010
3011 $self
3012}
3013
3014sub add {
3015 my ($self, @widgets) = @_;
3016
3017 $self->SUPER::add (@widgets);
3018
3019 $self->{current} = $self->{children}[0]
3020 if @{ $self->{children} };
3021}
3022
3023sub set_current_page {
3024 my ($self, $page_or_widget) = @_;
3025
3026 my $widget = ref $page_or_widget
3027 ? $page_or_widget
3028 : $self->{children}[$page_or_widget];
3029
3030 $self->{current} = $widget;
3031 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3032
3033 $self->_emit (page_changed => $self->{current});
3034
3035 $self->realloc;
3036}
3037
3038sub visible_children {
3039 $_[0]{current}
3040}
3041
3042sub size_request {
3043 my ($self) = @_;
3044
3045 $self->{current}->size_request
3046}
3047
3048sub size_allocate {
3049 my ($self, $w, $h) = @_;
3050
3051 $self->{current}->configure (0, 0, $w, $h);
3052}
3053
3054sub _draw {
3055 my ($self) = @_;
3056
3057 $self->{current}->draw;
3058}
3059
3060#############################################################################
3061
3062package CFClient::UI::Notebook;
3063
3064our @ISA = CFClient::UI::VBox::;
3065
3066sub new {
3067 my $class = shift;
3068
3069 my $self = $class->SUPER::new (
3070 buttonbar => (new CFClient::UI::Buttonbar),
3071 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3072 # filter => # will be put between multiplexer and $self
3073 @_,
3074 );
3075
3076 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3077 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3078
3079 $self
3080}
3081
3082sub add {
3083 my ($self, $title, $widget, $tooltip) = @_;
3084
3085 Scalar::Util::weaken $self;
3086
3087 $self->{buttonbar}->add (new CFClient::UI::Button
3088 markup => $title,
3089 tooltip => $tooltip,
3090 on_activate => sub { $self->set_current_page ($widget) },
3091 );
3092
3093 $self->{multiplexer}->add ($widget);
3094}
3095
3096sub set_current_page {
3097 my ($self, $page) = @_;
3098
3099 $self->{multiplexer}->set_current_page ($page);
3100 $self->_emit (page_changed => $self->{multiplexer}{current});
3101}
3102
3103#############################################################################
3104
3105package CFClient::UI::Combobox;
3106
3107use utf8;
3108
3109our @ISA = CFClient::UI::Button::;
3110
3111sub new {
3112 my $class = shift;
3113
3114 my $self = $class->SUPER::new (
3115 options => [], # [title, value, tooltip], ...
3116 value => undef,
3117 @_,
3118 );
3119
3120 $self->_set_value ($self->{value});
3121
3122 $self
3123}
3124
3125sub button_down {
3126 my ($self, $ev) = @_;
3127
3128 my @menu_items;
3129
3130 for (@{ $self->{options} }) {
3131 my ($title, $value, $tooltip) = @$_;
3132
3133 push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
3134 }
3135
3136 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3137}
3138
3139sub _set_value {
3140 my ($self, $value) = @_;
3141
3142 my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
3143 or return;
3144
3145 $self->{value} = $item->[1];
3146 $self->set_markup ("$item->[0] ⇓");
3147 $self->set_tooltip ($item->[2]);
3148}
3149
3150sub set_value {
3151 my ($self, $value) = @_;
3152
3153 return unless $self->{value} ne $value;
3154
3155 $self->_set_value ($value);
3156 $self->_emit (changed => $value);
3157}
3158
3159#############################################################################
3160
3161package CFClient::UI::Statusbox;
3162
3163our @ISA = CFClient::UI::VBox::;
3164
3165sub new {
3166 my $class = shift;
3167
3168 my $self = $class->SUPER::new (
2864 fontsize => 0.8, 3169 fontsize => 0.8,
2865 @_, 3170 @_,
2866 ) 3171 );
3172
3173 Scalar::Util::weaken (my $this = $self);
3174
3175 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3176
3177 $self
2867} 3178}
2868 3179
2869sub reorder { 3180sub reorder {
2870 my ($self) = @_; 3181 my ($self) = @_;
2871 my $NOW = time; 3182 my $NOW = Time::HiRes::time;
3183
3184 # freeze display when hovering over any label
3185 return if $CFClient::UI::TOOLTIP->{owner}
3186 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3187 values %{ $self->{item} };
2872 3188
2873 while (my ($k, $v) = each %{ $self->{item} }) { 3189 while (my ($k, $v) = each %{ $self->{item} }) {
2874 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3190 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2875 } 3191 }
2876 3192
… …
2879 my @items = sort { 3195 my @items = sort {
2880 $a->{pri} <=> $b->{pri} 3196 $a->{pri} <=> $b->{pri}
2881 or $b->{id} <=> $a->{id} 3197 or $b->{id} <=> $a->{id}
2882 } values %{ $self->{item} }; 3198 } values %{ $self->{item} };
2883 3199
3200 $self->{timer}->interval (1);
3201
2884 my $count = 10 + 1; 3202 my $count = 10 + 1;
2885 for my $item (@items) { 3203 for my $item (@items) {
2886 last unless --$count; 3204 last unless --$count;
2887 3205
2888 push @widgets, $item->{label} ||= do { 3206 my $label = $item->{label} ||= do {
2889 # TODO: doesn't handle markup well (read as: at all) 3207 # TODO: doesn't handle markup well (read as: at all)
2890 my $short = $item->{count} > 1 3208 my $short = $item->{count} > 1
2891 ? "<b>$item->{count} ×</b> $item->{text}" 3209 ? "<b>$item->{count} ×</b> $item->{text}"
2892 : $item->{text}; 3210 : $item->{text};
2893 3211
… …
2901 tooltip => $item->{tooltip}, 3219 tooltip => $item->{tooltip},
2902 tooltip_font => $::FONT_PROP, 3220 tooltip_font => $::FONT_PROP,
2903 tooltip_width => 0.67, 3221 tooltip_width => 0.67,
2904 fontsize => $item->{fontsize} || $self->{fontsize}, 3222 fontsize => $item->{fontsize} || $self->{fontsize},
2905 max_w => $::WIDTH * 0.44, 3223 max_w => $::WIDTH * 0.44,
2906 fg => $item->{fg}, 3224 fg => [@{ $item->{fg} }],
2907 can_events => 1, 3225 can_events => 1,
2908 can_hover => 1 3226 can_hover => 1
2909 }; 3227 };
3228
3229 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3230 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3231 $label->update;
3232 $label->set_max_size (undef, $label->{req_h} * $diff)
3233 if $diff < 1;
3234 $self->{timer}->interval (1/30);
3235 } else {
3236 $label->{fg}[3] = $item->{fg}[3] || 1;
3237 }
3238
3239 push @widgets, $label;
2910 } 3240 }
2911 3241
2912 $self->clear; 3242 $self->clear;
2913 $self->SUPER::add (reverse @widgets); 3243 $self->SUPER::add (reverse @widgets);
2914} 3244}
… …
2919 $text =~ s/^\s+//; 3249 $text =~ s/^\s+//;
2920 $text =~ s/\s+$//; 3250 $text =~ s/\s+$//;
2921 3251
2922 return unless $text; 3252 return unless $text;
2923 3253
2924 my $timeout = time + ((delete $arg{timeout}) || 60); 3254 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2925 3255
2926 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3256 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2927 3257
2928 if (my $item = $self->{item}{$group}) { 3258 if (my $item = $self->{item}{$group}) {
2929 if ($item->{text} eq $text) { 3259 if ($item->{text} eq $text) {
… …
2959 3289
2960 $self->reorder; 3290 $self->reorder;
2961 $self->SUPER::reconfigure; 3291 $self->SUPER::reconfigure;
2962} 3292}
2963 3293
3294sub DESTROY {
3295 my ($self) = @_;
3296
3297 $self->{timer}->cancel;
3298
3299 $self->SUPER::DESTROY;
3300}
3301
2964############################################################################# 3302#############################################################################
2965 3303
2966package CFClient::UI::Root; 3304package CFClient::UI::Inventory;
2967 3305
2968our @ISA = CFClient::UI::Container::; 3306our @ISA = CFClient::UI::ScrolledWindow::;
2969
2970use CFClient::OpenGL;
2971 3307
2972sub new { 3308sub new {
2973 my $class = shift; 3309 my $class = shift;
2974 3310
2975 $class->SUPER::new ( 3311 my $self = $class->SUPER::new (
3312 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3313 @_,
3314 );
3315
3316 $self
3317}
3318
3319sub set_items {
3320 my ($self, $items) = @_;
3321
3322 $self->{child}->clear;
3323 return unless $items;
3324
3325 my @items = sort {
3326 ($a->{type} <=> $b->{type})
3327 or ($a->{name} cmp $b->{name})
3328 } @$items;
3329
3330 $self->{real_items} = \@items;
3331
3332 my $row = 0;
3333 for my $item (@items) {
3334 CFClient::Item::update_widgets $item;
3335
3336 $self->{child}->add (0, $row, $item->{face_widget});
3337 $self->{child}->add (1, $row, $item->{desc_widget});
3338 $self->{child}->add (2, $row, $item->{weight_widget});
3339
3340 $row++;
3341 }
3342}
3343
3344#############################################################################
3345
3346package CFClient::UI::BindEditor;
3347
3348our @ISA = CFClient::UI::FancyFrame::;
3349
3350sub new {
3351 my $class = shift;
3352
3353 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3354
3355 $self->add (my $vb = new CFClient::UI::VBox);
3356
3357
3358 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3359 text => "start recording",
3360 tooltip => "Start/Stops recording of actions."
3361 ."All subsequent actions after the recording started will be captured."
3362 ."The actions are displayed after the record was stopped."
3363 ."To bind the action you have to click on the 'Bind' button",
3364 on_activate => sub {
3365 unless ($self->{recording}) {
3366 $self->start;
3367 } else {
3368 $self->stop;
3369 }
3370 });
3371
3372 $vb->add (new CFClient::UI::Label text => "Actions:");
3373 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3374
3375 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3376 $vb->add (my $hb = new CFClient::UI::HBox);
3377 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3378 $hb->add (new CFClient::UI::Button
3379 text => "bind",
3380 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3381 on_activate => sub {
3382 $self->ask_for_bind;
3383 });
3384
3385 $vb->add (my $hb = new CFClient::UI::HBox);
3386 $hb->add (new CFClient::UI::Button
3387 text => "ok",
3388 expand => 1,
3389 tooltip => "This closes the binding editor and saves the binding",
3390 on_activate => sub {
3391 $self->hide;
3392 $self->commit;
3393 });
3394
3395 $hb->add (new CFClient::UI::Button
3396 text => "cancel",
3397 expand => 1,
3398 tooltip => "This closes the binding editor without saving",
3399 on_activate => sub {
3400 $self->hide;
3401 $self->{binding_cancel}->()
3402 if $self->{binding_cancel};
3403 });
3404
3405 $self->update_binding_widgets;
3406
3407 $self
3408}
3409
3410sub commit {
3411 my ($self) = @_;
3412 my ($mod, $sym, $cmds) = $self->get_binding;
3413 if ($sym != 0 && @$cmds > 0) {
3414 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3415 ."'. Don't forget 'Save Config'!");
3416 $self->{binding_change}->($mod, $sym, $cmds)
3417 if $self->{binding_change};
3418 } else {
3419 $::STATUSBOX->add ("No action bound, no key or action specified!");
3420 $self->{binding_cancel}->()
3421 if $self->{binding_cancel};
3422 }
3423}
3424
3425sub start {
3426 my ($self) = @_;
3427
3428 $self->{rec_btn}->set_text ("stop recording");
3429 $self->{recording} = 1;
3430 $self->clear_command_list;
3431 $::CONN->start_record if $::CONN;
3432}
3433
3434sub stop {
3435 my ($self) = @_;
3436
3437 $self->{rec_btn}->set_text ("start recording");
3438 $self->{recording} = 0;
3439
3440 my $rec;
3441 $rec = $::CONN->stop_record if $::CONN;
3442 return unless ref $rec eq 'ARRAY';
3443 $self->set_command_list ($rec);
3444}
3445
3446
3447sub ask_for_bind_and_commit {
3448 my ($self) = @_;
3449 $self->ask_for_bind (1);
3450}
3451
3452sub ask_for_bind {
3453 my ($self, $commit) = @_;
3454
3455 CFClient::Binder::open_binding_dialog (sub {
3456 my ($mod, $sym) = @_;
3457 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3458 $self->update_binding_widgets;
3459 $self->commit if $commit;
3460 });
3461}
3462
3463# $mod and $sym are the modifiers and key symbol
3464# $cmds is a array ref of strings (the commands)
3465# $cb is the callback that is executed on OK
3466# $ccb is the callback that is executed on CANCEL and
3467# when the binding was unsuccessful on OK
3468sub set_binding {
3469 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3470
3471 $self->clear_command_list;
3472 $self->{recording} = 0;
3473 $self->{rec_btn}->set_text ("start recording");
3474
3475 $self->{binding} = [$mod, $sym];
3476 $self->{commands} = $cmds;
3477
3478 $self->{binding_change} = $cb;
3479 $self->{binding_cancel} = $ccb;
3480
3481 $self->update_binding_widgets;
3482}
3483
3484# this is a shortcut method that asks for a binding
3485# and then just binds it.
3486sub do_quick_binding {
3487 my ($self, $cmds) = @_;
3488 $self->set_binding (undef, undef, $cmds, sub {
3489 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3490 });
3491 $self->ask_for_bind (1);
3492}
3493
3494sub update_binding_widgets {
3495 my ($self) = @_;
3496 my ($mod, $sym, $cmds) = $self->get_binding;
3497 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3498 $self->set_command_list ($cmds);
3499}
3500
3501sub get_binding {
3502 my ($self) = @_;
3503 return (
3504 $self->{binding}->[0],
3505 $self->{binding}->[1],
3506 [ grep { defined $_ } @{$self->{commands}} ]
3507 );
3508}
3509
3510sub clear_command_list {
3511 my ($self) = @_;
3512 $self->{cmdbox}->clear ();
3513}
3514
3515sub set_command_list {
3516 my ($self, $cmds) = @_;
3517
3518 $self->{cmdbox}->clear ();
3519 $self->{commands} = $cmds;
3520
3521 my $idx = 0;
3522
3523 for (@$cmds) {
3524 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3525
3526 my $i = $idx;
3527 $hb->add (new CFClient::UI::Label text => $_);
3528 $hb->add (new CFClient::UI::Button
3529 text => "delete",
3530 tooltip => "Deletes the action from the record",
3531 on_activate => sub {
3532 $self->{cmdbox}->remove ($hb);
3533 $cmds->[$i] = undef;
3534 });
3535
3536
3537 $idx++
3538 }
3539}
3540
3541#############################################################################
3542
3543package CFClient::UI::SpellList;
3544
3545our @ISA = CFClient::UI::Table::;
3546
3547sub new {
3548 my $class = shift;
3549
3550 my $self = $class->SUPER::new (
3551 binding => [],
3552 commands => [],
3553 @_,
3554 )
3555}
3556
3557my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3558 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3559my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3561my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3562 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3563
3564sub rebuild_spell_list {
3565 my ($self) = @_;
3566
3567 $CFClient::UI::ROOT->on_refresh ($self => sub {
3568 $self->clear;
3569
3570 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3571 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3572 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3573 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3574
3575 my $row = 0;
3576
3577 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3578 my $spell = $self->{spell}{$_};
3579
3580 $row++;
3581
3582 $self->add (0, $row, new CFClient::UI::Face
3583 face => $spell->{face},
3584 can_hover => 1,
3585 can_events => 1,
3586 tooltip => $spell->{message},
3587 );
3588
3589 $self->add (1, $row, new CFClient::UI::Label
3590 expand => 1,
3591 text => $spell->{name},
3592 can_hover => 1,
3593 can_events => 1,
3594 tooltip => $spell->{message},
3595 );
3596
3597 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600
3601 # TODO: should be done via popup
3602 $self->add (5, $row, new CFClient::UI::Button
3603 text => "bind",
3604 tooltip => "bind spell readying (cast command) to key",
3605 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3606 );
3607 }
3608 });
3609}
3610
3611sub add_spell {
3612 my ($self, $spell) = @_;
3613
3614 $self->{spell}->{$spell->{name}} = $spell;
3615 $self->rebuild_spell_list;
3616}
3617
3618sub remove_spell {
3619 my ($self, $spell) = @_;
3620
3621 delete $self->{spell}->{$spell->{name}};
3622 $self->rebuild_spell_list;
3623}
3624
3625#############################################################################
3626
3627package CFClient::UI::Root;
3628
3629our @ISA = CFClient::UI::Container::;
3630
3631use List::Util qw(min max);
3632
3633use CFClient::OpenGL;
3634
3635sub new {
3636 my $class = shift;
3637
3638 my $self = $class->SUPER::new (
2976 visible => 1, 3639 visible => 1,
2977 @_, 3640 @_,
2978 ) 3641 );
2979}
2980 3642
2981sub configure { 3643 Scalar::Util::weaken ($self->{root} = $self);
2982 my ($self, $x, $y, $w, $h) = @_;
2983 3644
2984 $self->{w} = $w; 3645 $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} 3646}
2994 3647
2995sub size_request { 3648sub size_request {
2996 my ($self) = @_; 3649 my ($self) = @_;
2997 3650
2998 ($self->{w}, $self->{h}) 3651 ($self->{w}, $self->{h})
3652}
3653
3654sub _to_pixel {
3655 my ($coord, $size, $max) = @_;
3656
3657 $coord =
3658 $coord eq "center" ? ($max - $size) * 0.5
3659 : $coord eq "max" ? $max
3660 : $coord;
3661
3662 $coord = 0 if $coord < 0;
3663 $coord = $max - $size if $coord > $max - $size;
3664
3665 int $coord + 0.5
2999} 3666}
3000 3667
3001sub size_allocate { 3668sub size_allocate {
3002 my ($self, $w, $h) = @_; 3669 my ($self, $w, $h) = @_;
3003 3670
3004 for my $child ($self->children) { 3671 for my $child ($self->children) {
3005 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3672 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3006 3673
3007 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3674 $X = $child->{force_x} if exists $child->{force_x};
3008 if exists $child->{req_x}; 3675 $Y = $child->{force_y} if exists $child->{force_y};
3009 3676
3010 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3677 $X = _to_pixel $X, $W, $self->{w};
3011 if exists $child->{req_y}; 3678 $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 3679
3018 $child->configure ($X, $Y, $W, $H); 3680 $child->configure ($X, $Y, $W, $H);
3019 } 3681 }
3020} 3682}
3021 3683
… …
3032} 3694}
3033 3695
3034sub update { 3696sub update {
3035 my ($self) = @_; 3697 my ($self) = @_;
3036 3698
3037 $self->check_size;
3038 $::WANT_REFRESH++; 3699 $::WANT_REFRESH++;
3039} 3700}
3040 3701
3041sub add { 3702sub add {
3042 my ($self, @children) = @_; 3703 my ($self, @children) = @_;
3043 3704
3044 for my $child (@children) {
3045 $child->{is_toplevel} = 1; 3705 $_->{is_toplevel} = 1
3046 3706 for @children;
3047 # integerise window positions
3048 $child->{x} = int $child->{x};
3049 $child->{y} = int $child->{y};
3050 }
3051 3707
3052 $self->SUPER::add (@children); 3708 $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} 3709}
3060 3710
3061sub remove { 3711sub remove {
3062 my ($self, @children) = @_; 3712 my ($self, @children) = @_;
3063 3713
3064 $self->SUPER::remove (@children); 3714 $self->SUPER::remove (@children);
3715
3716 delete $self->{is_toplevel}
3717 for @children;
3065 3718
3066 while (@children) { 3719 while (@children) {
3067 my $w = pop @children; 3720 my $w = pop @children;
3068 push @children, $w->children; 3721 push @children, $w->children;
3069 $w->set_invisible; 3722 $w->set_invisible;
… …
3088 while ($self->{refresh_hook}) { 3741 while ($self->{refresh_hook}) {
3089 $_->() 3742 $_->()
3090 for values %{delete $self->{refresh_hook}}; 3743 for values %{delete $self->{refresh_hook}};
3091 } 3744 }
3092 3745
3093 if ($self->{check_size}) { 3746 if ($self->{realloc}) {
3747 my %queue;
3094 my @queue; 3748 my @queue;
3749 my $widget;
3095 3750
3096 for (;;) { 3751 outer:
3097 if ($self->{check_size}) { 3752 while () {
3098 #TODO use array-of-depth approach 3753 if (my $realloc = delete $self->{realloc}) {
3754 for $widget (values %$realloc) {
3755 $widget->{visible} or next; # do not resize invisible widgets
3099 3756
3100 @queue = sort { $a->{visible} <=> $b->{visible} } 3757 $queue{$widget+0}++ and next; # duplicates are common
3101 @queue, values %{delete $self->{check_size}}; 3758
3759 push @{ $queue[$widget->{visible}] }, $widget;
3760 }
3102 } 3761 }
3103 3762
3763 while () {
3764 @queue or last outer;
3765
3104 my $widget = pop @queue || last; 3766 $widget = pop @{ $queue[-1] || [] }
3105 3767 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 3768
3769 pop @queue;
3770 }
3771
3772 delete $queue{$widget+0};
3773
3774 my ($w, $h) = $widget->size_request;
3775
3776 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3777 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3778
3779 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3780 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3781
3782 $w = $widget->{force_w} if exists $widget->{force_w};
3783 $h = $widget->{force_h} if exists $widget->{force_h};
3784
3785 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3786 || delete $widget->{force_realloc}) {
3116 $widget->{req_w} = $w; 3787 $widget->{req_w} = $w;
3117 $widget->{req_h} = $h; 3788 $widget->{req_h} = $h;
3118 3789
3119 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3790 $self->{size_alloc}{$widget+0} = $widget;
3120 3791
3121 $widget->{parent}->check_size
3122 if $widget->{parent}; 3792 if (my $parent = $widget->{parent}) {
3793 $self->{realloc}{$parent+0} = $parent
3794 unless $queue{$parent+0};
3795
3796 $parent->{force_size_alloc} = 1;
3797 $self->{size_alloc}{$parent+0} = $parent;
3798 }
3123 } 3799 }
3800
3801 delete $self->{realloc}{$widget+0};
3124 } 3802 }
3125 } 3803 }
3126 3804
3127 while ($self->{size_alloc}) { 3805 while (my $size_alloc = delete $self->{size_alloc}) {
3128 for (
3129 sort { $a->[0]{visible} <=> $b->[0]{visible} } 3806 my @queue = sort { $b->{visible} <=> $a->{visible} }
3130 values %{delete $self->{size_alloc}} 3807 values %$size_alloc;
3131 ) { 3808
3132 my ($widget, $w, $h) = @$_; 3809 while () {
3810 my $widget = pop @queue || last;
3811
3812 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3133 3813
3134 $w = 0 if $w < 0; 3814 $w = 0 if $w < 0;
3135 $h = 0 if $h < 0; 3815 $h = 0 if $h < 0;
3136 3816
3817 $w = int $w + 0.5;
3818 $h = int $h + 0.5;
3819
3820 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3821 $widget->{old_w} = $widget->{w};
3822 $widget->{old_h} = $widget->{h};
3823
3137 $widget->{w} = $w; 3824 $widget->{w} = $w;
3138 $widget->{h} = $h; 3825 $widget->{h} = $h;
3826
3139 $widget->emit (size_allocate => $w, $h); 3827 $widget->emit (size_allocate => $w, $h);
3828 }
3140 } 3829 }
3141 } 3830 }
3142 3831
3143 while ($self->{post_alloc_hook}) { 3832 while ($self->{post_alloc_hook}) {
3144 $_->() 3833 $_->()
3145 for values %{delete $self->{post_alloc_hook}}; 3834 for values %{delete $self->{post_alloc_hook}};
3146 } 3835 }
3836
3147 3837
3148 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3838 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3149 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3839 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3150 glClear GL_COLOR_BUFFER_BIT; 3840 glClear GL_COLOR_BUFFER_BIT;
3151 3841
… …
3153 glLoadIdentity; 3843 glLoadIdentity;
3154 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3844 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3155 glMatrixMode GL_MODELVIEW; 3845 glMatrixMode GL_MODELVIEW;
3156 glLoadIdentity; 3846 glLoadIdentity;
3157 3847
3848 {
3849 package CFClient::UI::Base;
3850
3851 ($draw_x, $draw_y, $draw_w, $draw_h) =
3852 (0, 0, $self->{w}, $self->{h});
3853 }
3854
3158 $self->_draw; 3855 $self->_draw;
3159} 3856}
3160 3857
3161############################################################################# 3858#############################################################################
3162 3859

Diff Legend

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