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

Diff Legend

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