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.247 by root, Sun May 28 01:16:04 2006 UTC vs.
Revision 1.288 by root, Mon Jun 5 21:14:40 2006 UTC

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

Diff Legend

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