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.179 by elmex, Fri Apr 28 05:17:21 2006 UTC vs.
Revision 1.268 by root, Thu Jun 1 05:04:41 2006 UTC

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

Diff Legend

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