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.184 by root, Wed May 3 19:56:05 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 $self->emit (size_allocate => $w, $h);
243 } 368 }
244} 369}
245 370
246sub size_allocate { 371sub size_allocate {
247 # nothing to be done 372 # nothing to be done
248} 373}
249 374
250sub children { 375sub children {
251} 376}
252 377
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $_->check_size;
261}
262
263sub set_max_size { 378sub set_max_size {
264 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
265 380
266 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
267 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
268} 383}
269 384
270# return top left coordinates 385sub set_tooltip {
271sub _topleft {
272 my ($self, $x, $y) = @_; 386 my ($self, $tooltip) = @_;
273 387
274 $self->{parent} 388 $tooltip =~ s/^\s+//;
275 or Carp::confess "no parent widget in _topleft\n";#d# 389 $tooltip =~ s/\s+$//;
276 390
277 $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 }
278} 399}
279 400
280# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
281sub coord2local { 402sub coord2local {
282 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
283 404
284 my ($X, $Y) = $self->_topleft; 405 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285 ($x - $X, $y - $Y)
286} 406}
287 407
288# translate local coordinates to global coordinate system 408# translate local coordinates to global coordinate system
289sub coord2global { 409sub coord2global {
290 my ($self, $x, $y) = @_; 410 my ($self, $x, $y) = @_;
291 411
292 my ($X, $Y) = $self->_topleft; 412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293 ($x + $X, $y + $Y)
294} 413}
295 414
296sub focus_in { 415sub focus_in {
297 my ($self) = @_; 416 my ($self) = @_;
298 417
299 return if $FOCUS == $self; 418 return if $FOCUS == $self;
300 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
301 420
302 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
303 422
304 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
305 424
306 $focus->update if $focus; 425 $focus->update if $focus;
307 $FOCUS->update; 426 $FOCUS->update;
308} 427}
309 428
… …
312 431
313 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
314 433
315 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
316 435
317 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
318 437
319 $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;
320} 442}
321 443
322sub mouse_motion { } 444sub mouse_motion { }
323sub button_up { } 445sub button_up { }
324sub key_down { } 446sub key_down { }
325sub key_up { } 447sub key_up { }
326 448
327sub button_down { 449sub button_down {
328 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
329 451
330 $self->focus_in; 452 $self->focus_in;
331} 453}
332 454
333sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
334sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
335sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
336sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
337sub 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
338 528
339sub draw { 529sub draw {
340 my ($self) = @_; 530 my ($self) = @_;
341 531
342 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);
343 543
344 glPushMatrix; 544 glPushMatrix;
345 glTranslate $self->{x}, $self->{y}, 0; 545 glTranslate $self->{x}, $self->{y}, 0;
346 $self->_draw; 546 $self->_draw;
347 glPopMatrix; 547 glPopMatrix;
… …
359 glVertex $x , $y + $self->{h}; 559 glVertex $x , $y + $self->{h};
360 glEnd; 560 glEnd;
361 glDisable GL_BLEND; 561 glDisable GL_BLEND;
362 } 562 }
363 563
364 if ($ENV{PCLIENT_DEBUG}) { 564 if ($ENV{CFPLUS_DEBUG} & 1) {
365 glPushMatrix; 565 glPushMatrix;
366 glColor 1, 1, 0, 1; 566 glColor 1, 1, 0, 1;
367 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
368 glBegin GL_LINE_LOOP; 568 glBegin GL_LINE_LOOP;
369 glVertex 0 , 0; 569 glVertex 0 , 0;
370 glVertex $self->{w}, 0; 570 glVertex $self->{w} - 1, 0;
371 glVertex $self->{w}, $self->{h}; 571 glVertex $self->{w} - 1, $self->{h} - 1;
372 glVertex 0 , $self->{h}; 572 glVertex 0 , $self->{h} - 1;
373 glEnd; 573 glEnd;
374 glPopMatrix; 574 glPopMatrix;
375 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;
376 } 576 }
377} 577}
378 578
379sub _draw { 579sub _draw {
380 my ($self) = @_; 580 my ($self) = @_;
381 581
382 warn "no draw defined for $self\n"; 582 warn "no draw defined for $self\n";
383} 583}
384 584
385sub find_widget {
386 my ($self, $x, $y) = @_;
387
388 return () unless $self->{can_events};
389
390 return $self
391 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
392 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
393
394 ()
395}
396
397sub set_parent {
398 my ($self, $parent) = @_;
399
400 Scalar::Util::weaken ($self->{parent} = $parent);
401}
402
403sub check_size {
404 my ($self) = @_;
405
406 $self->{parent}
407 or return 1;
408
409 my ($w, $h) = $self->{user_w} && $self->{user_h}
410 ? @$self{qw(user_w user_h)}
411 : $self->size_request;
412
413 if ($w != $self->{req_w} || $h != $self->{req_h}) {
414 $self->{req_w} = $w;
415 $self->{req_h} = $h;
416
417 $self->{parent}->check_size
418 or $self->size_allocate (
419 (List::Util::max $self->{w}, $w),
420 (List::Util::max $self->{h}, $h),
421 );
422
423 1
424 } else {
425 0
426 }
427}
428
429sub update {
430 my ($self) = @_;
431
432 $self->{parent}->update
433 if $self->{parent};
434}
435
436sub connect {
437 my ($self, $signal, $cb) = @_;
438
439 push @{ $self->{signal_cb}{$signal} }, $cb;
440}
441
442sub emit {
443 my ($self, $signal, @args) = @_;
444
445 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
446}
447
448sub DESTROY { 585sub DESTROY {
449 my ($self) = @_; 586 my ($self) = @_;
450 587
588 delete $WIDGET{$self+0};
451 #$self->deactivate; 589 #$self->deactivate;
452} 590}
453 591
454############################################################################# 592#############################################################################
455 593
… …
464 my $class = shift; 602 my $class = shift;
465 603
466 # range [value, low, high, page] 604 # range [value, low, high, page]
467 605
468 $class->SUPER::new ( 606 $class->SUPER::new (
469 bg => [0, 0, 0, 0.2], 607 #bg => [0, 0, 0, 0.2],
470 active_bg => [1, 1, 1, 0.5], 608 #active_bg => [1, 1, 1, 0.5],
471 @_ 609 @_
472 ) 610 )
473} 611}
474 612
475sub _draw { 613sub _draw {
476 my ($self) = @_; 614 my ($self) = @_;
477 615
616 my $color = $FOCUS == $self && $self->{active_bg}
617 ? $self->{active_bg}
618 : $self->{bg};
619
620 if ($color && (@$color < 4 || $color->[3])) {
478 my ($w, $h) = @$self{qw(w h)}; 621 my ($w, $h) = @$self{qw(w h)};
479 622
480 glEnable GL_BLEND; 623 glEnable GL_BLEND;
481 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 624 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
482 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 625 glColor @$color;
483 626
484 glBegin GL_QUADS; 627 glBegin GL_QUADS;
485 glVertex 0 , 0; 628 glVertex 0 , 0;
486 glVertex 0 , $h; 629 glVertex 0 , $h;
487 glVertex $w, $h; 630 glVertex $w, $h;
488 glVertex $w, 0; 631 glVertex $w, 0;
489 glEnd; 632 glEnd;
490 633
491 glDisable GL_BLEND; 634 glDisable GL_BLEND;
635 }
492} 636}
493 637
494############################################################################# 638#############################################################################
495 639
496package CFClient::UI::Empty; 640package CFClient::UI::Empty;
… …
501 my ($class, %arg) = @_; 645 my ($class, %arg) = @_;
502 $class->SUPER::new (can_events => 0, %arg); 646 $class->SUPER::new (can_events => 0, %arg);
503} 647}
504 648
505sub size_request { 649sub size_request {
506 (0, 0) 650 my ($self) = @_;
651
652 ($self->{w} + 0, $self->{h} + 0)
507} 653}
508 654
509sub draw { } 655sub draw { }
510 656
511############################################################################# 657#############################################################################
… …
528 674
529 $self 675 $self
530} 676}
531 677
532sub add { 678sub add {
533 my ($self, $child) = @_; 679 my ($self, @widgets) = @_;
534 680
535 $child->set_parent ($self); 681 $_->set_parent ($self)
682 for @widgets;
536 683
537 use sort 'stable'; 684 use sort 'stable';
538 685
539 $self->{children} = [ 686 $self->{children} = [
540 sort { $a->{z} <=> $b->{z} } 687 sort { $a->{z} <=> $b->{z} }
541 @{$self->{children}}, $child 688 @{$self->{children}}, @widgets
542 ]; 689 ];
543 690
544 $child->check_size; 691 $self->realloc;
545 $self->update;
546} 692}
547 693
548sub children { 694sub children {
549 @{ $_[0]{children} } 695 @{ $_[0]{children} }
550} 696}
… …
555 delete $child->{parent}; 701 delete $child->{parent};
556 $child->hide; 702 $child->hide;
557 703
558 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 704 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
559 705
560 $self->check_size; 706 $self->realloc;
561 $self->update;
562} 707}
563 708
564sub clear { 709sub clear {
565 my ($self) = @_; 710 my ($self) = @_;
566 711
… …
570 for (@$children) { 715 for (@$children) {
571 delete $_->{parent}; 716 delete $_->{parent};
572 $_->hide; 717 $_->hide;
573 } 718 }
574 719
575 $self->check_size; 720 $self->realloc;
576 $self->update;
577} 721}
578 722
579sub find_widget { 723sub find_widget {
580 my ($self, $x, $y) = @_; 724 my ($self, $x, $y) = @_;
581 725
… …
656} 800}
657 801
658sub update { 802sub update {
659 my ($self) = @_; 803 my ($self) = @_;
660 804
661 $ROOT->on_refresh ($self => sub { $self->render_child }); 805 $ROOT->on_post_alloc ($self => sub { $self->render_child });
662 $self->SUPER::update; 806 $self->SUPER::update;
663} 807}
664 808
665sub size_allocate { 809sub size_allocate {
666 my ($self, $w, $h) = @_; 810 my ($self, $w, $h) = @_;
… …
668 $self->SUPER::size_allocate ($w, $h); 812 $self->SUPER::size_allocate ($w, $h);
669 $self->update; 813 $self->update;
670} 814}
671 815
672sub _render { 816sub _render {
817 my ($self) = @_;
818
673 $_[0]{children}[0]->draw; 819 $self->{children}[0]->draw;
674} 820}
675 821
676sub render_child { 822sub render_child {
677 my ($self) = @_; 823 my ($self) = @_;
678 824
679 $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 {
680 glClearColor 0, 0, 0, 0; 826 glClearColor 0, 0, 0, 0;
681 glClear GL_COLOR_BUFFER_BIT; 827 glClear GL_COLOR_BUFFER_BIT;
682 828
829 {
830 package CFClient::UI::Base;
831
832 ($draw_x, $draw_y, $draw_w, $draw_h) =
833 (0, 0, $self->{w}, $self->{h});
834 }
835
683 $self->_render; 836 $self->_render;
684# glColorMask 1, 1, 1, 0;
685# glEnable GL_BLEND;
686# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
687# glRasterPos 0, 0;
688# glCopyPixels 0, 0, $self->{w}, $self->{h};
689# glDisable GL_BLEND;
690# glColorMask 1, 1, 1, 1;
691 }; 837 };
692} 838}
693 839
694sub _draw { 840sub _draw {
695 my ($self) = @_; 841 my ($self) = @_;
696 842
697 my ($w, $h) = ($self->w, $self->h); 843 my ($w, $h) = @$self{qw(w h)};
698 844
699 my $tex = $self->{texture} 845 my $tex = $self->{texture}
700 or return; 846 or return;
701 847
702 glEnable GL_BLEND;
703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704 glEnable GL_TEXTURE_2D; 848 glEnable GL_TEXTURE_2D;
705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1; 850 glColor 1, 1, 1, 1;
707 851
708 $tex->draw_quad (0, 0, $w, $h); 852 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709 853
710 glDisable GL_BLEND;
711 glDisable GL_TEXTURE_2D; 854 glDisable GL_TEXTURE_2D;
712} 855}
713 856
714############################################################################# 857#############################################################################
715 858
716package CFClient::UI::ViewPort; 859package CFClient::UI::ViewPort;
717 860
718our @ISA = CFClient::UI::Window::; 861our @ISA = CFClient::UI::Window::;
719 862
863sub new {
864 my $class = shift;
865
866 $class->SUPER::new (
867 scroll_x => 0,
868 scroll_y => 1,
869 @_,
870 )
871}
872
720sub size_request { 873sub size_request {
721 my ($self) = @_; 874 my ($self) = @_;
722 875
723 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 876 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
724 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
725 877
726 @$self{qw(child_w child_h)} 878 $w = 10 if $self->{scroll_x};
879 $h = 10 if $self->{scroll_y};
880
881 ($w, $h)
727} 882}
728 883
729sub size_allocate { 884sub size_allocate {
730 my ($self, $w, $h) = @_; 885 my ($self, $w, $h) = @_;
731 886
887 my $child = $self->child;
888
889 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
890 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
891
892 $self->child->configure (0, 0, $w, $h);
732 $self->update; 893 $self->update;
733} 894}
734 895
735sub set_offset { 896sub set_offset {
736 my ($self, $x, $y) = @_; 897 my ($self, $x, $y) = @_;
… …
739 $self->{view_y} = int $y; 900 $self->{view_y} = int $y;
740 901
741 $self->update; 902 $self->update;
742} 903}
743 904
744# hmm, this does not work for topleft of $self... but we should not aks for that 905# hmm, this does not work for topleft of $self... but we should not ask for that
745sub _topleft { 906sub coord2local {
746 my ($self, $x, $y) = @_; 907 my ($self, $x, $y) = @_;
747 908
748 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 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)
749} 919}
750 920
751sub find_widget { 921sub find_widget {
752 my ($self, $x, $y) = @_; 922 my ($self, $x, $y) = @_;
753 923
… …
761} 931}
762 932
763sub _render { 933sub _render {
764 my ($self) = @_; 934 my ($self) = @_;
765 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
766 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 939 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
767 940
768 $self->SUPER::_render; 941 $self->SUPER::_render;
769} 942}
770 943
… …
778 my $class = shift; 951 my $class = shift;
779 952
780 my $self; 953 my $self;
781 954
782 my $slider = new CFClient::UI::Slider 955 my $slider = new CFClient::UI::Slider
783 vertical => 1, 956 vertical => 1,
784 range => [0, 0, 1, 0.01], # HACK fix 957 range => [0, 0, 1, 0.01], # HACK fix
785 connect_changed => sub { 958 on_changed => sub {
786 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 959 $self->{vp}->set_offset (0, $_[1]);
787 }, 960 },
788 ; 961 ;
789 962
790 $self = $class->SUPER::new ( 963 $self = $class->SUPER::new (
791 vp => (new CFClient::UI::ViewPort), 964 vp => (new CFClient::UI::ViewPort expand => 1),
792 slider => $slider, 965 slider => $slider,
793 @_, 966 @_,
794 ); 967 );
795 968
796 $self->{vp}->add ($self->{scrolled}); 969 $self->{vp}->add ($self->{scrolled});
… …
798 $self->add ($self->{slider}); 971 $self->add ($self->{slider});
799 972
800 $self 973 $self
801} 974}
802 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
803#TODO# update range on size_allocate depeneing on child 995#TODO# update range on size_allocate depending on child
804# update viewport offset on scroll 996# update viewport offset on scroll
805 997
806############################################################################# 998#############################################################################
807 999
808package CFClient::UI::Frame; 1000package CFClient::UI::Frame;
… …
812use CFClient::OpenGL; 1004use CFClient::OpenGL;
813 1005
814sub new { 1006sub new {
815 my $class = shift; 1007 my $class = shift;
816 1008
817 my $self = $class->SUPER::new ( 1009 $class->SUPER::new (
818 bg => [1, 1, 1, 1], 1010 bg => undef,
819 border_bg => [1, 1, 1, 1],
820 border => 0.8,
821 @_ 1011 @_,
822 ); 1012 )
823
824 $self
825} 1013}
826 1014
827sub _draw { 1015sub _draw {
828 my ($self) = @_; 1016 my ($self) = @_;
829 1017
830 my ($w, $h) = ($self->{w}, $self->{h}); 1018 if ($self->{bg}) {
1019 my ($w, $h) = @$self{qw(w h)};
831 1020
832 glEnable GL_BLEND; 1021 glEnable GL_BLEND;
833 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1022 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
834 glEnable GL_TEXTURE_2D; 1023 glColor @{ $self->{bg} };
835 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
836 1024
837# glBegin GL_QUADS; 1025 glBegin GL_QUADS;
838# glColor 0, 0, 0, 0;
839# glVertex 0 , 0; 1026 glVertex 0 , 0;
840# glVertex 0 , $h; 1027 glVertex 0 , $h;
841# glVertex $w, $h; 1028 glVertex $w, $h;
842# glVertex $w, 0; 1029 glVertex $w, 0;
843# glEnd; 1030 glEnd;
844 1031
845
846 $self->child->draw;
847 glDisable GL_BLEND; 1032 glDisable GL_BLEND;
848 glDisable GL_TEXTURE_2D; 1033 }
1034
1035 $self->SUPER::_draw;
849} 1036}
850 1037
851############################################################################# 1038#############################################################################
852 1039
853package CFClient::UI::FancyFrame; 1040package CFClient::UI::FancyFrame;
854 1041
855our @ISA = CFClient::UI::Bin::; 1042our @ISA = CFClient::UI::Bin::;
856 1043
857use CFClient::OpenGL; 1044use CFClient::OpenGL;
858 1045
859my @tex = 1046my $bg =
1047 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1048 mipmap => 1, wrap => 1;
1049
1050my @border =
860 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
861 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
862 1053
863sub new { 1054sub new {
864 my $class = shift; 1055 my $class = shift;
865 1056
866 # TODO: user_x, user_y, overwrite moveto?
867
868 my $self = $class->SUPER::new ( 1057 my $self = $class->SUPER::new (
869 bg => [1, 1, 1, 1], 1058 bg => [1, 1, 1, 1],
870 border_bg => [1, 1, 1, 1], 1059 border_bg => [1, 1, 1, 1],
871 border => 0.6, 1060 border => 0.6,
872 can_events => 1, 1061 can_events => 1,
1062 min_w => 16,
1063 min_h => 16,
873 @_ 1064 @_
874 ); 1065 );
875 1066
876 $self->{title} &&= new CFClient::UI::Label 1067 $self->{title} &&= new CFClient::UI::Label
877 align => 0, 1068 align => 0,
… …
901 my ($self, $w, $h) = @_; 1092 my ($self, $w, $h) = @_;
902 1093
903 $h -= List::Util::max 0, $self->border * 2; 1094 $h -= List::Util::max 0, $self->border * 2;
904 $w -= List::Util::max 0, $self->border * 2; 1095 $w -= List::Util::max 0, $self->border * 2;
905 1096
906 $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)
907 if $self->{title}; 1098 if $self->{title};
908 1099
909 $self->child->configure ($self->border, $self->border, $w, $h); 1100 $self->child->configure ($self->border, $self->border, $w, $h);
910} 1101}
911 1102
… …
930 my ($ev, $x, $y) = @_; 1121 my ($ev, $x, $y) = @_;
931 1122
932 my $dx = $ev->{x} - $ox; 1123 my $dx = $ev->{x} - $ox;
933 my $dy = $ev->{y} - $oy; 1124 my $dy = $ev->{y} - $oy;
934 1125
935 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1126 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
936 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1127 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1128
1129 $self->realloc;
937 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1130 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
938 $self->check_size;
939 }; 1131 };
940 1132
941 } elsif ($lr ^ $td) { 1133 } elsif ($lr ^ $td) {
942 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1134 my ($ox, $oy) = ($ev->{x}, $ev->{y});
943 my ($bx, $by) = ($self->{x}, $self->{y}); 1135 my ($bx, $by) = ($self->{x}, $self->{y});
… …
945 $self->{motion} = sub { 1137 $self->{motion} = sub {
946 my ($ev, $x, $y) = @_; 1138 my ($ev, $x, $y) = @_;
947 1139
948 ($x, $y) = ($ev->{x}, $ev->{y}); 1140 ($x, $y) = ($ev->{x}, $ev->{y});
949 1141
950 $self->move ($bx + $x - $ox, $by + $y - $oy); 1142 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
951 $self->update;
952 }; 1143 };
953 } 1144 }
954} 1145}
955 1146
956sub button_up { 1147sub button_up {
… …
969 my ($self) = @_; 1160 my ($self) = @_;
970 1161
971 my ($w, $h ) = ($self->{w}, $self->{h}); 1162 my ($w, $h ) = ($self->{w}, $self->{h});
972 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1163 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
973 1164
974 glEnable GL_BLEND;
975 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
976 glEnable GL_TEXTURE_2D; 1165 glEnable GL_TEXTURE_2D;
977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
978 1167
979 my $border = $self->border; 1168 my $border = $self->border;
980 1169
981 glColor @{ $self->{border_bg} }; 1170 glColor @{ $self->{border_bg} };
982 $tex[1]->draw_quad (0, 0, $w, $border); 1171 $border[0]->draw_quad_alpha (0, 0, $w, $border);
983 $tex[3]->draw_quad (0, $border, $border, $ch); 1172 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
984 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1173 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
985 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1174 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
986 1175
987 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1176 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
988 my $bg = $tex[0]; 1177 glColor @{ $self->{bg} };
989 1178
990 # TODO: repeat texture not scale 1179 # TODO: repeat texture not scale
1180 # solve this better(?)
991 my $rep_x = $cw / $bg->{w}; 1181 $bg->{s} = $cw / $bg->{w};
992 my $rep_y = $ch / $bg->{h}; 1182 $bg->{t} = $ch / $bg->{h};
993
994 glColor @{ $self->{bg} };
995
996 $bg->{s} = $rep_x;
997 $bg->{t} = $rep_y;
998 $bg->{wrap_mode} = 1;
999 $bg->draw_quad ($border, $border, $cw, $ch); 1183 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1184 }
1000 1185
1001 glDisable GL_TEXTURE_2D; 1186 glDisable GL_TEXTURE_2D;
1002 glDisable GL_BLEND;
1003 }
1004 1187
1005 $self->{title}->draw if $self->{title}; 1188 $self->{title}->draw if $self->{title};
1006 1189
1007 $self->child->draw; 1190 $self->child->draw;
1008} 1191}
… …
1020sub new { 1203sub new {
1021 my $class = shift; 1204 my $class = shift;
1022 1205
1023 $class->SUPER::new ( 1206 $class->SUPER::new (
1024 col_expand => [], 1207 col_expand => [],
1025 @_ 1208 @_,
1026 ) 1209 )
1210}
1211
1212sub children {
1213 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1027} 1214}
1028 1215
1029sub add { 1216sub add {
1030 my ($self, $x, $y, $child) = @_; 1217 my ($self, $x, $y, $child) = @_;
1031 1218
1032 $child->set_parent ($self); 1219 $child->set_parent ($self);
1033 $self->{children}[$y][$x] = $child; 1220 $self->{children}[$y][$x] = $child;
1034 1221
1035 $child->check_size; 1222 $self->realloc;
1036} 1223}
1037 1224
1038sub children {
1039 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1040}
1041
1042# 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?
1043sub clear { 1226sub clear {
1044 my ($self) = @_; 1227 my ($self) = @_;
1045 1228
1046 my @children = $self->children; 1229 my @children = $self->children;
1047 delete $self->{children}; 1230 delete $self->{children};
… …
1049 for (@children) { 1232 for (@children) {
1050 delete $_->{parent}; 1233 delete $_->{parent};
1051 $_->hide; 1234 $_->hide;
1052 } 1235 }
1053 1236
1054 $self->update; 1237 $self->realloc;
1055} 1238}
1056 1239
1057sub get_wh { 1240sub get_wh {
1058 my ($self) = @_; 1241 my ($self) = @_;
1059 1242
… …
1090sub size_allocate { 1273sub size_allocate {
1091 my ($self, $w, $h) = @_; 1274 my ($self, $w, $h) = @_;
1092 1275
1093 my ($ws, $hs) = $self->get_wh; 1276 my ($ws, $hs) = $self->get_wh;
1094 1277
1095 my $req_w = sum @$ws; 1278 my $req_w = (sum @$ws) || 1;
1096 my $req_h = sum @$hs; 1279 my $req_h = (sum @$hs) || 1;
1097 1280
1098 # TODO: nicer code && do row_expand 1281 # TODO: nicer code && do row_expand
1099 my @col_expand = @{$self->{col_expand}}; 1282 my @col_expand = @{$self->{col_expand}};
1100 @col_expand = (1) x @$ws unless @col_expand; 1283 @col_expand = (1) x @$ws unless @col_expand;
1101 my $col_expand = (sum @col_expand) || 1; 1284 my $col_expand = (sum @col_expand) || 1;
… …
1155 } 1338 }
1156} 1339}
1157 1340
1158############################################################################# 1341#############################################################################
1159 1342
1160package CFClient::UI::HBox; 1343package CFClient::UI::Box;
1161
1162# TODO: wrap into common Box base class
1163 1344
1164our @ISA = CFClient::UI::Container::; 1345our @ISA = CFClient::UI::Container::;
1165 1346
1166sub size_request { 1347sub size_request {
1167 my ($self) = @_; 1348 my ($self) = @_;
1168 1349
1169 my @alloc = map [$_->size_request], @{$self->{children}}; 1350 $self->{vertical}
1170 1351 ? (
1171 ( 1352 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1172 (List::Util::sum map $_->[0], @alloc), 1353 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1173 (List::Util::max map $_->[1], @alloc), 1354 )
1174 ) 1355 : (
1356 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1357 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1358 )
1175} 1359}
1176 1360
1177sub size_allocate { 1361sub size_allocate {
1178 my ($self, $w, $h) = @_; 1362 my ($self, $w, $h) = @_;
1179 1363
1180 ($h, $w) = ($w, $h); 1364 my $space = $self->{vertical} ? $h : $w;
1181
1182 my $children = $self->{children}; 1365 my $children = $self->{children};
1183 1366
1184 my @h = map $_->{req_w}, @$children; 1367 my @req;
1185 1368
1186 my $req_h = List::Util::sum @h; 1369 if ($self->{homogeneous}) {
1187 1370 @req = ($space / (@$children || 1)) x @$children;
1188 if ($req_h > $h) {
1189 # ah well, not enough space
1190 $_ *= $h / $req_h for @h;
1191 } 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 {
1192 my $exp = List::Util::sum map $_->{expand}, @$children; 1379 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1193 $exp ||= 1;
1194 1380
1381 $space = ($space - $req) / $expand; # remaining space to give away
1382
1383 $req[$_] += $space * $children->[$_]{expand}
1195 for (0 .. $#$children) { 1384 for 0 .. $#$children;
1196 my $child = $children->[$_];
1197
1198 my $alloc_h = $h[$_];
1199 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1200 $h[$_] = $alloc_h;
1201 } 1385 }
1202 } 1386 }
1203 1387
1204 CFClient::UI::harmonize \@h; 1388 CFClient::UI::harmonize \@req;
1205 1389
1206 my $y = 0; 1390 my $pos = 0;
1207 for (0 .. $#$children) { 1391 for (0 .. $#$children) {
1208 my $child = $children->[$_];
1209 my $h = $h[$_]; 1392 my $alloc = $req[$_];
1210 $child->configure ($y, 0, $h, $w); 1393 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1211 1394
1212 $y += $h; 1395 $pos += $alloc;
1213 } 1396 }
1214 1397
1215 1 1398 1
1216} 1399}
1217 1400
1218############################################################################# 1401#############################################################################
1219 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
1220package CFClient::UI::VBox; 1418package CFClient::UI::VBox;
1221 1419
1222# TODO: wrap into common Box base class
1223
1224our @ISA = CFClient::UI::Container::; 1420our @ISA = CFClient::UI::Box::;
1225 1421
1226sub size_request { 1422sub new {
1227 my ($self) = @_; 1423 my $class = shift;
1228 1424
1229 my @alloc = map [$_->size_request], @{$self->{children}}; 1425 $class->SUPER::new (
1230 1426 vertical => 1,
1231 ( 1427 @_,
1232 (List::Util::max map $_->[0], @alloc),
1233 (List::Util::sum map $_->[1], @alloc),
1234 ) 1428 )
1235} 1429}
1236 1430
1237sub size_allocate {
1238 my ($self, $w, $h) = @_;
1239
1240 my $children = $self->{children};
1241
1242 my @h = map $_->{req_h}, @$children;
1243
1244 my $req_h = List::Util::sum @h;
1245
1246 if ($req_h > $h) {
1247 # ah well, not enough space
1248 $_ *= $h / $req_h for @h;
1249 } else {
1250 my $exp = List::Util::sum map $_->{expand}, @$children;
1251 $exp ||= 1;
1252
1253 for (0 .. $#$children) {
1254 my $child = $children->[$_];
1255
1256 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1257 }
1258 }
1259
1260 CFClient::UI::harmonize \@h;
1261
1262 my $y = 0;
1263 for (0 .. $#$children) {
1264 my $child = $children->[$_];
1265 my $h = $h[$_];
1266 $child->configure (0, $y, $w, $h);
1267
1268 $y += $h;
1269 }
1270
1271 1
1272}
1273
1274############################################################################# 1431#############################################################################
1275 1432
1276package CFClient::UI::Label; 1433package CFClient::UI::Label;
1277 1434
1278our @ISA = CFClient::UI::Base::; 1435our @ISA = CFClient::UI::DrawBG::;
1279 1436
1280use CFClient::OpenGL; 1437use CFClient::OpenGL;
1281 1438
1282sub new { 1439sub new {
1283 my ($class, %arg) = @_; 1440 my ($class, %arg) = @_;
1284 1441
1285 my $self = $class->SUPER::new ( 1442 my $self = $class->SUPER::new (
1286 fg => [1, 1, 1], 1443 fg => [1, 1, 1],
1444 #bg => none
1445 #active_bg => none
1287 #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),
1288 fontsize => 1, 1452 fontsize => 1,
1289 text => "",
1290 align => -1, 1453 align => -1,
1291 valign => -1, 1454 valign => -1,
1292 padding => 2, 1455 padding_x => 2,
1293 layout => new CFClient::Layout, 1456 padding_y => 2,
1294 can_events => 0, 1457 can_events => 0,
1295 %arg 1458 %arg
1296 ); 1459 );
1297 1460
1298 if (exists $self->{template}) { 1461 if (exists $self->{template}) {
1299 my $layout = new CFClient::Layout; 1462 my $layout = new CFClient::Layout;
1300 $layout->set_text (delete $self->{template}); 1463 $layout->set_text (delete $self->{template});
1301 $self->{template} = $layout; 1464 $self->{template} = $layout;
1302 } 1465 }
1303 1466
1304 $self->set_text (delete $self->{text}) if exists $self->{text}; 1467 if (exists $self->{markup}) {
1305 $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 }
1306 1472
1307 $self 1473 $self
1308} 1474}
1309 1475
1310sub escape { 1476sub escape($) {
1311 local $_ = $_[1]; 1477 local $_ = $_[0];
1312 1478
1313 s/&/&amp;/g; 1479 s/&/&amp;/g;
1314 s/>/&gt;/g; 1480 s/>/&gt;/g;
1315 s/</&lt;/g; 1481 s/</&lt;/g;
1316 1482
1317 $_[1] 1483 $_
1318} 1484}
1319 1485
1320sub update { 1486sub update {
1321 my ($self) = @_; 1487 my ($self) = @_;
1322 1488
1323 delete $self->{texture}; 1489 delete $self->{texture};
1324 $self->SUPER::update; 1490 $self->SUPER::update;
1325} 1491}
1326 1492
1327sub reconfigure {
1328 my ($self) = @_;
1329
1330 delete $self->{texture};
1331}
1332
1333sub set_text { 1493sub set_text {
1334 my ($self, $text) = @_; 1494 my ($self, $text) = @_;
1335 1495
1336 return if $self->{text} eq "T$text"; 1496 return if $self->{text} eq "T$text";
1337 $self->{text} = "T$text"; 1497 $self->{text} = "T$text";
1338 1498
1499 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1339 $self->{layout}->set_text ($text); 1500 $self->{layout}->set_text ($text);
1340 1501
1341 delete $self->{texture}; 1502 $self->realloc;
1342 $self->update; 1503 $self->update;
1343 $self->check_size;
1344} 1504}
1345 1505
1346sub set_markup { 1506sub set_markup {
1347 my ($self, $markup) = @_; 1507 my ($self, $markup) = @_;
1348 1508
1349 return if $self->{text} eq "M$markup"; 1509 return if $self->{text} eq "M$markup";
1350 $self->{text} = "M$markup"; 1510 $self->{text} = "M$markup";
1351 1511
1512 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1513
1514 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1352 $self->{layout}->set_markup ($markup); 1515 $self->{layout}->set_markup ($markup);
1353 1516
1354 delete $self->{texture}; 1517 $self->realloc;
1355 $self->update; 1518 $self->update;
1356 $self->check_size;
1357} 1519}
1358 1520
1359sub size_request { 1521sub size_request {
1360 my ($self) = @_; 1522 my ($self) = @_;
1361 1523
1362 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1524 $self->{layout}->set_font ($self->{font}) if $self->{font};
1363 $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});
1364 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1528 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1365 1529
1366 my ($w, $h) = $self->{layout}->size; 1530 my ($w, $h) = $self->{layout}->size;
1367 1531
1368 if (exists $self->{template}) { 1532 if (exists $self->{template}) {
… …
1373 1537
1374 $w = List::Util::max $w, $w2; 1538 $w = List::Util::max $w, $w2;
1375 $h = List::Util::max $h, $h2; 1539 $h = List::Util::max $h, $h2;
1376 } 1540 }
1377 1541
1378 ( 1542 ($w, $h)
1379 $w + $self->{padding} * 2,
1380 $h + $self->{padding} * 2,
1381 )
1382} 1543}
1383 1544
1384sub size_allocate { 1545sub size_allocate {
1385 my ($self, $w, $h) = @_; 1546 my ($self, $w, $h) = @_;
1386 1547
1387 delete $self->{texture}; 1548 delete $self->{texture}
1549 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1388} 1550}
1389 1551
1390sub set_fontsize { 1552sub set_fontsize {
1391 my ($self, $fontsize) = @_; 1553 my ($self, $fontsize) = @_;
1392 1554
1393 $self->{fontsize} = $fontsize; 1555 $self->{fontsize} = $fontsize;
1394 delete $self->{texture}; 1556 delete $self->{texture};
1395 $self->check_size; 1557
1396 $self->update; 1558 $self->realloc;
1397} 1559}
1398 1560
1399sub _draw { 1561sub _draw {
1400 my ($self) = @_; 1562 my ($self) = @_;
1401 1563
1564 $self->SUPER::_draw; # draw background, if applicable
1565
1402 my $tex = $self->{texture} ||= do { 1566 my $tex = $self->{texture} ||= do {
1567 $self->{layout}->set_foreground (@{$self->{fg}});
1403 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1568 $self->{layout}->set_font ($self->{font}) if $self->{font};
1404 $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});
1405 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1572 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1573
1406 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
1407 }; 1585 };
1408 1586
1409 glEnable GL_BLEND;
1410 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1411 glEnable GL_TEXTURE_2D; 1587 glEnable GL_TEXTURE_2D;
1412 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1588 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1413 1589
1590 if ($tex->{format} == GL_ALPHA) {
1414 glColor @{$self->{fg}}; 1591 glColor @{$self->{fg}};
1415
1416 $self->{ox} = int (
1417 $self->{align} < 0 ? $self->{padding}
1418 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1419 : ($self->{w} - $tex->{w}) * 0.5
1420 );
1421
1422 $self->{oy} = int (
1423 $self->{valign} < 0 ? $self->{padding}
1424 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1425 : ($self->{h} - $tex->{h}) * 0.5
1426 );
1427
1428 $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 }
1429 1596
1430 glDisable GL_TEXTURE_2D; 1597 glDisable GL_TEXTURE_2D;
1431 glDisable GL_BLEND;
1432} 1598}
1433 1599
1434############################################################################# 1600#############################################################################
1435 1601
1436package CFClient::UI::EntryBase; 1602package CFClient::UI::EntryBase;
… …
1449 active_fg => [0, 0, 0], 1615 active_fg => [0, 0, 0],
1450 can_hover => 1, 1616 can_hover => 1,
1451 can_focus => 1, 1617 can_focus => 1,
1452 valign => 0, 1618 valign => 0,
1453 can_events => 1, 1619 can_events => 1,
1620 #text => ...
1454 @_ 1621 @_
1455 ) 1622 )
1456} 1623}
1457 1624
1458sub _set_text { 1625sub _set_text {
… …
1468 $self->{text} = $text; 1635 $self->{text} = $text;
1469 1636
1470 $text =~ s/./*/g if $self->{hidden}; 1637 $text =~ s/./*/g if $self->{hidden};
1471 $self->{layout}->set_text ("$text "); 1638 $self->{layout}->set_text ("$text ");
1472 1639
1473 $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;
1474} 1650}
1475 1651
1476sub get_text { 1652sub get_text {
1477 $_[0]{text} 1653 $_[0]{text}
1478} 1654}
… …
1481 my ($self) = @_; 1657 my ($self) = @_;
1482 1658
1483 my ($w, $h) = $self->SUPER::size_request; 1659 my ($w, $h) = $self->SUPER::size_request;
1484 1660
1485 ($w + 1, $h) # add 1 for cursor 1661 ($w + 1, $h) # add 1 for cursor
1486}
1487
1488sub size_allocate {
1489 my ($self, $w, $h) = @_;
1490
1491 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1492}
1493
1494sub set_text {
1495 my ($self, $text) = @_;
1496
1497 $self->{cursor} = length $text;
1498 $self->_set_text ($text);
1499 $self->update;
1500} 1662}
1501 1663
1502sub key_down { 1664sub key_down {
1503 my ($self, $ev) = @_; 1665 my ($self, $ev) = @_;
1504 1666
… …
1506 my $sym = $ev->{sym}; 1668 my $sym = $ev->{sym};
1507 my $uni = $ev->{unicode}; 1669 my $uni = $ev->{unicode};
1508 1670
1509 my $text = $self->get_text; 1671 my $text = $self->get_text;
1510 1672
1511 if ($sym == 8) { 1673 if ($uni == 8) {
1512 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1674 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1513 } elsif ($sym == 127) { 1675 } elsif ($uni == 127) {
1514 substr $text, $self->{cursor}, 1, ""; 1676 substr $text, $self->{cursor}, 1, "";
1515 } elsif ($sym == CFClient::SDLK_LEFT) { 1677 } elsif ($sym == CFClient::SDLK_LEFT) {
1516 --$self->{cursor} if $self->{cursor}; 1678 --$self->{cursor} if $self->{cursor};
1517 } elsif ($sym == CFClient::SDLK_RIGHT) { 1679 } elsif ($sym == CFClient::SDLK_RIGHT) {
1518 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1680 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1519 } elsif ($sym == CFClient::SDLK_HOME) { 1681 } elsif ($sym == CFClient::SDLK_HOME) {
1520 $self->{cursor} = 0; 1682 $self->{cursor} = 0;
1521 } elsif ($sym == CFClient::SDLK_END) { 1683 } elsif ($sym == CFClient::SDLK_END) {
1522 $self->{cursor} = length $text; 1684 $self->{cursor} = length $text;
1523 } elsif ($sym == 27) { 1685 } elsif ($uni == 27) {
1524 $self->emit ('escape'); 1686 $self->_emit ('escape');
1525 } elsif ($uni) { 1687 } elsif ($uni) {
1526 substr $text, $self->{cursor}++, 0, chr $uni; 1688 substr $text, $self->{cursor}++, 0, chr $uni;
1527 } 1689 }
1528 1690
1529 $self->_set_text ($text); 1691 $self->_set_text ($text);
1530 $self->update; 1692
1693 $self->realloc;
1531} 1694}
1532 1695
1533sub focus_in { 1696sub focus_in {
1534 my ($self) = @_; 1697 my ($self) = @_;
1535 1698
… …
1615 if ($sym == 13) { 1778 if ($sym == 13) {
1616 unshift @{$self->{history}}, 1779 unshift @{$self->{history}},
1617 my $txt = $self->get_text; 1780 my $txt = $self->get_text;
1618 $self->{history_pointer} = -1; 1781 $self->{history_pointer} = -1;
1619 $self->{history_saveback} = ''; 1782 $self->{history_saveback} = '';
1620 $self->emit (activate => $txt); 1783 $self->_emit (activate => $txt);
1621 $self->update; 1784 $self->update;
1622 1785
1623 } elsif ($sym == CFClient::SDLK_UP) { 1786 } elsif ($sym == CFClient::SDLK_UP) {
1624 if ($self->{history_pointer} < 0) { 1787 if ($self->{history_pointer} < 0) {
1625 $self->{history_saveback} = $self->get_text; 1788 $self->{history_saveback} = $self->get_text;
… …
1662 1825
1663sub new { 1826sub new {
1664 my $class = shift; 1827 my $class = shift;
1665 1828
1666 $class->SUPER::new ( 1829 $class->SUPER::new (
1667 padding => 4, 1830 padding_x => 4,
1831 padding_y => 4,
1668 fg => [1, 1, 1], 1832 fg => [1, 1, 1],
1669 bg => [1, 1, 1, 0.2],
1670 active_fg => [0, 0, 1], 1833 active_fg => [0, 0, 1],
1671 can_hover => 1, 1834 can_hover => 1,
1672 align => 0, 1835 align => 0,
1673 valign => 0, 1836 valign => 0,
1674 can_events => 1, 1837 can_events => 1,
1675 @_ 1838 @_
1676 ) 1839 )
1677} 1840}
1678 1841
1842sub activate { }
1843
1679sub button_up { 1844sub button_up {
1680 my ($self, $ev, $x, $y) = @_; 1845 my ($self, $ev, $x, $y) = @_;
1681 1846
1847 $self->emit ("activate")
1682 if ($x >= 0 && $x < $self->{w} 1848 if $x >= 0 && $x < $self->{w}
1683 && $y >= 0 && $y < $self->{h}) { 1849 && $y >= 0 && $y < $self->{h};
1684 $self->emit ("activate");
1685 }
1686} 1850}
1687 1851
1688sub _draw { 1852sub _draw {
1689 my ($self) = @_; 1853 my ($self) = @_;
1690 1854
… …
1692 1856
1693 if ($GRAB == $self) { 1857 if ($GRAB == $self) {
1694 $self->{fg} = $self->{active_fg}; 1858 $self->{fg} = $self->{active_fg};
1695 } 1859 }
1696 1860
1697 glEnable GL_BLEND;
1698 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1699 glEnable GL_TEXTURE_2D; 1861 glEnable GL_TEXTURE_2D;
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 glColor 0, 0, 0, 1; 1863 glColor 0, 0, 0, 1;
1702 1864
1703 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1865 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1704 1866
1705 glDisable GL_TEXTURE_2D; 1867 glDisable GL_TEXTURE_2D;
1706 glDisable GL_BLEND;
1707 1868
1708 $self->SUPER::_draw; 1869 $self->SUPER::_draw;
1709} 1870}
1710 1871
1711############################################################################# 1872#############################################################################
… …
1722 1883
1723sub new { 1884sub new {
1724 my $class = shift; 1885 my $class = shift;
1725 1886
1726 $class->SUPER::new ( 1887 $class->SUPER::new (
1727 padding => 2, 1888 padding_x => 2,
1889 padding_y => 2,
1728 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1729 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],
1730 state => 0, 1894 state => 0,
1731 can_hover => 1, 1895 can_hover => 1,
1732 @_ 1896 @_
1733 ) 1897 )
1734} 1898}
1735 1899
1736sub size_request { 1900sub size_request {
1737 my ($self) = @_; 1901 my ($self) = @_;
1738 1902
1739 ($self->{padding} * 2 + 6) x 2 1903 (6) x 2
1740} 1904}
1741 1905
1742sub button_down { 1906sub button_down {
1743 my ($self, $ev, $x, $y) = @_; 1907 my ($self, $ev, $x, $y) = @_;
1744 1908
1745 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1909 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1746 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1910 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1747 $self->{state} = !$self->{state}; 1911 $self->{state} = !$self->{state};
1748 $self->emit (changed => $self->{state}); 1912 $self->_emit (changed => $self->{state});
1749 } 1913 }
1750} 1914}
1751 1915
1752sub _draw { 1916sub _draw {
1753 my ($self) = @_; 1917 my ($self) = @_;
1754 1918
1755 $self->SUPER::_draw; 1919 $self->SUPER::_draw;
1756 1920
1757 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1921 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1758 1922
1759 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;
1760 1926
1761 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1927 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1762 1928
1763 glEnable GL_BLEND; 1929 my $tex = $self->{state} ? $tex[1] : $tex[0];
1930
1764 glEnable GL_TEXTURE_2D; 1931 glEnable GL_TEXTURE_2D;
1765 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1766
1767 my $tex = $self->{state} ? $tex[1] : $tex[0];
1768
1769 $tex->draw_quad (0, 0, $s, $s); 1932 $tex->draw_quad_alpha (0, 0, $s, $s);
1770
1771 glDisable GL_TEXTURE_2D; 1933 glDisable GL_TEXTURE_2D;
1772 glDisable GL_BLEND;
1773} 1934}
1774 1935
1775############################################################################# 1936#############################################################################
1776 1937
1777package CFClient::UI::Image; 1938package CFClient::UI::Image;
… …
1820 glTranslate 0, -$self->{w}, 0; 1981 glTranslate 0, -$self->{w}, 0;
1821 1982
1822 ($w, $h) = ($h, $w); 1983 ($w, $h) = ($h, $w);
1823 } 1984 }
1824 1985
1825 glEnable GL_BLEND;
1826 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1827 glEnable GL_TEXTURE_2D; 1986 glEnable GL_TEXTURE_2D;
1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1987 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829 1988
1830 $tex->draw_quad (0, 0, $w, $h); 1989 $tex->draw_quad_alpha (0, 0, $w, $h);
1831 1990
1832 glDisable GL_BLEND;
1833 glDisable GL_TEXTURE_2D; 1991 glDisable GL_TEXTURE_2D;
1834} 1992}
1835 1993
1836############################################################################# 1994#############################################################################
1837 1995
… …
2026 qw(s1_slider.png s1_slider_bg.png); 2184 qw(s1_slider.png s1_slider_bg.png);
2027 2185
2028sub new { 2186sub new {
2029 my $class = shift; 2187 my $class = shift;
2030 2188
2031 # range [value, low, high, page] 2189 # range [value, low, high, page, unit]
2032 2190
2033 # TODO: 0-width page 2191 # TODO: 0-width page
2034 # TODO: req_w/h are wrong with vertical 2192 # TODO: req_w/h are wrong with vertical
2035 # TODO: calculations are off 2193 # TODO: calculations are off
2036 my $self = $class->SUPER::new ( 2194 my $self = $class->SUPER::new (
2037 fg => [1, 1, 1], 2195 fg => [1, 1, 1],
2038 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],
2039 range => [0, 0, 100, 10], 2199 range => [0, 0, 100, 10, 0],
2040 req_w => $::WIDTH / 80, 2200 min_w => $::WIDTH / 80,
2041 req_h => $::WIDTH / 80, 2201 min_h => $::WIDTH / 80,
2042 vertical => 0, 2202 vertical => 0,
2043 can_hover => 1, 2203 can_hover => 1,
2044 inner_pad => 5, 2204 inner_pad => 0.02,
2045 @_ 2205 @_
2046 ); 2206 );
2047 2207
2208 $self->set_value ($self->{range}[0]);
2209 $self->update;
2210
2048 $self 2211 $self
2049} 2212}
2050 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
2051sub size_request { 2248sub size_request {
2052 my ($self) = @_; 2249 my ($self) = @_;
2053 2250
2054 my $w = $self->{req_w}; 2251 ($self->{req_w}, $self->{req_h})
2055 my $h = $self->{req_h};
2056
2057 $self->{vertical} ? ($h, $w) : ($w, $h)
2058} 2252}
2059 2253
2060sub button_down { 2254sub button_down {
2061 my ($self, $ev, $x, $y) = @_; 2255 my ($self, $ev, $x, $y) = @_;
2062 2256
2063 $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
2064 $self->mouse_motion ($ev, $x, $y); 2261 $self->mouse_motion ($ev, $x, $y);
2065} 2262}
2066 2263
2067sub mouse_motion { 2264sub mouse_motion {
2068 my ($self, $ev, $x, $y) = @_; 2265 my ($self, $ev, $x, $y) = @_;
2069 2266
2070 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
2071 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2284 my ($value, $lo, $hi, $page) = @{$self->{range}};
2285 my $range = ($hi - $page - $lo) || 1e-100;
2072 2286
2073 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2287 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2074 2288
2075 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2289 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2076 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2290 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2077 2291
2078 $x -= $inner_pad_px; # substract the padding 2292 $value = ($value - $lo) / $range;
2079 $x = $x * ($hi - $lo) / $inner_w + $lo; 2293 $value = $value * $self->{scale} + $self->{offset};
2080 $x = $lo if $x < $lo;
2081 $x = $hi - $page if $x > $hi - $page;
2082 $self->{range}[0] = $x;
2083 2294
2084 $self->emit (changed => $x); 2295 $self->{knob_x} = $value - $knob_w * 0.5;
2085 $self->update; 2296 $self->{knob_w} = $knob_w;
2086 } 2297 });
2087}
2088 2298
2089# the inner_* stuff is for generating a padding for the slider handle, 2299 $self->SUPER::update;
2090# so that the handle doesn't leave the texture. This calculation isn't 100%
2091# correct propably, but it does the job for now
2092sub _calc_inner_pad_px {
2093 my ($self, $w) = @_;
2094 ($w / 100) * $self->{inner_pad} # % to pixels
2095} 2300}
2096 2301
2097sub _draw { 2302sub _draw {
2098 my ($self) = @_; 2303 my ($self) = @_;
2099 2304
2100 $self->SUPER::_draw (); 2305 $self->SUPER::_draw ();
2101 2306
2102 my ($w, $h) = @$self{qw(w h)}; 2307 glScale $self->{w}, $self->{h};
2103 2308
2104 if ($self->{vertical}) { 2309 if ($self->{vertical}) {
2105 # draw a vertical slider like a rotated horizontal slider 2310 # draw a vertical slider like a rotated horizontal slider
2106 2311
2312 glTranslate 1, 0, 0;
2107 glRotate 90, 0, 0, 1; 2313 glRotate 90, 0, 0, 1;
2108 glTranslate 0, -$self->{w}, 0;
2109
2110 ($w, $h) = ($h, $w);
2111 } 2314 }
2112 2315
2113 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2316 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2114 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2317 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2115 2318
2116 my ($value, $lo, $hi, $page) = @{$self->{range}};
2117
2118 $hi = $value + 1 if $lo == $hi;
2119
2120 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2121 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2122
2123 $page = int $page * $inner_w / ($hi - $lo);
2124 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2125
2126 $w -= $page;
2127 $page &= ~1;
2128 glTranslate $page * 0.5, 0, 0;
2129 $page ||= 2;
2130
2131 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2132 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2133
2134 glEnable GL_BLEND;
2135 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2136 glEnable GL_TEXTURE_2D; 2319 glEnable GL_TEXTURE_2D;
2137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2138 2321
2139 # draw background 2322 # draw background
2140 $tex[1]->draw_quad (0, 0, $w, $h); 2323 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2141 2324
2142 # draw handle 2325 # draw handle
2143 $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);
2144 2327
2145 glDisable GL_BLEND;
2146 glDisable GL_TEXTURE_2D; 2328 glDisable GL_TEXTURE_2D;
2147} 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 (@_) }
2148 2371
2149############################################################################# 2372#############################################################################
2150 2373
2151package CFClient::UI::TextView; 2374package CFClient::UI::TextView;
2152 2375
… …
2161 fontsize => 1, 2384 fontsize => 1,
2162 can_events => 0, 2385 can_events => 0,
2163 #font => default_font 2386 #font => default_font
2164 @_, 2387 @_,
2165 2388
2166 layout => (new CFClient::Layout), 2389 layout => (new CFClient::Layout 1),
2167 par => [], 2390 par => [],
2168 height => 0, 2391 height => 0,
2169 children => [ 2392 children => [
2170 (new CFClient::UI::Empty expand => 1), 2393 (new CFClient::UI::Empty expand => 1),
2171 (new CFClient::UI::Slider vertical => 1), 2394 (new CFClient::UI::Slider vertical => 1),
… …
2182 2405
2183 $self->{fontsize} = $fontsize; 2406 $self->{fontsize} = $fontsize;
2184 $self->reflow; 2407 $self->reflow;
2185} 2408}
2186 2409
2187sub text_height {
2188 my ($self, $text) = @_;
2189
2190 my $layout = $self->{layout};
2191
2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2193 $layout->set_width ($self->{children}[0]{w});
2194 $layout->set_text ($text);
2195
2196 ($layout->size)[1]
2197}
2198
2199sub reflow {
2200 my ($self) = @_;
2201
2202 $self->{need_reflow}++;
2203 $self->update;
2204}
2205
2206sub size_allocate { 2410sub size_allocate {
2207 my ($self, $w, $h) = @_; 2411 my ($self, $w, $h) = @_;
2208 2412
2209 $self->SUPER::size_allocate ($w, $h); 2413 $self->SUPER::size_allocate ($w, $h);
2210 2414
… …
2213 $self->{layout}->set_width ($self->{children}[0]{w}); 2417 $self->{layout}->set_width ($self->{children}[0]{w});
2214 2418
2215 $self->reflow; 2419 $self->reflow;
2216} 2420}
2217 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
2218sub add_paragraph { 2456sub add_paragraph {
2219 my ($self, $color, $text) = @_; 2457 my ($self, $color, $text, $indent) = @_;
2220 2458
2221 #TODO: intelligently "reformat" paragraph 2459 for my $line (split /\n/, $text) {
2222 2460 my ($w, $h) = $self->text_size ($line);
2223 my $height = $self->text_height ($text);
2224
2225 $self->{height} += $height; 2461 $self->{height} += $h;
2462 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2463 }
2226 2464
2227 push @{$self->{par}}, [$height, $color, $text];
2228
2229 $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]);
2230 $self->{children}[1]->update;
2231} 2466}
2232 2467
2233sub update { 2468sub update {
2234 my ($self) = @_; 2469 my ($self) = @_;
2235 2470
… …
2237 2472
2238 return unless $self->{h} > 0; 2473 return unless $self->{h} > 0;
2239 2474
2240 delete $self->{texture}; 2475 delete $self->{texture};
2241 2476
2242 $ROOT->on_refresh ($self, sub { 2477 $ROOT->on_post_alloc ($self, sub {
2478 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2479
2243 if (delete $self->{need_reflow}) { 2480 if (delete $self->{need_reflow}) {
2244 my $height = 0; 2481 my $height = 0;
2245 2482
2246 $height += $_->[0] = $self->text_height ($_->[2]) 2483 my $layout = $self->{layout};
2484
2485 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2486
2247 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 }
2248 2498
2249 $self->{height} = $height; 2499 $self->{height} = $height;
2250 2500
2251 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2501 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2252 2502
2253 delete $self->{texture}; 2503 delete $self->{texture};
2254 } 2504 }
2255 2505
2256 $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 {
2257 glClearColor 0, 0, 0, 0; 2507 glClearColor 0.5, 0.5, 0.5, 0;
2258 glClear GL_COLOR_BUFFER_BIT; 2508 glClear GL_COLOR_BUFFER_BIT;
2259 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
2260 glEnable GL_BLEND; 2521 glEnable GL_BLEND;
2522 #TODO# not correct in windows where rgba is forced off
2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2523 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2262 glEnable GL_TEXTURE_2D;
2263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2264
2265 my $top = int $self->{children}[1]{range}[0];
2266
2267 my $y0 = $top;
2268 my $y1 = $top + $self->{h};
2269
2270 my $y = 0;
2271
2272 my $layout = $self->{layout};
2273
2274 $layout->set_font ($self->{font}) if $self->{font};
2275 2524
2276 for my $par (@{$self->{par}}) { 2525 for my $par (@{$self->{par}}) {
2277 my $h = $par->[0]; 2526 my $h = $par->[1];
2278 2527
2279 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]);
2280 $layout->set_text ($par->[2]); 2531 $layout->set_markup ($par->[4]);
2281 2532
2282 glColor @{ $par->[1] }; 2533 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2283 my ($W, $H) = $layout->size; 2534
2284 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;
2285 } 2537 }
2286 2538
2287 $y += $h; 2539 $y += $h;
2288 } 2540 }
2289 2541
2290 glDisable GL_TEXTURE_2D;
2291 glDisable GL_BLEND; 2542 glDisable GL_BLEND;
2292 }; 2543 };
2293 }); 2544 });
2294} 2545}
2295 2546
2296sub _draw { 2547sub _draw {
2297 my ($self) = @_; 2548 my ($self) = @_;
2298 2549
2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2301 glEnable GL_TEXTURE_2D; 2550 glEnable GL_TEXTURE_2D;
2302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2551 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303 glColor 1, 1, 1, 1; 2552 glColor 1, 1, 1, 1;
2304 $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});
2305 glDisable GL_TEXTURE_2D; 2554 glDisable GL_TEXTURE_2D;
2306 glDisable GL_BLEND;
2307 2555
2308 $self->{children}[1]->draw; 2556 $self->{children}[1]->draw;
2309 2557
2310} 2558}
2311 2559
… …
2359 2607
2360sub new { 2608sub new {
2361 my $class = shift; 2609 my $class = shift;
2362 2610
2363 my $self = $class->SUPER::new ( 2611 my $self = $class->SUPER::new (
2364 state => 0, 2612 state => 0,
2365 connect_activate => \&toggle_flopper, 2613 on_activate => \&toggle_flopper,
2366 @_ 2614 @_
2367 ); 2615 );
2368 2616
2369 if ($self->{state}) {
2370 $self->{state} = 0;
2371 $self->toggle_flopper;
2372 }
2373
2374 $self 2617 $self
2375} 2618}
2376 2619
2377sub toggle_flopper { 2620sub toggle_flopper {
2378 my ($self) = @_; 2621 my ($self) = @_;
2379 2622
2380 # TODO: use animation 2623 $self->{other}->toggle_visibility;
2381 if ($self->{state} = !$self->{state}) {
2382 $CFClient::UI::ROOT->add ($self->{other});
2383 $self->{other}->move ($self->coord2global (0, $self->{h}));
2384 $self->emit ("open");
2385 } else {
2386 $CFClient::UI::ROOT->remove ($self->{other});
2387 $self->emit ("close");
2388 }
2389
2390 $self->emit (changed => $self->{state});
2391} 2624}
2392 2625
2393############################################################################# 2626#############################################################################
2394 2627
2395package CFClient::UI::Tooltip; 2628package CFClient::UI::Tooltip;
… …
2405 @_, 2638 @_,
2406 can_events => 0, 2639 can_events => 0,
2407 ) 2640 )
2408} 2641}
2409 2642
2410sub set_markup { 2643sub set_tooltip_from {
2411 my ($self, $text) = @_; 2644 my ($self, $widget) = @_;
2412 2645
2413 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2646 my $tooltip = $widget->{tooltip};
2414 $self->{label}->set_markup ($text); 2647
2415 $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 );
2416} 2663}
2417 2664
2418sub size_request { 2665sub size_request {
2419 my ($self) = @_; 2666 my ($self) = @_;
2420
2421 $self->child->set_max_size ($::WIDTH * 0.3);
2422 2667
2423 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2668 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2424 2669
2425 ($w + 4, $h + 4) 2670 ($w + 4, $h + 4)
2426} 2671}
… …
2429 my ($self, $w, $h) = @_; 2674 my ($self, $w, $h) = @_;
2430 2675
2431 $self->SUPER::size_allocate ($w - 4, $h - 4); 2676 $self->SUPER::size_allocate ($w - 4, $h - 4);
2432} 2677}
2433 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
2434sub _draw { 2697sub _draw {
2435 my ($self) = @_; 2698 my ($self) = @_;
2436 2699
2437 glPushMatrix;
2438 glTranslate 0.375, 0.375; 2700 glTranslate 0.375, 0.375;
2439 2701
2440 my ($w, $h) = @$self{qw(w h)}; 2702 my ($w, $h) = @$self{qw(w h)};
2441 2703
2442 glColor 1, 0.8, 0.4; 2704 glColor 1, 0.8, 0.4;
… …
2453 glVertex 0 , $h; 2715 glVertex 0 , $h;
2454 glVertex $w, $h; 2716 glVertex $w, $h;
2455 glVertex $w, 0; 2717 glVertex $w, 0;
2456 glEnd; 2718 glEnd;
2457 2719
2458 glPopMatrix; 2720 glTranslate 2 - 0.375, 2 - 0.375;
2459 2721
2460 glTranslate 2, 2;
2461 $self->SUPER::_draw; 2722 $self->SUPER::_draw;
2462} 2723}
2463 2724
2464############################################################################# 2725#############################################################################
2465 2726
… …
2470use CFClient::OpenGL; 2731use CFClient::OpenGL;
2471 2732
2472sub new { 2733sub new {
2473 my $class = shift; 2734 my $class = shift;
2474 2735
2475 $class->SUPER::new ( 2736 my $self = $class->SUPER::new (
2476 aspect => 1, 2737 aspect => 1,
2738 can_events => 0,
2477 @_, 2739 @_,
2478 ) 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
2479} 2757}
2480 2758
2481sub size_request { 2759sub size_request {
2482 (32, 8) 2760 (32, 8)
2483} 2761}
2484 2762
2763sub update {
2764 my ($self) = @_;
2765
2766 return unless $self->{visible};
2767
2768 $self->SUPER::update;
2769}
2770
2485sub _draw { 2771sub _draw {
2486 my ($self) = @_; 2772 my ($self) = @_;
2487 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
2488 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2785 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2489 2786
2490 # TODO animation
2491 if ($tex) { 2787 if ($tex) {
2492 glEnable GL_BLEND;
2493 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2494 glEnable GL_TEXTURE_2D; 2788 glEnable GL_TEXTURE_2D;
2495 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2496 glColor 1, 1, 1, 1; 2790 glColor 1, 1, 1, 1;
2497 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2791 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2498 glDisable GL_TEXTURE_2D; 2792 glDisable GL_TEXTURE_2D;
2499 glDisable GL_BLEND;
2500 } 2793 }
2794}
2795
2796sub DESTROY {
2797 my ($self) = @_;
2798
2799 $self->{timer}->cancel
2800 if $self->{timer};
2801
2802 $self->SUPER::DESTROY;
2501} 2803}
2502 2804
2503############################################################################# 2805#############################################################################
2504 2806
2505package CFClient::UI::Menu; 2807package CFClient::UI::Menu;
… …
2540 2842
2541# 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)
2542sub popup { 2844sub popup {
2543 my ($self, $ev) = @_; 2845 my ($self, $ev) = @_;
2544 2846
2545 $self->emit ("popdown"); 2847 $self->_emit ("popdown");
2546 2848
2547 # maybe save $GRAB? must be careful about events... 2849 # maybe save $GRAB? must be careful about events...
2548 $GRAB = $self; 2850 $GRAB = $self;
2549 $self->{button} = $ev->{button}; 2851 $self->{button} = $ev->{button};
2550 2852
2551 $self->show; 2853 $self->show;
2552 $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);
2553} 2855}
2554 2856
2555sub mouse_motion { 2857sub mouse_motion {
2556 my ($self, $ev, $x, $y) = @_; 2858 my ($self, $ev, $x, $y) = @_;
2557 2859
… …
2565 2867
2566 if ($ev->{button} == $self->{button}) { 2868 if ($ev->{button} == $self->{button}) {
2567 undef $GRAB; 2869 undef $GRAB;
2568 $self->hide; 2870 $self->hide;
2569 2871
2570 $self->emit ("popdown"); 2872 $self->_emit ("popdown");
2571 $self->{hover}[1]->() if $self->{hover}; 2873 $self->{hover}[1]->() if $self->{hover};
2572 } 2874 }
2573} 2875}
2574 2876
2575############################################################################# 2877#############################################################################
2576 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
2577package CFClient::UI::Root; 3280package CFClient::UI::Root;
2578 3281
2579our @ISA = CFClient::UI::Container::; 3282our @ISA = CFClient::UI::Container::;
2580 3283
2581use CFClient::OpenGL; 3284use CFClient::OpenGL;
2582 3285
2583sub check_size { 3286sub new {
2584 my ($self) = @_; 3287 my $class = shift;
2585 3288
2586 $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
2587} 3297}
2588 3298
2589sub size_request { 3299sub size_request {
2590 ($::WIDTH, $::HEIGHT) 3300 my ($self) = @_;
2591}
2592 3301
2593sub 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 {
2594 my ($self, $x, $y, $w, $h) = @_; 3320 my ($self, $w, $h) = @_;
2595 3321
2596 $self->SUPER::configure ($x, $y, $w, $h);
2597
2598 for my $child (@{$self->{children}}) { 3322 for my $child ($self->children) {
2599 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)};
2600 3324
2601 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3325 $X = $child->{force_x} if exists $child->{force_x};
2602 $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
2603 $child->configure ($X, $Y, $W,$H); 3331 $child->configure ($X, $Y, $W, $H);
2604 } 3332 }
2605} 3333}
2606 3334
2607sub _topleft { 3335sub coord2local {
2608 my ($self, $x, $y) = @_; 3336 my ($self, $x, $y) = @_;
2609 3337
2610 ($x, $y) 3338 ($x, $y)
2611} 3339}
2612 3340
3341sub coord2global {
3342 my ($self, $x, $y) = @_;
3343
3344 ($x, $y)
3345}
3346
2613sub update { 3347sub update {
2614 my ($self) = @_; 3348 my ($self) = @_;
2615 3349
2616 $self->check_size; 3350 $::WANT_REFRESH++;
2617 ::refresh ();
2618} 3351}
2619 3352
2620sub add { 3353sub add {
2621 my ($self, $child) = @_; 3354 my ($self, @children) = @_;
2622 3355
2623 # integerize window positions 3356 $_->{is_toplevel} = 1
2624 $child->{x} = int $child->{x}; 3357 for @children;
2625 $child->{y} = int $child->{y};
2626 3358
2627 $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 }
2628} 3375}
2629 3376
2630sub on_refresh { 3377sub on_refresh {
2631 my ($self, $id, $cb) = @_; 3378 my ($self, $id, $cb) = @_;
2632 3379
2633 $self->{refresh_hook}{$id} = $cb; 3380 $self->{refresh_hook}{$id} = $cb;
2634} 3381}
2635 3382
3383sub on_post_alloc {
3384 my ($self, $id, $cb) = @_;
3385
3386 $self->{post_alloc_hook}{$id} = $cb;
3387}
3388
2636sub draw { 3389sub draw {
2637 my ($self) = @_; 3390 my ($self) = @_;
2638 3391
2639 while (my $rcb = delete $self->{refresh_hook}) { 3392 while ($self->{refresh_hook}) {
2640 $_->() for values %$rcb; 3393 $_->()
3394 for values %{delete $self->{refresh_hook}};
2641 } 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
2642 3485
2643 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3486 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2644 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3487 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2645 glClear GL_COLOR_BUFFER_BIT; 3488 glClear GL_COLOR_BUFFER_BIT;
2646 3489
2647 glMatrixMode GL_PROJECTION; 3490 glMatrixMode GL_PROJECTION;
2648 glLoadIdentity; 3491 glLoadIdentity;
2649 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3492 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2650 glMatrixMode GL_MODELVIEW; 3493 glMatrixMode GL_MODELVIEW;
2651 glLoadIdentity; 3494 glLoadIdentity;
2652 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
2653 $self->_draw; 3503 $self->_draw;
2654} 3504}
2655 3505
2656############################################################################# 3506#############################################################################
2657 3507
2658package CFClient::UI::InventoryItem;
2659
2660our @ISA = CFClient::UI::HBox::;
2661
2662sub new {
2663 my $class = shift;
2664
2665 my %args = @_;
2666
2667 my $item = $args{item};
2668
2669 my $desc = $item->{nrof} < 2
2670 ? $item->{name}
2671 : "$item->{nrof} $item->{name_pl}";
2672
2673
2674 my $self = $class->SUPER::new (
2675 can_hover => 1,
2676 can_events => 1,
2677 tooltip => (CFClient::UI::Label->escape ($desc)
2678 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2679 connect_button_down => sub {
2680 my ($self, $ev, $x, $y) = @_;
2681
2682 # todo: maybe put examine on 1? but should just be a tooltip :(
2683 if ($ev->{button} == 1) {
2684 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2685 } elsif ($ev->{button} == 2) {
2686 $::CONN->send ("apply $item->{tag}");
2687 } elsif ($ev->{button} == 3) {
2688 CFClient::UI::Menu->new (
2689 items => [
2690 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2691 [
2692 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2693 sub { $::CONN->send ("lock $item->{tag}") },
2694 ],
2695 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2696 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2697 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2698 ],
2699 )->popup ($ev);
2700 }
2701
2702 1
2703 },
2704 %args
2705 );
2706 $self->add(new CFClient::UI::Face
2707 can_events => 0,
2708 face => $item->{face},
2709 anim => $item->{anim},
2710 animspeed => $item->{animspeed});
2711 $self->add(new CFClient::UI::Label
2712 can_events => 0,
2713 text => $desc);
2714
2715 $self
2716}
2717
2718#############################################################################
2719
2720package CFClient::UI::Inventory;
2721
2722our @ISA = CFClient::UI::ScrolledWindow::;
2723
2724sub new {
2725 my $class = shift;
2726
2727 my $self = $class->SUPER::new (
2728 scrolled => (new CFClient::UI::VBox),
2729 @_,
2730 );
2731
2732 $self
2733}
2734
2735sub set_items {
2736 my ($self, $items) = @_;
2737
2738 $self->{scrolled}->clear;
2739 return unless $items;
2740
2741 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2742
2743 $self->{real_items} = \@items;
2744
2745 for my $item (@items) {
2746 my $desc = $item->{nrof} < 2
2747 ? $item->{name}
2748 : "$item->{nrof} $item->{name_pl}";
2749
2750 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2751 }
2752
2753# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2754}
2755
2756sub size_request {
2757 my ($self) = @_;
2758 ($self->{req_w}, $self->{req_h});
2759}
2760
2761#############################################################################
2762
2763package CFClient::UI; 3508package CFClient::UI;
2764 3509
2765$ROOT = new CFClient::UI::Root; 3510$ROOT = new CFClient::UI::Root;
2766$TOOLTIP = new CFClient::UI::Tooltip; 3511$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2767 3512
27681 35131
2769 3514

Diff Legend

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