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.251 by root, Sun May 28 22:24:24 2006 UTC vs.
Revision 1.301 by elmex, Mon Jun 12 12:28:06 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->realloc;
61 } 39 }
62 40
63 return; 41 return;
64 } 42 }
65 } 43 }
66 } 44 }
67 45
68 $TOOLTIP->hide; 46 $TOOLTIP->hide;
69 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;
70} 71}
71 72
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 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 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
171sub rescale_widgets { 172sub rescale_widgets {
172 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
173 174
174 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
175 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
176 $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.]+$/;
177 $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};
178 $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};
179 $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.]+$/;
180 $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};
181 $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
182 } 190 }
183 } 191 }
184 192
185 reconfigure_widgets; 193 reconfigure_widgets;
186} 194}
… …
195 203
196sub new { 204sub new {
197 my $class = shift; 205 my $class = shift;
198 206
199 my $self = bless { 207 my $self = bless {
200 x => 0, 208 x => "center",
201 y => 0, 209 y => "center",
202 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
203 can_events => 1, 213 can_events => 1,
204 @_ 214 @_
205 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
206 218
207 for (keys %$self) { 219 for (keys %$self) {
208 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
209 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
210 } 222 }
211 } 223 }
212 224
213 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
214
215 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
216 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
217 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
218 $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};
219 $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};
220 } 235 }
221 236
222 $self 237 $self
223} 238}
224 239
… …
235 return if $self->{parent}; 250 return if $self->{parent};
236 251
237 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
238} 253}
239 254
240sub center {
241 my ($self) = @_;
242
243 $CFClient::UI::ROOT->on_post_alloc (
244 "center_$self" => sub {
245 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
246 },
247 );
248
249 $self->update;
250}
251
252sub set_visible { 255sub set_visible {
253 my ($self) = @_; 256 my ($self) = @_;
254 257
255 return if $self->{visible}; 258 return if $self->{visible};
256 259
257 $self->{root} = $self->{parent}{root}; 260 $self->{root} = $self->{parent}{root};
258 $self->{visible} = $self->{parent}{visible} + 1; 261 $self->{visible} = $self->{parent}{visible} + 1;
259 262
260 $self->emit (visibility_change => 1); 263 $self->emit (visibility_change => 1);
261 264
262 $self->realloc unless exists $self->{req_w}; 265 $self->realloc if !exists $self->{req_w};
263 266
264 $_->set_visible for $self->children; 267 $_->set_visible for $self->children;
265} 268}
266 269
267sub set_invisible { 270sub set_invisible {
… …
275 delete $self->{visible}; 278 delete $self->{visible};
276 279
277 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
278 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
279 282
280 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
281 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
282 285
283 $self->focus_out; 286 $self->focus_out;
284 287
285 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
… …
309 312
310 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
311 if $self->{parent}; 314 if $self->{parent};
312} 315}
313 316
314sub move { 317sub move_abs {
315 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
316 319
317 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
318 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
319 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
320 323
321 $self->update; 324 $self->update;
322} 325}
323 326
324sub set_size { 327sub set_size {
325 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
326 329
327 $self->{def_w} = $w; 330 $self->{force_w} = $w;
328 $self->{def_h} = $h; 331 $self->{force_h} = $h;
329 332
330 $self->realloc; 333 $self->realloc;
331} 334}
332 335
333sub size_request { 336sub size_request {
… …
337 340
338sub configure { 341sub configure {
339 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
340 343
341 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
342 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
343 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
344 349
345 # use alignment to adjust x, y 350 # use alignment to adjust x, y
346 351
347 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
348 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
349
350 ($w, $h) = ($w2, $h2);
351 } 354 }
352 355
353 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
354 $self->{x} = $x; 357 $self->{x} = $x;
355 $self->{y} = $y; 358 $self->{y} = $y;
356 $self->update; 359 $self->update;
357 } 360 }
358 361
359 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
360 return unless $self->{visible}; 363 return unless $self->{visible};
361 364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
362 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 368 $self->{root}{size_alloc}{$self+0} = $self;
363 } 369 }
364} 370}
365 371
366sub size_allocate { 372sub size_allocate {
367 # nothing to be done 373 # nothing to be done
368} 374}
369 375
370sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
371} 382}
372 383
373sub set_max_size { 384sub set_max_size {
374 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
375 386
376 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
377 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
378} 391}
379 392
380sub set_tooltip { 393sub set_tooltip {
381 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
382 395
… …
387 400
388 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
389 402
390 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
391 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
392 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
393 } 406 }
394} 407}
395 408
396# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
397sub coord2local { 410sub coord2local {
… …
434 447
435 $::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
436 unless $FOCUS; 449 unless $FOCUS;
437} 450}
438 451
439sub mouse_motion { } 452sub mouse_motion { 0 }
440sub button_up { } 453sub button_up { 0 }
441sub key_down { } 454sub key_down { 0 }
442sub key_up { } 455sub key_up { 0 }
443 456
444sub button_down { 457sub button_down {
445 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
446 459
447 $self->focus_in; 460 $self->focus_in;
448}
449 461
450sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
451sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
452sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
453sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
454sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
455 464
456sub find_widget { 465sub find_widget {
457 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
458 467
459 return () unless $self->{can_events}; 468 return () unless $self->{can_events};
… …
467 476
468sub set_parent { 477sub set_parent {
469 my ($self, $parent) = @_; 478 my ($self, $parent) = @_;
470 479
471 Scalar::Util::weaken ($self->{parent} = $parent); 480 Scalar::Util::weaken ($self->{parent} = $parent);
472
473 $self->set_visible if $parent->{visible}; 481 $self->set_visible if $parent->{visible};
474
475 $self->realloc;
476} 482}
477 483
478sub connect { 484sub connect {
479 my ($self, $signal, $cb) = @_; 485 my ($self, $signal, $cb) = @_;
480 486
… …
499} 505}
500 506
501sub realloc { 507sub realloc {
502 my ($self) = @_; 508 my ($self) = @_;
503 509
504 return unless $self->{visible}; 510 if ($self->{visible}) {
505
506 return if $self->{root}{realloc}{$self}; 511 return if $self->{root}{realloc}{$self+0};
507 512
508 $self->{root}{realloc}{$self} = $self; 513 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update; 514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
510} 519}
511 520
512sub update { 521sub update {
513 my ($self) = @_; 522 my ($self) = @_;
514 523
515 $self->{parent}->update 524 $self->{parent}->update
516 if $self->{parent}; 525 if $self->{parent};
517} 526}
518 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
538
519sub draw { 539sub draw {
520 my ($self) = @_; 540 my ($self) = @_;
521 541
522 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);
523 553
524 glPushMatrix; 554 glPushMatrix;
525 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
526 $self->_draw;
527 glPopMatrix;
528 556
529 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
530 my ($x, $y) = @$self{qw(x y)};
531
532 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
533 glEnable GL_BLEND; 559 glEnable GL_BLEND;
534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
535 glBegin GL_QUADS; 561 glBegin GL_QUADS;
536 glVertex $x , $y; 562 glVertex 0 , 0;
537 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
538 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
539 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
540 glEnd; 566 glEnd;
541 glDisable GL_BLEND; 567 glDisable GL_BLEND;
542 } 568 }
543 569
544 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
545 glPushMatrix; 571 glPushMatrix;
546 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
547 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
548 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
549 glVertex 0 , 0; 575 glVertex 0 , 0;
550 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
551 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
552 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
553 glEnd; 579 glEnd;
554 glPopMatrix; 580 glPopMatrix;
555 #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;
556 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
557} 586}
558 587
559sub _draw { 588sub _draw {
560 my ($self) = @_; 589 my ($self) = @_;
561 590
… …
599 628
600 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
601 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
602 631
603 glEnable GL_BLEND; 632 glEnable GL_BLEND;
604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
605 glColor @$color; 634 glColor_premultiply @$color;
606 635
607 glBegin GL_QUADS; 636 glBegin GL_QUADS;
608 glVertex 0 , 0; 637 glVertex 0 , 0;
609 glVertex 0 , $h; 638 glVertex 0 , $h;
610 glVertex $w, $h; 639 glVertex $w, $h;
… …
625 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
626 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
627} 656}
628 657
629sub size_request { 658sub size_request {
630 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
631} 662}
632 663
633sub draw { } 664sub draw { }
634 665
635############################################################################# 666#############################################################################
… …
639our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
640 671
641sub new { 672sub new {
642 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
643 674
644 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
645 676
646 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
647 children => [], 678 children => [],
648 can_events => 0, 679 can_events => 0,
649 %arg, 680 %arg,
650 ); 681 );
682
651 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
652 685
653 $self 686 $self
654} 687}
655 688
656sub add { 689sub add {
… …
704 $x -= $self->{x}; 737 $x -= $self->{x};
705 $y -= $self->{y}; 738 $y -= $self->{y};
706 739
707 my $res; 740 my $res;
708 741
709 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
710 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
711 and return $res; 744 and return $res;
712 } 745 }
713 746
714 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
756sub size_request { 789sub size_request {
757 $_[0]{children}[0]->size_request 790 $_[0]{children}[0]->size_request
758} 791}
759 792
760sub size_allocate { 793sub size_allocate {
761 my ($self, $w, $h, $changed) = @_; 794 my ($self, $w, $h) = @_;
762 795
763 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
764} 797}
765 798
766############################################################################# 799#############################################################################
800
801# back-buffered drawing area
767 802
768package CFClient::UI::Window; 803package CFClient::UI::Window;
769 804
770our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
771 806
… …
783 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
784 $self->SUPER::update; 819 $self->SUPER::update;
785} 820}
786 821
787sub size_allocate { 822sub size_allocate {
788 my ($self, $w, $h, $changed) = @_; 823 my ($self, $w, $h) = @_;
789 824
790 $self->SUPER::size_allocate ($w, $h, $changed); 825 $self->SUPER::size_allocate ($w, $h);
791 $self->update 826 $self->update;
792 if $changed;
793} 827}
794 828
795sub _render { 829sub _render {
830 my ($self) = @_;
831
796 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
797} 833}
798 834
799sub render_child { 835sub render_child {
800 my ($self) = @_; 836 my ($self) = @_;
801 837
802 $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 {
803 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
804 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
805 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
806 $self->_render; 849 $self->_render;
807 }; 850 };
808} 851}
809 852
810sub _draw { 853sub _draw {
811 my ($self) = @_; 854 my ($self) = @_;
812 855
813 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
814 857
815 my $tex = $self->{texture} 858 my $tex = $self->{texture}
816 or return; 859 or return;
817 860
818 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
820 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
821 864
822 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
823 866
824 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
825} 868}
… …
841} 884}
842 885
843sub size_request { 886sub size_request {
844 my ($self) = @_; 887 my ($self) = @_;
845 888
846 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)};
847 890
848 $w = 10 if $self->{scroll_x}; 891 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y}; 892 $h = 10 if $self->{scroll_y};
850 893
851 ($w, $h) 894 ($w, $h)
852} 895}
853 896
854sub size_allocate { 897sub size_allocate {
855 my ($self, $w, $h, $changed) = @_; 898 my ($self, $w, $h) = @_;
856 899
900 my $child = $self->child;
901
857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859 904
860 $self->child->configure (0, 0, $w, $h); 905 $self->child->configure (0, 0, $w, $h);
861 $self->update; 906 $self->update;
862} 907}
863 908
… …
899} 944}
900 945
901sub _render { 946sub _render {
902 my ($self) = @_; 947 my ($self) = @_;
903 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
904 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905 953
906 $self->SUPER::_render; 954 $self->SUPER::_render;
907} 955}
908 956
… …
911package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
912 960
913our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
914 962
915sub new { 963sub new {
916 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
917 967
918 my $self; 968 my $self;
919 969
920 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
921 vertical => 1, 971 vertical => 1,
… …
926 ; 976 ;
927 977
928 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
929 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
930 slider => $slider, 980 slider => $slider,
931 @_, 981 %arg,
932 ); 982 );
933 983
934 $self->{vp}->add ($self->{scrolled});
935 $self->add ($self->{vp});
936 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
937 986
938 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
939} 994}
940 995
941sub update { 996sub update {
942 my ($self) = @_; 997 my ($self) = @_;
943 998
… …
947 my $child = $self->{vp}->child; 1002 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949} 1004}
950 1005
951sub size_allocate { 1006sub size_allocate {
952 my ($self, $w, $h, $changed) = @_; 1007 my ($self, $w, $h) = @_;
953 1008
954 $self->SUPER::size_allocate ($w, $h, $changed); 1009 $self->SUPER::size_allocate ($w, $h);
955 1010
956 my $child = $self->{vp}->child; 1011 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958} 1013}
959 1014
… …
982 1037
983 if ($self->{bg}) { 1038 if ($self->{bg}) {
984 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
985 1040
986 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
988 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
989 1044
990 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
991 glVertex 0 , 0; 1046 glVertex 0 , 0;
992 glVertex 0 , $h; 1047 glVertex 0 , $h;
993 glVertex $w, $h; 1048 glVertex $w, $h;
… …
1006 1061
1007our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
1008 1063
1009use CFClient::OpenGL; 1064use CFClient::OpenGL;
1010 1065
1011my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1013 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);
1014 1073
1015sub new { 1074sub new {
1016 my $class = shift; 1075 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1017 1078
1018 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
1019 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
1020 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
1021 border => 0.6, 1082 border => 0.6,
1022 is_toplevel => 1,
1023 can_events => 1, 1083 can_events => 1,
1024 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
1025 ); 1087 );
1026 1088
1027 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
1028 align => 0, 1090 align => 0,
1029 valign => 1, 1091 valign => 1,
1030 text => $self->{title}, 1092 text => $title,
1031 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
1032 1095
1033 $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};
1034} 1104}
1035 1105
1036sub border { 1106sub border {
1037 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
1038} 1108}
1039 1109
1040sub size_request { 1110sub size_request {
1041 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
1042 1115
1043 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
1044 1117
1045 ( 1118 (
1046 $w + $self->border * 2, 1119 $w + $self->border * 2,
1047 $h + $self->border * 2, 1120 $h + $self->border * 2,
1048 ) 1121 )
1049} 1122}
1050 1123
1051sub size_allocate { 1124sub size_allocate {
1052 my ($self, $w, $h, $changed) = @_; 1125 my ($self, $w, $h) = @_;
1053 1126
1054 return unless $changed; 1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1055 1132
1133 my $border = $self->border;
1134
1056 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
1057 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1058 1137
1059 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1060 if $self->{title};
1061
1062 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1063} 1139}
1064 1140
1065sub button_down { 1141sub button_down {
1066 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1067 1143
… …
1083 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1084 1160
1085 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1086 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1087 1163
1088 $self->{user_x} = $wx + $dx * $mx;
1089 $self->{user_y} = $wy + $dy * $my;
1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1092 $self->move ($self->{user_x}, $self->{user_y}); 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1093 $self->realloc; 1168 $self->realloc;
1094 }; 1169 };
1095 1170
1096 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1097 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1100 $self->{motion} = sub { 1175 $self->{motion} = sub {
1101 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1102 1177
1103 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1104 1179
1105 $self->{user_x} = $bx + $x - $ox; 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1106 $self->{user_y} = $by + $y - $oy; 1181 # HACK: the next line is required to enforce placement
1107 1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1108 $self->move ($self->{user_x}, $self->{user_y});
1109 $self->realloc;
1110 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1111 } 1188 1
1112} 1189}
1113 1190
1114sub button_up { 1191sub button_up {
1115 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1116 1193
1117 delete $self->{motion}; 1194 !!delete $self->{motion}
1118} 1195}
1119 1196
1120sub mouse_motion { 1197sub mouse_motion {
1121 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1122 1199
1123 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1124} 1203}
1125 1204
1126sub _draw { 1205sub _draw {
1127 my ($self) = @_; 1206 my ($self) = @_;
1128 1207
1208 my $child = $self->{children}[0];
1209
1129 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1130 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1131 1212
1132 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1133 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1134 1215
1135 my $border = $self->border; 1216 my $border = $self->border;
1136 1217
1137 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1138 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1139 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1140 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1141 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1142 1223
1143 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1144 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1145 1226
1146 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1147 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1148 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1149
1150 glColor @{ $self->{bg} };
1151
1152 $bg->{s} = $rep_x;
1153 $bg->{t} = $rep_y;
1154 $bg->{wrap_mode} = 1;
1155 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1156 } 1232 }
1157 1233
1158 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1159 1235
1160 $self->{title}->draw if $self->{title};
1161
1162 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1163} 1242}
1164 1243
1165############################################################################# 1244#############################################################################
1166 1245
1167package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1241 (sum @$hs), 1320 (sum @$hs),
1242 ) 1321 )
1243} 1322}
1244 1323
1245sub size_allocate { 1324sub size_allocate {
1246 my ($self, $w, $h, $changed) = @_; 1325 my ($self, $w, $h) = @_;
1247 1326
1248 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1249 1328
1250 my $req_w = (sum @$ws) || 1; 1329 my $req_w = (sum @$ws) || 1;
1251 my $req_h = (sum @$hs) || 1; 1330 my $req_h = (sum @$hs) || 1;
… …
1329 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1330 ) 1409 )
1331} 1410}
1332 1411
1333sub size_allocate { 1412sub size_allocate {
1334 my ($self, $w, $h, $changed) = @_; 1413 my ($self, $w, $h) = @_;
1335 1414
1336 my $space = $self->{vertical} ? $h : $w; 1415 my $space = $self->{vertical} ? $h : $w;
1337 my $children = $self->{children}; 1416 my $children = $self->{children};
1338 1417
1339 my @req; 1418 my @req;
… …
1422 ellipsise => 3, # end 1501 ellipsise => 3, # end
1423 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1424 fontsize => 1, 1503 fontsize => 1,
1425 align => -1, 1504 align => -1,
1426 valign => -1, 1505 valign => -1,
1427 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1428 can_events => 0, 1508 can_events => 0,
1429 %arg 1509 %arg
1430 ); 1510 );
1431 1511
1432 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1459 1539
1460 delete $self->{texture}; 1540 delete $self->{texture};
1461 $self->SUPER::update; 1541 $self->SUPER::update;
1462} 1542}
1463 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1464sub set_text { 1551sub set_text {
1465 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1466 1553
1467 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1468 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1469 1556
1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1471 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1472 1559
1560 delete $self->{size_req};
1473 $self->realloc; 1561 $self->realloc;
1562 $self->update;
1474} 1563}
1475 1564
1476sub set_markup { 1565sub set_markup {
1477 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1478 1567
… …
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1572
1484 $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;
1485 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1486 1575
1576 delete $self->{size_req};
1487 $self->realloc; 1577 $self->realloc;
1578 $self->update;
1488} 1579}
1489 1580
1490sub size_request { 1581sub size_request {
1491 my ($self) = @_; 1582 my ($self) = @_;
1492 1583
1584 $self->{size_req} ||= do {
1493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1494 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1495 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498 1590
1499 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1500 1592
1501 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1502 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1503 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1504 1596
1505 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1506 1598
1507 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1508 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1509 } 1604 };
1510 1605
1511 ( 1606 @{ $self->{size_req} }
1512 $w + $self->{padding} * 2,
1513 $h + $self->{padding} * 2,
1514 )
1515} 1607}
1516 1608
1517sub size_allocate { 1609sub size_allocate {
1518 my ($self, $w, $h, $changed) = @_; 1610 my ($self, $w, $h) = @_;
1611
1612 delete $self->{ox};
1519 1613
1520 delete $self->{texture} 1614 delete $self->{texture}
1521 if $changed; 1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522} 1616}
1523 1617
1524sub set_fontsize { 1618sub set_fontsize {
1525 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1526 1620
1527 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1528 delete $self->{texture}; 1622 delete $self->{texture};
1529 1623
1530 $self->realloc; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1531} 1633}
1532 1634
1533sub _draw { 1635sub _draw {
1534 my ($self) = @_; 1636 my ($self) = @_;
1535 1637
… …
1541 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1542 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1543 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545 1647
1546 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1649 };
1547 1650
1651 unless (exists $self->{ox}) {
1548 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550 : ($self->{w} - $tex->{w}) * 0.5); 1654 : ($self->{w} - $tex->{w}) * 0.5);
1551 1655
1552 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1555
1556 $tex
1557 }; 1659 };
1558 1660
1559 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1560 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};
1561 1665
1562 if ($tex->{format} == GL_ALPHA) { 1666 if ($tex->{format} == GL_ALPHA) {
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1563 glColor @{$self->{fg}}; 1668 glColor @{$self->{fg}};
1564 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1565 } else { 1670 } else {
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1566 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1567 } 1673 }
1568 1674
1569 glDisable GL_TEXTURE_2D; 1675 glDisable GL_TEXTURE_2D;
1570} 1676}
1571 1677
… …
1588 can_hover => 1, 1694 can_hover => 1,
1589 can_focus => 1, 1695 can_focus => 1,
1590 valign => 0, 1696 valign => 0,
1591 can_events => 1, 1697 can_events => 1,
1592 #text => ... 1698 #text => ...
1699 #hidden => "*",
1593 @_ 1700 @_
1594 ) 1701 )
1595} 1702}
1596 1703
1597sub _set_text { 1704sub _set_text {
… …
1599 1706
1600 delete $self->{cur_h}; 1707 delete $self->{cur_h};
1601 1708
1602 return if $self->{text} eq $text; 1709 return if $self->{text} eq $text;
1603 1710
1604 delete $self->{texture};
1605
1606 $self->{last_activity} = $::NOW; 1711 $self->{last_activity} = $::NOW;
1607 $self->{text} = $text; 1712 $self->{text} = $text;
1608 1713
1609 $text =~ s/./*/g if $self->{hidden}; 1714 $text =~ s/./*/g if $self->{hidden};
1610 $self->{layout}->set_text ("$text "); 1715 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req};
1611 1717
1612 $self->_emit (changed => $self->{text}); 1718 $self->_emit (changed => $self->{text});
1719
1720 $self->realloc;
1721 $self->update;
1613} 1722}
1614 1723
1615sub set_text { 1724sub set_text {
1616 my ($self, $text) = @_; 1725 my ($self, $text) = @_;
1617 1726
1618 $self->{cursor} = length $text; 1727 $self->{cursor} = length $text;
1619 $self->_set_text ($text); 1728 $self->_set_text ($text);
1620
1621 $self->realloc;
1622} 1729}
1623 1730
1624sub get_text { 1731sub get_text {
1625 $_[0]{text} 1732 $_[0]{text}
1626} 1733}
… …
1656 $self->{cursor} = length $text; 1763 $self->{cursor} = length $text;
1657 } elsif ($uni == 27) { 1764 } elsif ($uni == 27) {
1658 $self->_emit ('escape'); 1765 $self->_emit ('escape');
1659 } elsif ($uni) { 1766 } elsif ($uni) {
1660 substr $text, $self->{cursor}++, 0, chr $uni; 1767 substr $text, $self->{cursor}++, 0, chr $uni;
1768 } else {
1769 return 0;
1661 } 1770 }
1662 1771
1663 $self->_set_text ($text); 1772 $self->_set_text ($text);
1664 1773
1665 $self->realloc; 1774 $self->realloc;
1775
1776 1
1666} 1777}
1667 1778
1668sub focus_in { 1779sub focus_in {
1669 my ($self) = @_; 1780 my ($self) = @_;
1670 1781
… …
1685 utf8::encode $text; 1796 utf8::encode $text;
1686 $self->{cursor} = length substr $text, 0, $idx; 1797 $self->{cursor} = length substr $text, 0, $idx;
1687 1798
1688 $self->_set_text ($self->{text}); 1799 $self->_set_text ($self->{text});
1689 $self->update; 1800 $self->update;
1801
1802 1
1690} 1803}
1691 1804
1692sub mouse_motion { 1805sub mouse_motion {
1693 my ($self, $ev, $x, $y) = @_; 1806 my ($self, $ev, $x, $y) = @_;
1694# 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
1695} 1810}
1696 1811
1697sub _draw { 1812sub _draw {
1698 my ($self) = @_; 1813 my ($self) = @_;
1699 1814
1700 local $self->{fg} = $self->{fg}; 1815 local $self->{fg} = $self->{fg};
1701 1816
1702 if ($FOCUS == $self) { 1817 if ($FOCUS == $self) {
1703 glColor @{$self->{active_bg}}; 1818 glColor_premultiply @{$self->{active_bg}};
1704 $self->{fg} = $self->{active_fg}; 1819 $self->{fg} = $self->{active_fg};
1705 } else { 1820 } else {
1706 glColor @{$self->{bg}}; 1821 glColor_premultiply @{$self->{bg}};
1707 } 1822 }
1708 1823
1709 glEnable GL_BLEND; 1824 glEnable GL_BLEND;
1710 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1825 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1711 glBegin GL_QUADS; 1826 glBegin GL_QUADS;
1712 glVertex 0 , 0; 1827 glVertex 0 , 0;
1713 glVertex 0 , $self->{h}; 1828 glVertex 0 , $self->{h};
1714 glVertex $self->{w}, $self->{h}; 1829 glVertex $self->{w}, $self->{h};
1715 glVertex $self->{w}, 0; 1830 glVertex $self->{w}, 0;
… …
1776 } else { 1891 } else {
1777 $self->set_text ($self->{history_saveback}); 1892 $self->set_text ($self->{history_saveback});
1778 } 1893 }
1779 1894
1780 } else { 1895 } else {
1781 $self->SUPER::key_down ($ev); 1896 return $self->SUPER::key_down ($ev)
1897 }
1898
1782 } 1899 1
1783
1784} 1900}
1785 1901
1786############################################################################# 1902#############################################################################
1787 1903
1788package CFClient::UI::Button; 1904package CFClient::UI::Button;
… …
1797 1913
1798sub new { 1914sub new {
1799 my $class = shift; 1915 my $class = shift;
1800 1916
1801 $class->SUPER::new ( 1917 $class->SUPER::new (
1802 padding => 4, 1918 padding_x => 4,
1919 padding_y => 4,
1803 fg => [1, 1, 1], 1920 fg => [1, 1, 1],
1804 active_fg => [0, 0, 1], 1921 active_fg => [0, 0, 1],
1805 can_hover => 1, 1922 can_hover => 1,
1806 align => 0, 1923 align => 0,
1807 valign => 0, 1924 valign => 0,
… …
1816 my ($self, $ev, $x, $y) = @_; 1933 my ($self, $ev, $x, $y) = @_;
1817 1934
1818 $self->emit ("activate") 1935 $self->emit ("activate")
1819 if $x >= 0 && $x < $self->{w} 1936 if $x >= 0 && $x < $self->{w}
1820 && $y >= 0 && $y < $self->{h}; 1937 && $y >= 0 && $y < $self->{h};
1938
1939 1
1821} 1940}
1822 1941
1823sub _draw { 1942sub _draw {
1824 my ($self) = @_; 1943 my ($self) = @_;
1825 1944
1826 local $self->{fg} = $self->{fg}; 1945 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1827
1828 if ($GRAB == $self) {
1829 $self->{fg} = $self->{active_fg};
1830 }
1831 1946
1832 glEnable GL_TEXTURE_2D; 1947 glEnable GL_TEXTURE_2D;
1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834 glColor 0, 0, 0, 1; 1949 glColor 0, 0, 0, 1;
1835 1950
… …
1854 1969
1855sub new { 1970sub new {
1856 my $class = shift; 1971 my $class = shift;
1857 1972
1858 $class->SUPER::new ( 1973 $class->SUPER::new (
1859 padding => 2, 1974 padding_x => 2,
1975 padding_y => 2,
1860 fg => [1, 1, 1], 1976 fg => [1, 1, 1],
1861 active_fg => [1, 1, 0], 1977 active_fg => [1, 1, 0],
1862 bg => [0, 0, 0, 0.2], 1978 bg => [0, 0, 0, 0.2],
1863 active_bg => [1, 1, 1, 0.5], 1979 active_bg => [1, 1, 1, 0.5],
1864 state => 0, 1980 state => 0,
… …
1868} 1984}
1869 1985
1870sub size_request { 1986sub size_request {
1871 my ($self) = @_; 1987 my ($self) = @_;
1872 1988
1873 ($self->{padding} * 2 + 6) x 2 1989 (6) x 2
1874} 1990}
1875 1991
1876sub button_down { 1992sub button_down {
1877 my ($self, $ev, $x, $y) = @_; 1993 my ($self, $ev, $x, $y) = @_;
1878 1994
1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1995 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1996 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881 $self->{state} = !$self->{state}; 1997 $self->{state} = !$self->{state};
1882 $self->_emit (changed => $self->{state}); 1998 $self->_emit (changed => $self->{state});
1999 } else {
2000 return 0
2001 }
2002
1883 } 2003 1
1884} 2004}
1885 2005
1886sub _draw { 2006sub _draw {
1887 my ($self) = @_; 2007 my ($self) = @_;
1888 2008
1889 $self->SUPER::_draw; 2009 $self->SUPER::_draw;
1890 2010
1891 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2011 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892 2012
1893 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;
1894 2016
1895 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2017 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896 2018
1897 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2019 my $tex = $self->{state} ? $tex[1] : $tex[0];
1898 2020
… …
2053 2175
2054 my $h1 = $self->{h} * (1 - $ycut1); 2176 my $h1 = $self->{h} * (1 - $ycut1);
2055 my $h2 = $self->{h} * (1 - $ycut2); 2177 my $h2 = $self->{h} * (1 - $ycut2);
2056 2178
2057 glEnable GL_BLEND; 2179 glEnable GL_BLEND;
2058 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;
2059 glEnable GL_TEXTURE_2D; 2182 glEnable GL_TEXTURE_2D;
2060 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2183 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2061 2184
2062 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2185 glBindTexture GL_TEXTURE_2D, $t1->{name};
2063 glBegin GL_QUADS; 2186 glBegin GL_QUADS;
… …
2163 fg => [1, 1, 1], 2286 fg => [1, 1, 1],
2164 active_fg => [0, 0, 0], 2287 active_fg => [0, 0, 0],
2165 bg => [0, 0, 0, 0.2], 2288 bg => [0, 0, 0, 0.2],
2166 active_bg => [1, 1, 1, 0.5], 2289 active_bg => [1, 1, 1, 0.5],
2167 range => [0, 0, 100, 10, 0], 2290 range => [0, 0, 100, 10, 0],
2168 req_w => $::WIDTH / 80, 2291 min_w => $::WIDTH / 80,
2169 req_h => $::WIDTH / 80, 2292 min_h => $::WIDTH / 80,
2170 vertical => 0, 2293 vertical => 0,
2171 can_hover => 1, 2294 can_hover => 1,
2172 inner_pad => 0.02, 2295 inner_pad => 0.02,
2173 @_ 2296 @_
2174 ); 2297 );
… …
2184sub set_range { 2307sub set_range {
2185 my ($self, $range) = @_; 2308 my ($self, $range) = @_;
2186 2309
2187 ($range, $self->{range}) = ($self->{range}, $range); 2310 ($range, $self->{range}) = ($self->{range}, $range);
2188 2311
2189 $self->update
2190 if "@$range" ne "@{$self->{range}}"; 2312 if ("@$range" ne "@{$self->{range}}") {
2313 $self->update;
2314 $self->set_value ($self->{range}[0]);
2315 }
2191} 2316}
2192 2317
2193sub set_value { 2318sub set_value {
2194 my ($self, $value) = @_; 2319 my ($self, $value) = @_;
2195 2320
… …
2214} 2339}
2215 2340
2216sub size_request { 2341sub size_request {
2217 my ($self) = @_; 2342 my ($self) = @_;
2218 2343
2219 my $w = $self->{req_w}; 2344 ($self->{req_w}, $self->{req_h})
2220 my $h = $self->{req_h};
2221
2222 $self->{vertical} ? ($h, $w) : ($w, $h)
2223} 2345}
2224 2346
2225sub button_down { 2347sub button_down {
2226 my ($self, $ev, $x, $y) = @_; 2348 my ($self, $ev, $x, $y) = @_;
2227 2349
2228 $self->SUPER::button_down ($ev, $x, $y); 2350 $self->SUPER::button_down ($ev, $x, $y);
2229 2351
2230 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2352 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2231 2353
2232 $self->mouse_motion ($ev, $x, $y); 2354 $self->mouse_motion ($ev, $x, $y)
2233} 2355}
2234 2356
2235sub mouse_motion { 2357sub mouse_motion {
2236 my ($self, $ev, $x, $y) = @_; 2358 my ($self, $ev, $x, $y) = @_;
2237 2359
… …
2241 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2363 my (undef, $lo, $hi, $page) = @{$self->{range}};
2242 2364
2243 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2365 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2244 2366
2245 $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
2246 } 2372 1
2247} 2373}
2248 2374
2249sub update { 2375sub update {
2250 my ($self) = @_; 2376 my ($self) = @_;
2251 2377
2252 $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}) {
2253 $self->set_value ($self->{range}[0]); 2386 $self->set_value ($self->{range}[0]);
2254 2387
2255 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2388 my ($value, $lo, $hi, $page) = @{$self->{range}};
2256 my $range = ($hi - $page - $lo) || 1e-100; 2389 my $range = ($hi - $page - $lo) || 1e-100;
2257 2390
… …
2263 $value = ($value - $lo) / $range; 2396 $value = ($value - $lo) / $range;
2264 $value = $value * $self->{scale} + $self->{offset}; 2397 $value = $value * $self->{scale} + $self->{offset};
2265 2398
2266 $self->{knob_x} = $value - $knob_w * 0.5; 2399 $self->{knob_x} = $value - $knob_w * 0.5;
2267 $self->{knob_w} = $knob_w; 2400 $self->{knob_w} = $knob_w;
2268 }); 2401 }
2269
2270 $self->SUPER::update;
2271}
2272
2273sub _draw {
2274 my ($self) = @_;
2275 2402
2276 $self->SUPER::_draw (); 2403 $self->SUPER::_draw ();
2277 2404
2278 glScale $self->{w}, $self->{h}; 2405 glScale $self->{w}, $self->{h};
2279 2406
… …
2340sub set_range { shift->{slider}->set_range (@_) } 2467sub set_range { shift->{slider}->set_range (@_) }
2341sub set_value { shift->{slider}->set_value (@_) } 2468sub set_value { shift->{slider}->set_value (@_) }
2342 2469
2343############################################################################# 2470#############################################################################
2344 2471
2345package CFClient::UI::TextView; 2472package CFClient::UI::TextScroller;
2346 2473
2347our @ISA = CFClient::UI::HBox::; 2474our @ISA = CFClient::UI::HBox::;
2348 2475
2349use CFClient::OpenGL; 2476use CFClient::OpenGL;
2350 2477
… …
2352 my $class = shift; 2479 my $class = shift;
2353 2480
2354 my $self = $class->SUPER::new ( 2481 my $self = $class->SUPER::new (
2355 fontsize => 1, 2482 fontsize => 1,
2356 can_events => 0, 2483 can_events => 0,
2484 indent => 0,
2357 #font => default_font 2485 #font => default_font
2358 @_, 2486 @_,
2359 2487
2360 layout => (new CFClient::Layout 1), 2488 layout => (new CFClient::Layout 1),
2361 par => [], 2489 par => [],
… …
2377 $self->{fontsize} = $fontsize; 2505 $self->{fontsize} = $fontsize;
2378 $self->reflow; 2506 $self->reflow;
2379} 2507}
2380 2508
2381sub size_allocate { 2509sub size_allocate {
2382 my ($self, $w, $h, $changed) = @_; 2510 my ($self, $w, $h) = @_;
2383 2511
2384 $self->SUPER::size_allocate ($w, $h, $changed); 2512 $self->SUPER::size_allocate ($w, $h);
2385
2386 return unless $changed;
2387 2513
2388 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2514 $self->{layout}->set_font ($self->{font}) if $self->{font};
2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2390 $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});
2391 2518
2392 $self->reflow; 2519 $self->reflow;
2393} 2520}
2394 2521
2395sub text_size { 2522sub text_size {
… …
2397 2524
2398 my $layout = $self->{layout}; 2525 my $layout = $self->{layout};
2399 2526
2400 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2527 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2401 $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});
2402 $layout->set_markup ($text); 2530 $layout->set_markup ($text);
2403 2531
2404 $layout->size 2532 $layout->size
2405} 2533}
2406 2534
… …
2445 2573
2446 return unless $self->{h} > 0; 2574 return unless $self->{h} > 0;
2447 2575
2448 delete $self->{texture}; 2576 delete $self->{texture};
2449 2577
2450 $ROOT->on_post_alloc ($self, sub { 2578 $ROOT->on_post_alloc ($self => sub {
2451 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2579 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2452 2580
2453 if (delete $self->{need_reflow}) { 2581 if (delete $self->{need_reflow}) {
2454 my $height = 0; 2582 my $height = 0;
2455 2583
… …
2458 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2586 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2459 2587
2460 for (@{$self->{par}}) { 2588 for (@{$self->{par}}) {
2461 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2589 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2462 $layout->set_width ($W - $_->[3]); 2590 $layout->set_width ($W - $_->[3]);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2463 $layout->set_markup ($_->[4]); 2592 $layout->set_markup ($_->[4]);
2464 my ($w, $h) = $layout->size; 2593 my ($w, $h) = $layout->size;
2465 $_->[0] = $w + $_->[3]; 2594 $_->[0] = $w + $_->[3];
2466 $_->[1] = $h; 2595 $_->[1] = $h;
2467 } 2596 }
… …
2470 } 2599 }
2471 2600
2472 $self->{height} = $height; 2601 $self->{height} = $height;
2473 2602
2474 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2603 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2475 2604
2476 delete $self->{texture}; 2605 delete $self->{texture};
2477 } 2606 }
2478 2607
2479 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2608 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2480 glClearColor 0.5, 0.5, 0.5, 0; 2609 glClearColor 0, 0, 0, 0;
2481 glClear GL_COLOR_BUFFER_BIT; 2610 glClear GL_COLOR_BUFFER_BIT;
2482 2611
2483 my $top = int $self->{children}[1]{range}[0]; 2612 my $top = int $self->{children}[1]{range}[0];
2484 2613
2485 my $y0 = $top; 2614 my $y0 = $top;
… …
2499 my $h = $par->[1]; 2628 my $h = $par->[1];
2500 2629
2501 if ($y0 < $y + $h && $y < $y1) { 2630 if ($y0 < $y + $h && $y < $y1) {
2502 $layout->set_foreground (@{ $par->[2] }); 2631 $layout->set_foreground (@{ $par->[2] });
2503 $layout->set_width ($W - $par->[3]); 2632 $layout->set_width ($W - $par->[3]);
2633 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2504 $layout->set_markup ($par->[4]); 2634 $layout->set_markup ($par->[4]);
2505 2635
2506 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2636 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2507 2637
2508 glRasterPos $par->[3], $y - $y0; 2638 glRasterPos $par->[3], $y - $y0;
… …
2520sub _draw { 2650sub _draw {
2521 my ($self) = @_; 2651 my ($self) = @_;
2522 2652
2523 glEnable GL_TEXTURE_2D; 2653 glEnable GL_TEXTURE_2D;
2524 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2525 glColor 1, 1, 1, 1; 2655 glColor 0, 0, 0, 1;
2526 $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});
2527 glDisable GL_TEXTURE_2D; 2657 glDisable GL_TEXTURE_2D;
2528 2658
2529 $self->{children}[1]->draw; 2659 $self->{children}[1]->draw;
2530 2660
2531} 2661}
… …
2614} 2744}
2615 2745
2616sub set_tooltip_from { 2746sub set_tooltip_from {
2617 my ($self, $widget) = @_; 2747 my ($self, $widget) = @_;
2618 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
2758 $tooltip =~ s/^\n+//;
2759 $tooltip =~ s/\n+$//;
2760
2619 $self->add (new CFClient::UI::Label 2761 $self->add (new CFClient::UI::Label
2620 markup => $widget->{tooltip}, 2762 markup => $tooltip,
2621 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2763 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2622 fontsize => 0.8, 2764 fontsize => 0.8,
2623 fg => [0, 0, 0, 1], 2765 fg => [0, 0, 0, 1],
2624 ellipsise => 0, 2766 ellipsise => 0,
2625 font => ($widget->{tooltip_font} || $::FONT_PROP), 2767 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2633 2775
2634 ($w + 4, $h + 4) 2776 ($w + 4, $h + 4)
2635} 2777}
2636 2778
2637sub size_allocate { 2779sub size_allocate {
2638 my ($self, $w, $h, $changed) = @_; 2780 my ($self, $w, $h) = @_;
2639 2781
2640 return unless $changed;
2641
2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2782 $self->SUPER::size_allocate ($w - 4, $h - 4);
2783}
2784
2785sub visibility_change {
2786 my ($self, $visible) = @_;
2787
2788 return unless $visible;
2789
2790 $self->{root}->on_post_alloc ("move_$self" => sub {
2791 my $widget = $self->{owner}
2792 or return;
2793
2794 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2795
2796 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2797 if $x + $self->{w} > $self->{root}{w};
2798
2799 $self->move_abs ($x, $y);
2800 });
2643} 2801}
2644 2802
2645sub _draw { 2803sub _draw {
2646 my ($self) = @_; 2804 my ($self) = @_;
2647 2805
… …
2664 glVertex $w, $h; 2822 glVertex $w, $h;
2665 glVertex $w, 0; 2823 glVertex $w, 0;
2666 glEnd; 2824 glEnd;
2667 2825
2668 glTranslate 2 - 0.375, 2 - 0.375; 2826 glTranslate 2 - 0.375, 2 - 0.375;
2827
2669 $self->SUPER::_draw; 2828 $self->SUPER::_draw;
2670} 2829}
2671 2830
2672############################################################################# 2831#############################################################################
2673 2832
… …
2732 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2891 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2733 2892
2734 if ($tex) { 2893 if ($tex) {
2735 glEnable GL_TEXTURE_2D; 2894 glEnable GL_TEXTURE_2D;
2736 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2895 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2737 glColor 1, 1, 1, 1; 2896 glColor 0, 0, 0, 1;
2738 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2897 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2739 glDisable GL_TEXTURE_2D; 2898 glDisable GL_TEXTURE_2D;
2740 } 2899 }
2741} 2900}
2742 2901
… …
2749 $self->SUPER::DESTROY; 2908 $self->SUPER::DESTROY;
2750} 2909}
2751 2910
2752############################################################################# 2911#############################################################################
2753 2912
2754package CFClient::UI::Inventory; 2913package CFClient::UI::Buttonbar;
2755 2914
2756our @ISA = CFClient::UI::ScrolledWindow::; 2915our @ISA = CFClient::UI::HBox::;
2757 2916
2758sub new { 2917# TODO: should actualyl wrap buttons and other goodies.
2759 my $class = shift;
2760
2761 my $self = $class->SUPER::new (
2762 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2763 @_,
2764 );
2765
2766 $self
2767}
2768
2769sub set_items {
2770 my ($self, $items) = @_;
2771
2772 $self->{scrolled}->clear;
2773 return unless $items;
2774
2775 my @items = sort {
2776 ($a->{type} <=> $b->{type})
2777 or ($a->{name} cmp $b->{name})
2778 } @$items;
2779
2780 $self->{real_items} = \@items;
2781
2782 my $row = 0;
2783 for my $item (@items) {
2784 CFClient::Item::update_widgets $item;
2785
2786 $self->{scrolled}->add (0, $row, $item->{face_widget});
2787 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2788 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2789
2790 $row++;
2791 }
2792}
2793 2918
2794############################################################################# 2919#############################################################################
2795 2920
2796package CFClient::UI::Menu; 2921package CFClient::UI::Menu;
2797 2922
… …
2809 ); 2934 );
2810 2935
2811 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2936 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2812 2937
2813 for my $item (@{ $self->{items} }) { 2938 for my $item (@{ $self->{items} }) {
2814 my ($widget, $cb) = @$item; 2939 my ($widget, $cb, $tooltip) = @$item;
2815 2940
2816 # handle various types of items, only text for now 2941 # handle various types of items, only text for now
2817 if (!ref $widget) { 2942 if (!ref $widget) {
2818 $widget = new CFClient::UI::Label 2943 $widget = new CFClient::UI::Label
2819 can_hover => 1, 2944 can_hover => 1,
2820 can_events => 1, 2945 can_events => 1,
2821 text => $widget; 2946 markup => $widget,
2947 tooltip => $tooltip
2822 } 2948 }
2823 2949
2824 $self->{item}{$widget} = $item; 2950 $self->{item}{$widget} = $item;
2825 2951
2826 $self->{vbox}->add ($widget); 2952 $self->{vbox}->add ($widget);
… …
2838 # maybe save $GRAB? must be careful about events... 2964 # maybe save $GRAB? must be careful about events...
2839 $GRAB = $self; 2965 $GRAB = $self;
2840 $self->{button} = $ev->{button}; 2966 $self->{button} = $ev->{button};
2841 2967
2842 $self->show; 2968 $self->show;
2843 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2969 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2844} 2970}
2845 2971
2846sub mouse_motion { 2972sub mouse_motion {
2847 my ($self, $ev, $x, $y) = @_; 2973 my ($self, $ev, $x, $y) = @_;
2848 2974
2849 # TODO: should use vbox->find_widget or so 2975 # TODO: should use vbox->find_widget or so
2850 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2976 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2851 $self->{hover} = $self->{item}{$HOVER}; 2977 $self->{hover} = $self->{item}{$HOVER};
2978
2979 0
2852} 2980}
2853 2981
2854sub button_up { 2982sub button_up {
2855 my ($self, $ev, $x, $y) = @_; 2983 my ($self, $ev, $x, $y) = @_;
2856 2984
… …
2858 undef $GRAB; 2986 undef $GRAB;
2859 $self->hide; 2987 $self->hide;
2860 2988
2861 $self->_emit ("popdown"); 2989 $self->_emit ("popdown");
2862 $self->{hover}[1]->() if $self->{hover}; 2990 $self->{hover}[1]->() if $self->{hover};
2991 } else {
2992 return 0
2993 }
2994
2863 } 2995 1
2864} 2996}
2865 2997
2866############################################################################# 2998#############################################################################
2867 2999
2868package CFClient::UI::Statusbox; 3000package CFClient::UI::Multiplexer;
2869 3001
2870our @ISA = CFClient::UI::VBox::; 3002our @ISA = CFClient::UI::Container::;
2871 3003
2872sub new { 3004sub new {
2873 my $class = shift; 3005 my $class = shift;
2874 3006
2875 $class->SUPER::new ( 3007 my $self = $class->SUPER::new (
3008 @_,
3009 );
3010
3011 $self->{current} = $self->{children}[0]
3012 if @{ $self->{children} };
3013
3014 $self
3015}
3016
3017sub add {
3018 my ($self, @widgets) = @_;
3019
3020 $self->SUPER::add (@widgets);
3021
3022 $self->{current} = $self->{children}[0]
3023 if @{ $self->{children} };
3024}
3025
3026sub set_current_page {
3027 my ($self, $page_or_widget) = @_;
3028
3029 my $widget = ref $page_or_widget
3030 ? $page_or_widget
3031 : $self->{children}[$page_or_widget];
3032
3033 $self->{current} = $widget;
3034 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3035
3036 $self->_emit (page_changed => $self->{current});
3037
3038 $self->realloc;
3039}
3040
3041sub visible_children {
3042 $_[0]{current}
3043}
3044
3045sub size_request {
3046 my ($self) = @_;
3047
3048 $self->{current}->size_request
3049}
3050
3051sub size_allocate {
3052 my ($self, $w, $h) = @_;
3053
3054 $self->{current}->configure (0, 0, $w, $h);
3055}
3056
3057sub _draw {
3058 my ($self) = @_;
3059
3060 $self->{current}->draw;
3061}
3062
3063#############################################################################
3064
3065package CFClient::UI::Notebook;
3066
3067our @ISA = CFClient::UI::VBox::;
3068
3069sub new {
3070 my $class = shift;
3071
3072 my $self = $class->SUPER::new (
3073 buttonbar => (new CFClient::UI::Buttonbar),
3074 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3075 # filter => # will be put between multiplexer and $self
3076 @_,
3077 );
3078
3079 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3080 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3081
3082 $self
3083}
3084
3085sub add {
3086 my ($self, $title, $widget, $tooltip) = @_;
3087
3088 Scalar::Util::weaken $self;
3089
3090 $self->{buttonbar}->add (new CFClient::UI::Button
3091 markup => $title,
3092 tooltip => $tooltip,
3093 on_activate => sub { $self->set_current_page ($widget) },
3094 );
3095
3096 $self->{multiplexer}->add ($widget);
3097}
3098
3099sub set_current_page {
3100 my ($self, $page) = @_;
3101
3102 $self->{multiplexer}->set_current_page ($page);
3103 $self->_emit (page_changed => $self->{multiplexer}{current});
3104}
3105
3106#############################################################################
3107
3108package CFClient::UI::Combobox;
3109
3110use utf8;
3111
3112our @ISA = CFClient::UI::Button::;
3113
3114sub new {
3115 my $class = shift;
3116
3117 my $self = $class->SUPER::new (
3118 options => [], # [value, title, longdesc], ...
3119 value => undef,
3120 @_,
3121 );
3122
3123 $self->_set_value ($self->{value});
3124
3125 $self
3126}
3127
3128sub button_down {
3129 my ($self, $ev) = @_;
3130
3131 my @menu_items;
3132
3133 for (@{ $self->{options} }) {
3134 my ($value, $title, $tooltip) = @$_;
3135
3136 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3137 }
3138
3139 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3140}
3141
3142sub _set_value {
3143 my ($self, $value) = @_;
3144
3145 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3146 or return;
3147
3148 $self->{value} = $item->[0];
3149 $self->set_markup ("$item->[1] ⇓");
3150 $self->set_tooltip ($item->[2]);
3151}
3152
3153sub set_value {
3154 my ($self, $value) = @_;
3155
3156 return unless $self->{value} ne $value;
3157
3158 $self->_set_value ($value);
3159 $self->_emit (changed => $value);
3160}
3161
3162#############################################################################
3163
3164package CFClient::UI::Statusbox;
3165
3166our @ISA = CFClient::UI::VBox::;
3167
3168sub new {
3169 my $class = shift;
3170
3171 my $self = $class->SUPER::new (
2876 fontsize => 0.8, 3172 fontsize => 0.8,
2877 @_, 3173 @_,
2878 ) 3174 );
3175
3176 Scalar::Util::weaken (my $this = $self);
3177
3178 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3179
3180 $self
2879} 3181}
2880 3182
2881sub reorder { 3183sub reorder {
2882 my ($self) = @_; 3184 my ($self) = @_;
2883 my $NOW = time; 3185 my $NOW = Time::HiRes::time;
3186
3187 # freeze display when hovering over any label
3188 return if $CFClient::UI::TOOLTIP->{owner}
3189 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3190 values %{ $self->{item} };
2884 3191
2885 while (my ($k, $v) = each %{ $self->{item} }) { 3192 while (my ($k, $v) = each %{ $self->{item} }) {
2886 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3193 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2887 } 3194 }
2888 3195
… …
2891 my @items = sort { 3198 my @items = sort {
2892 $a->{pri} <=> $b->{pri} 3199 $a->{pri} <=> $b->{pri}
2893 or $b->{id} <=> $a->{id} 3200 or $b->{id} <=> $a->{id}
2894 } values %{ $self->{item} }; 3201 } values %{ $self->{item} };
2895 3202
3203 $self->{timer}->interval (1);
3204
2896 my $count = 10 + 1; 3205 my $count = 10 + 1;
2897 for my $item (@items) { 3206 for my $item (@items) {
2898 last unless --$count; 3207 last unless --$count;
2899 3208
2900 push @widgets, $item->{label} ||= do { 3209 my $label = $item->{label} ||= do {
2901 # TODO: doesn't handle markup well (read as: at all) 3210 # TODO: doesn't handle markup well (read as: at all)
2902 my $short = $item->{count} > 1 3211 my $short = $item->{count} > 1
2903 ? "<b>$item->{count} ×</b> $item->{text}" 3212 ? "<b>$item->{count} ×</b> $item->{text}"
2904 : $item->{text}; 3213 : $item->{text};
2905 3214
… …
2913 tooltip => $item->{tooltip}, 3222 tooltip => $item->{tooltip},
2914 tooltip_font => $::FONT_PROP, 3223 tooltip_font => $::FONT_PROP,
2915 tooltip_width => 0.67, 3224 tooltip_width => 0.67,
2916 fontsize => $item->{fontsize} || $self->{fontsize}, 3225 fontsize => $item->{fontsize} || $self->{fontsize},
2917 max_w => $::WIDTH * 0.44, 3226 max_w => $::WIDTH * 0.44,
2918 fg => $item->{fg}, 3227 fg => [@{ $item->{fg} }],
2919 can_events => 1, 3228 can_events => 1,
2920 can_hover => 1 3229 can_hover => 1
2921 }; 3230 };
3231
3232 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3233 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3234 $label->update;
3235 $label->set_max_size (undef, $label->{req_h} * $diff)
3236 if $diff < 1;
3237 $self->{timer}->interval (1/30);
3238 } else {
3239 $label->{fg}[3] = $item->{fg}[3] || 1;
3240 }
3241
3242 push @widgets, $label;
2922 } 3243 }
2923 3244
2924 $self->clear; 3245 $self->clear;
2925 $self->SUPER::add (reverse @widgets); 3246 $self->SUPER::add (reverse @widgets);
2926} 3247}
… …
2931 $text =~ s/^\s+//; 3252 $text =~ s/^\s+//;
2932 $text =~ s/\s+$//; 3253 $text =~ s/\s+$//;
2933 3254
2934 return unless $text; 3255 return unless $text;
2935 3256
2936 my $timeout = time + ((delete $arg{timeout}) || 60); 3257 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2937 3258
2938 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3259 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2939 3260
2940 if (my $item = $self->{item}{$group}) { 3261 if (my $item = $self->{item}{$group}) {
2941 if ($item->{text} eq $text) { 3262 if ($item->{text} eq $text) {
2942 $item->{count}++; 3263 $item->{count}++;
2943 } else { 3264 } else {
2944 $item->{count} = 1; 3265 $item->{count} = 1;
2945 $item->{text} = $item->{tooltip} = $text; 3266 $item->{text} = $item->{tooltip} = $text;
2946 } 3267 }
2947 $item->{id} = ++$self->{id}; 3268 $item->{id} += 0.2;#d#
2948 $item->{timeout} = $timeout; 3269 $item->{timeout} = $timeout;
2949 delete $item->{label}; 3270 delete $item->{label};
2950 } else { 3271 } else {
2951 $self->{item}{$group} = { 3272 $self->{item}{$group} = {
2952 id => ++$self->{id}, 3273 id => ++$self->{id},
… …
2971 3292
2972 $self->reorder; 3293 $self->reorder;
2973 $self->SUPER::reconfigure; 3294 $self->SUPER::reconfigure;
2974} 3295}
2975 3296
3297sub DESTROY {
3298 my ($self) = @_;
3299
3300 $self->{timer}->cancel;
3301
3302 $self->SUPER::DESTROY;
3303}
3304
2976############################################################################# 3305#############################################################################
2977 3306
3307package CFClient::UI::Inventory;
3308
3309our @ISA = CFClient::UI::ScrolledWindow::;
3310
3311sub new {
3312 my $class = shift;
3313
3314 my $self = $class->SUPER::new (
3315 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3316 @_,
3317 );
3318
3319 $self
3320}
3321
3322sub set_items {
3323 my ($self, $items) = @_;
3324
3325 $self->{child}->clear;
3326 return unless $items;
3327
3328 my @items = sort {
3329 ($a->{type} <=> $b->{type})
3330 or ($a->{name} cmp $b->{name})
3331 } @$items;
3332
3333 $self->{real_items} = \@items;
3334
3335 my $row = 0;
3336 for my $item (@items) {
3337 CFClient::Item::update_widgets $item;
3338
3339 $self->{child}->add (0, $row, $item->{face_widget});
3340 $self->{child}->add (1, $row, $item->{desc_widget});
3341 $self->{child}->add (2, $row, $item->{weight_widget});
3342
3343 $row++;
3344 }
3345}
3346
3347#############################################################################
3348
3349package CFClient::UI::BindEditor;
3350
3351our @ISA = CFClient::UI::FancyFrame::;
3352
3353sub new {
3354 my $class = shift;
3355
3356 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3357
3358 $self->add (my $vb = new CFClient::UI::VBox);
3359
3360
3361 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3362 text => "start recording",
3363 tooltip => "Start/Stops recording of actions."
3364 ."All subsequent actions after the recording started will be captured."
3365 ."The actions are displayed after the record was stopped."
3366 ."To bind the action you have to click on the 'Bind' button",
3367 on_activate => sub {
3368 unless ($self->{recording}) {
3369 $self->start;
3370 } else {
3371 $self->stop;
3372 }
3373 });
3374
3375 $vb->add (new CFClient::UI::Label text => "Actions:");
3376 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3377
3378 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3379 $vb->add (my $hb = new CFClient::UI::HBox);
3380 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3381 $hb->add (new CFClient::UI::Button
3382 text => "bind",
3383 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3384 on_activate => sub {
3385 $self->ask_for_bind;
3386 });
3387
3388 $vb->add (my $hb = new CFClient::UI::HBox);
3389 $hb->add (new CFClient::UI::Button
3390 text => "ok",
3391 expand => 1,
3392 tooltip => "This closes the binding editor and saves the binding",
3393 on_activate => sub {
3394 $self->hide;
3395 $self->commit;
3396 });
3397
3398 $hb->add (new CFClient::UI::Button
3399 text => "cancel",
3400 expand => 1,
3401 tooltip => "This closes the binding editor without saving",
3402 on_activate => sub {
3403 $self->hide;
3404 $self->{binding_cancel}->()
3405 if $self->{binding_cancel};
3406 });
3407
3408 $self->update_binding_widgets;
3409
3410 $self
3411}
3412
3413sub commit {
3414 my ($self) = @_;
3415 my ($mod, $sym, $cmds) = $self->get_binding;
3416 if ($sym != 0 && @$cmds > 0) {
3417 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3418 ."'. Don't forget 'Save Config'!");
3419 $self->{binding_change}->($mod, $sym, $cmds)
3420 if $self->{binding_change};
3421 } else {
3422 $::STATUSBOX->add ("No action bound, no key or action specified!");
3423 $self->{binding_cancel}->()
3424 if $self->{binding_cancel};
3425 }
3426}
3427
3428sub start {
3429 my ($self) = @_;
3430
3431 $self->{rec_btn}->set_text ("stop recording");
3432 $self->{recording} = 1;
3433 $self->clear_command_list;
3434 $::CONN->start_record if $::CONN;
3435}
3436
3437sub stop {
3438 my ($self) = @_;
3439
3440 $self->{rec_btn}->set_text ("start recording");
3441 $self->{recording} = 0;
3442
3443 my $rec;
3444 $rec = $::CONN->stop_record if $::CONN;
3445 return unless ref $rec eq 'ARRAY';
3446 $self->set_command_list ($rec);
3447}
3448
3449
3450sub ask_for_bind_and_commit {
3451 my ($self) = @_;
3452 $self->ask_for_bind (1);
3453}
3454
3455sub ask_for_bind {
3456 my ($self, $commit) = @_;
3457
3458 CFClient::Binder::open_binding_dialog (sub {
3459 my ($mod, $sym) = @_;
3460 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3461 $self->update_binding_widgets;
3462 $self->commit if $commit;
3463 });
3464}
3465
3466# $mod and $sym are the modifiers and key symbol
3467# $cmds is a array ref of strings (the commands)
3468# $cb is the callback that is executed on OK
3469# $ccb is the callback that is executed on CANCEL and
3470# when the binding was unsuccessful on OK
3471sub set_binding {
3472 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3473
3474 $self->clear_command_list;
3475 $self->{recording} = 0;
3476 $self->{rec_btn}->set_text ("start recording");
3477
3478 $self->{binding} = [$mod, $sym];
3479 $self->{commands} = $cmds;
3480
3481 $self->{binding_change} = $cb;
3482 $self->{binding_cancel} = $ccb;
3483
3484 $self->update_binding_widgets;
3485}
3486
3487# this is a shortcut method that asks for a binding
3488# and then just binds it.
3489sub do_quick_binding {
3490 my ($self, $cmds) = @_;
3491 $self->set_binding (undef, undef, $cmds, sub {
3492 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3493 });
3494 $self->ask_for_bind (1);
3495}
3496
3497sub update_binding_widgets {
3498 my ($self) = @_;
3499 my ($mod, $sym, $cmds) = $self->get_binding;
3500 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3501 $self->set_command_list ($cmds);
3502}
3503
3504sub get_binding {
3505 my ($self) = @_;
3506 return (
3507 $self->{binding}->[0],
3508 $self->{binding}->[1],
3509 [ grep { defined $_ } @{$self->{commands}} ]
3510 );
3511}
3512
3513sub clear_command_list {
3514 my ($self) = @_;
3515 $self->{cmdbox}->clear ();
3516}
3517
3518sub set_command_list {
3519 my ($self, $cmds) = @_;
3520
3521 $self->{cmdbox}->clear ();
3522 $self->{commands} = $cmds;
3523
3524 my $idx = 0;
3525
3526 for (@$cmds) {
3527 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3528
3529 my $i = $idx;
3530 $hb->add (new CFClient::UI::Label text => $_);
3531 $hb->add (new CFClient::UI::Button
3532 text => "delete",
3533 tooltip => "Deletes the action from the record",
3534 on_activate => sub {
3535 $self->{cmdbox}->remove ($hb);
3536 $cmds->[$i] = undef;
3537 });
3538
3539
3540 $idx++
3541 }
3542}
3543
3544#############################################################################
3545
3546package CFClient::UI::SpellList;
3547
3548our @ISA = CFClient::UI::Table::;
3549
3550sub new {
3551 my $class = shift;
3552
3553 my $self = $class->SUPER::new (
3554 binding => [],
3555 commands => [],
3556 @_,
3557 )
3558}
3559
3560my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3561
3562my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3563 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3564my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3565 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3566my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3567 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3568my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3569 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3570my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3571 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3572
3573sub rebuild_spell_list {
3574 my ($self) = @_;
3575
3576 $CFClient::UI::ROOT->on_refresh ($self => sub {
3577 $self->clear;
3578
3579 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3580 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3581 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3582 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3583 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3584
3585 my $row = 0;
3586
3587 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3588 my $spell = $self->{spell}{$_};
3589
3590 $row++;
3591
3592 my $spell_cb = sub {
3593 my ($widget, $ev) = @_;
3594
3595 if ($ev->{button} == 1) {
3596 $::CONN->user_send ("cast $spell->{name}");
3597 } elsif ($ev->{button} == 2) {
3598 $::CONN->user_send ("invoke $spell->{name}");
3599 } elsif ($ev->{button} == 3) {
3600 (new CFClient::UI::Menu
3601 items => [
3602 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3603 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3604 ],
3605 )->popup ($ev);
3606 } else {
3607 return 0;
3608 }
3609
3610 1
3611 };
3612
3613 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3614
3615 #TODO: add path info to tooltip
3616 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3617
3618 $self->add (0, $row, new CFClient::UI::Face
3619 face => $spell->{face},
3620 can_hover => 1,
3621 can_events => 1,
3622 tooltip => $tooltip,
3623 on_button_down => $spell_cb,
3624 );
3625
3626 $self->add (1, $row, new CFClient::UI::Label
3627 expand => 1,
3628 text => $spell->{name},
3629 can_hover => 1,
3630 can_events => 1,
3631 tooltip => $tooltip,
3632 on_button_down => $spell_cb,
3633 );
3634
3635 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3636 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3637 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3638 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3639 }
3640 });
3641}
3642
3643sub add_spell {
3644 my ($self, $spell) = @_;
3645
3646 $self->{spell}->{$spell->{name}} = $spell;
3647 $self->rebuild_spell_list;
3648}
3649
3650sub remove_spell {
3651 my ($self, $spell) = @_;
3652
3653 delete $self->{spell}->{$spell->{name}};
3654 $self->rebuild_spell_list;
3655}
3656
3657sub clear_spells {
3658 my ($self) = @_;
3659
3660 $self->{spell} = {};
3661 $self->rebuild_spell_list;
3662}
3663
3664#############################################################################
3665
2978package CFClient::UI::Root; 3666package CFClient::UI::Root;
2979 3667
2980our @ISA = CFClient::UI::Container::; 3668our @ISA = CFClient::UI::Container::;
3669
3670use List::Util qw(min max);
2981 3671
2982use CFClient::OpenGL; 3672use CFClient::OpenGL;
2983 3673
2984sub new { 3674sub new {
2985 my $class = shift; 3675 my $class = shift;
… …
2992 Scalar::Util::weaken ($self->{root} = $self); 3682 Scalar::Util::weaken ($self->{root} = $self);
2993 3683
2994 $self 3684 $self
2995} 3685}
2996 3686
2997sub configure {
2998 my ($self, $x, $y, $w, $h) = @_;
2999
3000 $self->{w} = $w;
3001 $self->{h} = $h;
3002}
3003
3004sub reconfigure {
3005 my ($self) = @_;
3006
3007 $self->SUPER::reconfigure;
3008
3009 $self->size_allocate ($self->{w}, $self->{h}, 1)
3010 if $self->{w};
3011}
3012
3013sub size_request { 3687sub size_request {
3014 my ($self) = @_; 3688 my ($self) = @_;
3015 3689
3016 ($self->{w}, $self->{h}) 3690 ($self->{w}, $self->{h})
3017} 3691}
3018 3692
3693sub _to_pixel {
3694 my ($coord, $size, $max) = @_;
3695
3696 $coord =
3697 $coord eq "center" ? ($max - $size) * 0.5
3698 : $coord eq "max" ? $max
3699 : $coord;
3700
3701 $coord = 0 if $coord < 0;
3702 $coord = $max - $size if $coord > $max - $size;
3703
3704 int $coord + 0.5
3705}
3706
3019sub size_allocate { 3707sub size_allocate {
3020 my ($self, $w, $h, $changed) = @_; 3708 my ($self, $w, $h) = @_;
3021 3709
3022 for my $child ($self->children) { 3710 for my $child ($self->children) {
3023 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3711 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3024 3712
3025 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3713 $X = $child->{force_x} if exists $child->{force_x};
3026 if exists $child->{req_x}; 3714 $Y = $child->{force_y} if exists $child->{force_y};
3027 3715
3028 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3716 $X = _to_pixel $X, $W, $self->{w};
3029 if exists $child->{req_y}; 3717 $Y = _to_pixel $Y, $H, $self->{h};
3030
3031 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3032
3033 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3034 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035 3718
3036 $child->configure ($X, $Y, $W, $H); 3719 $child->configure ($X, $Y, $W, $H);
3037 } 3720 }
3038} 3721}
3039 3722
… …
3056} 3739}
3057 3740
3058sub add { 3741sub add {
3059 my ($self, @children) = @_; 3742 my ($self, @children) = @_;
3060 3743
3061 for my $child (@children) {
3062 $child->{is_toplevel} = 1; 3744 $_->{is_toplevel} = 1
3063 3745 for @children;
3064 # integerise window positions
3065 $child->{x} = int $child->{x};
3066 $child->{y} = int $child->{y};
3067 }
3068 3746
3069 $self->SUPER::add (@children); 3747 $self->SUPER::add (@children);
3070} 3748}
3071 3749
3072sub remove { 3750sub remove {
3073 my ($self, @children) = @_; 3751 my ($self, @children) = @_;
3074 3752
3075 $self->SUPER::remove (@children); 3753 $self->SUPER::remove (@children);
3754
3755 delete $self->{is_toplevel}
3756 for @children;
3076 3757
3077 while (@children) { 3758 while (@children) {
3078 my $w = pop @children; 3759 my $w = pop @children;
3079 push @children, $w->children; 3760 push @children, $w->children;
3080 $w->set_invisible; 3761 $w->set_invisible;
… …
3100 $_->() 3781 $_->()
3101 for values %{delete $self->{refresh_hook}}; 3782 for values %{delete $self->{refresh_hook}};
3102 } 3783 }
3103 3784
3104 if ($self->{realloc}) { 3785 if ($self->{realloc}) {
3786 my %queue;
3105 my @queue; 3787 my @queue;
3788 my $widget;
3106 3789
3790 outer:
3107 while () { 3791 while () {
3108 if ($self->{realloc}) { 3792 if (my $realloc = delete $self->{realloc}) {
3109 #TODO use array-of-depth approach 3793 for $widget (values %$realloc) {
3794 $widget->{visible} or next; # do not resize invisible widgets
3110 3795
3111 @queue = sort { $a->{visible} <=> $b->{visible} } 3796 $queue{$widget+0}++ and next; # duplicates are common
3112 @queue, values %{delete $self->{realloc}}; 3797
3798 push @{ $queue[$widget->{visible}] }, $widget;
3799 }
3113 } 3800 }
3114 3801
3802 while () {
3803 @queue or last outer;
3804
3805 $widget = pop @{ $queue[-1] || [] }
3806 and last;
3807
3808 pop @queue;
3809 }
3810
3811 delete $queue{$widget+0};
3812
3813 my ($w, $h) = $widget->size_request;
3814
3815 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3816 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3817
3818 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3819 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3820
3821 $w = $widget->{force_w} if exists $widget->{force_w};
3822 $h = $widget->{force_h} if exists $widget->{force_h};
3823
3824 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3825 || delete $widget->{force_realloc}) {
3826 $widget->{req_w} = $w;
3827 $widget->{req_h} = $h;
3828
3829 $self->{size_alloc}{$widget+0} = $widget;
3830
3831 if (my $parent = $widget->{parent}) {
3832 $self->{realloc}{$parent+0} = $parent
3833 unless $queue{$parent+0};
3834
3835 $parent->{force_size_alloc} = 1;
3836 $self->{size_alloc}{$parent+0} = $parent;
3837 }
3838 }
3839
3840 delete $self->{realloc}{$widget+0};
3841 }
3842 }
3843
3844 while (my $size_alloc = delete $self->{size_alloc}) {
3845 my @queue = sort { $b->{visible} <=> $a->{visible} }
3846 values %$size_alloc;
3847
3848 while () {
3115 my $widget = pop @queue || last; 3849 my $widget = pop @queue || last;
3116 3850
3117 $widget->{visible} or last; # do not resize invisible widgets 3851 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3118
3119 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3120 ? @$widget{qw(def_w def_h)}
3121 : $widget->size_request;
3122
3123 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3124
3125 $widget->{req_w} = $w;
3126 $widget->{req_h} = $h;
3127
3128 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3129
3130 push @queue, $widget->{parent}
3131 if $widget->{parent};
3132 }
3133 }
3134
3135 while (my $size_alloc = delete $self->{size_alloc}) {
3136 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3137 values %$size_alloc;
3138
3139 while () {
3140 my ($widget, $w, $h) = @{ pop @queue or last };
3141 3852
3142 $w = 0 if $w < 0; 3853 $w = 0 if $w < 0;
3143 $h = 0 if $h < 0; 3854 $h = 0 if $h < 0;
3144 3855
3856 $w = int $w + 0.5;
3857 $h = int $h + 0.5;
3858
3859 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3860 $widget->{old_w} = $widget->{w};
3861 $widget->{old_h} = $widget->{h};
3862
3145 $widget->{w} = $w; 3863 $widget->{w} = $w;
3146 $widget->{h} = $h; 3864 $widget->{h} = $h;
3865
3147 $widget->emit (size_allocate => $w, $h, 1); 3866 $widget->emit (size_allocate => $w, $h);
3867 }
3148 } 3868 }
3149 } 3869 }
3150 3870
3151 while ($self->{post_alloc_hook}) { 3871 while ($self->{post_alloc_hook}) {
3152 $_->() 3872 $_->()
3153 for values %{delete $self->{post_alloc_hook}}; 3873 for values %{delete $self->{post_alloc_hook}};
3154 } 3874 }
3875
3155 3876
3156 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3877 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3157 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3878 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3158 glClear GL_COLOR_BUFFER_BIT; 3879 glClear GL_COLOR_BUFFER_BIT;
3159 3880
… …
3161 glLoadIdentity; 3882 glLoadIdentity;
3162 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3883 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3163 glMatrixMode GL_MODELVIEW; 3884 glMatrixMode GL_MODELVIEW;
3164 glLoadIdentity; 3885 glLoadIdentity;
3165 3886
3887 {
3888 package CFClient::UI::Base;
3889
3890 ($draw_x, $draw_y, $draw_w, $draw_h) =
3891 (0, 0, $self->{w}, $self->{h});
3892 }
3893
3166 $self->_draw; 3894 $self->_draw;
3167} 3895}
3168 3896
3169############################################################################# 3897#############################################################################
3170 3898

Diff Legend

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