ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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