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.190 by root, Mon May 8 22:17:38 2006 UTC vs.
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
15 18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
16sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
17 if (!$GRAB) { 47 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
22 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
23 54
24 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
25 56
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 58
28 $TOOLTIP->set_markup ($widget->{tooltip}); 59 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 60 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 } 61 }
40 62
41 return; 63 return;
42 } 64 }
43 } 65 }
… …
47 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
48} 70}
49 71
50# class methods for events 72# class methods for events
51sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 75 if $FOCUS;
54} 76}
55 77
56sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 80 if $FOCUS;
59} 81}
60 82
61sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
62 my ($ev) = @_; 84 my ($ev) = @_;
… …
71 check_tooltip; 93 check_tooltip;
72 } 94 }
73 95
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 97
76 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 100}
81 101
82sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
83 my ($ev) = @_; 103 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
85 105
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 107
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 109
90 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 112
95 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 115 $grab->update if $grab;
98 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 133
116 check_tooltip; 134 check_tooltip;
117 } 135 }
118 136
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 138 if $HOVER;
123} 139}
124 140
125# convert position array to integers 141# convert position array to integers
126sub harmonize { 142sub harmonize {
127 my ($vals) = @_; 143 my ($vals) = @_;
… …
133 $rem += $_ - $i; 149 $rem += $_ - $i;
134 $_ = $i; 150 $_ = $i;
135 } 151 }
136} 152}
137 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
189 }
190 }
191
192 reconfigure_widgets;
193}
194
138############################################################################# 195#############################################################################
139 196
140package CFClient::UI::Base; 197package CFClient::UI::Base;
141 198
142use strict; 199use strict;
… …
145 202
146sub new { 203sub new {
147 my $class = shift; 204 my $class = shift;
148 205
149 my $self = bless { 206 my $self = bless {
150 x => 0, 207 x => "center",
151 y => 0, 208 y => "center",
152 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
153 can_events => 1, 212 can_events => 1,
154 @_ 213 @_
155 }, $class; 214 }, $class;
156 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
157 for (keys %$self) { 218 for (keys %$self) {
158 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
160 } 221 }
161 } 222 }
162 223
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
235
163 $self 236 $self
164} 237}
165 238
166sub destroy { 239sub destroy {
167 my ($self) = @_; 240 my ($self) = @_;
… …
176 return if $self->{parent}; 249 return if $self->{parent};
177 250
178 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
179} 252}
180 253
181sub hide { 254sub set_visible {
182 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
183 278
184 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
186 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
187 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
188 if $self->{parent}; 313 if $self->{parent};
189} 314}
190 315
191sub move { 316sub move_abs {
192 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
193 318
194 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
195 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
196 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
197 322
198 $self->update; 323 $self->update;
199} 324}
200 325
201sub set_size { 326sub set_size {
202 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
203 328
204 $self->{user_w} = $w; 329 $self->{force_w} = $w;
205 $self->{user_h} = $h; 330 $self->{force_h} = $h;
206 331
207 $self->check_size; 332 $self->realloc;
208} 333}
209 334
210sub size_request { 335sub size_request {
211 require Carp; 336 require Carp;
212 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
214 339
215sub configure { 340sub configure {
216 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
217 342
218 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
219 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
221 348
222 # use alignment to adjust x, y 349 # use alignment to adjust x, y
223 350
224 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
225 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
226
227 ($w, $h) = ($w2, $h2);
228 } 353 }
229 354
230 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
231 $self->{x} = $x; 356 $self->{x} = $x;
232 $self->{y} = $y; 357 $self->{y} = $y;
233 $self->update; 358 $self->update;
234 } 359 }
235 360
236 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
362 return unless $self->{visible};
363
237 $self->{w} = $w; 364 $self->{alloc_w} = $w;
238 $self->{h} = $h; 365 $self->{alloc_h} = $h;
239 366
240 $self->size_allocate ($w, $h); 367 $self->{root}{size_alloc}{$self+0} = $self;
241 $self->update;
242 $self->emit (size_allocate => $w, $h);
243 } 368 }
244} 369}
245 370
246sub size_allocate { 371sub size_allocate {
247 # nothing to be done 372 # nothing to be done
248} 373}
249 374
250sub children { 375sub children {
376 # nop
251} 377}
252 378
253# call when resolution changes etc. 379sub visible_children {
254sub reconfigure { 380 $_[0]->children
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h});
262 $self->update;
263} 381}
264 382
265sub set_max_size { 383sub set_max_size {
266 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
267 385
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
270} 388}
271 389
272# return top left coordinates 390sub set_tooltip {
273sub _topleft {
274 my ($self, $x, $y) = @_; 391 my ($self, $tooltip) = @_;
275 392
276 $self->{parent} 393 $tooltip =~ s/^\s+//;
277 or Carp::confess "no parent widget in _topleft\n";#d# 394 $tooltip =~ s/\s+$//;
278 395
279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 396 return if $self->{tooltip} eq $tooltip;
397
398 $self->{tooltip} = $tooltip;
399
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip;
403 }
280} 404}
281 405
282# translate global coordinates to local coordinate system 406# translate global coordinates to local coordinate system
283sub coord2local { 407sub coord2local {
284 my ($self, $x, $y) = @_; 408 my ($self, $x, $y) = @_;
285 409
286 my ($X, $Y) = $self->_topleft; 410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 411}
289 412
290# translate local coordinates to global coordinate system 413# translate local coordinates to global coordinate system
291sub coord2global { 414sub coord2global {
292 my ($self, $x, $y) = @_; 415 my ($self, $x, $y) = @_;
293 416
294 my ($X, $Y) = $self->_topleft; 417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 418}
297 419
298sub focus_in { 420sub focus_in {
299 my ($self) = @_; 421 my ($self) = @_;
300 422
301 return if $FOCUS == $self; 423 return if $FOCUS == $self;
302 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
303 425
304 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
305 427
306 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
307 429
308 $focus->update if $focus; 430 $focus->update if $focus;
309 $FOCUS->update; 431 $FOCUS->update;
310} 432}
311 433
… …
314 436
315 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
316 438
317 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
318 440
319 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
320 442
321 $focus->update if $focus; #? 443 $focus->update if $focus; #?
322}
323 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
324sub mouse_motion { } 449sub mouse_motion { 0 }
325sub button_up { } 450sub button_up { 0 }
326sub key_down { } 451sub key_down { 0 }
327sub key_up { } 452sub key_up { 0 }
328 453
329sub button_down { 454sub button_down {
330 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
331 456
332 $self->focus_in; 457 $self->focus_in;
333}
334 458
335sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
336sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
337sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
338sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
339sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
340 535
341sub draw { 536sub draw {
342 my ($self) = @_; 537 my ($self) = @_;
343 538
344 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
345 550
346 glPushMatrix; 551 glPushMatrix;
347 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
348 $self->_draw;
349 glPopMatrix;
350 553
351 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
352 my ($x, $y) = @$self{qw(x y)};
353
354 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
355 glEnable GL_BLEND; 556 glEnable GL_BLEND;
356 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
357 glBegin GL_QUADS; 558 glBegin GL_QUADS;
358 glVertex $x , $y;
359 glVertex $x + $self->{w}, $y;
360 glVertex $x + $self->{w}, $y + $self->{h};
361 glVertex $x , $y + $self->{h};
362 glEnd;
363 glDisable GL_BLEND;
364 }
365
366 if ($ENV{PCLIENT_DEBUG}) {
367 glPushMatrix;
368 glColor 1, 1, 0, 1;
369 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
370 glBegin GL_LINE_LOOP;
371 glVertex 0 , 0; 559 glVertex 0 , 0;
372 glVertex $self->{w}, 0; 560 glVertex $self->{w}, 0;
373 glVertex $self->{w}, $self->{h}; 561 glVertex $self->{w}, $self->{h};
374 glVertex 0 , $self->{h}; 562 glVertex 0 , $self->{h};
375 glEnd; 563 glEnd;
564 glDisable GL_BLEND;
565 }
566
567 if ($ENV{CFPLUS_DEBUG} & 1) {
568 glPushMatrix;
569 glColor 1, 1, 0, 1;
570 glTranslate 0.375, 0.375;
571 glBegin GL_LINE_LOOP;
572 glVertex 0 , 0;
573 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1;
576 glEnd;
376 glPopMatrix; 577 glPopMatrix;
377 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
379} 583}
380 584
381sub _draw { 585sub _draw {
382 my ($self) = @_; 586 my ($self) = @_;
383 587
384 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
385} 589}
386 590
387sub find_widget {
388 my ($self, $x, $y) = @_;
389
390 return () unless $self->{can_events};
391
392 return $self
393 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
394 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
395
396 ()
397}
398
399sub set_parent {
400 my ($self, $parent) = @_;
401
402 Scalar::Util::weaken ($self->{parent} = $parent);
403}
404
405sub check_size {
406 my ($self) = @_;
407
408 $self->_check_size;
409 return;
410 #TODO: but needs a vastly more difficult algorithm
411 my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
412
413 $check_size->{$self} = $self;
414
415 $CFClient::UI::ROOT->on_refresh (_check_size => sub {
416 while (%$check_size) {
417 my @widgets = values %$check_size;
418 $_->_check_size
419 for @widgets;
420 }
421 });
422}
423
424sub _check_size {
425 my ($self) = @_;
426
427 delete $CFClient::UI::ROOT->{_check_size}{$self};
428
429 $self->{parent}
430 or return 1;
431
432 my ($w, $h) = $self->{user_w} && $self->{user_h}
433 ? @$self{qw(user_w user_h)}
434 : $self->size_request;
435
436 if ($w != $self->{req_w} || $h != $self->{req_h}) {
437 $self->{req_w} = $w;
438 $self->{req_h} = $h;
439
440 $self->{parent}->_check_size
441 or $self->size_allocate (
442 (List::Util::max $self->{w}, $w),
443 (List::Util::max $self->{h}, $h),
444 );
445
446 1
447 } else {
448 0
449 }
450}
451
452sub update {
453 my ($self) = @_;
454
455 my $update = $CFClient::UI::ROOT->{_update} ||= {};
456
457 $update->{$self} = $self;
458
459 $CFClient::UI::ROOT->on_refresh (_update => sub {
460 while (%$update) {
461 my @widgets = values %$update;
462 %$update = ();
463
464 $_->{parent} && $_->{parent}->update
465 for @widgets;
466 }
467 });
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
480}
481
482sub DESTROY { 591sub DESTROY {
483 my ($self) = @_; 592 my ($self) = @_;
484 593
594 delete $WIDGET{$self+0};
485 #$self->deactivate; 595 #$self->deactivate;
486} 596}
487 597
488############################################################################# 598#############################################################################
489 599
… …
498 my $class = shift; 608 my $class = shift;
499 609
500 # range [value, low, high, page] 610 # range [value, low, high, page]
501 611
502 $class->SUPER::new ( 612 $class->SUPER::new (
503 bg => [0, 0, 0, 0.2], 613 #bg => [0, 0, 0, 0.2],
504 active_bg => [1, 1, 1, 0.5], 614 #active_bg => [1, 1, 1, 0.5],
505 @_ 615 @_
506 ) 616 )
507} 617}
508 618
509sub _draw { 619sub _draw {
510 my ($self) = @_; 620 my ($self) = @_;
511 621
622 my $color = $FOCUS == $self && $self->{active_bg}
623 ? $self->{active_bg}
624 : $self->{bg};
625
626 if ($color && (@$color < 4 || $color->[3])) {
512 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
513 628
514 glEnable GL_BLEND; 629 glEnable GL_BLEND;
515 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
516 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 631 glColor_premultiply @$color;
517 632
518 glBegin GL_QUADS; 633 glBegin GL_QUADS;
519 glVertex 0 , 0; 634 glVertex 0 , 0;
520 glVertex 0 , $h; 635 glVertex 0 , $h;
521 glVertex $w, $h; 636 glVertex $w, $h;
522 glVertex $w, 0; 637 glVertex $w, 0;
523 glEnd; 638 glEnd;
524 639
525 glDisable GL_BLEND; 640 glDisable GL_BLEND;
641 }
526} 642}
527 643
528############################################################################# 644#############################################################################
529 645
530package CFClient::UI::Empty; 646package CFClient::UI::Empty;
… …
535 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
536 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
537} 653}
538 654
539sub size_request { 655sub size_request {
540 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
541} 659}
542 660
543sub draw { } 661sub draw { }
544 662
545############################################################################# 663#############################################################################
… …
549our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
550 668
551sub new { 669sub new {
552 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
553 671
554 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
555 673
556 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
557 children => [], 675 children => [],
558 can_events => 0, 676 can_events => 0,
559 %arg, 677 %arg,
560 ); 678 );
679
561 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
562 682
563 $self 683 $self
564} 684}
565 685
566sub add { 686sub add {
… …
574 $self->{children} = [ 694 $self->{children} = [
575 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
576 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
577 ]; 697 ];
578 698
579 $_->check_size 699 $self->realloc;
580 for @widgets;
581
582 $self->update;
583} 700}
584 701
585sub children { 702sub children {
586 @{ $_[0]{children} } 703 @{ $_[0]{children} }
587} 704}
… …
592 delete $child->{parent}; 709 delete $child->{parent};
593 $child->hide; 710 $child->hide;
594 711
595 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
596 713
597 $self->check_size; 714 $self->realloc;
598 $self->update;
599} 715}
600 716
601sub clear { 717sub clear {
602 my ($self) = @_; 718 my ($self) = @_;
603 719
… …
607 for (@$children) { 723 for (@$children) {
608 delete $_->{parent}; 724 delete $_->{parent};
609 $_->hide; 725 $_->hide;
610 } 726 }
611 727
612 $self->check_size; 728 $self->realloc;
613 $self->update;
614} 729}
615 730
616sub find_widget { 731sub find_widget {
617 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
618 733
619 $x -= $self->{x}; 734 $x -= $self->{x};
620 $y -= $self->{y}; 735 $y -= $self->{y};
621 736
622 my $res; 737 my $res;
623 738
624 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
625 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
626 and return $res; 741 and return $res;
627 } 742 }
628 743
629 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
678 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
679} 794}
680 795
681############################################################################# 796#############################################################################
682 797
798# back-buffered drawing area
799
683package CFClient::UI::Window; 800package CFClient::UI::Window;
684 801
685our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
686 803
687use CFClient::OpenGL; 804use CFClient::OpenGL;
… …
693} 810}
694 811
695sub update { 812sub update {
696 my ($self) = @_; 813 my ($self) = @_;
697 814
698 $ROOT->on_refresh ($self => sub { $self->render_child }); 815 $ROOT->on_post_alloc ($self => sub { $self->render_child });
699 $self->SUPER::update; 816 $self->SUPER::update;
700} 817}
701 818
702sub size_allocate { 819sub size_allocate {
703 my ($self, $w, $h) = @_; 820 my ($self, $w, $h) = @_;
… …
705 $self->SUPER::size_allocate ($w, $h); 822 $self->SUPER::size_allocate ($w, $h);
706 $self->update; 823 $self->update;
707} 824}
708 825
709sub _render { 826sub _render {
827 my ($self) = @_;
828
710 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
711} 830}
712 831
713sub render_child { 832sub render_child {
714 my ($self) = @_; 833 my ($self) = @_;
715 834
716 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
717 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
718 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
719 838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
720 $self->_render; 846 $self->_render;
721# glColorMask 1, 1, 1, 0;
722# glEnable GL_BLEND;
723# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
724# glRasterPos 0, 0;
725# glCopyPixels 0, 0, $self->{w}, $self->{h};
726# glDisable GL_BLEND;
727# glColorMask 1, 1, 1, 1;
728 }; 847 };
729} 848}
730 849
731sub _draw { 850sub _draw {
732 my ($self) = @_; 851 my ($self) = @_;
733 852
734 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
735 854
736 my $tex = $self->{texture} 855 my $tex = $self->{texture}
737 or return; 856 or return;
738 857
739 glEnable GL_BLEND;
740 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
741 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
743 glColor 0, 0, 0, 1; 860 glColor 0, 0, 0, 1;
744 861
745 $tex->draw_quad (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
746 863
747 glDisable GL_BLEND;
748 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
749} 865}
750 866
751############################################################################# 867#############################################################################
752 868
753package CFClient::UI::ViewPort; 869package CFClient::UI::ViewPort;
754 870
755our @ISA = CFClient::UI::Window::; 871our @ISA = CFClient::UI::Window::;
756 872
873sub new {
874 my $class = shift;
875
876 $class->SUPER::new (
877 scroll_x => 0,
878 scroll_y => 1,
879 @_,
880 )
881}
882
757sub size_request { 883sub size_request {
758 my ($self) = @_; 884 my ($self) = @_;
759 885
760 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
761 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
762 887
763 @$self{qw(child_w child_h)} 888 $w = 10 if $self->{scroll_x};
889 $h = 10 if $self->{scroll_y};
890
891 ($w, $h)
764} 892}
765 893
766sub size_allocate { 894sub size_allocate {
767 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
768 896
897 my $child = $self->child;
898
899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
901
902 $self->child->configure (0, 0, $w, $h);
769 $self->update; 903 $self->update;
770} 904}
771 905
772sub set_offset { 906sub set_offset {
773 my ($self, $x, $y) = @_; 907 my ($self, $x, $y) = @_;
… …
776 $self->{view_y} = int $y; 910 $self->{view_y} = int $y;
777 911
778 $self->update; 912 $self->update;
779} 913}
780 914
781# hmm, this does not work for topleft of $self... but we should not aks for that 915# hmm, this does not work for topleft of $self... but we should not ask for that
782sub _topleft { 916sub coord2local {
783 my ($self, $x, $y) = @_; 917 my ($self, $x, $y) = @_;
784 918
785 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 919 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
920}
921
922sub coord2global {
923 my ($self, $x, $y) = @_;
924
925 $x = List::Util::min $self->{w}, $x - $self->{view_x};
926 $y = List::Util::min $self->{h}, $y - $self->{view_y};
927
928 $self->SUPER::coord2global ($x, $y)
786} 929}
787 930
788sub find_widget { 931sub find_widget {
789 my ($self, $x, $y) = @_; 932 my ($self, $x, $y) = @_;
790 933
… …
798} 941}
799 942
800sub _render { 943sub _render {
801 my ($self) = @_; 944 my ($self) = @_;
802 945
946 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
947 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
948
803 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 949 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
804 950
805 $self->SUPER::_render; 951 $self->SUPER::_render;
806} 952}
807 953
808############################################################################# 954#############################################################################
809 955
810package CFClient::UI::ScrolledWindow; 956package CFClient::UI::ScrolledWindow;
811 957
812our @ISA = CFClient::UI::HBox::; 958our @ISA = CFClient::UI::HBox::;
959
960sub new {
961 my ($class, %arg) = @_;
962
963 my $child = delete $arg{child};
964
965 my $self;
966
967 my $slider = new CFClient::UI::Slider
968 vertical => 1,
969 range => [0, 0, 1, 0.01], # HACK fix
970 on_changed => sub {
971 $self->{vp}->set_offset (0, $_[1]);
972 },
973 ;
974
975 $self = $class->SUPER::new (
976 vp => (new CFClient::UI::ViewPort expand => 1),
977 slider => $slider,
978 %arg,
979 );
980
981 $self->SUPER::add ($self->{vp}, $self->{slider});
982 $self->add ($child) if $child;
983
984 $self
985}
986
987sub add {
988 my ($self, $widget) = @_;
989
990 $self->{vp}->add ($self->{child} = $widget);
991}
992
993sub update {
994 my ($self) = @_;
995
996 $self->SUPER::update;
997
998 # todo: overwrite size_allocate of child
999 my $child = $self->{vp}->child;
1000 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1001}
1002
1003sub size_allocate {
1004 my ($self, $w, $h) = @_;
1005
1006 $self->SUPER::size_allocate ($w, $h);
1007
1008 my $child = $self->{vp}->child;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010}
1011
1012#TODO# update range on size_allocate depending on child
1013# update viewport offset on scroll
1014
1015#############################################################################
1016
1017package CFClient::UI::Frame;
1018
1019our @ISA = CFClient::UI::Bin::;
1020
1021use CFClient::OpenGL;
813 1022
814sub new { 1023sub new {
815 my $class = shift; 1024 my $class = shift;
816 1025
817 my $self;
818
819 my $slider = new CFClient::UI::Slider
820 vertical => 1,
821 range => [0, 0, 1, 0.01], # HACK fix
822 connect_changed => sub {
823 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
824 },
825 ;
826
827 $self = $class->SUPER::new ( 1026 $class->SUPER::new (
828 vp => (new CFClient::UI::ViewPort), 1027 bg => undef,
829 slider => $slider,
830 @_, 1028 @_,
1029 )
1030}
1031
1032sub _draw {
1033 my ($self) = @_;
1034
1035 if ($self->{bg}) {
1036 my ($w, $h) = @$self{qw(w h)};
1037
1038 glEnable GL_BLEND;
1039 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1040 glColor_premultiply @{ $self->{bg} };
1041
1042 glBegin GL_QUADS;
1043 glVertex 0 , 0;
1044 glVertex 0 , $h;
1045 glVertex $w, $h;
1046 glVertex $w, 0;
1047 glEnd;
1048
1049 glDisable GL_BLEND;
1050 }
1051
1052 $self->SUPER::_draw;
1053}
1054
1055#############################################################################
1056
1057package CFClient::UI::FancyFrame;
1058
1059our @ISA = CFClient::UI::Bin::;
1060
1061use CFClient::OpenGL;
1062
1063my $bg =
1064 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1065 mipmap => 1, wrap => 1;
1066
1067my @border =
1068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1069 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1070
1071sub new {
1072 my ($class, %arg) = @_;
1073
1074 my $title = delete $arg{title};
1075
1076 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1],
1079 border => 0.6,
1080 can_events => 1,
1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
831 ); 1084 );
832 1085
833 $self->{vp}->add ($self->{scrolled});
834 $self->add ($self->{vp});
835 $self->add ($self->{slider});
836
837 $self
838}
839
840#TODO# update range on size_allocate depeneing on child
841# update viewport offset on scroll
842
843#############################################################################
844
845package CFClient::UI::Frame;
846
847our @ISA = CFClient::UI::Bin::;
848
849use CFClient::OpenGL;
850
851sub new {
852 my $class = shift;
853
854 my $self = $class->SUPER::new (
855 bg => [1, 1, 1, 1],
856 border_bg => [1, 1, 1, 1],
857 border => 0.8,
858 @_
859 );
860
861 $self
862}
863
864sub _draw {
865 my ($self) = @_;
866
867 my ($w, $h) = ($self->{w}, $self->{h});
868
869 glEnable GL_BLEND;
870 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
871 glEnable GL_TEXTURE_2D;
872 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
873
874# glBegin GL_QUADS;
875# glColor 0, 0, 0, 0;
876# glVertex 0 , 0;
877# glVertex 0 , $h;
878# glVertex $w, $h;
879# glVertex $w, 0;
880# glEnd;
881
882
883 $self->child->draw;
884 glDisable GL_BLEND;
885 glDisable GL_TEXTURE_2D;
886}
887
888#############################################################################
889
890package CFClient::UI::FancyFrame;
891
892our @ISA = CFClient::UI::Bin::;
893
894use CFClient::OpenGL;
895
896my @tex =
897 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
898 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
899
900sub new {
901 my $class = shift;
902
903 # TODO: user_x, user_y, overwrite moveto?
904
905 my $self = $class->SUPER::new (
906 bg => [1, 1, 1, 1],
907 border_bg => [1, 1, 1, 1],
908 border => 0.6,
909 can_events => 1,
910 @_
911 );
912
913 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title} = new CFClient::UI::Label
914 align => 0, 1087 align => 0,
915 valign => 1, 1088 valign => 1,
916 text => $self->{title}, 1089 text => $title,
917 fontsize => $self->{border}; 1090 fontsize => $self->{border}
1091 if defined $title;
918 1092
919 $self 1093 $self
1094}
1095
1096sub add {
1097 my ($self, @widgets) = @_;
1098
1099 $self->SUPER::add (@widgets);
1100 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
920} 1101}
921 1102
922sub border { 1103sub border {
923 int $_[0]{border} * $::FONTSIZE 1104 int $_[0]{border} * $::FONTSIZE
924} 1105}
925 1106
926sub size_request { 1107sub size_request {
927 my ($self) = @_; 1108 my ($self) = @_;
1109
1110 $self->{title}->size_request
1111 if $self->{title};
928 1112
929 my ($w, $h) = $self->SUPER::size_request; 1113 my ($w, $h) = $self->SUPER::size_request;
930 1114
931 ( 1115 (
932 $w + $self->border * 2, 1116 $w + $self->border * 2,
… …
935} 1119}
936 1120
937sub size_allocate { 1121sub size_allocate {
938 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
939 1123
1124 if ($self->{title}) {
1125 $self->{title}{w} = $w;
1126 $self->{title}{h} = $h;
1127 $self->{title}->size_allocate ($w, $h);
1128 }
1129
1130 my $border = $self->border;
1131
940 $h -= List::Util::max 0, $self->border * 2; 1132 $h -= List::Util::max 0, $border * 2;
941 $w -= List::Util::max 0, $self->border * 2; 1133 $w -= List::Util::max 0, $border * 2;
942 1134
943 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
944 if $self->{title};
945
946 $self->child->configure ($self->border, $self->border, $w, $h); 1135 $self->child->configure ($border, $border, $w, $h);
947} 1136}
948 1137
949sub button_down { 1138sub button_down {
950 my ($self, $ev, $x, $y) = @_; 1139 my ($self, $ev, $x, $y) = @_;
951 1140
… …
967 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
968 1157
969 my $dx = $ev->{x} - $ox; 1158 my $dx = $ev->{x} - $ox;
970 my $dy = $ev->{y} - $oy; 1159 my $dy = $ev->{y} - $oy;
971 1160
972 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1161 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
973 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1162 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1163
974 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
975 $self->check_size; 1165 $self->realloc;
976 }; 1166 };
977 1167
978 } elsif ($lr ^ $td) { 1168 } elsif ($lr ^ $td) {
979 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1169 my ($ox, $oy) = ($ev->{x}, $ev->{y});
980 my ($bx, $by) = ($self->{x}, $self->{y}); 1170 my ($bx, $by) = ($self->{x}, $self->{y});
… …
982 $self->{motion} = sub { 1172 $self->{motion} = sub {
983 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
984 1174
985 ($x, $y) = ($ev->{x}, $ev->{y}); 1175 ($x, $y) = ($ev->{x}, $ev->{y});
986 1176
987 $self->move ($bx + $x - $ox, $by + $y - $oy); 1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
988 $self->update; 1178 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
989 }; 1180 };
1181 } else {
1182 return 0;
1183 }
1184
990 } 1185 1
991} 1186}
992 1187
993sub button_up { 1188sub button_up {
994 my ($self, $ev, $x, $y) = @_; 1189 my ($self, $ev, $x, $y) = @_;
995 1190
996 delete $self->{motion}; 1191 !!delete $self->{motion}
997} 1192}
998 1193
999sub mouse_motion { 1194sub mouse_motion {
1000 my ($self, $ev, $x, $y) = @_; 1195 my ($self, $ev, $x, $y) = @_;
1001 1196
1002 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1197 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198
1199 !!$self->{motion}
1003} 1200}
1004 1201
1005sub _draw { 1202sub _draw {
1006 my ($self) = @_; 1203 my ($self) = @_;
1007 1204
1205 my $child = $self->{children}[0];
1206
1008 my ($w, $h ) = ($self->{w}, $self->{h}); 1207 my ($w, $h ) = ($self->{w}, $self->{h});
1009 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1208 my ($cw, $ch) = ($child->{w}, $child->{h});
1010 1209
1011 glEnable GL_BLEND;
1012 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1013 glEnable GL_TEXTURE_2D; 1210 glEnable GL_TEXTURE_2D;
1014 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1015 1212
1016 my $border = $self->border; 1213 my $border = $self->border;
1017 1214
1018 glColor @{ $self->{border_bg} }; 1215 glColor @{ $self->{border_bg} };
1019 $tex[1]->draw_quad (0, 0, $w, $border); 1216 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1020 $tex[3]->draw_quad (0, $border, $border, $ch); 1217 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1021 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1218 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1022 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1219 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1023 1220
1024 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1221 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1025 my $bg = $tex[0]; 1222 glColor @{ $self->{bg} };
1026 1223
1027 # TODO: repeat texture not scale 1224 # TODO: repeat texture not scale
1225 # solve this better(?)
1028 my $rep_x = $cw / $bg->{w}; 1226 $bg->{s} = $cw / $bg->{w};
1029 my $rep_y = $ch / $bg->{h}; 1227 $bg->{t} = $ch / $bg->{h};
1030
1031 glColor @{ $self->{bg} };
1032
1033 $bg->{s} = $rep_x;
1034 $bg->{t} = $rep_y;
1035 $bg->{wrap_mode} = 1;
1036 $bg->draw_quad ($border, $border, $cw, $ch); 1228 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1229 }
1037 1230
1038 glDisable GL_TEXTURE_2D; 1231 glDisable GL_TEXTURE_2D;
1039 glDisable GL_BLEND;
1040 }
1041 1232
1042 $self->{title}->draw if $self->{title};
1043
1044 $self->child->draw; 1233 $child->draw;
1234
1235 if ($self->{title}) {
1236 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw;
1238 }
1045} 1239}
1046 1240
1047############################################################################# 1241#############################################################################
1048 1242
1049package CFClient::UI::Table; 1243package CFClient::UI::Table;
… …
1057sub new { 1251sub new {
1058 my $class = shift; 1252 my $class = shift;
1059 1253
1060 $class->SUPER::new ( 1254 $class->SUPER::new (
1061 col_expand => [], 1255 col_expand => [],
1062 @_ 1256 @_,
1063 ) 1257 )
1258}
1259
1260sub children {
1261 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1064} 1262}
1065 1263
1066sub add { 1264sub add {
1067 my ($self, $x, $y, $child) = @_; 1265 my ($self, $x, $y, $child) = @_;
1068 1266
1069 $child->set_parent ($self); 1267 $child->set_parent ($self);
1070 $self->{children}[$y][$x] = $child; 1268 $self->{children}[$y][$x] = $child;
1071 1269
1072 $child->check_size; 1270 $self->realloc;
1073} 1271}
1074 1272
1075sub children {
1076 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1077}
1078
1079# TODO: move to container class maybe? send childs a signal on removal? 1273# TODO: move to container class maybe? send children a signal on removal?
1080sub clear { 1274sub clear {
1081 my ($self) = @_; 1275 my ($self) = @_;
1082 1276
1083 my @children = $self->children; 1277 my @children = $self->children;
1084 delete $self->{children}; 1278 delete $self->{children};
… …
1086 for (@children) { 1280 for (@children) {
1087 delete $_->{parent}; 1281 delete $_->{parent};
1088 $_->hide; 1282 $_->hide;
1089 } 1283 }
1090 1284
1091 $self->update; 1285 $self->realloc;
1092} 1286}
1093 1287
1094sub get_wh { 1288sub get_wh {
1095 my ($self) = @_; 1289 my ($self) = @_;
1096 1290
… …
1127sub size_allocate { 1321sub size_allocate {
1128 my ($self, $w, $h) = @_; 1322 my ($self, $w, $h) = @_;
1129 1323
1130 my ($ws, $hs) = $self->get_wh; 1324 my ($ws, $hs) = $self->get_wh;
1131 1325
1132 my $req_w = sum @$ws; 1326 my $req_w = (sum @$ws) || 1;
1133 my $req_h = sum @$hs; 1327 my $req_h = (sum @$hs) || 1;
1134 1328
1135 # TODO: nicer code && do row_expand 1329 # TODO: nicer code && do row_expand
1136 my @col_expand = @{$self->{col_expand}}; 1330 my @col_expand = @{$self->{col_expand}};
1137 @col_expand = (1) x @$ws unless @col_expand; 1331 @col_expand = (1) x @$ws unless @col_expand;
1138 my $col_expand = (sum @col_expand) || 1; 1332 my $col_expand = (sum @col_expand) || 1;
… …
1192 } 1386 }
1193} 1387}
1194 1388
1195############################################################################# 1389#############################################################################
1196 1390
1197package CFClient::UI::HBox; 1391package CFClient::UI::Box;
1198
1199# TODO: wrap into common Box base class
1200 1392
1201our @ISA = CFClient::UI::Container::; 1393our @ISA = CFClient::UI::Container::;
1202 1394
1203sub size_request { 1395sub size_request {
1204 my ($self) = @_; 1396 my ($self) = @_;
1205 1397
1206 my @alloc = map [$_->size_request], @{$self->{children}}; 1398 $self->{vertical}
1207 1399 ? (
1208 ( 1400 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1209 (List::Util::sum map $_->[0], @alloc), 1401 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1210 (List::Util::max map $_->[1], @alloc), 1402 )
1211 ) 1403 : (
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 )
1212} 1407}
1213 1408
1214sub size_allocate { 1409sub size_allocate {
1215 my ($self, $w, $h) = @_; 1410 my ($self, $w, $h) = @_;
1216 1411
1217 ($h, $w) = ($w, $h); 1412 my $space = $self->{vertical} ? $h : $w;
1218
1219 my $children = $self->{children}; 1413 my $children = $self->{children};
1220 1414
1221 my @h = map $_->{req_w}, @$children; 1415 my @req;
1222 1416
1223 my $req_h = List::Util::sum @h; 1417 if ($self->{homogeneous}) {
1224 1418 @req = ($space / (@$children || 1)) x @$children;
1225 if ($req_h > $h) {
1226 # ah well, not enough space
1227 $_ *= $h / $req_h for @h;
1228 } else { 1419 } else {
1420 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1421 my $req = List::Util::sum @req;
1422
1423 if ($req > $space) {
1424 # ah well, not enough space
1425 $_ *= $space / $req for @req;
1426 } else {
1229 my $exp = List::Util::sum map $_->{expand}, @$children; 1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1230 $exp ||= 1;
1231 1428
1429 $space = ($space - $req) / $expand; # remaining space to give away
1430
1431 $req[$_] += $space * $children->[$_]{expand}
1232 for (0 .. $#$children) { 1432 for 0 .. $#$children;
1233 my $child = $children->[$_];
1234
1235 my $alloc_h = $h[$_];
1236 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1237 $h[$_] = $alloc_h;
1238 } 1433 }
1239 } 1434 }
1240 1435
1241 CFClient::UI::harmonize \@h; 1436 CFClient::UI::harmonize \@req;
1242 1437
1243 my $y = 0; 1438 my $pos = 0;
1244 for (0 .. $#$children) { 1439 for (0 .. $#$children) {
1245 my $child = $children->[$_];
1246 my $h = $h[$_]; 1440 my $alloc = $req[$_];
1247 $child->configure ($y, 0, $h, $w); 1441 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1248 1442
1249 $y += $h; 1443 $pos += $alloc;
1250 } 1444 }
1251 1445
1252 1 1446 1
1253} 1447}
1254 1448
1255############################################################################# 1449#############################################################################
1256 1450
1451package CFClient::UI::HBox;
1452
1453our @ISA = CFClient::UI::Box::;
1454
1455sub new {
1456 my $class = shift;
1457
1458 $class->SUPER::new (
1459 vertical => 0,
1460 @_,
1461 )
1462}
1463
1464#############################################################################
1465
1257package CFClient::UI::VBox; 1466package CFClient::UI::VBox;
1258 1467
1259# TODO: wrap into common Box base class
1260
1261our @ISA = CFClient::UI::Container::; 1468our @ISA = CFClient::UI::Box::;
1262 1469
1263sub size_request { 1470sub new {
1264 my ($self) = @_; 1471 my $class = shift;
1265 1472
1266 my @alloc = map [$_->size_request], @{$self->{children}}; 1473 $class->SUPER::new (
1267 1474 vertical => 1,
1268 ( 1475 @_,
1269 (List::Util::max map $_->[0], @alloc),
1270 (List::Util::sum map $_->[1], @alloc),
1271 ) 1476 )
1272} 1477}
1273 1478
1274sub size_allocate {
1275 my ($self, $w, $h) = @_;
1276
1277 my $children = $self->{children};
1278
1279 my @h = map $_->{req_h}, @$children;
1280
1281 my $req_h = List::Util::sum @h;
1282
1283 if ($req_h > $h) {
1284 # ah well, not enough space
1285 $_ *= $h / $req_h for @h;
1286 } else {
1287 my $exp = List::Util::sum map $_->{expand}, @$children;
1288 $exp ||= 1;
1289
1290 for (0 .. $#$children) {
1291 my $child = $children->[$_];
1292
1293 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1294 }
1295 }
1296
1297 CFClient::UI::harmonize \@h;
1298
1299 my $y = 0;
1300 for (0 .. $#$children) {
1301 my $child = $children->[$_];
1302 my $h = $h[$_];
1303 $child->configure (0, $y, $w, $h);
1304
1305 $y += $h;
1306 }
1307
1308 1
1309}
1310
1311############################################################################# 1479#############################################################################
1312 1480
1313package CFClient::UI::Label; 1481package CFClient::UI::Label;
1314 1482
1315our @ISA = CFClient::UI::Base::; 1483our @ISA = CFClient::UI::DrawBG::;
1316 1484
1317use CFClient::OpenGL; 1485use CFClient::OpenGL;
1318 1486
1319sub new { 1487sub new {
1320 my ($class, %arg) = @_; 1488 my ($class, %arg) = @_;
1321 1489
1322 my $self = $class->SUPER::new ( 1490 my $self = $class->SUPER::new (
1323 fg => [1, 1, 1], 1491 fg => [1, 1, 1],
1492 #bg => none
1493 #active_bg => none
1324 #font => default_font 1494 #font => default_font
1495 #text => initial text
1496 #markup => initial narkup
1497 #max_w => maximum pixel width
1498 ellipsise => 3, # end
1499 layout => (new CFClient::Layout),
1325 fontsize => 1, 1500 fontsize => 1,
1326 text => "",
1327 align => -1, 1501 align => -1,
1328 valign => -1, 1502 valign => -1,
1329 padding => 2, 1503 padding_x => 2,
1330 layout => new CFClient::Layout, 1504 padding_y => 2,
1331 can_events => 0, 1505 can_events => 0,
1332 %arg 1506 %arg
1333 ); 1507 );
1334 1508
1335 if (exists $self->{template}) { 1509 if (exists $self->{template}) {
1336 my $layout = new CFClient::Layout; 1510 my $layout = new CFClient::Layout;
1337 $layout->set_text (delete $self->{template}); 1511 $layout->set_text (delete $self->{template});
1338 $self->{template} = $layout; 1512 $self->{template} = $layout;
1339 } 1513 }
1340 1514
1341 $self->set_text (delete $self->{text}) if exists $self->{text}; 1515 if (exists $self->{markup}) {
1342 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1516 $self->set_markup (delete $self->{markup});
1517 } else {
1518 $self->set_text (delete $self->{text});
1519 }
1343 1520
1344 $self 1521 $self
1345} 1522}
1346 1523
1347sub escape { 1524sub escape($) {
1348 local $_ = $_[1]; 1525 local $_ = $_[0];
1349 1526
1350 s/&/&amp;/g; 1527 s/&/&amp;/g;
1351 s/>/&gt;/g; 1528 s/>/&gt;/g;
1352 s/</&lt;/g; 1529 s/</&lt;/g;
1353 1530
1354 $_[1] 1531 $_
1355} 1532}
1356 1533
1357sub update { 1534sub update {
1358 my ($self) = @_; 1535 my ($self) = @_;
1359 1536
… …
1365 my ($self, $text) = @_; 1542 my ($self, $text) = @_;
1366 1543
1367 return if $self->{text} eq "T$text"; 1544 return if $self->{text} eq "T$text";
1368 $self->{text} = "T$text"; 1545 $self->{text} = "T$text";
1369 1546
1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1548 $self->{layout}->set_text ($text);
1371 1549
1372 delete $self->{texture}; 1550 $self->realloc;
1373 $self->update; 1551 $self->update;
1374 $self->check_size;
1375} 1552}
1376 1553
1377sub set_markup { 1554sub set_markup {
1378 my ($self, $markup) = @_; 1555 my ($self, $markup) = @_;
1379 1556
1380 return if $self->{text} eq "M$markup"; 1557 return if $self->{text} eq "M$markup";
1381 $self->{text} = "M$markup"; 1558 $self->{text} = "M$markup";
1382 1559
1560 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1561
1562 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1383 $self->{layout}->set_markup ($markup); 1563 $self->{layout}->set_markup ($markup);
1384 1564
1385 delete $self->{texture}; 1565 $self->realloc;
1386 $self->update; 1566 $self->update;
1387 $self->check_size;
1388} 1567}
1389 1568
1390sub size_request { 1569sub size_request {
1391 my ($self) = @_; 1570 my ($self) = @_;
1392 1571
1393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1572 $self->{layout}->set_font ($self->{font}) if $self->{font};
1394 $self->{layout}->set_width ($self->{max_w} || -1); 1573 $self->{layout}->set_width ($self->{max_w} || -1);
1574 $self->{layout}->set_ellipsise ($self->{ellipsise});
1575 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1576 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1396 1577
1397 my ($w, $h) = $self->{layout}->size; 1578 my ($w, $h) = $self->{layout}->size;
1398 1579
1399 if (exists $self->{template}) { 1580 if (exists $self->{template}) {
… …
1404 1585
1405 $w = List::Util::max $w, $w2; 1586 $w = List::Util::max $w, $w2;
1406 $h = List::Util::max $h, $h2; 1587 $h = List::Util::max $h, $h2;
1407 } 1588 }
1408 1589
1409 ( 1590 ($w, $h)
1410 $w + $self->{padding} * 2,
1411 $h + $self->{padding} * 2,
1412 )
1413} 1591}
1414 1592
1415sub size_allocate { 1593sub size_allocate {
1416 my ($self, $w, $h) = @_; 1594 my ($self, $w, $h) = @_;
1417 1595
1596 delete $self->{ox};
1597
1418 delete $self->{texture}; 1598 delete $self->{texture}
1599 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1419} 1600}
1420 1601
1421sub set_fontsize { 1602sub set_fontsize {
1422 my ($self, $fontsize) = @_; 1603 my ($self, $fontsize) = @_;
1423 1604
1424 $self->{fontsize} = $fontsize; 1605 $self->{fontsize} = $fontsize;
1425 delete $self->{texture}; 1606 delete $self->{texture};
1426 1607
1427 $self->update; 1608 $self->realloc;
1428 $self->check_size;
1429} 1609}
1430 1610
1431sub _draw { 1611sub _draw {
1432 my ($self) = @_; 1612 my ($self) = @_;
1433 1613
1614 $self->SUPER::_draw; # draw background, if applicable
1615
1434 my $tex = $self->{texture} ||= do { 1616 my $tex = $self->{texture} ||= do {
1617 $self->{layout}->set_foreground (@{$self->{fg}});
1435 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1618 $self->{layout}->set_font ($self->{font}) if $self->{font};
1436 $self->{layout}->set_width ($self->{w}); 1619 $self->{layout}->set_width ($self->{w});
1620 $self->{layout}->set_ellipsise ($self->{ellipsise});
1621 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1437 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1623
1438 new_from_layout CFClient::Texture $self->{layout} 1624 new_from_layout CFClient::Texture $self->{layout}
1439 }; 1625 };
1440 1626
1441 glEnable GL_BLEND; 1627 unless (exists $self->{ox}) {
1442 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1630 : ($self->{w} - $tex->{w}) * 0.5);
1631
1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1634 : ($self->{h} - $tex->{h}) * 0.5);
1635 };
1636
1443 glEnable GL_TEXTURE_2D; 1637 glEnable GL_TEXTURE_2D;
1444 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1445 1639
1446 glColor @{$self->{fg}}; 1640 glColor_premultiply @{$self->{fg}}
1641 if $tex->{format} == GL_ALPHA;
1447 1642
1448 $self->{ox} = int (
1449 $self->{align} < 0 ? $self->{padding}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1451 : ($self->{w} - $tex->{w}) * 0.5
1452 );
1453
1454 $self->{oy} = int (
1455 $self->{valign} < 0 ? $self->{padding}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1457 : ($self->{h} - $tex->{h}) * 0.5
1458 );
1459
1460 $tex->draw_quad ($self->{ox}, $self->{oy}); 1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1461 1644
1462 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1463 glDisable GL_BLEND;
1464} 1646}
1465 1647
1466############################################################################# 1648#############################################################################
1467 1649
1468package CFClient::UI::EntryBase; 1650package CFClient::UI::EntryBase;
… …
1481 active_fg => [0, 0, 0], 1663 active_fg => [0, 0, 0],
1482 can_hover => 1, 1664 can_hover => 1,
1483 can_focus => 1, 1665 can_focus => 1,
1484 valign => 0, 1666 valign => 0,
1485 can_events => 1, 1667 can_events => 1,
1668 #text => ...
1486 @_ 1669 @_
1487 ) 1670 )
1488} 1671}
1489 1672
1490sub _set_text { 1673sub _set_text {
… …
1492 1675
1493 delete $self->{cur_h}; 1676 delete $self->{cur_h};
1494 1677
1495 return if $self->{text} eq $text; 1678 return if $self->{text} eq $text;
1496 1679
1497 delete $self->{texture};
1498
1499 $self->{last_activity} = $::NOW; 1680 $self->{last_activity} = $::NOW;
1500 $self->{text} = $text; 1681 $self->{text} = $text;
1501 1682
1502 $text =~ s/./*/g if $self->{hidden}; 1683 $text =~ s/./*/g if $self->{hidden};
1503 $self->{layout}->set_text ("$text "); 1684 $self->{layout}->set_text ("$text ");
1504 1685
1505 $self->emit (changed => $self->{text}); 1686 $self->_emit (changed => $self->{text});
1687 $self->update;
1688}
1689
1690sub set_text {
1691 my ($self, $text) = @_;
1692
1693 $self->{cursor} = length $text;
1694 $self->_set_text ($text);
1695
1696 $self->realloc;
1506} 1697}
1507 1698
1508sub get_text { 1699sub get_text {
1509 $_[0]{text} 1700 $_[0]{text}
1510} 1701}
… …
1513 my ($self) = @_; 1704 my ($self) = @_;
1514 1705
1515 my ($w, $h) = $self->SUPER::size_request; 1706 my ($w, $h) = $self->SUPER::size_request;
1516 1707
1517 ($w + 1, $h) # add 1 for cursor 1708 ($w + 1, $h) # add 1 for cursor
1518}
1519
1520sub size_allocate {
1521 my ($self, $w, $h) = @_;
1522
1523 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1524}
1525
1526sub set_text {
1527 my ($self, $text) = @_;
1528
1529 $self->{cursor} = length $text;
1530 $self->_set_text ($text);
1531 $self->update;
1532} 1709}
1533 1710
1534sub key_down { 1711sub key_down {
1535 my ($self, $ev) = @_; 1712 my ($self, $ev) = @_;
1536 1713
… …
1538 my $sym = $ev->{sym}; 1715 my $sym = $ev->{sym};
1539 my $uni = $ev->{unicode}; 1716 my $uni = $ev->{unicode};
1540 1717
1541 my $text = $self->get_text; 1718 my $text = $self->get_text;
1542 1719
1543 if ($sym == 8) { 1720 if ($uni == 8) {
1544 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1721 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1545 } elsif ($sym == 127) { 1722 } elsif ($uni == 127) {
1546 substr $text, $self->{cursor}, 1, ""; 1723 substr $text, $self->{cursor}, 1, "";
1547 } elsif ($sym == CFClient::SDLK_LEFT) { 1724 } elsif ($sym == CFClient::SDLK_LEFT) {
1548 --$self->{cursor} if $self->{cursor}; 1725 --$self->{cursor} if $self->{cursor};
1549 } elsif ($sym == CFClient::SDLK_RIGHT) { 1726 } elsif ($sym == CFClient::SDLK_RIGHT) {
1550 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1727 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1551 } elsif ($sym == CFClient::SDLK_HOME) { 1728 } elsif ($sym == CFClient::SDLK_HOME) {
1552 $self->{cursor} = 0; 1729 $self->{cursor} = 0;
1553 } elsif ($sym == CFClient::SDLK_END) { 1730 } elsif ($sym == CFClient::SDLK_END) {
1554 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1555 } elsif ($sym == 27) { 1732 } elsif ($uni == 27) {
1556 $self->emit ('escape'); 1733 $self->_emit ('escape');
1557 } elsif ($uni) { 1734 } elsif ($uni) {
1558 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1559 } 1738 }
1560 1739
1561 $self->_set_text ($text); 1740 $self->_set_text ($text);
1562 $self->update; 1741
1742 $self->realloc;
1743
1744 1
1563} 1745}
1564 1746
1565sub focus_in { 1747sub focus_in {
1566 my ($self) = @_; 1748 my ($self) = @_;
1567 1749
… …
1582 utf8::encode $text; 1764 utf8::encode $text;
1583 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1584 1766
1585 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1586 $self->update; 1768 $self->update;
1769
1770 1
1587} 1771}
1588 1772
1589sub mouse_motion { 1773sub mouse_motion {
1590 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1591# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776
1777 0
1592} 1778}
1593 1779
1594sub _draw { 1780sub _draw {
1595 my ($self) = @_; 1781 my ($self) = @_;
1596 1782
1597 local $self->{fg} = $self->{fg}; 1783 local $self->{fg} = $self->{fg};
1598 1784
1599 if ($FOCUS == $self) { 1785 if ($FOCUS == $self) {
1600 glColor @{$self->{active_bg}}; 1786 glColor_premultiply @{$self->{active_bg}};
1601 $self->{fg} = $self->{active_fg}; 1787 $self->{fg} = $self->{active_fg};
1602 } else { 1788 } else {
1603 glColor @{$self->{bg}}; 1789 glColor_premultiply @{$self->{bg}};
1604 } 1790 }
1605 1791
1606 glEnable GL_BLEND; 1792 glEnable GL_BLEND;
1607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1793 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1608 glBegin GL_QUADS; 1794 glBegin GL_QUADS;
1609 glVertex 0 , 0; 1795 glVertex 0 , 0;
1610 glVertex 0 , $self->{h}; 1796 glVertex 0 , $self->{h};
1611 glVertex $self->{w}, $self->{h}; 1797 glVertex $self->{w}, $self->{h};
1612 glVertex $self->{w}, 0; 1798 glVertex $self->{w}, 0;
… …
1647 if ($sym == 13) { 1833 if ($sym == 13) {
1648 unshift @{$self->{history}}, 1834 unshift @{$self->{history}},
1649 my $txt = $self->get_text; 1835 my $txt = $self->get_text;
1650 $self->{history_pointer} = -1; 1836 $self->{history_pointer} = -1;
1651 $self->{history_saveback} = ''; 1837 $self->{history_saveback} = '';
1652 $self->emit (activate => $txt); 1838 $self->_emit (activate => $txt);
1653 $self->update; 1839 $self->update;
1654 1840
1655 } elsif ($sym == CFClient::SDLK_UP) { 1841 } elsif ($sym == CFClient::SDLK_UP) {
1656 if ($self->{history_pointer} < 0) { 1842 if ($self->{history_pointer} < 0) {
1657 $self->{history_saveback} = $self->get_text; 1843 $self->{history_saveback} = $self->get_text;
… …
1673 } else { 1859 } else {
1674 $self->set_text ($self->{history_saveback}); 1860 $self->set_text ($self->{history_saveback});
1675 } 1861 }
1676 1862
1677 } else { 1863 } else {
1678 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1679 } 1867 1
1680
1681} 1868}
1682 1869
1683############################################################################# 1870#############################################################################
1684 1871
1685package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1694 1881
1695sub new { 1882sub new {
1696 my $class = shift; 1883 my $class = shift;
1697 1884
1698 $class->SUPER::new ( 1885 $class->SUPER::new (
1699 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1700 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1701 bg => [1, 1, 1, 0.2],
1702 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1703 can_hover => 1, 1890 can_hover => 1,
1704 align => 0, 1891 align => 0,
1705 valign => 0, 1892 valign => 0,
1706 can_events => 1, 1893 can_events => 1,
1707 @_ 1894 @_
1708 ) 1895 )
1709} 1896}
1710 1897
1898sub activate { }
1899
1711sub button_up { 1900sub button_up {
1712 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1713 1902
1903 $self->emit ("activate")
1714 if ($x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1715 && $y >= 0 && $y < $self->{h}) { 1905 && $y >= 0 && $y < $self->{h};
1716 $self->emit ("activate"); 1906
1717 } 1907 1
1718} 1908}
1719 1909
1720sub _draw { 1910sub _draw {
1721 my ($self) = @_; 1911 my ($self) = @_;
1722 1912
1723 local $self->{fg} = $self->{fg}; 1913 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1724 1914
1725 if ($GRAB == $self) {
1726 $self->{fg} = $self->{active_fg};
1727 }
1728
1729 glEnable GL_BLEND;
1730 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1731 glEnable GL_TEXTURE_2D; 1915 glEnable GL_TEXTURE_2D;
1732 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1733 glColor 0, 0, 0, 1; 1917 glColor 0, 0, 0, 1;
1734 1918
1735 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1919 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1736 1920
1737 glDisable GL_TEXTURE_2D; 1921 glDisable GL_TEXTURE_2D;
1738 glDisable GL_BLEND;
1739 1922
1740 $self->SUPER::_draw; 1923 $self->SUPER::_draw;
1741} 1924}
1742 1925
1743############################################################################# 1926#############################################################################
… …
1754 1937
1755sub new { 1938sub new {
1756 my $class = shift; 1939 my $class = shift;
1757 1940
1758 $class->SUPER::new ( 1941 $class->SUPER::new (
1759 padding => 2, 1942 padding_x => 2,
1943 padding_y => 2,
1760 fg => [1, 1, 1], 1944 fg => [1, 1, 1],
1761 active_fg => [1, 1, 0], 1945 active_fg => [1, 1, 0],
1946 bg => [0, 0, 0, 0.2],
1947 active_bg => [1, 1, 1, 0.5],
1762 state => 0, 1948 state => 0,
1763 can_hover => 1, 1949 can_hover => 1,
1764 @_ 1950 @_
1765 ) 1951 )
1766} 1952}
1767 1953
1768sub size_request { 1954sub size_request {
1769 my ($self) = @_; 1955 my ($self) = @_;
1770 1956
1771 ($self->{padding} * 2 + 6) x 2 1957 (6) x 2
1772} 1958}
1773 1959
1774sub button_down { 1960sub button_down {
1775 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1776 1962
1777 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1778 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1779 $self->{state} = !$self->{state}; 1965 $self->{state} = !$self->{state};
1780 $self->emit (changed => $self->{state}); 1966 $self->_emit (changed => $self->{state});
1967 } else {
1968 return 0
1969 }
1970
1781 } 1971 1
1782} 1972}
1783 1973
1784sub _draw { 1974sub _draw {
1785 my ($self) = @_; 1975 my ($self) = @_;
1786 1976
1787 $self->SUPER::_draw; 1977 $self->SUPER::_draw;
1788 1978
1789 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1979 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1790 1980
1791 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1981 my ($w, $h) = @$self{qw(w h)};
1982
1983 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1792 1984
1793 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1985 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1794 1986
1795 glEnable GL_BLEND; 1987 my $tex = $self->{state} ? $tex[1] : $tex[0];
1988
1796 glEnable GL_TEXTURE_2D; 1989 glEnable GL_TEXTURE_2D;
1797 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798
1799 my $tex = $self->{state} ? $tex[1] : $tex[0];
1800
1801 $tex->draw_quad (0, 0, $s, $s); 1990 $tex->draw_quad_alpha (0, 0, $s, $s);
1802
1803 glDisable GL_TEXTURE_2D; 1991 glDisable GL_TEXTURE_2D;
1804 glDisable GL_BLEND;
1805} 1992}
1806 1993
1807############################################################################# 1994#############################################################################
1808 1995
1809package CFClient::UI::Image; 1996package CFClient::UI::Image;
… …
1852 glTranslate 0, -$self->{w}, 0; 2039 glTranslate 0, -$self->{w}, 0;
1853 2040
1854 ($w, $h) = ($h, $w); 2041 ($w, $h) = ($h, $w);
1855 } 2042 }
1856 2043
1857 glEnable GL_BLEND;
1858 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1859 glEnable GL_TEXTURE_2D; 2044 glEnable GL_TEXTURE_2D;
1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2045 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861 2046
1862 $tex->draw_quad (0, 0, $w, $h); 2047 $tex->draw_quad_alpha (0, 0, $w, $h);
1863 2048
1864 glDisable GL_BLEND;
1865 glDisable GL_TEXTURE_2D; 2049 glDisable GL_TEXTURE_2D;
1866} 2050}
1867 2051
1868############################################################################# 2052#############################################################################
1869 2053
… …
1959 2143
1960 my $h1 = $self->{h} * (1 - $ycut1); 2144 my $h1 = $self->{h} * (1 - $ycut1);
1961 my $h2 = $self->{h} * (1 - $ycut2); 2145 my $h2 = $self->{h} * (1 - $ycut2);
1962 2146
1963 glEnable GL_BLEND; 2147 glEnable GL_BLEND;
1964 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2148 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2149 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1965 glEnable GL_TEXTURE_2D; 2150 glEnable GL_TEXTURE_2D;
1966 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1967 2152
1968 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2153 glBindTexture GL_TEXTURE_2D, $t1->{name};
1969 glBegin GL_QUADS; 2154 glBegin GL_QUADS;
… …
2058 qw(s1_slider.png s1_slider_bg.png); 2243 qw(s1_slider.png s1_slider_bg.png);
2059 2244
2060sub new { 2245sub new {
2061 my $class = shift; 2246 my $class = shift;
2062 2247
2063 # range [value, low, high, page] 2248 # range [value, low, high, page, unit]
2064 2249
2065 # TODO: 0-width page 2250 # TODO: 0-width page
2066 # TODO: req_w/h are wrong with vertical 2251 # TODO: req_w/h are wrong with vertical
2067 # TODO: calculations are off 2252 # TODO: calculations are off
2068 my $self = $class->SUPER::new ( 2253 my $self = $class->SUPER::new (
2069 fg => [1, 1, 1], 2254 fg => [1, 1, 1],
2070 active_fg => [0, 0, 0], 2255 active_fg => [0, 0, 0],
2256 bg => [0, 0, 0, 0.2],
2257 active_bg => [1, 1, 1, 0.5],
2071 range => [0, 0, 100, 10], 2258 range => [0, 0, 100, 10, 0],
2072 req_w => $::WIDTH / 80, 2259 min_w => $::WIDTH / 80,
2073 req_h => $::WIDTH / 80, 2260 min_h => $::WIDTH / 80,
2074 vertical => 0, 2261 vertical => 0,
2075 can_hover => 1, 2262 can_hover => 1,
2076 inner_pad => 5, 2263 inner_pad => 0.02,
2077 @_ 2264 @_
2078 ); 2265 );
2079 2266
2267 $self->set_value ($self->{range}[0]);
2268 $self->update;
2269
2080 $self 2270 $self
2081} 2271}
2082 2272
2273sub changed { }
2274
2275sub set_range {
2276 my ($self, $range) = @_;
2277
2278 ($range, $self->{range}) = ($self->{range}, $range);
2279
2280 $self->update
2281 if "@$range" ne "@{$self->{range}}";
2282}
2283
2284sub set_value {
2285 my ($self, $value) = @_;
2286
2287 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2288
2289 $hi = $lo + 1 if $hi <= $lo;
2290
2291 $page = $hi - $lo if $page > $hi - $lo;
2292
2293 $value = $lo if $value < $lo;
2294 $value = $hi - $page if $value > $hi - $page;
2295
2296 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2297 if $unit;
2298
2299 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2300
2301 if ($value != $old_value) {
2302 $self->_emit (changed => $value);
2303 $self->update;
2304 }
2305}
2306
2083sub size_request { 2307sub size_request {
2084 my ($self) = @_; 2308 my ($self) = @_;
2085 2309
2086 my $w = $self->{req_w}; 2310 ($self->{req_w}, $self->{req_h})
2087 my $h = $self->{req_h};
2088
2089 $self->{vertical} ? ($h, $w) : ($w, $h)
2090} 2311}
2091 2312
2092sub button_down { 2313sub button_down {
2093 my ($self, $ev, $x, $y) = @_; 2314 my ($self, $ev, $x, $y) = @_;
2094 2315
2095 $self->SUPER::button_down ($ev, $x, $y); 2316 $self->SUPER::button_down ($ev, $x, $y);
2317
2318 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2319
2096 $self->mouse_motion ($ev, $x, $y); 2320 $self->mouse_motion ($ev, $x, $y)
2097} 2321}
2098 2322
2099sub mouse_motion { 2323sub mouse_motion {
2100 my ($self, $ev, $x, $y) = @_; 2324 my ($self, $ev, $x, $y) = @_;
2101 2325
2102 if ($GRAB == $self) { 2326 if ($GRAB == $self) {
2327 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2328
2329 my (undef, $lo, $hi, $page) = @{$self->{range}};
2330
2331 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2332
2333 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2334 } else {
2335 return 0;
2336 }
2337
2338 1
2339}
2340
2341sub update {
2342 my ($self) = @_;
2343
2344 delete $self->{knob_w};
2345 $self->SUPER::update;
2346}
2347
2348sub _draw {
2349 my ($self) = @_;
2350
2351 unless ($self->{knob_w}) {
2352 $self->set_value ($self->{range}[0]);
2353
2103 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2354 my ($value, $lo, $hi, $page) = @{$self->{range}};
2355 my $range = ($hi - $page - $lo) || 1e-100;
2104 2356
2105 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2357 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2106 2358
2107 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2359 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2108 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2360 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2109 2361
2110 $x -= $inner_pad_px; # substract the padding 2362 $value = ($value - $lo) / $range;
2111 $x = $x * ($hi - $lo) / $inner_w + $lo; 2363 $value = $value * $self->{scale} + $self->{offset};
2112 $x = $lo if $x < $lo;
2113 $x = $hi - $page if $x > $hi - $page;
2114 $self->{range}[0] = $x;
2115 2364
2116 $self->emit (changed => $x); 2365 $self->{knob_x} = $value - $knob_w * 0.5;
2117 $self->update; 2366 $self->{knob_w} = $knob_w;
2118 } 2367 }
2119}
2120
2121# the inner_* stuff is for generating a padding for the slider handle,
2122# so that the handle doesn't leave the texture. This calculation isn't 100%
2123# correct propably, but it does the job for now
2124sub _calc_inner_pad_px {
2125 my ($self, $w) = @_;
2126 ($w / 100) * $self->{inner_pad} # % to pixels
2127}
2128
2129sub _draw {
2130 my ($self) = @_;
2131 2368
2132 $self->SUPER::_draw (); 2369 $self->SUPER::_draw ();
2133 2370
2134 my ($w, $h) = @$self{qw(w h)}; 2371 glScale $self->{w}, $self->{h};
2135 2372
2136 if ($self->{vertical}) { 2373 if ($self->{vertical}) {
2137 # draw a vertical slider like a rotated horizontal slider 2374 # draw a vertical slider like a rotated horizontal slider
2138 2375
2376 glTranslate 1, 0, 0;
2139 glRotate 90, 0, 0, 1; 2377 glRotate 90, 0, 0, 1;
2140 glTranslate 0, -$self->{w}, 0;
2141
2142 ($w, $h) = ($h, $w);
2143 } 2378 }
2144 2379
2145 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2380 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2146 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2381 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2147 2382
2148 my ($value, $lo, $hi, $page) = @{$self->{range}};
2149
2150 $hi = $value + 1 if $lo == $hi;
2151
2152 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2153 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2154
2155 $page = int $page * $inner_w / ($hi - $lo);
2156 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2157
2158 $w -= $page;
2159 $page &= ~1;
2160 glTranslate $page * 0.5, 0, 0;
2161 $page ||= 2;
2162
2163 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2164 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2165
2166 glEnable GL_BLEND;
2167 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2168 glEnable GL_TEXTURE_2D; 2383 glEnable GL_TEXTURE_2D;
2169 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170 2385
2171 # draw background 2386 # draw background
2172 $tex[1]->draw_quad (0, 0, $w, $h); 2387 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2173 2388
2174 # draw handle 2389 # draw handle
2175 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2390 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2176 2391
2177 glDisable GL_BLEND;
2178 glDisable GL_TEXTURE_2D; 2392 glDisable GL_TEXTURE_2D;
2179} 2393}
2394
2395#############################################################################
2396
2397package CFClient::UI::ValSlider;
2398
2399our @ISA = CFClient::UI::HBox::;
2400
2401sub new {
2402 my ($class, %arg) = @_;
2403
2404 my $range = delete $arg{range};
2405
2406 my $self = $class->SUPER::new (
2407 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2408 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2409 to_value => sub { shift },
2410 from_value => sub { shift },
2411 %arg,
2412 );
2413
2414 $self->{slider}->connect (changed => sub {
2415 my ($self, $value) = @_;
2416 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2417 $self->{parent}->emit (changed => $value);
2418 });
2419
2420# $self->{entry}->connect (changed => sub {
2421# my ($self, $value) = @_;
2422# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2423# $self->{parent}->emit (changed => $value);
2424# });
2425
2426 $self->add ($self->{slider}, $self->{entry});
2427
2428 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2429
2430 $self
2431}
2432
2433sub set_range { shift->{slider}->set_range (@_) }
2434sub set_value { shift->{slider}->set_value (@_) }
2180 2435
2181############################################################################# 2436#############################################################################
2182 2437
2183package CFClient::UI::TextView; 2438package CFClient::UI::TextView;
2184 2439
… …
2193 fontsize => 1, 2448 fontsize => 1,
2194 can_events => 0, 2449 can_events => 0,
2195 #font => default_font 2450 #font => default_font
2196 @_, 2451 @_,
2197 2452
2198 layout => (new CFClient::Layout), 2453 layout => (new CFClient::Layout 1),
2199 par => [], 2454 par => [],
2200 height => 0, 2455 height => 0,
2201 children => [ 2456 children => [
2202 (new CFClient::UI::Empty expand => 1), 2457 (new CFClient::UI::Empty expand => 1),
2203 (new CFClient::UI::Slider vertical => 1), 2458 (new CFClient::UI::Slider vertical => 1),
… …
2214 2469
2215 $self->{fontsize} = $fontsize; 2470 $self->{fontsize} = $fontsize;
2216 $self->reflow; 2471 $self->reflow;
2217} 2472}
2218 2473
2219sub text_height {
2220 my ($self, $text) = @_;
2221
2222 my $layout = $self->{layout};
2223
2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225 $layout->set_width ($self->{children}[0]{w});
2226 $layout->set_text ($text);
2227
2228 ($layout->size)[1]
2229}
2230
2231sub reflow {
2232 my ($self) = @_;
2233
2234 $self->{need_reflow}++;
2235 $self->update;
2236}
2237
2238sub size_allocate { 2474sub size_allocate {
2239 my ($self, $w, $h) = @_; 2475 my ($self, $w, $h) = @_;
2240 2476
2241 $self->SUPER::size_allocate ($w, $h); 2477 $self->SUPER::size_allocate ($w, $h);
2242 2478
… …
2245 $self->{layout}->set_width ($self->{children}[0]{w}); 2481 $self->{layout}->set_width ($self->{children}[0]{w});
2246 2482
2247 $self->reflow; 2483 $self->reflow;
2248} 2484}
2249 2485
2486sub text_size {
2487 my ($self, $text, $indent) = @_;
2488
2489 my $layout = $self->{layout};
2490
2491 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2492 $layout->set_width ($self->{children}[0]{w} - $indent);
2493 $layout->set_markup ($text);
2494
2495 $layout->size
2496}
2497
2498sub reflow {
2499 my ($self) = @_;
2500
2501 $self->{need_reflow}++;
2502 $self->update;
2503}
2504
2505sub set_offset {
2506 my ($self, $offset) = @_;
2507
2508 # todo: base offset on lines or so, not on pixels
2509 $self->{children}[1]->set_value ($offset);
2510}
2511
2512sub clear {
2513 my ($self) = @_;
2514
2515 $self->{par} = [];
2516 $self->{height} = 0;
2517 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2518}
2519
2250sub add_paragraph { 2520sub add_paragraph {
2251 my ($self, $color, $text) = @_; 2521 my ($self, $color, $text, $indent) = @_;
2252 2522
2253 #TODO: intelligently "reformat" paragraph 2523 for my $line (split /\n/, $text) {
2254 2524 my ($w, $h) = $self->text_size ($line);
2255 my $height = $self->text_height ($text);
2256
2257 $self->{height} += $height; 2525 $self->{height} += $h;
2526 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2527 }
2258 2528
2259 push @{$self->{par}}, [$height, $color, $text];
2260
2261 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2529 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2262 $self->{children}[1]->update;
2263} 2530}
2264 2531
2265sub update { 2532sub update {
2266 my ($self) = @_; 2533 my ($self) = @_;
2267 2534
… …
2269 2536
2270 return unless $self->{h} > 0; 2537 return unless $self->{h} > 0;
2271 2538
2272 delete $self->{texture}; 2539 delete $self->{texture};
2273 2540
2274 $ROOT->on_refresh ($self, sub { 2541 $ROOT->on_post_alloc ($self, sub {
2542 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543
2275 if (delete $self->{need_reflow}) { 2544 if (delete $self->{need_reflow}) {
2276 my $height = 0; 2545 my $height = 0;
2277 2546
2278 $height += $_->[0] = $self->text_height ($_->[2]) 2547 my $layout = $self->{layout};
2548
2549 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550
2279 for @{$self->{par}}; 2551 for (@{$self->{par}}) {
2552 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2553 $layout->set_width ($W - $_->[3]);
2554 $layout->set_markup ($_->[4]);
2555 my ($w, $h) = $layout->size;
2556 $_->[0] = $w + $_->[3];
2557 $_->[1] = $h;
2558 }
2559
2560 $height += $_->[1];
2561 }
2280 2562
2281 $self->{height} = $height; 2563 $self->{height} = $height;
2282 2564
2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2565 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284 2566
2285 delete $self->{texture}; 2567 delete $self->{texture};
2286 } 2568 }
2287 2569
2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2289 glClearColor 0, 0, 0, 0; 2571 glClearColor 0, 0, 0, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2572 glClear GL_COLOR_BUFFER_BIT;
2291 2573
2574 my $top = int $self->{children}[1]{range}[0];
2575
2576 my $y0 = $top;
2577 my $y1 = $top + $H;
2578
2579 my $y = 0;
2580
2581 my $layout = $self->{layout};
2582
2583 $layout->set_font ($self->{font}) if $self->{font};
2584
2292 glEnable GL_BLEND; 2585 glEnable GL_BLEND;
2586 #TODO# not correct in windows where rgba is forced off
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2587 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2294 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296
2297 my $top = int $self->{children}[1]{range}[0];
2298
2299 my $y0 = $top;
2300 my $y1 = $top + $self->{h};
2301
2302 my $y = 0;
2303
2304 my $layout = $self->{layout};
2305
2306 $layout->set_font ($self->{font}) if $self->{font};
2307 2588
2308 for my $par (@{$self->{par}}) { 2589 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2590 my $h = $par->[1];
2310 2591
2311 if ($y0 < $y + $h && $y < $y1) { 2592 if ($y0 < $y + $h && $y < $y1) {
2593 $layout->set_foreground (@{ $par->[2] });
2594 $layout->set_width ($W - $par->[3]);
2312 $layout->set_text ($par->[2]); 2595 $layout->set_markup ($par->[4]);
2313 2596
2314 glColor @{ $par->[1] }; 2597 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2315 my ($W, $H) = $layout->size; 2598
2316 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2599 glRasterPos $par->[3], $y - $y0;
2600 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2317 } 2601 }
2318 2602
2319 $y += $h; 2603 $y += $h;
2320 } 2604 }
2321 2605
2322 glDisable GL_TEXTURE_2D;
2323 glDisable GL_BLEND; 2606 glDisable GL_BLEND;
2324 }; 2607 };
2325 }); 2608 });
2326} 2609}
2327 2610
2328sub _draw { 2611sub _draw {
2329 my ($self) = @_; 2612 my ($self) = @_;
2330 2613
2331 glEnable GL_BLEND;
2332 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2333 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1; 2616 glColor 0, 0, 0, 1;
2336 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2617 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2337 glDisable GL_TEXTURE_2D; 2618 glDisable GL_TEXTURE_2D;
2338 glDisable GL_BLEND;
2339 2619
2340 $self->{children}[1]->draw; 2620 $self->{children}[1]->draw;
2341 2621
2342} 2622}
2343 2623
… …
2391 2671
2392sub new { 2672sub new {
2393 my $class = shift; 2673 my $class = shift;
2394 2674
2395 my $self = $class->SUPER::new ( 2675 my $self = $class->SUPER::new (
2396 state => 0, 2676 state => 0,
2397 connect_activate => \&toggle_flopper, 2677 on_activate => \&toggle_flopper,
2398 @_ 2678 @_
2399 ); 2679 );
2400 2680
2401 if ($self->{state}) {
2402 $self->{state} = 0;
2403 $self->toggle_flopper;
2404 }
2405
2406 $self 2681 $self
2407} 2682}
2408 2683
2409sub toggle_flopper { 2684sub toggle_flopper {
2410 my ($self) = @_; 2685 my ($self) = @_;
2411 2686
2412 # TODO: use animation 2687 $self->{other}->toggle_visibility;
2413 if ($self->{state} = !$self->{state}) {
2414 $CFClient::UI::ROOT->add ($self->{other});
2415 $self->{other}->move ($self->coord2global (0, $self->{h}));
2416 $self->emit ("open");
2417 } else {
2418 $CFClient::UI::ROOT->remove ($self->{other});
2419 $self->emit ("close");
2420 }
2421
2422 $self->emit (changed => $self->{state});
2423} 2688}
2424 2689
2425############################################################################# 2690#############################################################################
2426 2691
2427package CFClient::UI::Tooltip; 2692package CFClient::UI::Tooltip;
… …
2437 @_, 2702 @_,
2438 can_events => 0, 2703 can_events => 0,
2439 ) 2704 )
2440} 2705}
2441 2706
2442sub set_markup { 2707sub set_tooltip_from {
2443 my ($self, $text) = @_; 2708 my ($self, $widget) = @_;
2444 2709
2445 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2710 my $tooltip = $widget->{tooltip};
2446 $self->{label}->set_markup ($text); 2711
2447 $self->add ($self->{label}); 2712 if ($ENV{CFPLUS_DEBUG} & 2) {
2713 $tooltip .= "\n\n" . (ref $widget) . "\n"
2714 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2715 . "req $widget->{req_w} $widget->{req_h}\n"
2716 . "visible $widget->{visible}";
2717 }
2718
2719 $self->add (new CFClient::UI::Label
2720 markup => $tooltip,
2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2722 fontsize => 0.8,
2723 fg => [0, 0, 0, 1],
2724 ellipsise => 0,
2725 font => ($widget->{tooltip_font} || $::FONT_PROP),
2726 );
2448} 2727}
2449 2728
2450sub size_request { 2729sub size_request {
2451 my ($self) = @_; 2730 my ($self) = @_;
2452
2453 $self->child->set_max_size ($::WIDTH * 0.3);
2454 2731
2455 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2732 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2456 2733
2457 ($w + 4, $h + 4) 2734 ($w + 4, $h + 4)
2458} 2735}
… …
2461 my ($self, $w, $h) = @_; 2738 my ($self, $w, $h) = @_;
2462 2739
2463 $self->SUPER::size_allocate ($w - 4, $h - 4); 2740 $self->SUPER::size_allocate ($w - 4, $h - 4);
2464} 2741}
2465 2742
2743sub visibility_change {
2744 my ($self, $visible) = @_;
2745
2746 return unless $visible;
2747
2748 $self->{root}->on_post_alloc ("move_$self" => sub {
2749 my $widget = $self->{owner}
2750 or return;
2751
2752 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2753
2754 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2755 if $x + $self->{w} > $::WIDTH;
2756
2757 $self->move_abs ($x, $y);
2758 });
2759}
2760
2466sub _draw { 2761sub _draw {
2467 my ($self) = @_; 2762 my ($self) = @_;
2468 2763
2469 glPushMatrix;
2470 glTranslate 0.375, 0.375; 2764 glTranslate 0.375, 0.375;
2471 2765
2472 my ($w, $h) = @$self{qw(w h)}; 2766 my ($w, $h) = @$self{qw(w h)};
2473 2767
2474 glColor 1, 0.8, 0.4; 2768 glColor 1, 0.8, 0.4;
… …
2485 glVertex 0 , $h; 2779 glVertex 0 , $h;
2486 glVertex $w, $h; 2780 glVertex $w, $h;
2487 glVertex $w, 0; 2781 glVertex $w, 0;
2488 glEnd; 2782 glEnd;
2489 2783
2490 glPopMatrix; 2784 glTranslate 2 - 0.375, 2 - 0.375;
2491 2785
2492 glTranslate 2, 2;
2493 $self->SUPER::_draw; 2786 $self->SUPER::_draw;
2494} 2787}
2495 2788
2496############################################################################# 2789#############################################################################
2497 2790
… …
2502use CFClient::OpenGL; 2795use CFClient::OpenGL;
2503 2796
2504sub new { 2797sub new {
2505 my $class = shift; 2798 my $class = shift;
2506 2799
2507 $class->SUPER::new ( 2800 my $self = $class->SUPER::new (
2508 aspect => 1, 2801 aspect => 1,
2802 can_events => 0,
2509 @_, 2803 @_,
2510 ) 2804 );
2805
2806 if ($self->{anim} && $self->{animspeed}) {
2807 Scalar::Util::weaken (my $widget = $self);
2808
2809 $self->{timer} = Event->timer (
2810 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2811 hard => 1,
2812 interval => $self->{animspeed},
2813 cb => sub {
2814 ++$widget->{frame};
2815 $widget->update;
2816 },
2817 );
2818 }
2819
2820 $self
2511} 2821}
2512 2822
2513sub size_request { 2823sub size_request {
2514 (32, 8) 2824 (32, 8)
2515} 2825}
2516 2826
2827sub update {
2828 my ($self) = @_;
2829
2830 return unless $self->{visible};
2831
2832 $self->SUPER::update;
2833}
2834
2517sub _draw { 2835sub _draw {
2518 my ($self) = @_; 2836 my ($self) = @_;
2519 2837
2520 return unless $::CONN;#d# manage and cache textures differently 2838 return unless $::CONN;
2839
2840 my $face;
2841
2842 if ($self->{frame}) {
2843 my $anim = $::CONN->{anim}[$self->{anim}];
2844
2845 $face = $anim->[ $self->{frame} % @$anim ]
2846 if $anim && @$anim;
2847 }
2848
2521 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2849 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2522 2850
2523 # TODO animation
2524 if ($tex) { 2851 if ($tex) {
2525 glEnable GL_BLEND;
2526 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2527 glEnable GL_TEXTURE_2D; 2852 glEnable GL_TEXTURE_2D;
2528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2529 glColor 1, 1, 1, 1; 2854 glColor 0, 0, 0, 1;
2530 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2531 glDisable GL_TEXTURE_2D; 2856 glDisable GL_TEXTURE_2D;
2532 glDisable GL_BLEND;
2533 } 2857 }
2858}
2859
2860sub DESTROY {
2861 my ($self) = @_;
2862
2863 $self->{timer}->cancel
2864 if $self->{timer};
2865
2866 $self->SUPER::DESTROY;
2534} 2867}
2535 2868
2536############################################################################# 2869#############################################################################
2537 2870
2538package CFClient::UI::InventoryItem; 2871package CFClient::UI::Buttonbar;
2539 2872
2540our @ISA = CFClient::UI::HBox::; 2873our @ISA = CFClient::UI::HBox::;
2541 2874
2542sub new { 2875# TODO: should actualyl wrap buttons and other goodies.
2543 my $class = shift;
2544
2545 my %args = @_;
2546
2547 my $item = $args{item};
2548
2549 my $desc = $item->{nrof} < 2
2550 ? $item->{name}
2551 : "$item->{nrof} $item->{name_pl}";
2552
2553
2554 my $self = $class->SUPER::new (
2555 can_hover => 1,
2556 can_events => 1,
2557 tooltip => (CFClient::UI::Label->escape ($desc)
2558 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2559 connect_button_down => sub {
2560 my ($self, $ev, $x, $y) = @_;
2561
2562 # todo: maybe put examine on 1? but should just be a tooltip :(
2563 if ($ev->{button} == 1) {
2564 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2565 } elsif ($ev->{button} == 2) {
2566 $::CONN->send ("apply $item->{tag}");
2567 } elsif ($ev->{button} == 3) {
2568 CFClient::UI::Menu->new (
2569 items => [
2570 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2571 [
2572 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2573 sub { $::CONN->send ("lock $item->{tag}") },
2574 ],
2575 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2576 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2577 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2578 ],
2579 )->popup ($ev);
2580 }
2581
2582 1
2583 },
2584 %args
2585 );
2586 $self->add(new CFClient::UI::Face
2587 can_events => 0,
2588 face => $item->{face},
2589 anim => $item->{anim},
2590 animspeed => $item->{animspeed});
2591 $self->add(new CFClient::UI::Label
2592 can_events => 0,
2593 text => $desc);
2594
2595 $self
2596}
2597
2598#############################################################################
2599
2600package CFClient::UI::Inventory;
2601
2602our @ISA = CFClient::UI::ScrolledWindow::;
2603
2604sub new {
2605 my $class = shift;
2606
2607 my $self = $class->SUPER::new (
2608 scrolled => (new CFClient::UI::VBox),
2609 @_,
2610 );
2611
2612 $self
2613}
2614
2615sub set_items {
2616 my ($self, $items) = @_;
2617
2618 $self->{scrolled}->clear;
2619 return unless $items;
2620
2621 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2622
2623 $self->{real_items} = \@items;
2624
2625 for my $item (@items) {
2626 my $desc = $item->{nrof} < 2
2627 ? $item->{name}
2628 : "$item->{nrof} $item->{name_pl}";
2629
2630 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2631 }
2632
2633# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2634}
2635
2636sub size_request {
2637 my ($self) = @_;
2638 ($self->{req_w}, $self->{req_h});
2639}
2640 2876
2641############################################################################# 2877#############################################################################
2642 2878
2643package CFClient::UI::Menu; 2879package CFClient::UI::Menu;
2644 2880
… …
2678 2914
2679# popup given the event (must be a mouse button down event currently) 2915# popup given the event (must be a mouse button down event currently)
2680sub popup { 2916sub popup {
2681 my ($self, $ev) = @_; 2917 my ($self, $ev) = @_;
2682 2918
2683 $self->emit ("popdown"); 2919 $self->_emit ("popdown");
2684 2920
2685 # maybe save $GRAB? must be careful about events... 2921 # maybe save $GRAB? must be careful about events...
2686 $GRAB = $self; 2922 $GRAB = $self;
2687 $self->{button} = $ev->{button}; 2923 $self->{button} = $ev->{button};
2688 2924
2689 $self->show; 2925 $self->show;
2690 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2926 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2691} 2927}
2692 2928
2693sub mouse_motion { 2929sub mouse_motion {
2694 my ($self, $ev, $x, $y) = @_; 2930 my ($self, $ev, $x, $y) = @_;
2695 2931
2696 # TODO: should use vbox->find_widget or so 2932 # TODO: should use vbox->find_widget or so
2697 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2698 $self->{hover} = $self->{item}{$HOVER}; 2934 $self->{hover} = $self->{item}{$HOVER};
2935
2936 0
2699} 2937}
2700 2938
2701sub button_up { 2939sub button_up {
2702 my ($self, $ev, $x, $y) = @_; 2940 my ($self, $ev, $x, $y) = @_;
2703 2941
2704 if ($ev->{button} == $self->{button}) { 2942 if ($ev->{button} == $self->{button}) {
2705 undef $GRAB; 2943 undef $GRAB;
2706 $self->hide; 2944 $self->hide;
2707 2945
2708 $self->emit ("popdown"); 2946 $self->_emit ("popdown");
2709 $self->{hover}[1]->() if $self->{hover}; 2947 $self->{hover}[1]->() if $self->{hover};
2948 } else {
2949 return 0
2950 }
2951
2710 } 2952 1
2711} 2953}
2712 2954
2713############################################################################# 2955#############################################################################
2714 2956
2715package CFClient::UI::Root; 2957package CFClient::UI::Multiplexer;
2716 2958
2717our @ISA = CFClient::UI::Container::; 2959our @ISA = CFClient::UI::Container::;
2718 2960
2719use CFClient::OpenGL; 2961sub new {
2962 my $class = shift;
2720 2963
2721sub check_size { 2964 my $self = $class->SUPER::new (
2965 @_,
2966 );
2967
2968 $self->{current} = $self->{children}[0]
2969 if @{ $self->{children} };
2970
2971 $self
2972}
2973
2974sub add {
2722 my ($self) = @_; 2975 my ($self, @widgets) = @_;
2723 2976
2977 $self->SUPER::add (@widgets);
2978
2979 $self->{current} = $self->{children}[0]
2980 if @{ $self->{children} };
2981}
2982
2983sub set_current_page {
2984 my ($self, $page_or_widget) = @_;
2985
2986 my $widget = ref $page_or_widget
2987 ? $page_or_widget
2988 : $self->{children}[$page_or_widget];
2989
2990 $self->{current} = $widget;
2724 $self->configure (0, 0, $self->{w}, $self->{h}); 2991 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2992
2993 $self->_emit (page_changed => $self->{current});
2994
2995 $self->realloc;
2996}
2997
2998sub visible_children {
2999 $_[0]{current}
2725} 3000}
2726 3001
2727sub size_request { 3002sub size_request {
2728 my ($self) = @_; 3003 my ($self) = @_;
2729 3004
2730 ($self->{w}, $self->{h}) 3005 $self->{current}->size_request
2731} 3006}
2732 3007
2733sub size_allocate { 3008sub size_allocate {
2734 my ($self, $w, $h) = @_; 3009 my ($self, $w, $h) = @_;
2735 3010
2736 my $old_w = $self->{old_w}; 3011 $self->{current}->configure (0, 0, $w, $h);
2737 my $old_h = $self->{old_h}; 3012}
2738 3013
2739 if ($old_w && $old_h) { 3014sub _draw {
2740 for my $child ($self->children) { 3015 my ($self) = @_;
2741 $child->{x} = int 0.5 + $child->{x} * $w / $old_w; 3016
2742 $child->{w} = int 0.5 + $child->{w} * $w / $old_w; 3017 $self->{current}->draw;
2743 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w}; 3018}
2744 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w}; 3019
2745 $child->{y} = int 0.5 + $child->{y} * $h / $old_h; 3020#############################################################################
2746 $child->{h} = int 0.5 + $child->{h} * $h / $old_h; 3021
2747 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h}; 3022package CFClient::UI::Notebook;
2748 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h}; 3023
3024our @ISA = CFClient::UI::VBox::;
3025
3026sub new {
3027 my $class = shift;
3028
3029 my $self = $class->SUPER::new (
3030 buttonbar => (new CFClient::UI::Buttonbar),
3031 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3032 # filter => # will be put between multiplexer and $self
3033 @_,
3034 );
3035
3036 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3037 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3038
3039 $self
3040}
3041
3042sub add {
3043 my ($self, $title, $widget, $tooltip) = @_;
3044
3045 Scalar::Util::weaken $self;
3046
3047 $self->{buttonbar}->add (new CFClient::UI::Button
3048 markup => $title,
3049 tooltip => $tooltip,
3050 on_activate => sub { $self->set_current_page ($widget) },
3051 );
3052
3053 $self->{multiplexer}->add ($widget);
3054}
3055
3056sub set_current_page {
3057 my ($self, $page) = @_;
3058
3059 $self->{multiplexer}->set_current_page ($page);
3060 $self->_emit (page_changed => $self->{multiplexer}{current});
3061}
3062
3063#############################################################################
3064
3065package CFClient::UI::Statusbox;
3066
3067our @ISA = CFClient::UI::VBox::;
3068
3069sub new {
3070 my $class = shift;
3071
3072 $class->SUPER::new (
3073 fontsize => 0.8,
3074 @_,
3075 )
3076}
3077
3078sub reorder {
3079 my ($self) = @_;
3080 my $NOW = time;
3081
3082 while (my ($k, $v) = each %{ $self->{item} }) {
3083 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3084 }
3085
3086 my @widgets;
3087
3088 my @items = sort {
3089 $a->{pri} <=> $b->{pri}
3090 or $b->{id} <=> $a->{id}
3091 } values %{ $self->{item} };
3092
3093 my $count = 10 + 1;
3094 for my $item (@items) {
3095 last unless --$count;
3096
3097 push @widgets, $item->{label} ||= do {
3098 # TODO: doesn't handle markup well (read as: at all)
3099 my $short = $item->{count} > 1
3100 ? "<b>$item->{count} ×</b> $item->{text}"
3101 : $item->{text};
3102
3103 for ($short) {
3104 s/^\s+//;
3105 s/\s+/ /g;
3106 }
3107
3108 new CFClient::UI::Label
3109 markup => $short,
3110 tooltip => $item->{tooltip},
3111 tooltip_font => $::FONT_PROP,
3112 tooltip_width => 0.67,
3113 fontsize => $item->{fontsize} || $self->{fontsize},
3114 max_w => $::WIDTH * 0.44,
3115 fg => $item->{fg},
3116 can_events => 1,
3117 can_hover => 1
3118 };
3119 }
3120
3121 $self->clear;
3122 $self->SUPER::add (reverse @widgets);
3123}
3124
3125sub add {
3126 my ($self, $text, %arg) = @_;
3127
3128 $text =~ s/^\s+//;
3129 $text =~ s/\s+$//;
3130
3131 return unless $text;
3132
3133 my $timeout = time + ((delete $arg{timeout}) || 60);
3134
3135 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3136
3137 if (my $item = $self->{item}{$group}) {
3138 if ($item->{text} eq $text) {
3139 $item->{count}++;
3140 } else {
3141 $item->{count} = 1;
3142 $item->{text} = $item->{tooltip} = $text;
2749 } 3143 }
3144 $item->{id} = ++$self->{id};
3145 $item->{timeout} = $timeout;
3146 delete $item->{label};
3147 } else {
3148 $self->{item}{$group} = {
3149 id => ++$self->{id},
3150 text => $text,
3151 timeout => $timeout,
3152 tooltip => $text,
3153 fg => [0.8, 0.8, 0.8, 0.8],
3154 pri => 0,
3155 count => 1,
3156 %arg,
3157 };
2750 } 3158 }
2751 3159
2752 $self->{old_w} = $w; 3160 $self->reorder;
2753 $self->{old_h} = $h;
2754} 3161}
2755 3162
2756sub configure { 3163sub reconfigure {
3164 my ($self) = @_;
3165
3166 delete $_->{label}
3167 for values %{ $self->{item} || {} };
3168
3169 $self->reorder;
3170 $self->SUPER::reconfigure;
3171}
3172
3173#############################################################################
3174
3175package CFClient::UI::Inventory;
3176
3177our @ISA = CFClient::UI::ScrolledWindow::;
3178
3179sub new {
3180 my $class = shift;
3181
3182 my $self = $class->SUPER::new (
3183 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3184 @_,
3185 );
3186
3187 $self
3188}
3189
3190sub set_items {
3191 my ($self, $items) = @_;
3192
3193 $self->{child}->clear;
3194 return unless $items;
3195
3196 my @items = sort {
3197 ($a->{type} <=> $b->{type})
3198 or ($a->{name} cmp $b->{name})
3199 } @$items;
3200
3201 $self->{real_items} = \@items;
3202
3203 my $row = 0;
3204 for my $item (@items) {
3205 CFClient::Item::update_widgets $item;
3206
3207 $self->{child}->add (0, $row, $item->{face_widget});
3208 $self->{child}->add (1, $row, $item->{desc_widget});
3209 $self->{child}->add (2, $row, $item->{weight_widget});
3210
3211 $row++;
3212 }
3213}
3214
3215#############################################################################
3216
3217package CFClient::UI::BindEditor;
3218
3219our @ISA = CFClient::UI::FancyFrame::;
3220
3221sub new {
3222 my $class = shift;
3223
3224 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3225
3226 $self->add (my $vb = new CFClient::UI::VBox);
3227
3228
3229 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3230 text => "start recording",
3231 tooltip => "Start/Stops recording of actions."
3232 ."All subsequent actions after the recording started will be captured."
3233 ."The actions are displayed after the record was stopped."
3234 ."To bind the action you have to click on the 'Bind' button",
3235 on_activate => sub {
3236 unless ($self->{recording}) {
3237 $self->start;
3238 } else {
3239 $self->stop;
3240 }
3241 });
3242
3243 $vb->add (new CFClient::UI::Label text => "Actions:");
3244 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3245
3246 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3247 $vb->add (my $hb = new CFClient::UI::HBox);
3248 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3249 $hb->add (new CFClient::UI::Button
3250 text => "bind",
3251 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3252 on_activate => sub {
3253 $self->ask_for_bind;
3254 });
3255
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add (new CFClient::UI::Button
3258 text => "ok",
3259 expand => 1,
3260 tooltip => "This closes the binding editor and saves the binding",
3261 on_activate => sub {
3262 $self->hide;
3263 $self->commit;
3264 });
3265
3266 $hb->add (new CFClient::UI::Button
3267 text => "cancel",
3268 expand => 1,
3269 tooltip => "This closes the binding editor without saving",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->{binding_cancel}->()
3273 if $self->{binding_cancel};
3274 });
3275
3276 $self->update_binding_widgets;
3277
3278 $self
3279}
3280
3281sub commit {
3282 my ($self) = @_;
3283 my ($mod, $sym, $cmds) = $self->get_binding;
3284 if ($sym != 0 && @$cmds > 0) {
3285 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3286 ."'. Don't forget 'Save Config'!");
3287 $self->{binding_change}->($mod, $sym, $cmds)
3288 if $self->{binding_change};
3289 } else {
3290 $::STATUSBOX->add ("No action bound, no key or action specified!");
3291 $self->{binding_cancel}->()
3292 if $self->{binding_cancel};
3293 }
3294}
3295
3296sub start {
3297 my ($self) = @_;
3298
3299 $self->{rec_btn}->set_text ("stop recording");
3300 $self->{recording} = 1;
3301 $self->clear_command_list;
3302 $::CONN->start_record if $::CONN;
3303}
3304
3305sub stop {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("start recording");
3309 $self->{recording} = 0;
3310
3311 my $rec;
3312 $rec = $::CONN->stop_record if $::CONN;
3313 return unless ref $rec eq 'ARRAY';
3314 $self->set_command_list ($rec);
3315}
3316
3317
3318sub ask_for_bind_and_commit {
3319 my ($self) = @_;
3320 $self->ask_for_bind (1);
3321}
3322
3323sub ask_for_bind {
3324 my ($self, $commit) = @_;
3325
3326 CFClient::Binder::open_binding_dialog (sub {
3327 my ($mod, $sym) = @_;
3328 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3329 $self->update_binding_widgets;
3330 $self->commit if $commit;
3331 });
3332}
3333
3334# $mod and $sym are the modifiers and key symbol
3335# $cmds is a array ref of strings (the commands)
3336# $cb is the callback that is executed on OK
3337# $ccb is the callback that is executed on CANCEL and
3338# when the binding was unsuccessful on OK
3339sub set_binding {
3340 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3341
3342 $self->clear_command_list;
3343 $self->{recording} = 0;
3344 $self->{rec_btn}->set_text ("start recording");
3345
3346 $self->{binding} = [$mod, $sym];
3347 $self->{commands} = $cmds;
3348
3349 $self->{binding_change} = $cb;
3350 $self->{binding_cancel} = $ccb;
3351
3352 $self->update_binding_widgets;
3353}
3354
3355# this is a shortcut method that asks for a binding
3356# and then just binds it.
3357sub do_quick_binding {
3358 my ($self, $cmds) = @_;
3359 $self->set_binding (undef, undef, $cmds, sub {
3360 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3361 });
3362 $self->ask_for_bind (1);
3363}
3364
3365sub update_binding_widgets {
3366 my ($self) = @_;
3367 my ($mod, $sym, $cmds) = $self->get_binding;
3368 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3369 $self->set_command_list ($cmds);
3370}
3371
3372sub get_binding {
3373 my ($self) = @_;
3374 return (
3375 $self->{binding}->[0],
3376 $self->{binding}->[1],
3377 [ grep { defined $_ } @{$self->{commands}} ]
3378 );
3379}
3380
3381sub clear_command_list {
3382 my ($self) = @_;
3383 $self->{cmdbox}->clear ();
3384}
3385
3386sub set_command_list {
3387 my ($self, $cmds) = @_;
3388
3389 $self->{cmdbox}->clear ();
3390 $self->{commands} = $cmds;
3391
3392 my $idx = 0;
3393
3394 for (@$cmds) {
3395 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3396
3397 my $i = $idx;
3398 $hb->add (new CFClient::UI::Label text => $_);
3399 $hb->add (new CFClient::UI::Button
3400 text => "delete",
3401 tooltip => "Deletes the action from the record",
3402 on_activate => sub {
3403 $self->{cmdbox}->remove ($hb);
3404 $cmds->[$i] = undef;
3405 });
3406
3407
3408 $idx++
3409 }
3410}
3411
3412#############################################################################
3413
3414package CFClient::UI::SpellList;
3415
3416our @ISA = CFClient::UI::Table::;
3417
3418sub new {
3419 my $class = shift;
3420
3421 my $self = $class->SUPER::new (
3422 binding => [],
3423 commands => [],
3424 @_,
3425 )
3426}
3427
3428# XXX: Do sorting? Argl...
3429sub add_spell {
3430 my ($self, $spell) = @_;
3431 $self->{spells}->{$spell->{name}} = $spell;
3432
3433 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3434 face => $spell->{face},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message});
3438
3439 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3440 text => $spell->{name},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message},
3444 expand => 1);
3445
3446 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3447 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3448 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3449 expand => 1);
3450
3451 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3452 text => "bind to key",
3453 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3454}
3455
3456sub rebuild_spell_list {
3457 my ($self) = @_;
3458 $self->{tbl_idx} = 0;
3459 $self->add_spell ($_) for values %{$self->{spells}};
3460}
3461
3462sub remove_spell {
3463 my ($self, $spell) = @_;
3464 delete $self->{spells}->{$spell->{name}};
3465 $self->rebuild_spell_list;
3466}
3467
3468#############################################################################
3469
3470package CFClient::UI::Root;
3471
3472our @ISA = CFClient::UI::Container::;
3473
3474use CFClient::OpenGL;
3475
3476sub new {
3477 my $class = shift;
3478
3479 my $self = $class->SUPER::new (
3480 visible => 1,
3481 @_,
3482 );
3483
3484 Scalar::Util::weaken ($self->{root} = $self);
3485
3486 $self
3487}
3488
3489sub size_request {
3490 my ($self) = @_;
3491
3492 ($self->{w}, $self->{h})
3493}
3494
3495sub _to_pixel {
3496 my ($coord, $size, $max) = @_;
3497
3498 $coord =
3499 $coord eq "center" ? ($max - $size) * 0.5
3500 : $coord eq "max" ? $max
3501 : $coord;
3502
3503 $coord = 0 if $coord < 0;
3504 $coord = $max - $size if $coord > $max - $size;
3505
3506 int $coord + 0.5
3507}
3508
3509sub size_allocate {
2757 my ($self, $x, $y, $w, $h) = @_; 3510 my ($self, $w, $h) = @_;
2758
2759 $self->SUPER::configure ($x, $y, $w, $h);
2760 3511
2761 for my $child ($self->children) { 3512 for my $child ($self->children) {
2762 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3513 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2763 3514
2764 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3515 $X = $child->{force_x} if exists $child->{force_x};
2765 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3516 $Y = $child->{force_y} if exists $child->{force_y};
3517
3518 $X = _to_pixel $X, $W, $self->{w};
3519 $Y = _to_pixel $Y, $H, $self->{h};
3520
2766 $child->configure ($X, $Y, $W, $H); 3521 $child->configure ($X, $Y, $W, $H);
2767 } 3522 }
2768} 3523}
2769 3524
2770sub _topleft { 3525sub coord2local {
2771 my ($self, $x, $y) = @_; 3526 my ($self, $x, $y) = @_;
2772 3527
2773 ($x, $y) 3528 ($x, $y)
2774} 3529}
2775 3530
3531sub coord2global {
3532 my ($self, $x, $y) = @_;
3533
3534 ($x, $y)
3535}
3536
2776sub update { 3537sub update {
2777 my ($self) = @_; 3538 my ($self) = @_;
2778 3539
2779 $self->check_size; 3540 $::WANT_REFRESH++;
2780 ::refresh ();
2781} 3541}
2782 3542
2783sub add { 3543sub add {
2784 my ($self, $child) = @_; 3544 my ($self, @children) = @_;
2785 3545
2786 # integerize window positions 3546 $_->{is_toplevel} = 1
2787 $child->{x} = int $child->{x}; 3547 for @children;
2788 $child->{y} = int $child->{y};
2789 3548
2790 $self->SUPER::add ($child); 3549 $self->SUPER::add (@children);
3550}
3551
3552sub remove {
3553 my ($self, @children) = @_;
3554
3555 $self->SUPER::remove (@children);
3556
3557 delete $self->{is_toplevel}
3558 for @children;
3559
3560 while (@children) {
3561 my $w = pop @children;
3562 push @children, $w->children;
3563 $w->set_invisible;
3564 }
2791} 3565}
2792 3566
2793sub on_refresh { 3567sub on_refresh {
2794 my ($self, $id, $cb) = @_; 3568 my ($self, $id, $cb) = @_;
2795 3569
2796 $self->{refresh_hook}{$id} = $cb; 3570 $self->{refresh_hook}{$id} = $cb;
2797} 3571}
2798 3572
3573sub on_post_alloc {
3574 my ($self, $id, $cb) = @_;
3575
3576 $self->{post_alloc_hook}{$id} = $cb;
3577}
3578
2799sub draw { 3579sub draw {
2800 my ($self) = @_; 3580 my ($self) = @_;
2801 3581
2802 while (my $rcb = delete $self->{refresh_hook}) { 3582 while ($self->{refresh_hook}) {
2803 $_->() for values %$rcb; 3583 $_->()
3584 for values %{delete $self->{refresh_hook}};
2804 } 3585 }
3586
3587 if ($self->{realloc}) {
3588 my %queue;
3589 my @queue;
3590 my $widget;
3591
3592 outer:
3593 while () {
3594 if (my $realloc = delete $self->{realloc}) {
3595 for $widget (values %$realloc) {
3596 $widget->{visible} or next; # do not resize invisible widgets
3597
3598 $queue{$widget+0}++ and next; # duplicates are common
3599
3600 push @{ $queue[$widget->{visible}] }, $widget;
3601 }
3602 }
3603
3604 while () {
3605 @queue or last outer;
3606
3607 $widget = pop @{ $queue[-1] || [] }
3608 and last;
3609
3610 pop @queue;
3611 }
3612
3613 delete $queue{$widget+0};
3614
3615 my ($w, $h) = $widget->size_request;
3616
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3619
3620 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h};
3622
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3624 || delete $widget->{force_realloc}) {
3625 $widget->{req_w} = $w;
3626 $widget->{req_h} = $h;
3627
3628 $self->{size_alloc}{$widget+0} = $widget;
3629
3630 if (my $parent = $widget->{parent}) {
3631 $self->{realloc}{$parent+0} = $parent
3632 unless $queue{$parent+0};
3633
3634 $parent->{force_size_alloc} = 1;
3635 $self->{size_alloc}{$parent+0} = $parent;
3636 }
3637 }
3638
3639 delete $self->{realloc}{$widget+0};
3640 }
3641 }
3642
3643 while (my $size_alloc = delete $self->{size_alloc}) {
3644 my @queue = sort { $b->{visible} <=> $a->{visible} }
3645 values %$size_alloc;
3646
3647 while () {
3648 my $widget = pop @queue || last;
3649
3650 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3651
3652 $w = 0 if $w < 0;
3653 $h = 0 if $h < 0;
3654
3655 $w = int $w + 0.5;
3656 $h = int $h + 0.5;
3657
3658 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3659 $widget->{old_w} = $widget->{w};
3660 $widget->{old_h} = $widget->{h};
3661
3662 $widget->{w} = $w;
3663 $widget->{h} = $h;
3664
3665 $widget->emit (size_allocate => $w, $h);
3666 }
3667 }
3668 }
3669
3670 while ($self->{post_alloc_hook}) {
3671 $_->()
3672 for values %{delete $self->{post_alloc_hook}};
3673 }
3674
2805 3675
2806 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3676 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2807 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3677 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2808 glClear GL_COLOR_BUFFER_BIT; 3678 glClear GL_COLOR_BUFFER_BIT;
2809 3679
2810 glMatrixMode GL_PROJECTION; 3680 glMatrixMode GL_PROJECTION;
2811 glLoadIdentity; 3681 glLoadIdentity;
2812 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3682 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2813 glMatrixMode GL_MODELVIEW; 3683 glMatrixMode GL_MODELVIEW;
2814 glLoadIdentity; 3684 glLoadIdentity;
2815 3685
3686 {
3687 package CFClient::UI::Base;
3688
3689 ($draw_x, $draw_y, $draw_w, $draw_h) =
3690 (0, 0, $self->{w}, $self->{h});
3691 }
3692
2816 $self->_draw; 3693 $self->_draw;
2817} 3694}
2818 3695
2819############################################################################# 3696#############################################################################
2820 3697
2821package CFClient::UI; 3698package CFClient::UI;
2822 3699
2823$ROOT = new CFClient::UI::Root; 3700$ROOT = new CFClient::UI::Root;
2824$TOOLTIP = new CFClient::UI::Tooltip; 3701$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2825 3702
28261 37031
2827 3704

Diff Legend

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