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

Diff Legend

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