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.302 by root, Mon Jun 12 13:26:14 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 {
… …
269 272
270 return unless $self->{visible}; 273 return unless $self->{visible};
271 274
272 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
273 276
277 delete $self->{visible};
274 delete $self->{root}; 278 delete $self->{root};
275 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
… …
564 593
565sub DESTROY { 594sub DESTROY {
566 my ($self) = @_; 595 my ($self) = @_;
567 596
568 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
569 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
570} 601}
571 602
572############################################################################# 603#############################################################################
573 604
574package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
599 630
600 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
601 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
602 633
603 glEnable GL_BLEND; 634 glEnable GL_BLEND;
604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
605 glColor @$color; 636 glColor_premultiply @$color;
606 637
607 glBegin GL_QUADS; 638 glBegin GL_QUADS;
608 glVertex 0 , 0; 639 glVertex 0 , 0;
609 glVertex 0 , $h; 640 glVertex 0 , $h;
610 glVertex $w, $h; 641 glVertex $w, $h;
… …
625 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
626 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
627} 658}
628 659
629sub size_request { 660sub size_request {
630 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
631} 664}
632 665
633sub draw { } 666sub draw { }
634 667
635############################################################################# 668#############################################################################
… …
639our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
640 673
641sub new { 674sub new {
642 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
643 676
644 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
645 678
646 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
647 children => [], 680 children => [],
648 can_events => 0, 681 can_events => 0,
649 %arg, 682 %arg,
650 ); 683 );
684
651 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
652 687
653 $self 688 $self
654} 689}
655 690
656sub add { 691sub add {
… …
704 $x -= $self->{x}; 739 $x -= $self->{x};
705 $y -= $self->{y}; 740 $y -= $self->{y};
706 741
707 my $res; 742 my $res;
708 743
709 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
710 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
711 and return $res; 746 and return $res;
712 } 747 }
713 748
714 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
735} 770}
736 771
737sub add { 772sub add {
738 my ($self, $child) = @_; 773 my ($self, $child) = @_;
739 774
740 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
741
742 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
743} 777}
744 778
745sub remove { 779sub remove {
746 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
756sub size_request { 790sub size_request {
757 $_[0]{children}[0]->size_request 791 $_[0]{children}[0]->size_request
758} 792}
759 793
760sub size_allocate { 794sub size_allocate {
761 my ($self, $w, $h, $changed) = @_; 795 my ($self, $w, $h) = @_;
762 796
763 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
764} 798}
765 799
766############################################################################# 800#############################################################################
801
802# back-buffered drawing area
767 803
768package CFClient::UI::Window; 804package CFClient::UI::Window;
769 805
770our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
771 807
… …
783 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 819 $ROOT->on_post_alloc ($self => sub { $self->render_child });
784 $self->SUPER::update; 820 $self->SUPER::update;
785} 821}
786 822
787sub size_allocate { 823sub size_allocate {
788 my ($self, $w, $h, $changed) = @_; 824 my ($self, $w, $h) = @_;
789 825
790 $self->SUPER::size_allocate ($w, $h, $changed); 826 $self->SUPER::size_allocate ($w, $h);
791 $self->update 827 $self->update;
792 if $changed;
793} 828}
794 829
795sub _render { 830sub _render {
831 my ($self) = @_;
832
796 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
797} 834}
798 835
799sub render_child { 836sub render_child {
800 my ($self) = @_; 837 my ($self) = @_;
801 838
802 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
803 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
804 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
805 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
806 $self->_render; 850 $self->_render;
807 }; 851 };
808} 852}
809 853
810sub _draw { 854sub _draw {
811 my ($self) = @_; 855 my ($self) = @_;
812 856
813 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
814 858
815 my $tex = $self->{texture} 859 my $tex = $self->{texture}
816 or return; 860 or return;
817 861
818 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
820 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
821 865
822 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
823 867
824 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
825} 869}
… …
841} 885}
842 886
843sub size_request { 887sub size_request {
844 my ($self) = @_; 888 my ($self) = @_;
845 889
846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
847 891
848 $w = 10 if $self->{scroll_x}; 892 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y}; 893 $h = 10 if $self->{scroll_y};
850 894
851 ($w, $h) 895 ($w, $h)
852} 896}
853 897
854sub size_allocate { 898sub size_allocate {
855 my ($self, $w, $h, $changed) = @_; 899 my ($self, $w, $h) = @_;
856 900
901 my $child = $self->child;
902
857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859 905
860 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
861 $self->update; 907 $self->update;
862} 908}
863 909
… …
899} 945}
900 946
901sub _render { 947sub _render {
902 my ($self) = @_; 948 my ($self) = @_;
903 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
904 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905 954
906 $self->SUPER::_render; 955 $self->SUPER::_render;
907} 956}
908 957
… …
911package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
912 961
913our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
914 963
915sub new { 964sub new {
916 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
917 968
918 my $self; 969 my $self;
919 970
920 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
921 vertical => 1, 972 vertical => 1,
… …
926 ; 977 ;
927 978
928 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
929 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
930 slider => $slider, 981 slider => $slider,
931 @_, 982 %arg,
932 ); 983 );
933 984
934 $self->{vp}->add ($self->{scrolled});
935 $self->add ($self->{vp});
936 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
937 987
938 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
939} 995}
940 996
941sub update { 997sub update {
942 my ($self) = @_; 998 my ($self) = @_;
943 999
… …
947 my $child = $self->{vp}->child; 1003 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949} 1005}
950 1006
951sub size_allocate { 1007sub size_allocate {
952 my ($self, $w, $h, $changed) = @_; 1008 my ($self, $w, $h) = @_;
953 1009
954 $self->SUPER::size_allocate ($w, $h, $changed); 1010 $self->SUPER::size_allocate ($w, $h);
955 1011
956 my $child = $self->{vp}->child; 1012 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958} 1014}
959 1015
… …
982 1038
983 if ($self->{bg}) { 1039 if ($self->{bg}) {
984 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
985 1041
986 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
988 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
989 1045
990 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
991 glVertex 0 , 0; 1047 glVertex 0 , 0;
992 glVertex 0 , $h; 1048 glVertex 0 , $h;
993 glVertex $w, $h; 1049 glVertex $w, $h;
… …
1006 1062
1007our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
1008 1064
1009use CFClient::OpenGL; 1065use CFClient::OpenGL;
1010 1066
1011my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 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); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1014 1074
1015sub new { 1075sub new {
1016 my $class = shift; 1076 my ($class, %arg) = @_;
1017 1077
1018 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1019 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1020 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1021 border => 0.6, 1081 border => 0.6,
1022 is_toplevel => 1,
1023 can_events => 1, 1082 can_events => 1,
1024 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
1025 ); 1086 );
1026 1087
1027 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1028 align => 0, 1089 align => 0,
1029 valign => 1, 1090 valign => 1,
1030 text => $self->{title}, 1091 text => $self->{title},
1031 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1032 1094
1033 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1034} 1103}
1035 1104
1036sub border { 1105sub border {
1037 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1038} 1107}
1039 1108
1040sub size_request { 1109sub size_request {
1041 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title_widget}->size_request
1113 if $self->{title_widget};
1042 1114
1043 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1044 1116
1045 ( 1117 (
1046 $w + $self->border * 2, 1118 $w + $self->border * 2,
1047 $h + $self->border * 2, 1119 $h + $self->border * 2,
1048 ) 1120 )
1049} 1121}
1050 1122
1051sub size_allocate { 1123sub size_allocate {
1052 my ($self, $w, $h, $changed) = @_; 1124 my ($self, $w, $h) = @_;
1053 1125
1054 return unless $changed; 1126 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h);
1130 }
1055 1131
1132 my $border = $self->border;
1133
1056 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
1057 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
1058 1136
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); 1137 $self->child->configure ($border, $border, $w, $h);
1063} 1138}
1064 1139
1065sub button_down { 1140sub button_down {
1066 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1067 1142
… …
1083 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1084 1159
1085 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1086 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1087 1162
1088 $self->{user_x} = $wx + $dx * $mx;
1089 $self->{user_y} = $wy + $dy * $my;
1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1092 $self->move ($self->{user_x}, $self->{user_y}); 1165
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1093 $self->realloc; 1167 $self->realloc;
1094 }; 1168 };
1095 1169
1096 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1097 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1100 $self->{motion} = sub { 1174 $self->{motion} = sub {
1101 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1102 1176
1103 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1104 1178
1105 $self->{user_x} = $bx + $x - $ox; 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1106 $self->{user_y} = $by + $y - $oy; 1180 # HACK: the next line is required to enforce placement
1107 1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1108 $self->move ($self->{user_x}, $self->{user_y});
1109 $self->realloc;
1110 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1111 } 1187 1
1112} 1188}
1113 1189
1114sub button_up { 1190sub button_up {
1115 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1116 1192
1117 delete $self->{motion}; 1193 !!delete $self->{motion}
1118} 1194}
1119 1195
1120sub mouse_motion { 1196sub mouse_motion {
1121 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1122 1198
1123 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1124} 1202}
1125 1203
1126sub _draw { 1204sub _draw {
1127 my ($self) = @_; 1205 my ($self) = @_;
1128 1206
1207 my $child = $self->{children}[0];
1208
1129 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1130 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1131 1211
1132 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1133 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1134 1214
1135 my $border = $self->border; 1215 my $border = $self->border;
1136 1216
1137 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1138 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1139 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1140 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1141 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1142 1222
1143 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1144 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1145 1225
1146 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1147 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1148 my $rep_y = $ch / $bg->{h}; 1229 $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); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1156 } 1231 }
1157 1232
1158 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1159 1234
1160 $self->{title}->draw if $self->{title};
1161
1162 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw;
1240 }
1163} 1241}
1164 1242
1165############################################################################# 1243#############################################################################
1166 1244
1167package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1190 1268
1191 $child->set_parent ($self); 1269 $child->set_parent ($self);
1192 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1193 1271
1194 $self->realloc; 1272 $self->realloc;
1273}
1274
1275sub remove {
1276 my ($self, $child) = @_;
1277
1278 # TODO: not yet implemented
1195} 1279}
1196 1280
1197# TODO: move to container class maybe? send children a signal on removal? 1281# TODO: move to container class maybe? send children a signal on removal?
1198sub clear { 1282sub clear {
1199 my ($self) = @_; 1283 my ($self) = @_;
… …
1241 (sum @$hs), 1325 (sum @$hs),
1242 ) 1326 )
1243} 1327}
1244 1328
1245sub size_allocate { 1329sub size_allocate {
1246 my ($self, $w, $h, $changed) = @_; 1330 my ($self, $w, $h) = @_;
1247 1331
1248 my ($ws, $hs) = $self->get_wh; 1332 my ($ws, $hs) = $self->get_wh;
1249 1333
1250 my $req_w = (sum @$ws) || 1; 1334 my $req_w = (sum @$ws) || 1;
1251 my $req_h = (sum @$hs) || 1; 1335 my $req_h = (sum @$hs) || 1;
… …
1329 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1413 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1330 ) 1414 )
1331} 1415}
1332 1416
1333sub size_allocate { 1417sub size_allocate {
1334 my ($self, $w, $h, $changed) = @_; 1418 my ($self, $w, $h) = @_;
1335 1419
1336 my $space = $self->{vertical} ? $h : $w; 1420 my $space = $self->{vertical} ? $h : $w;
1337 my $children = $self->{children}; 1421 my $children = $self->{children};
1338 1422
1339 my @req; 1423 my @req;
… …
1422 ellipsise => 3, # end 1506 ellipsise => 3, # end
1423 layout => (new CFClient::Layout), 1507 layout => (new CFClient::Layout),
1424 fontsize => 1, 1508 fontsize => 1,
1425 align => -1, 1509 align => -1,
1426 valign => -1, 1510 valign => -1,
1427 padding => 2, 1511 padding_x => 2,
1512 padding_y => 2,
1428 can_events => 0, 1513 can_events => 0,
1429 %arg 1514 %arg
1430 ); 1515 );
1431 1516
1432 if (exists $self->{template}) { 1517 if (exists $self->{template}) {
… …
1459 1544
1460 delete $self->{texture}; 1545 delete $self->{texture};
1461 $self->SUPER::update; 1546 $self->SUPER::update;
1462} 1547}
1463 1548
1549sub realloc {
1550 my ($self) = @_;
1551
1552 delete $self->{ox};
1553 $self->SUPER::realloc;
1554}
1555
1464sub set_text { 1556sub set_text {
1465 my ($self, $text) = @_; 1557 my ($self, $text) = @_;
1466 1558
1467 return if $self->{text} eq "T$text"; 1559 return if $self->{text} eq "T$text";
1468 $self->{text} = "T$text"; 1560 $self->{text} = "T$text";
1469 1561
1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1471 $self->{layout}->set_text ($text); 1563 $self->{layout}->set_text ($text);
1472 1564
1565 delete $self->{size_req};
1473 $self->realloc; 1566 $self->realloc;
1567 $self->update;
1474} 1568}
1475 1569
1476sub set_markup { 1570sub set_markup {
1477 my ($self, $markup) = @_; 1571 my ($self, $markup) = @_;
1478 1572
… …
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1576 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1577
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1579 $self->{layout}->set_markup ($markup);
1486 1580
1581 delete $self->{size_req};
1487 $self->realloc; 1582 $self->realloc;
1583 $self->update;
1488} 1584}
1489 1585
1490sub size_request { 1586sub size_request {
1491 my ($self) = @_; 1587 my ($self) = @_;
1492 1588
1589 $self->{size_req} ||= do {
1493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1590 $self->{layout}->set_font ($self->{font}) if $self->{font};
1494 $self->{layout}->set_width ($self->{max_w} || -1); 1591 $self->{layout}->set_width ($self->{max_w} || -1);
1495 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1592 $self->{layout}->set_ellipsise ($self->{ellipsise});
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1593 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498 1595
1499 my ($w, $h) = $self->{layout}->size; 1596 my ($w, $h) = $self->{layout}->size;
1500 1597
1501 if (exists $self->{template}) { 1598 if (exists $self->{template}) {
1502 $self->{template}->set_font ($self->{font}) if $self->{font}; 1599 $self->{template}->set_font ($self->{font}) if $self->{font};
1503 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1504 1601
1505 my ($w2, $h2) = $self->{template}->size; 1602 my ($w2, $h2) = $self->{template}->size;
1506 1603
1507 $w = List::Util::max $w, $w2; 1604 $w = List::Util::max $w, $w2;
1508 $h = List::Util::max $h, $h2; 1605 $h = List::Util::max $h, $h2;
1606 }
1607
1608 [$w, $h]
1509 } 1609 };
1510 1610
1511 ( 1611 @{ $self->{size_req} }
1512 $w + $self->{padding} * 2,
1513 $h + $self->{padding} * 2,
1514 )
1515} 1612}
1516 1613
1517sub size_allocate { 1614sub size_allocate {
1518 my ($self, $w, $h, $changed) = @_; 1615 my ($self, $w, $h) = @_;
1616
1617 delete $self->{ox};
1519 1618
1520 delete $self->{texture} 1619 delete $self->{texture}
1521 if $changed; 1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522} 1621}
1523 1622
1524sub set_fontsize { 1623sub set_fontsize {
1525 my ($self, $fontsize) = @_; 1624 my ($self, $fontsize) = @_;
1526 1625
1527 $self->{fontsize} = $fontsize; 1626 $self->{fontsize} = $fontsize;
1528 delete $self->{texture}; 1627 delete $self->{texture};
1529 1628
1530 $self->realloc; 1629 $self->realloc;
1630}
1631
1632sub reconfigure {
1633 my ($self) = @_;
1634
1635 delete $self->{size_req};
1636
1637 $self->SUPER::reconfigure;
1531} 1638}
1532 1639
1533sub _draw { 1640sub _draw {
1534 my ($self) = @_; 1641 my ($self) = @_;
1535 1642
… …
1541 $self->{layout}->set_width ($self->{w}); 1648 $self->{layout}->set_width ($self->{w});
1542 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1649 $self->{layout}->set_ellipsise ($self->{ellipsise});
1543 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545 1652
1546 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1653 new_from_layout CFClient::Texture $self->{layout}
1654 };
1547 1655
1656 unless (exists $self->{ox}) {
1548 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550 : ($self->{w} - $tex->{w}) * 0.5); 1659 : ($self->{w} - $tex->{w}) * 0.5);
1551 1660
1552 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554 : ($self->{h} - $tex->{h}) * 0.5); 1663 : ($self->{h} - $tex->{h}) * 0.5);
1555
1556 $tex
1557 }; 1664 };
1558 1665
1559 glEnable GL_TEXTURE_2D; 1666 glEnable GL_TEXTURE_2D;
1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1561 1670
1562 if ($tex->{format} == GL_ALPHA) { 1671 if ($tex->{format} == GL_ALPHA) {
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1563 glColor @{$self->{fg}}; 1673 glColor @{$self->{fg}};
1564 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1565 } else { 1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1566 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1567 } 1678 }
1568 1679
1569 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1570} 1681}
1571 1682
… …
1588 can_hover => 1, 1699 can_hover => 1,
1589 can_focus => 1, 1700 can_focus => 1,
1590 valign => 0, 1701 valign => 0,
1591 can_events => 1, 1702 can_events => 1,
1592 #text => ... 1703 #text => ...
1704 #hidden => "*",
1593 @_ 1705 @_
1594 ) 1706 )
1595} 1707}
1596 1708
1597sub _set_text { 1709sub _set_text {
… …
1599 1711
1600 delete $self->{cur_h}; 1712 delete $self->{cur_h};
1601 1713
1602 return if $self->{text} eq $text; 1714 return if $self->{text} eq $text;
1603 1715
1604 delete $self->{texture};
1605
1606 $self->{last_activity} = $::NOW; 1716 $self->{last_activity} = $::NOW;
1607 $self->{text} = $text; 1717 $self->{text} = $text;
1608 1718
1609 $text =~ s/./*/g if $self->{hidden}; 1719 $text =~ s/./*/g if $self->{hidden};
1610 $self->{layout}->set_text ("$text "); 1720 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req};
1611 1722
1612 $self->_emit (changed => $self->{text}); 1723 $self->_emit (changed => $self->{text});
1724
1725 $self->realloc;
1726 $self->update;
1613} 1727}
1614 1728
1615sub set_text { 1729sub set_text {
1616 my ($self, $text) = @_; 1730 my ($self, $text) = @_;
1617 1731
1618 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1619 $self->_set_text ($text); 1733 $self->_set_text ($text);
1620
1621 $self->realloc;
1622} 1734}
1623 1735
1624sub get_text { 1736sub get_text {
1625 $_[0]{text} 1737 $_[0]{text}
1626} 1738}
… …
1656 $self->{cursor} = length $text; 1768 $self->{cursor} = length $text;
1657 } elsif ($uni == 27) { 1769 } elsif ($uni == 27) {
1658 $self->_emit ('escape'); 1770 $self->_emit ('escape');
1659 } elsif ($uni) { 1771 } elsif ($uni) {
1660 substr $text, $self->{cursor}++, 0, chr $uni; 1772 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else {
1774 return 0;
1661 } 1775 }
1662 1776
1663 $self->_set_text ($text); 1777 $self->_set_text ($text);
1664 1778
1665 $self->realloc; 1779 $self->realloc;
1780
1781 1
1666} 1782}
1667 1783
1668sub focus_in { 1784sub focus_in {
1669 my ($self) = @_; 1785 my ($self) = @_;
1670 1786
… …
1685 utf8::encode $text; 1801 utf8::encode $text;
1686 $self->{cursor} = length substr $text, 0, $idx; 1802 $self->{cursor} = length substr $text, 0, $idx;
1687 1803
1688 $self->_set_text ($self->{text}); 1804 $self->_set_text ($self->{text});
1689 $self->update; 1805 $self->update;
1806
1807 1
1690} 1808}
1691 1809
1692sub mouse_motion { 1810sub mouse_motion {
1693 my ($self, $ev, $x, $y) = @_; 1811 my ($self, $ev, $x, $y) = @_;
1694# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813
1814 0
1695} 1815}
1696 1816
1697sub _draw { 1817sub _draw {
1698 my ($self) = @_; 1818 my ($self) = @_;
1699 1819
1700 local $self->{fg} = $self->{fg}; 1820 local $self->{fg} = $self->{fg};
1701 1821
1702 if ($FOCUS == $self) { 1822 if ($FOCUS == $self) {
1703 glColor @{$self->{active_bg}}; 1823 glColor_premultiply @{$self->{active_bg}};
1704 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1705 } else { 1825 } else {
1706 glColor @{$self->{bg}}; 1826 glColor_premultiply @{$self->{bg}};
1707 } 1827 }
1708 1828
1709 glEnable GL_BLEND; 1829 glEnable GL_BLEND;
1710 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1830 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1711 glBegin GL_QUADS; 1831 glBegin GL_QUADS;
1712 glVertex 0 , 0; 1832 glVertex 0 , 0;
1713 glVertex 0 , $self->{h}; 1833 glVertex 0 , $self->{h};
1714 glVertex $self->{w}, $self->{h}; 1834 glVertex $self->{w}, $self->{h};
1715 glVertex $self->{w}, 0; 1835 glVertex $self->{w}, 0;
… …
1776 } else { 1896 } else {
1777 $self->set_text ($self->{history_saveback}); 1897 $self->set_text ($self->{history_saveback});
1778 } 1898 }
1779 1899
1780 } else { 1900 } else {
1781 $self->SUPER::key_down ($ev); 1901 return $self->SUPER::key_down ($ev)
1902 }
1903
1782 } 1904 1
1783
1784} 1905}
1785 1906
1786############################################################################# 1907#############################################################################
1787 1908
1788package CFClient::UI::Button; 1909package CFClient::UI::Button;
… …
1797 1918
1798sub new { 1919sub new {
1799 my $class = shift; 1920 my $class = shift;
1800 1921
1801 $class->SUPER::new ( 1922 $class->SUPER::new (
1802 padding => 4, 1923 padding_x => 4,
1924 padding_y => 4,
1803 fg => [1, 1, 1], 1925 fg => [1, 1, 1],
1804 active_fg => [0, 0, 1], 1926 active_fg => [0, 0, 1],
1805 can_hover => 1, 1927 can_hover => 1,
1806 align => 0, 1928 align => 0,
1807 valign => 0, 1929 valign => 0,
… …
1816 my ($self, $ev, $x, $y) = @_; 1938 my ($self, $ev, $x, $y) = @_;
1817 1939
1818 $self->emit ("activate") 1940 $self->emit ("activate")
1819 if $x >= 0 && $x < $self->{w} 1941 if $x >= 0 && $x < $self->{w}
1820 && $y >= 0 && $y < $self->{h}; 1942 && $y >= 0 && $y < $self->{h};
1943
1944 1
1821} 1945}
1822 1946
1823sub _draw { 1947sub _draw {
1824 my ($self) = @_; 1948 my ($self) = @_;
1825 1949
1826 local $self->{fg} = $self->{fg}; 1950 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1827
1828 if ($GRAB == $self) {
1829 $self->{fg} = $self->{active_fg};
1830 }
1831 1951
1832 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834 glColor 0, 0, 0, 1; 1954 glColor 0, 0, 0, 1;
1835 1955
… …
1854 1974
1855sub new { 1975sub new {
1856 my $class = shift; 1976 my $class = shift;
1857 1977
1858 $class->SUPER::new ( 1978 $class->SUPER::new (
1859 padding => 2, 1979 padding_x => 2,
1980 padding_y => 2,
1860 fg => [1, 1, 1], 1981 fg => [1, 1, 1],
1861 active_fg => [1, 1, 0], 1982 active_fg => [1, 1, 0],
1862 bg => [0, 0, 0, 0.2], 1983 bg => [0, 0, 0, 0.2],
1863 active_bg => [1, 1, 1, 0.5], 1984 active_bg => [1, 1, 1, 0.5],
1864 state => 0, 1985 state => 0,
… …
1868} 1989}
1869 1990
1870sub size_request { 1991sub size_request {
1871 my ($self) = @_; 1992 my ($self) = @_;
1872 1993
1873 ($self->{padding} * 2 + 6) x 2 1994 (6) x 2
1874} 1995}
1875 1996
1876sub button_down { 1997sub button_down {
1877 my ($self, $ev, $x, $y) = @_; 1998 my ($self, $ev, $x, $y) = @_;
1878 1999
1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881 $self->{state} = !$self->{state}; 2002 $self->{state} = !$self->{state};
1882 $self->_emit (changed => $self->{state}); 2003 $self->_emit (changed => $self->{state});
2004 } else {
2005 return 0
2006 }
2007
1883 } 2008 1
1884} 2009}
1885 2010
1886sub _draw { 2011sub _draw {
1887 my ($self) = @_; 2012 my ($self) = @_;
1888 2013
1889 $self->SUPER::_draw; 2014 $self->SUPER::_draw;
1890 2015
1891 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2016 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892 2017
1893 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2018 my ($w, $h) = @$self{qw(w h)};
2019
2020 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894 2021
1895 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2022 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896 2023
1897 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2024 my $tex = $self->{state} ? $tex[1] : $tex[0];
1898 2025
… …
2053 2180
2054 my $h1 = $self->{h} * (1 - $ycut1); 2181 my $h1 = $self->{h} * (1 - $ycut1);
2055 my $h2 = $self->{h} * (1 - $ycut2); 2182 my $h2 = $self->{h} * (1 - $ycut2);
2056 2183
2057 glEnable GL_BLEND; 2184 glEnable GL_BLEND;
2058 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2059 glEnable GL_TEXTURE_2D; 2187 glEnable GL_TEXTURE_2D;
2060 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2188 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2061 2189
2062 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2190 glBindTexture GL_TEXTURE_2D, $t1->{name};
2063 glBegin GL_QUADS; 2191 glBegin GL_QUADS;
… …
2163 fg => [1, 1, 1], 2291 fg => [1, 1, 1],
2164 active_fg => [0, 0, 0], 2292 active_fg => [0, 0, 0],
2165 bg => [0, 0, 0, 0.2], 2293 bg => [0, 0, 0, 0.2],
2166 active_bg => [1, 1, 1, 0.5], 2294 active_bg => [1, 1, 1, 0.5],
2167 range => [0, 0, 100, 10, 0], 2295 range => [0, 0, 100, 10, 0],
2168 req_w => $::WIDTH / 80, 2296 min_w => $::WIDTH / 80,
2169 req_h => $::WIDTH / 80, 2297 min_h => $::WIDTH / 80,
2170 vertical => 0, 2298 vertical => 0,
2171 can_hover => 1, 2299 can_hover => 1,
2172 inner_pad => 0.02, 2300 inner_pad => 0.02,
2173 @_ 2301 @_
2174 ); 2302 );
… …
2184sub set_range { 2312sub set_range {
2185 my ($self, $range) = @_; 2313 my ($self, $range) = @_;
2186 2314
2187 ($range, $self->{range}) = ($self->{range}, $range); 2315 ($range, $self->{range}) = ($self->{range}, $range);
2188 2316
2189 $self->update
2190 if "@$range" ne "@{$self->{range}}"; 2317 if ("@$range" ne "@{$self->{range}}") {
2318 $self->update;
2319 $self->set_value ($self->{range}[0]);
2320 }
2191} 2321}
2192 2322
2193sub set_value { 2323sub set_value {
2194 my ($self, $value) = @_; 2324 my ($self, $value) = @_;
2195 2325
… …
2214} 2344}
2215 2345
2216sub size_request { 2346sub size_request {
2217 my ($self) = @_; 2347 my ($self) = @_;
2218 2348
2219 my $w = $self->{req_w}; 2349 ($self->{req_w}, $self->{req_h})
2220 my $h = $self->{req_h};
2221
2222 $self->{vertical} ? ($h, $w) : ($w, $h)
2223} 2350}
2224 2351
2225sub button_down { 2352sub button_down {
2226 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
2227 2354
2228 $self->SUPER::button_down ($ev, $x, $y); 2355 $self->SUPER::button_down ($ev, $x, $y);
2229 2356
2230 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2231 2358
2232 $self->mouse_motion ($ev, $x, $y); 2359 $self->mouse_motion ($ev, $x, $y)
2233} 2360}
2234 2361
2235sub mouse_motion { 2362sub mouse_motion {
2236 my ($self, $ev, $x, $y) = @_; 2363 my ($self, $ev, $x, $y) = @_;
2237 2364
… …
2241 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2368 my (undef, $lo, $hi, $page) = @{$self->{range}};
2242 2369
2243 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2370 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2244 2371
2245 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2372 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2373 } else {
2374 return 0;
2375 }
2376
2246 } 2377 1
2247} 2378}
2248 2379
2249sub update { 2380sub update {
2250 my ($self) = @_; 2381 my ($self) = @_;
2251 2382
2252 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2383 delete $self->{knob_w};
2384 $self->SUPER::update;
2385}
2386
2387sub _draw {
2388 my ($self) = @_;
2389
2390 unless ($self->{knob_w}) {
2253 $self->set_value ($self->{range}[0]); 2391 $self->set_value ($self->{range}[0]);
2254 2392
2255 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2393 my ($value, $lo, $hi, $page) = @{$self->{range}};
2256 my $range = ($hi - $page - $lo) || 1e-100; 2394 my $range = ($hi - $page - $lo) || 1e-100;
2257 2395
… …
2263 $value = ($value - $lo) / $range; 2401 $value = ($value - $lo) / $range;
2264 $value = $value * $self->{scale} + $self->{offset}; 2402 $value = $value * $self->{scale} + $self->{offset};
2265 2403
2266 $self->{knob_x} = $value - $knob_w * 0.5; 2404 $self->{knob_x} = $value - $knob_w * 0.5;
2267 $self->{knob_w} = $knob_w; 2405 $self->{knob_w} = $knob_w;
2268 }); 2406 }
2269
2270 $self->SUPER::update;
2271}
2272
2273sub _draw {
2274 my ($self) = @_;
2275 2407
2276 $self->SUPER::_draw (); 2408 $self->SUPER::_draw ();
2277 2409
2278 glScale $self->{w}, $self->{h}; 2410 glScale $self->{w}, $self->{h};
2279 2411
… …
2340sub set_range { shift->{slider}->set_range (@_) } 2472sub set_range { shift->{slider}->set_range (@_) }
2341sub set_value { shift->{slider}->set_value (@_) } 2473sub set_value { shift->{slider}->set_value (@_) }
2342 2474
2343############################################################################# 2475#############################################################################
2344 2476
2345package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2346 2478
2347our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2348 2480
2349use CFClient::OpenGL; 2481use CFClient::OpenGL;
2350 2482
… …
2352 my $class = shift; 2484 my $class = shift;
2353 2485
2354 my $self = $class->SUPER::new ( 2486 my $self = $class->SUPER::new (
2355 fontsize => 1, 2487 fontsize => 1,
2356 can_events => 0, 2488 can_events => 0,
2489 indent => 0,
2357 #font => default_font 2490 #font => default_font
2358 @_, 2491 @_,
2359 2492
2360 layout => (new CFClient::Layout 1), 2493 layout => (new CFClient::Layout 1),
2361 par => [], 2494 par => [],
… …
2377 $self->{fontsize} = $fontsize; 2510 $self->{fontsize} = $fontsize;
2378 $self->reflow; 2511 $self->reflow;
2379} 2512}
2380 2513
2381sub size_allocate { 2514sub size_allocate {
2382 my ($self, $w, $h, $changed) = @_; 2515 my ($self, $w, $h) = @_;
2383 2516
2384 $self->SUPER::size_allocate ($w, $h, $changed); 2517 $self->SUPER::size_allocate ($w, $h);
2385
2386 return unless $changed;
2387 2518
2388 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2519 $self->{layout}->set_font ($self->{font}) if $self->{font};
2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2390 $self->{layout}->set_width ($self->{children}[0]{w}); 2521 $self->{layout}->set_width ($self->{children}[0]{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2391 2523
2392 $self->reflow; 2524 $self->reflow;
2393} 2525}
2394 2526
2395sub text_size { 2527sub text_size {
… …
2397 2529
2398 my $layout = $self->{layout}; 2530 my $layout = $self->{layout};
2399 2531
2400 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2401 $layout->set_width ($self->{children}[0]{w} - $indent); 2533 $layout->set_width ($self->{children}[0]{w} - $indent);
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2402 $layout->set_markup ($text); 2535 $layout->set_markup ($text);
2403 2536
2404 $layout->size 2537 $layout->size
2405} 2538}
2406 2539
… …
2445 2578
2446 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2447 2580
2448 delete $self->{texture}; 2581 delete $self->{texture};
2449 2582
2450 $ROOT->on_post_alloc ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2451 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2452 2585
2453 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2454 my $height = 0; 2587 my $height = 0;
2455 2588
… …
2458 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2459 2592
2460 for (@{$self->{par}}) { 2593 for (@{$self->{par}}) {
2461 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2462 $layout->set_width ($W - $_->[3]); 2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2463 $layout->set_markup ($_->[4]); 2597 $layout->set_markup ($_->[4]);
2464 my ($w, $h) = $layout->size; 2598 my ($w, $h) = $layout->size;
2465 $_->[0] = $w + $_->[3]; 2599 $_->[0] = $w + $_->[3];
2466 $_->[1] = $h; 2600 $_->[1] = $h;
2467 } 2601 }
… …
2470 } 2604 }
2471 2605
2472 $self->{height} = $height; 2606 $self->{height} = $height;
2473 2607
2474 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2475 2609
2476 delete $self->{texture}; 2610 delete $self->{texture};
2477 } 2611 }
2478 2612
2479 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2480 glClearColor 0.5, 0.5, 0.5, 0; 2614 glClearColor 0, 0, 0, 0;
2481 glClear GL_COLOR_BUFFER_BIT; 2615 glClear GL_COLOR_BUFFER_BIT;
2482 2616
2483 my $top = int $self->{children}[1]{range}[0]; 2617 my $top = int $self->{children}[1]{range}[0];
2484 2618
2485 my $y0 = $top; 2619 my $y0 = $top;
… …
2499 my $h = $par->[1]; 2633 my $h = $par->[1];
2500 2634
2501 if ($y0 < $y + $h && $y < $y1) { 2635 if ($y0 < $y + $h && $y < $y1) {
2502 $layout->set_foreground (@{ $par->[2] }); 2636 $layout->set_foreground (@{ $par->[2] });
2503 $layout->set_width ($W - $par->[3]); 2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2504 $layout->set_markup ($par->[4]); 2639 $layout->set_markup ($par->[4]);
2505 2640
2506 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2641 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2507 2642
2508 glRasterPos $par->[3], $y - $y0; 2643 glRasterPos $par->[3], $y - $y0;
… …
2520sub _draw { 2655sub _draw {
2521 my ($self) = @_; 2656 my ($self) = @_;
2522 2657
2523 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
2524 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2659 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2525 glColor 1, 1, 1, 1; 2660 glColor 0, 0, 0, 1;
2526 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2527 glDisable GL_TEXTURE_2D; 2662 glDisable GL_TEXTURE_2D;
2528 2663
2529 $self->{children}[1]->draw; 2664 $self->{children}[1]->draw;
2530 2665
2531} 2666}
… …
2614} 2749}
2615 2750
2616sub set_tooltip_from { 2751sub set_tooltip_from {
2617 my ($self, $widget) = @_; 2752 my ($self, $widget) = @_;
2618 2753
2754 my $tooltip = $widget->{tooltip};
2755
2756 if ($ENV{CFPLUS_DEBUG} & 2) {
2757 $tooltip .= "\n\n" . (ref $widget) . "\n"
2758 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2759 . "req $widget->{req_w} $widget->{req_h}\n"
2760 . "visible $widget->{visible}";
2761 }
2762
2763 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//;
2765
2619 $self->add (new CFClient::UI::Label 2766 $self->add (new CFClient::UI::Label
2620 markup => $widget->{tooltip}, 2767 markup => $tooltip,
2621 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2622 fontsize => 0.8, 2769 fontsize => 0.8,
2623 fg => [0, 0, 0, 1], 2770 fg => [0, 0, 0, 1],
2624 ellipsise => 0, 2771 ellipsise => 0,
2625 font => ($widget->{tooltip_font} || $::FONT_PROP), 2772 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2633 2780
2634 ($w + 4, $h + 4) 2781 ($w + 4, $h + 4)
2635} 2782}
2636 2783
2637sub size_allocate { 2784sub size_allocate {
2638 my ($self, $w, $h, $changed) = @_; 2785 my ($self, $w, $h) = @_;
2639 2786
2640 return unless $changed;
2641
2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2787 $self->SUPER::size_allocate ($w - 4, $h - 4);
2788}
2789
2790sub visibility_change {
2791 my ($self, $visible) = @_;
2792
2793 return unless $visible;
2794
2795 $self->{root}->on_post_alloc ("move_$self" => sub {
2796 my $widget = $self->{owner}
2797 or return;
2798
2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800
2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802 if $x + $self->{w} > $self->{root}{w};
2803
2804 $self->move_abs ($x, $y);
2805 });
2643} 2806}
2644 2807
2645sub _draw { 2808sub _draw {
2646 my ($self) = @_; 2809 my ($self) = @_;
2647 2810
… …
2664 glVertex $w, $h; 2827 glVertex $w, $h;
2665 glVertex $w, 0; 2828 glVertex $w, 0;
2666 glEnd; 2829 glEnd;
2667 2830
2668 glTranslate 2 - 0.375, 2 - 0.375; 2831 glTranslate 2 - 0.375, 2 - 0.375;
2832
2669 $self->SUPER::_draw; 2833 $self->SUPER::_draw;
2670} 2834}
2671 2835
2672############################################################################# 2836#############################################################################
2673 2837
… …
2732 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2733 2897
2734 if ($tex) { 2898 if ($tex) {
2735 glEnable GL_TEXTURE_2D; 2899 glEnable GL_TEXTURE_2D;
2736 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2737 glColor 1, 1, 1, 1; 2901 glColor 0, 0, 0, 1;
2738 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2739 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2740 } 2904 }
2741} 2905}
2742 2906
2743sub DESTROY { 2907sub destroy {
2744 my ($self) = @_; 2908 my ($self) = @_;
2745 2909
2746 $self->{timer}->cancel 2910 $self->{timer}->cancel
2747 if $self->{timer}; 2911 if $self->{timer};
2748 2912
2749 $self->SUPER::DESTROY; 2913 $self->SUPER::destroy;
2750} 2914}
2751 2915
2752############################################################################# 2916#############################################################################
2753 2917
2754package CFClient::UI::Inventory; 2918package CFClient::UI::Buttonbar;
2755 2919
2756our @ISA = CFClient::UI::ScrolledWindow::; 2920our @ISA = CFClient::UI::HBox::;
2757 2921
2758sub new { 2922# 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 2923
2794############################################################################# 2924#############################################################################
2795 2925
2796package CFClient::UI::Menu; 2926package CFClient::UI::Menu;
2797 2927
… …
2809 ); 2939 );
2810 2940
2811 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2941 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2812 2942
2813 for my $item (@{ $self->{items} }) { 2943 for my $item (@{ $self->{items} }) {
2814 my ($widget, $cb) = @$item; 2944 my ($widget, $cb, $tooltip) = @$item;
2815 2945
2816 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2817 if (!ref $widget) { 2947 if (!ref $widget) {
2818 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2819 can_hover => 1, 2949 can_hover => 1,
2820 can_events => 1, 2950 can_events => 1,
2821 text => $widget; 2951 markup => $widget,
2952 tooltip => $tooltip
2822 } 2953 }
2823 2954
2824 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2825 2956
2826 $self->{vbox}->add ($widget); 2957 $self->{vbox}->add ($widget);
… …
2838 # maybe save $GRAB? must be careful about events... 2969 # maybe save $GRAB? must be careful about events...
2839 $GRAB = $self; 2970 $GRAB = $self;
2840 $self->{button} = $ev->{button}; 2971 $self->{button} = $ev->{button};
2841 2972
2842 $self->show; 2973 $self->show;
2843 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2844} 2975}
2845 2976
2846sub mouse_motion { 2977sub mouse_motion {
2847 my ($self, $ev, $x, $y) = @_; 2978 my ($self, $ev, $x, $y) = @_;
2848 2979
2849 # TODO: should use vbox->find_widget or so 2980 # TODO: should use vbox->find_widget or so
2850 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2851 $self->{hover} = $self->{item}{$HOVER}; 2982 $self->{hover} = $self->{item}{$HOVER};
2983
2984 0
2852} 2985}
2853 2986
2854sub button_up { 2987sub button_up {
2855 my ($self, $ev, $x, $y) = @_; 2988 my ($self, $ev, $x, $y) = @_;
2856 2989
… …
2858 undef $GRAB; 2991 undef $GRAB;
2859 $self->hide; 2992 $self->hide;
2860 2993
2861 $self->_emit ("popdown"); 2994 $self->_emit ("popdown");
2862 $self->{hover}[1]->() if $self->{hover}; 2995 $self->{hover}[1]->() if $self->{hover};
2996 } else {
2997 return 0
2998 }
2999
2863 } 3000 1
2864} 3001}
2865 3002
2866############################################################################# 3003#############################################################################
2867 3004
2868package CFClient::UI::Statusbox; 3005package CFClient::UI::Multiplexer;
2869 3006
2870our @ISA = CFClient::UI::VBox::; 3007our @ISA = CFClient::UI::Container::;
2871 3008
2872sub new { 3009sub new {
2873 my $class = shift; 3010 my $class = shift;
2874 3011
2875 $class->SUPER::new ( 3012 my $self = $class->SUPER::new (
3013 @_,
3014 );
3015
3016 $self->{current} = $self->{children}[0]
3017 if @{ $self->{children} };
3018
3019 $self
3020}
3021
3022sub add {
3023 my ($self, @widgets) = @_;
3024
3025 $self->SUPER::add (@widgets);
3026
3027 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} };
3029}
3030
3031sub set_current_page {
3032 my ($self, $page_or_widget) = @_;
3033
3034 my $widget = ref $page_or_widget
3035 ? $page_or_widget
3036 : $self->{children}[$page_or_widget];
3037
3038 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040
3041 $self->_emit (page_changed => $self->{current});
3042
3043 $self->realloc;
3044}
3045
3046sub visible_children {
3047 $_[0]{current}
3048}
3049
3050sub size_request {
3051 my ($self) = @_;
3052
3053 $self->{current}->size_request
3054}
3055
3056sub size_allocate {
3057 my ($self, $w, $h) = @_;
3058
3059 $self->{current}->configure (0, 0, $w, $h);
3060}
3061
3062sub _draw {
3063 my ($self) = @_;
3064
3065 $self->{current}->draw;
3066}
3067
3068#############################################################################
3069
3070package CFClient::UI::Notebook;
3071
3072our @ISA = CFClient::UI::VBox::;
3073
3074sub new {
3075 my $class = shift;
3076
3077 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self
3081 @_,
3082 );
3083
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3085 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3086
3087 $self
3088}
3089
3090sub add {
3091 my ($self, $title, $widget, $tooltip) = @_;
3092
3093 Scalar::Util::weaken $self;
3094
3095 $self->{buttonbar}->add (new CFClient::UI::Button
3096 markup => $title,
3097 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) },
3099 );
3100
3101 $self->{multiplexer}->add ($widget);
3102}
3103
3104sub set_current_page {
3105 my ($self, $page) = @_;
3106
3107 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current});
3109}
3110
3111#############################################################################
3112
3113package CFClient::UI::Combobox;
3114
3115use utf8;
3116
3117our @ISA = CFClient::UI::Button::;
3118
3119sub new {
3120 my $class = shift;
3121
3122 my $self = $class->SUPER::new (
3123 options => [], # [value, title, longdesc], ...
3124 value => undef,
3125 @_,
3126 );
3127
3128 $self->_set_value ($self->{value});
3129
3130 $self
3131}
3132
3133sub button_down {
3134 my ($self, $ev) = @_;
3135
3136 my @menu_items;
3137
3138 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_;
3140
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 }
3143
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145}
3146
3147sub _set_value {
3148 my ($self, $value) = @_;
3149
3150 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3151 or return;
3152
3153 $self->{value} = $item->[0];
3154 $self->set_markup ("$item->[1] ⇓");
3155 $self->set_tooltip ($item->[2]);
3156}
3157
3158sub set_value {
3159 my ($self, $value) = @_;
3160
3161 return unless $self->{value} ne $value;
3162
3163 $self->_set_value ($value);
3164 $self->_emit (changed => $value);
3165}
3166
3167#############################################################################
3168
3169package CFClient::UI::Statusbox;
3170
3171our @ISA = CFClient::UI::VBox::;
3172
3173sub new {
3174 my $class = shift;
3175
3176 my $self = $class->SUPER::new (
2876 fontsize => 0.8, 3177 fontsize => 0.8,
2877 @_, 3178 @_,
2878 ) 3179 );
3180
3181 Scalar::Util::weaken (my $this = $self);
3182
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184
3185 $self
2879} 3186}
2880 3187
2881sub reorder { 3188sub reorder {
2882 my ($self) = @_; 3189 my ($self) = @_;
2883 my $NOW = time; 3190 my $NOW = Time::HiRes::time;
3191
3192 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} };
2884 3196
2885 while (my ($k, $v) = each %{ $self->{item} }) { 3197 while (my ($k, $v) = each %{ $self->{item} }) {
2886 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3198 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2887 } 3199 }
2888 3200
… …
2891 my @items = sort { 3203 my @items = sort {
2892 $a->{pri} <=> $b->{pri} 3204 $a->{pri} <=> $b->{pri}
2893 or $b->{id} <=> $a->{id} 3205 or $b->{id} <=> $a->{id}
2894 } values %{ $self->{item} }; 3206 } values %{ $self->{item} };
2895 3207
3208 $self->{timer}->interval (1);
3209
2896 my $count = 10 + 1; 3210 my $count = 10 + 1;
2897 for my $item (@items) { 3211 for my $item (@items) {
2898 last unless --$count; 3212 last unless --$count;
2899 3213
2900 push @widgets, $item->{label} ||= do { 3214 my $label = $item->{label} ||= do {
2901 # TODO: doesn't handle markup well (read as: at all) 3215 # TODO: doesn't handle markup well (read as: at all)
2902 my $short = $item->{count} > 1 3216 my $short = $item->{count} > 1
2903 ? "<b>$item->{count} ×</b> $item->{text}" 3217 ? "<b>$item->{count} ×</b> $item->{text}"
2904 : $item->{text}; 3218 : $item->{text};
2905 3219
… …
2913 tooltip => $item->{tooltip}, 3227 tooltip => $item->{tooltip},
2914 tooltip_font => $::FONT_PROP, 3228 tooltip_font => $::FONT_PROP,
2915 tooltip_width => 0.67, 3229 tooltip_width => 0.67,
2916 fontsize => $item->{fontsize} || $self->{fontsize}, 3230 fontsize => $item->{fontsize} || $self->{fontsize},
2917 max_w => $::WIDTH * 0.44, 3231 max_w => $::WIDTH * 0.44,
2918 fg => $item->{fg}, 3232 fg => [@{ $item->{fg} }],
2919 can_events => 1, 3233 can_events => 1,
2920 can_hover => 1 3234 can_hover => 1
2921 }; 3235 };
3236
3237 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3238 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3239 $label->update;
3240 $label->set_max_size (undef, $label->{req_h} * $diff)
3241 if $diff < 1;
3242 $self->{timer}->interval (1/30);
3243 } else {
3244 $label->{fg}[3] = $item->{fg}[3] || 1;
3245 }
3246
3247 push @widgets, $label;
2922 } 3248 }
2923 3249
2924 $self->clear; 3250 $self->clear;
2925 $self->SUPER::add (reverse @widgets); 3251 $self->SUPER::add (reverse @widgets);
2926} 3252}
… …
2931 $text =~ s/^\s+//; 3257 $text =~ s/^\s+//;
2932 $text =~ s/\s+$//; 3258 $text =~ s/\s+$//;
2933 3259
2934 return unless $text; 3260 return unless $text;
2935 3261
2936 my $timeout = time + ((delete $arg{timeout}) || 60); 3262 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2937 3263
2938 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3264 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2939 3265
2940 if (my $item = $self->{item}{$group}) { 3266 if (my $item = $self->{item}{$group}) {
2941 if ($item->{text} eq $text) { 3267 if ($item->{text} eq $text) {
2942 $item->{count}++; 3268 $item->{count}++;
2943 } else { 3269 } else {
2944 $item->{count} = 1; 3270 $item->{count} = 1;
2945 $item->{text} = $item->{tooltip} = $text; 3271 $item->{text} = $item->{tooltip} = $text;
2946 } 3272 }
2947 $item->{id} = ++$self->{id}; 3273 $item->{id} += 0.2;#d#
2948 $item->{timeout} = $timeout; 3274 $item->{timeout} = $timeout;
2949 delete $item->{label}; 3275 delete $item->{label};
2950 } else { 3276 } else {
2951 $self->{item}{$group} = { 3277 $self->{item}{$group} = {
2952 id => ++$self->{id}, 3278 id => ++$self->{id},
… …
2971 3297
2972 $self->reorder; 3298 $self->reorder;
2973 $self->SUPER::reconfigure; 3299 $self->SUPER::reconfigure;
2974} 3300}
2975 3301
3302sub destroy {
3303 my ($self) = @_;
3304
3305 $self->{timer}->cancel;
3306
3307 $self->SUPER::destroy;
3308}
3309
2976############################################################################# 3310#############################################################################
2977 3311
3312package CFClient::UI::Inventory;
3313
3314our @ISA = CFClient::UI::ScrolledWindow::;
3315
3316sub new {
3317 my $class = shift;
3318
3319 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321 @_,
3322 );
3323
3324 $self
3325}
3326
3327sub set_items {
3328 my ($self, $items) = @_;
3329
3330 $self->{child}->clear;
3331 return unless $items;
3332
3333 my @items = sort {
3334 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name})
3336 } @$items;
3337
3338 $self->{real_items} = \@items;
3339
3340 my $row = 0;
3341 for my $item (@items) {
3342 CFClient::Item::update_widgets $item;
3343
3344 $self->{child}->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget});
3347
3348 $row++;
3349 }
3350}
3351
3352#############################################################################
3353
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 }
3547}
3548
3549#############################################################################
3550
3551package CFClient::UI::SpellList;
3552
3553our @ISA = CFClient::UI::Table::;
3554
3555sub new {
3556 my $class = shift;
3557
3558 my $self = $class->SUPER::new (
3559 binding => [],
3560 commands => [],
3561 @_,
3562 )
3563}
3564
3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578sub rebuild_spell_list {
3579 my ($self) = @_;
3580
3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear;
3583
3584 return unless $::CONN;
3585
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592 my $row = 0;
3593
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_};
3596
3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625 $self->add (0, $row, new CFClient::UI::Face
3626 face => $spell->{face},
3627 can_hover => 1,
3628 can_events => 1,
3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3631 );
3632
3633 $self->add (1, $row, new CFClient::UI::Label
3634 expand => 1,
3635 text => $spell->{name},
3636 can_hover => 1,
3637 can_events => 1,
3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3640 );
3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 }
3647 });
3648}
3649
3650sub add_spell {
3651 my ($self, $spell) = @_;
3652
3653 $self->{spell}->{$spell->{name}} = $spell;
3654 $self->rebuild_spell_list;
3655}
3656
3657sub remove_spell {
3658 my ($self, $spell) = @_;
3659
3660 delete $self->{spell}->{$spell->{name}};
3661 $self->rebuild_spell_list;
3662}
3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3668 $self->rebuild_spell_list;
3669}
3670
3671#############################################################################
3672
2978package CFClient::UI::Root; 3673package CFClient::UI::Root;
2979 3674
2980our @ISA = CFClient::UI::Container::; 3675our @ISA = CFClient::UI::Container::;
3676
3677use List::Util qw(min max);
2981 3678
2982use CFClient::OpenGL; 3679use CFClient::OpenGL;
2983 3680
2984sub new { 3681sub new {
2985 my $class = shift; 3682 my $class = shift;
… …
2992 Scalar::Util::weaken ($self->{root} = $self); 3689 Scalar::Util::weaken ($self->{root} = $self);
2993 3690
2994 $self 3691 $self
2995} 3692}
2996 3693
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 { 3694sub size_request {
3014 my ($self) = @_; 3695 my ($self) = @_;
3015 3696
3016 ($self->{w}, $self->{h}) 3697 ($self->{w}, $self->{h})
3017} 3698}
3018 3699
3700sub _to_pixel {
3701 my ($coord, $size, $max) = @_;
3702
3703 $coord =
3704 $coord eq "center" ? ($max - $size) * 0.5
3705 : $coord eq "max" ? $max
3706 : $coord;
3707
3708 $coord = 0 if $coord < 0;
3709 $coord = $max - $size if $coord > $max - $size;
3710
3711 int $coord + 0.5
3712}
3713
3019sub size_allocate { 3714sub size_allocate {
3020 my ($self, $w, $h, $changed) = @_; 3715 my ($self, $w, $h) = @_;
3021 3716
3022 for my $child ($self->children) { 3717 for my $child ($self->children) {
3023 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3024 3719
3025 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3720 $X = $child->{force_x} if exists $child->{force_x};
3026 if exists $child->{req_x}; 3721 $Y = $child->{force_y} if exists $child->{force_y};
3027 3722
3028 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3723 $X = _to_pixel $X, $W, $self->{w};
3029 if exists $child->{req_y}; 3724 $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 3725
3036 $child->configure ($X, $Y, $W, $H); 3726 $child->configure ($X, $Y, $W, $H);
3037 } 3727 }
3038} 3728}
3039 3729
… …
3056} 3746}
3057 3747
3058sub add { 3748sub add {
3059 my ($self, @children) = @_; 3749 my ($self, @children) = @_;
3060 3750
3061 for my $child (@children) {
3062 $child->{is_toplevel} = 1; 3751 $_->{is_toplevel} = 1
3063 3752 for @children;
3064 # integerise window positions
3065 $child->{x} = int $child->{x};
3066 $child->{y} = int $child->{y};
3067 }
3068 3753
3069 $self->SUPER::add (@children); 3754 $self->SUPER::add (@children);
3070} 3755}
3071 3756
3072sub remove { 3757sub remove {
3073 my ($self, @children) = @_; 3758 my ($self, @children) = @_;
3074 3759
3075 $self->SUPER::remove (@children); 3760 $self->SUPER::remove (@children);
3761
3762 delete $self->{is_toplevel}
3763 for @children;
3076 3764
3077 while (@children) { 3765 while (@children) {
3078 my $w = pop @children; 3766 my $w = pop @children;
3079 push @children, $w->children; 3767 push @children, $w->children;
3080 $w->set_invisible; 3768 $w->set_invisible;
… …
3100 $_->() 3788 $_->()
3101 for values %{delete $self->{refresh_hook}}; 3789 for values %{delete $self->{refresh_hook}};
3102 } 3790 }
3103 3791
3104 if ($self->{realloc}) { 3792 if ($self->{realloc}) {
3793 my %queue;
3105 my @queue; 3794 my @queue;
3795 my $widget;
3106 3796
3797 outer:
3107 while () { 3798 while () {
3108 if ($self->{realloc}) { 3799 if (my $realloc = delete $self->{realloc}) {
3109 #TODO use array-of-depth approach 3800 for $widget (values %$realloc) {
3801 $widget->{visible} or next; # do not resize invisible widgets
3110 3802
3111 @queue = sort { $a->{visible} <=> $b->{visible} } 3803 $queue{$widget+0}++ and next; # duplicates are common
3112 @queue, values %{delete $self->{realloc}}; 3804
3805 push @{ $queue[$widget->{visible}] }, $widget;
3806 }
3113 } 3807 }
3114 3808
3809 while () {
3810 @queue or last outer;
3811
3812 $widget = pop @{ $queue[-1] || [] }
3813 and last;
3814
3815 pop @queue;
3816 }
3817
3818 delete $queue{$widget+0};
3819
3820 my ($w, $h) = $widget->size_request;
3821
3822 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3823 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3824
3825 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3826 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3827
3828 $w = $widget->{force_w} if exists $widget->{force_w};
3829 $h = $widget->{force_h} if exists $widget->{force_h};
3830
3831 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3832 || delete $widget->{force_realloc}) {
3833 $widget->{req_w} = $w;
3834 $widget->{req_h} = $h;
3835
3836 $self->{size_alloc}{$widget+0} = $widget;
3837
3838 if (my $parent = $widget->{parent}) {
3839 $self->{realloc}{$parent+0} = $parent
3840 unless $queue{$parent+0};
3841
3842 $parent->{force_size_alloc} = 1;
3843 $self->{size_alloc}{$parent+0} = $parent;
3844 }
3845 }
3846
3847 delete $self->{realloc}{$widget+0};
3848 }
3849 }
3850
3851 while (my $size_alloc = delete $self->{size_alloc}) {
3852 my @queue = sort { $b->{visible} <=> $a->{visible} }
3853 values %$size_alloc;
3854
3855 while () {
3115 my $widget = pop @queue || last; 3856 my $widget = pop @queue || last;
3116 3857
3117 $widget->{visible} or last; # do not resize invisible widgets 3858 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 3859
3142 $w = 0 if $w < 0; 3860 $w = 0 if $w < 0;
3143 $h = 0 if $h < 0; 3861 $h = 0 if $h < 0;
3144 3862
3863 $w = int $w + 0.5;
3864 $h = int $h + 0.5;
3865
3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w};
3868 $widget->{old_h} = $widget->{h};
3869
3145 $widget->{w} = $w; 3870 $widget->{w} = $w;
3146 $widget->{h} = $h; 3871 $widget->{h} = $h;
3872
3147 $widget->emit (size_allocate => $w, $h, 1); 3873 $widget->emit (size_allocate => $w, $h);
3874 }
3148 } 3875 }
3149 } 3876 }
3150 3877
3151 while ($self->{post_alloc_hook}) { 3878 while ($self->{post_alloc_hook}) {
3152 $_->() 3879 $_->()
3153 for values %{delete $self->{post_alloc_hook}}; 3880 for values %{delete $self->{post_alloc_hook}};
3154 } 3881 }
3882
3155 3883
3156 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3157 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3158 glClear GL_COLOR_BUFFER_BIT; 3886 glClear GL_COLOR_BUFFER_BIT;
3159 3887
… …
3161 glLoadIdentity; 3889 glLoadIdentity;
3162 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3163 glMatrixMode GL_MODELVIEW; 3891 glMatrixMode GL_MODELVIEW;
3164 glLoadIdentity; 3892 glLoadIdentity;
3165 3893
3894 {
3895 package CFClient::UI::Base;
3896
3897 ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h});
3899 }
3900
3166 $self->_draw; 3901 $self->_draw;
3167} 3902}
3168 3903
3169############################################################################# 3904#############################################################################
3170 3905

Diff Legend

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