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.183 by elmex, Sun Apr 30 13:10:46 2006 UTC vs.
Revision 1.269 by root, Fri Jun 2 06:22:55 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
905# hmm, this does not work for topleft of $self... but we should not ask for that
906sub coord2local {
907 my ($self, $x, $y) = @_;
908
909 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
910}
911
912sub coord2global {
913 my ($self, $x, $y) = @_;
914
915 $x = List::Util::min $self->{w}, $x - $self->{view_x};
916 $y = List::Util::min $self->{h}, $y - $self->{view_y};
917
918 $self->SUPER::coord2global ($x, $y)
919}
920
921sub find_widget {
922 my ($self, $x, $y) = @_;
923
924 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
925 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
926 ) {
927 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
928 } else {
929 $self->CFClient::UI::Base::find_widget ($x, $y)
930 }
931}
932
744sub _render { 933sub _render {
745 my ($self) = @_; 934 my ($self) = @_;
935
936 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
937 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
746 938
747 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 939 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
748 940
749 $self->SUPER::_render; 941 $self->SUPER::_render;
750} 942}
… …
759 my $class = shift; 951 my $class = shift;
760 952
761 my $self; 953 my $self;
762 954
763 my $slider = new CFClient::UI::Slider 955 my $slider = new CFClient::UI::Slider
764 vertical => 1, 956 vertical => 1,
765 range => [0, 0, 1, 0.01], # HACK fix 957 range => [0, 0, 1, 0.01], # HACK fix
766 connect_changed => sub { 958 on_changed => sub {
767 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 959 $self->{vp}->set_offset (0, $_[1]);
768 }, 960 },
769 ; 961 ;
770 962
771 $self = $class->SUPER::new ( 963 $self = $class->SUPER::new (
772 vp => (new CFClient::UI::ViewPort), 964 vp => (new CFClient::UI::ViewPort expand => 1),
773 slider => $slider, 965 slider => $slider,
774 @_, 966 @_,
775 ); 967 );
776 968
777 $self->{vp}->add ($self->{scrolled}); 969 $self->{vp}->add ($self->{scrolled});
… …
779 $self->add ($self->{slider}); 971 $self->add ($self->{slider});
780 972
781 $self 973 $self
782} 974}
783 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
784#TODO# update range on size_allocate depeneing on child 995#TODO# update range on size_allocate depending on child
785# update viewport offset on scroll 996# update viewport offset on scroll
786 997
787############################################################################# 998#############################################################################
788 999
789package CFClient::UI::Frame; 1000package CFClient::UI::Frame;
… …
793use CFClient::OpenGL; 1004use CFClient::OpenGL;
794 1005
795sub new { 1006sub new {
796 my $class = shift; 1007 my $class = shift;
797 1008
1009 $class->SUPER::new (
1010 bg => undef,
1011 @_,
1012 )
1013}
1014
1015sub _draw {
1016 my ($self) = @_;
1017
1018 if ($self->{bg}) {
1019 my ($w, $h) = @$self{qw(w h)};
1020
1021 glEnable GL_BLEND;
1022 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1023 glColor @{ $self->{bg} };
1024
1025 glBegin GL_QUADS;
1026 glVertex 0 , 0;
1027 glVertex 0 , $h;
1028 glVertex $w, $h;
1029 glVertex $w, 0;
1030 glEnd;
1031
1032 glDisable GL_BLEND;
1033 }
1034
1035 $self->SUPER::_draw;
1036}
1037
1038#############################################################################
1039
1040package CFClient::UI::FancyFrame;
1041
1042our @ISA = CFClient::UI::Bin::;
1043
1044use CFClient::OpenGL;
1045
1046my $bg =
1047 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1048 mipmap => 1, wrap => 1;
1049
1050my @border =
1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1053
1054sub new {
1055 my ($class, %arg) = @_;
1056
1057 my $title = delete $arg{title};
1058
798 my $self = $class->SUPER::new ( 1059 my $self = $class->SUPER::new (
799 bg => [1, 1, 1, 1], 1060 bg => [1, 1, 1, 1],
800 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
801 border => 0.8, 1062 border => 0.6,
802 @_ 1063 can_events => 1,
1064 min_w => 16,
1065 min_h => 16,
1066 %arg,
803 ); 1067 );
804 1068
805 $self
806}
807
808sub _draw {
809 my ($self) = @_;
810
811 my ($w, $h) = ($self->{w}, $self->{h});
812
813 glEnable GL_BLEND;
814 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
815 glEnable GL_TEXTURE_2D;
816 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
817
818# glBegin GL_QUADS;
819# glColor 0, 0, 0, 0;
820# glVertex 0 , 0;
821# glVertex 0 , $h;
822# glVertex $w, $h;
823# glVertex $w, 0;
824# glEnd;
825
826
827 $self->child->draw;
828 glDisable GL_BLEND;
829 glDisable GL_TEXTURE_2D;
830}
831
832#############################################################################
833
834package CFClient::UI::FancyFrame;
835
836our @ISA = CFClient::UI::Bin::;
837
838use CFClient::OpenGL;
839
840my @tex =
841 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
842 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
843
844sub new {
845 my $class = shift;
846
847 # TODO: user_x, user_y, overwrite moveto?
848
849 my $self = $class->SUPER::new (
850 bg => [1, 1, 1, 1],
851 border_bg => [1, 1, 1, 1],
852 border => 0.6,
853 can_events => 1,
854 @_
855 );
856
857 $self->{title} &&= new CFClient::UI::Label 1069 $self->{title} = new CFClient::UI::Label
858 align => 0, 1070 align => 0,
859 valign => 1, 1071 valign => 1,
860 text => $self->{title}, 1072 text => $title,
861 fontsize => $self->{border}; 1073 fontsize => $self->{border}
1074 if defined $title;
862 1075
863 $self 1076 $self
1077}
1078
1079sub add {
1080 my ($self, @widgets) = @_;
1081
1082 $self->SUPER::add (@widgets);
1083 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
864} 1084}
865 1085
866sub border { 1086sub border {
867 int $_[0]{border} * $::FONTSIZE 1087 int $_[0]{border} * $::FONTSIZE
868} 1088}
869 1089
870sub size_request { 1090sub size_request {
871 my ($self) = @_; 1091 my ($self) = @_;
1092
1093 $self->{title}->size_request
1094 if $self->{title};
872 1095
873 my ($w, $h) = $self->SUPER::size_request; 1096 my ($w, $h) = $self->SUPER::size_request;
874 1097
875 ( 1098 (
876 $w + $self->border * 2, 1099 $w + $self->border * 2,
… …
879} 1102}
880 1103
881sub size_allocate { 1104sub size_allocate {
882 my ($self, $w, $h) = @_; 1105 my ($self, $w, $h) = @_;
883 1106
1107 if ($self->{title}) {
1108 $self->{title}{w} = $w;
1109 $self->{title}{h} = $h;
1110 $self->{title}->size_allocate ($w, $h);
1111 }
1112
1113 my $border = $self->border;
1114
884 $h -= List::Util::max 0, $self->border * 2; 1115 $h -= List::Util::max 0, $border * 2;
885 $w -= List::Util::max 0, $self->border * 2; 1116 $w -= List::Util::max 0, $border * 2;
886 1117
887 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
888 if $self->{title};
889
890 $self->child->configure ($self->border, $self->border, $w, $h); 1118 $self->child->configure ($border, $border, $w, $h);
891} 1119}
892 1120
893sub button_down { 1121sub button_down {
894 my ($self, $ev, $x, $y) = @_; 1122 my ($self, $ev, $x, $y) = @_;
895 1123
… …
911 my ($ev, $x, $y) = @_; 1139 my ($ev, $x, $y) = @_;
912 1140
913 my $dx = $ev->{x} - $ox; 1141 my $dx = $ev->{x} - $ox;
914 my $dy = $ev->{y} - $oy; 1142 my $dy = $ev->{y} - $oy;
915 1143
916 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
917 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146
1147 $self->realloc;
918 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
919 $self->check_size;
920 }; 1149 };
921 1150
922 } elsif ($lr ^ $td) { 1151 } elsif ($lr ^ $td) {
923 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1152 my ($ox, $oy) = ($ev->{x}, $ev->{y});
924 my ($bx, $by) = ($self->{x}, $self->{y}); 1153 my ($bx, $by) = ($self->{x}, $self->{y});
… …
926 $self->{motion} = sub { 1155 $self->{motion} = sub {
927 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
928 1157
929 ($x, $y) = ($ev->{x}, $ev->{y}); 1158 ($x, $y) = ($ev->{x}, $ev->{y});
930 1159
931 $self->move ($bx + $x - $ox, $by + $y - $oy); 1160 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
932 $self->update;
933 }; 1161 };
934 } 1162 }
935} 1163}
936 1164
937sub button_up { 1165sub button_up {
… …
947} 1175}
948 1176
949sub _draw { 1177sub _draw {
950 my ($self) = @_; 1178 my ($self) = @_;
951 1179
1180 my $child = $self->{children}[0];
1181
952 my ($w, $h ) = ($self->{w}, $self->{h}); 1182 my ($w, $h ) = ($self->{w}, $self->{h});
953 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1183 my ($cw, $ch) = ($child->{w}, $child->{h});
954 1184
955 glEnable GL_BLEND;
956 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
957 glEnable GL_TEXTURE_2D; 1185 glEnable GL_TEXTURE_2D;
958 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1186 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
959 1187
960 my $border = $self->border; 1188 my $border = $self->border;
961 1189
962 glColor @{ $self->{border_bg} }; 1190 glColor @{ $self->{border_bg} };
963 $tex[1]->draw_quad (0, 0, $w, $border); 1191 $border[0]->draw_quad_alpha (0, 0, $w, $border);
964 $tex[3]->draw_quad (0, $border, $border, $ch); 1192 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
965 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1193 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
966 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1194 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
967 1195
968 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1196 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
969 my $bg = $tex[0]; 1197 glColor @{ $self->{bg} };
970 1198
971 # TODO: repeat texture not scale 1199 # TODO: repeat texture not scale
1200 # solve this better(?)
972 my $rep_x = $cw / $bg->{w}; 1201 $bg->{s} = $cw / $bg->{w};
973 my $rep_y = $ch / $bg->{h}; 1202 $bg->{t} = $ch / $bg->{h};
974
975 glColor @{ $self->{bg} };
976
977 $bg->{s} = $rep_x;
978 $bg->{t} = $rep_y;
979 $bg->{wrap_mode} = 1;
980 $bg->draw_quad ($border, $border, $cw, $ch); 1203 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1204 }
981 1205
982 glDisable GL_TEXTURE_2D; 1206 glDisable GL_TEXTURE_2D;
983 glDisable GL_BLEND;
984 }
985 1207
986 $self->{title}->draw if $self->{title};
987
988 $self->child->draw; 1208 $child->draw;
1209
1210 if ($self->{title}) {
1211 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw;
1213 }
989} 1214}
990 1215
991############################################################################# 1216#############################################################################
992 1217
993package CFClient::UI::Table; 1218package CFClient::UI::Table;
… …
1001sub new { 1226sub new {
1002 my $class = shift; 1227 my $class = shift;
1003 1228
1004 $class->SUPER::new ( 1229 $class->SUPER::new (
1005 col_expand => [], 1230 col_expand => [],
1006 @_ 1231 @_,
1007 ) 1232 )
1233}
1234
1235sub children {
1236 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1008} 1237}
1009 1238
1010sub add { 1239sub add {
1011 my ($self, $x, $y, $child) = @_; 1240 my ($self, $x, $y, $child) = @_;
1012 1241
1013 $child->set_parent ($self); 1242 $child->set_parent ($self);
1014 $self->{children}[$y][$x] = $child; 1243 $self->{children}[$y][$x] = $child;
1015 1244
1016 $child->check_size; 1245 $self->realloc;
1017} 1246}
1018 1247
1019sub children {
1020 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1021}
1022
1023# TODO: move to container class maybe? send childs a signal on removal? 1248# TODO: move to container class maybe? send children a signal on removal?
1024sub clear { 1249sub clear {
1025 my ($self) = @_; 1250 my ($self) = @_;
1026 1251
1027 my @children = $self->children; 1252 my @children = $self->children;
1028 delete $self->{children}; 1253 delete $self->{children};
… …
1030 for (@children) { 1255 for (@children) {
1031 delete $_->{parent}; 1256 delete $_->{parent};
1032 $_->hide; 1257 $_->hide;
1033 } 1258 }
1034 1259
1035 $self->update; 1260 $self->realloc;
1036} 1261}
1037 1262
1038sub get_wh { 1263sub get_wh {
1039 my ($self) = @_; 1264 my ($self) = @_;
1040 1265
… …
1071sub size_allocate { 1296sub size_allocate {
1072 my ($self, $w, $h) = @_; 1297 my ($self, $w, $h) = @_;
1073 1298
1074 my ($ws, $hs) = $self->get_wh; 1299 my ($ws, $hs) = $self->get_wh;
1075 1300
1076 my $req_w = sum @$ws; 1301 my $req_w = (sum @$ws) || 1;
1077 my $req_h = sum @$hs; 1302 my $req_h = (sum @$hs) || 1;
1078 1303
1079 # TODO: nicer code && do row_expand 1304 # TODO: nicer code && do row_expand
1080 my @col_expand = @{$self->{col_expand}}; 1305 my @col_expand = @{$self->{col_expand}};
1081 @col_expand = (1) x @$ws unless @col_expand; 1306 @col_expand = (1) x @$ws unless @col_expand;
1082 my $col_expand = (sum @col_expand) || 1; 1307 my $col_expand = (sum @col_expand) || 1;
… …
1136 } 1361 }
1137} 1362}
1138 1363
1139############################################################################# 1364#############################################################################
1140 1365
1141package CFClient::UI::HBox; 1366package CFClient::UI::Box;
1142
1143# TODO: wrap into common Box base class
1144 1367
1145our @ISA = CFClient::UI::Container::; 1368our @ISA = CFClient::UI::Container::;
1146 1369
1147sub size_request { 1370sub size_request {
1148 my ($self) = @_; 1371 my ($self) = @_;
1149 1372
1150 my @alloc = map [$_->size_request], @{$self->{children}}; 1373 $self->{vertical}
1151 1374 ? (
1152 ( 1375 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1153 (List::Util::sum map $_->[0], @alloc), 1376 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1154 (List::Util::max map $_->[1], @alloc), 1377 )
1155 ) 1378 : (
1379 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1380 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1381 )
1156} 1382}
1157 1383
1158sub size_allocate { 1384sub size_allocate {
1159 my ($self, $w, $h) = @_; 1385 my ($self, $w, $h) = @_;
1160 1386
1161 ($h, $w) = ($w, $h); 1387 my $space = $self->{vertical} ? $h : $w;
1162
1163 my $children = $self->{children}; 1388 my $children = $self->{children};
1164 1389
1165 my @h = map $_->{req_w}, @$children; 1390 my @req;
1166 1391
1167 my $req_h = List::Util::sum @h; 1392 if ($self->{homogeneous}) {
1168 1393 @req = ($space / (@$children || 1)) x @$children;
1169 if ($req_h > $h) {
1170 # ah well, not enough space
1171 $_ *= $h / $req_h for @h;
1172 } else { 1394 } else {
1395 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1396 my $req = List::Util::sum @req;
1397
1398 if ($req > $space) {
1399 # ah well, not enough space
1400 $_ *= $space / $req for @req;
1401 } else {
1173 my $exp = List::Util::sum map $_->{expand}, @$children; 1402 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1174 $exp ||= 1;
1175 1403
1404 $space = ($space - $req) / $expand; # remaining space to give away
1405
1406 $req[$_] += $space * $children->[$_]{expand}
1176 for (0 .. $#$children) { 1407 for 0 .. $#$children;
1177 my $child = $children->[$_];
1178
1179 my $alloc_h = $h[$_];
1180 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1181 $h[$_] = $alloc_h;
1182 } 1408 }
1183 } 1409 }
1184 1410
1185 CFClient::UI::harmonize \@h; 1411 CFClient::UI::harmonize \@req;
1186 1412
1187 my $y = 0; 1413 my $pos = 0;
1188 for (0 .. $#$children) { 1414 for (0 .. $#$children) {
1189 my $child = $children->[$_];
1190 my $h = $h[$_]; 1415 my $alloc = $req[$_];
1191 $child->configure ($y, 0, $h, $w); 1416 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1192 1417
1193 $y += $h; 1418 $pos += $alloc;
1194 } 1419 }
1195 1420
1196 1 1421 1
1197} 1422}
1198 1423
1199############################################################################# 1424#############################################################################
1200 1425
1426package CFClient::UI::HBox;
1427
1428our @ISA = CFClient::UI::Box::;
1429
1430sub new {
1431 my $class = shift;
1432
1433 $class->SUPER::new (
1434 vertical => 0,
1435 @_,
1436 )
1437}
1438
1439#############################################################################
1440
1201package CFClient::UI::VBox; 1441package CFClient::UI::VBox;
1202 1442
1203# TODO: wrap into common Box base class
1204
1205our @ISA = CFClient::UI::Container::; 1443our @ISA = CFClient::UI::Box::;
1206 1444
1207sub size_request { 1445sub new {
1208 my ($self) = @_; 1446 my $class = shift;
1209 1447
1210 my @alloc = map [$_->size_request], @{$self->{children}}; 1448 $class->SUPER::new (
1211 1449 vertical => 1,
1212 ( 1450 @_,
1213 (List::Util::max map $_->[0], @alloc),
1214 (List::Util::sum map $_->[1], @alloc),
1215 ) 1451 )
1216} 1452}
1217 1453
1218sub size_allocate {
1219 my ($self, $w, $h) = @_;
1220
1221 my $children = $self->{children};
1222
1223 my @h = map $_->{req_h}, @$children;
1224
1225 my $req_h = List::Util::sum @h;
1226
1227 if ($req_h > $h) {
1228 # ah well, not enough space
1229 $_ *= $h / $req_h for @h;
1230 } else {
1231 my $exp = List::Util::sum map $_->{expand}, @$children;
1232 $exp ||= 1;
1233
1234 for (0 .. $#$children) {
1235 my $child = $children->[$_];
1236
1237 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1238 }
1239 }
1240
1241 CFClient::UI::harmonize \@h;
1242
1243 my $y = 0;
1244 for (0 .. $#$children) {
1245 my $child = $children->[$_];
1246 my $h = $h[$_];
1247 $child->configure (0, $y, $w, $h);
1248
1249 $y += $h;
1250 }
1251
1252 1
1253}
1254
1255############################################################################# 1454#############################################################################
1256 1455
1257package CFClient::UI::Label; 1456package CFClient::UI::Label;
1258 1457
1259our @ISA = CFClient::UI::Base::; 1458our @ISA = CFClient::UI::DrawBG::;
1260 1459
1261use CFClient::OpenGL; 1460use CFClient::OpenGL;
1262 1461
1263sub new { 1462sub new {
1264 my ($class, %arg) = @_; 1463 my ($class, %arg) = @_;
1265 1464
1266 my $self = $class->SUPER::new ( 1465 my $self = $class->SUPER::new (
1267 fg => [1, 1, 1], 1466 fg => [1, 1, 1],
1467 #bg => none
1468 #active_bg => none
1268 #font => default_font 1469 #font => default_font
1470 #text => initial text
1471 #markup => initial narkup
1472 #max_w => maximum pixel width
1473 ellipsise => 3, # end
1474 layout => (new CFClient::Layout),
1269 fontsize => 1, 1475 fontsize => 1,
1270 text => "",
1271 align => -1, 1476 align => -1,
1272 valign => -1, 1477 valign => -1,
1273 padding => 2, 1478 padding_x => 2,
1274 layout => new CFClient::Layout, 1479 padding_y => 2,
1275 can_events => 0, 1480 can_events => 0,
1276 %arg 1481 %arg
1277 ); 1482 );
1278 1483
1279 if (exists $self->{template}) { 1484 if (exists $self->{template}) {
1280 my $layout = new CFClient::Layout; 1485 my $layout = new CFClient::Layout;
1281 $layout->set_text (delete $self->{template}); 1486 $layout->set_text (delete $self->{template});
1282 $self->{template} = $layout; 1487 $self->{template} = $layout;
1283 } 1488 }
1284 1489
1285 $self->set_text (delete $self->{text}) if exists $self->{text}; 1490 if (exists $self->{markup}) {
1286 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1491 $self->set_markup (delete $self->{markup});
1492 } else {
1493 $self->set_text (delete $self->{text});
1494 }
1287 1495
1288 $self 1496 $self
1289} 1497}
1290 1498
1291sub escape { 1499sub escape($) {
1292 local $_ = $_[1]; 1500 local $_ = $_[0];
1293 1501
1294 s/&/&amp;/g; 1502 s/&/&amp;/g;
1295 s/>/&gt;/g; 1503 s/>/&gt;/g;
1296 s/</&lt;/g; 1504 s/</&lt;/g;
1297 1505
1298 $_[1] 1506 $_
1299} 1507}
1300 1508
1301sub update { 1509sub update {
1302 my ($self) = @_; 1510 my ($self) = @_;
1303 1511
1304 delete $self->{texture}; 1512 delete $self->{texture};
1305 $self->SUPER::update; 1513 $self->SUPER::update;
1306} 1514}
1307 1515
1308sub reconfigure {
1309 my ($self) = @_;
1310
1311 delete $self->{texture};
1312}
1313
1314sub set_text { 1516sub set_text {
1315 my ($self, $text) = @_; 1517 my ($self, $text) = @_;
1316 1518
1317 return if $self->{text} eq "T$text"; 1519 return if $self->{text} eq "T$text";
1318 $self->{text} = "T$text"; 1520 $self->{text} = "T$text";
1319 1521
1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1320 $self->{layout}->set_text ($text); 1523 $self->{layout}->set_text ($text);
1321 1524
1322 delete $self->{texture}; 1525 $self->realloc;
1323 $self->update; 1526 $self->update;
1324 $self->check_size;
1325} 1527}
1326 1528
1327sub set_markup { 1529sub set_markup {
1328 my ($self, $markup) = @_; 1530 my ($self, $markup) = @_;
1329 1531
1330 return if $self->{text} eq "M$markup"; 1532 return if $self->{text} eq "M$markup";
1331 $self->{text} = "M$markup"; 1533 $self->{text} = "M$markup";
1332 1534
1535 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1536
1537 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1333 $self->{layout}->set_markup ($markup); 1538 $self->{layout}->set_markup ($markup);
1334 1539
1335 delete $self->{texture}; 1540 $self->realloc;
1336 $self->update; 1541 $self->update;
1337 $self->check_size;
1338} 1542}
1339 1543
1340sub size_request { 1544sub size_request {
1341 my ($self) = @_; 1545 my ($self) = @_;
1342 1546
1343 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1547 $self->{layout}->set_font ($self->{font}) if $self->{font};
1344 $self->{layout}->set_width ($self->{max_w} || -1); 1548 $self->{layout}->set_width ($self->{max_w} || -1);
1549 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1345 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1346 1552
1347 my ($w, $h) = $self->{layout}->size; 1553 my ($w, $h) = $self->{layout}->size;
1348 1554
1349 if (exists $self->{template}) { 1555 if (exists $self->{template}) {
… …
1354 1560
1355 $w = List::Util::max $w, $w2; 1561 $w = List::Util::max $w, $w2;
1356 $h = List::Util::max $h, $h2; 1562 $h = List::Util::max $h, $h2;
1357 } 1563 }
1358 1564
1359 ( 1565 ($w, $h)
1360 $w + $self->{padding} * 2,
1361 $h + $self->{padding} * 2,
1362 )
1363} 1566}
1364 1567
1365sub size_allocate { 1568sub size_allocate {
1366 my ($self, $w, $h) = @_; 1569 my ($self, $w, $h) = @_;
1367 1570
1571 delete $self->{ox};
1572
1368 delete $self->{texture}; 1573 delete $self->{texture}
1574 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1369} 1575}
1370 1576
1371sub set_fontsize { 1577sub set_fontsize {
1372 my ($self, $fontsize) = @_; 1578 my ($self, $fontsize) = @_;
1373 1579
1374 $self->{fontsize} = $fontsize; 1580 $self->{fontsize} = $fontsize;
1375 delete $self->{texture}; 1581 delete $self->{texture};
1376 $self->check_size; 1582
1377 $self->update; 1583 $self->realloc;
1378} 1584}
1379 1585
1380sub _draw { 1586sub _draw {
1381 my ($self) = @_; 1587 my ($self) = @_;
1382 1588
1589 $self->SUPER::_draw; # draw background, if applicable
1590
1383 my $tex = $self->{texture} ||= do { 1591 my $tex = $self->{texture} ||= do {
1592 $self->{layout}->set_foreground (@{$self->{fg}});
1384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1593 $self->{layout}->set_font ($self->{font}) if $self->{font};
1385 $self->{layout}->set_width ($self->{w}); 1594 $self->{layout}->set_width ($self->{w});
1595 $self->{layout}->set_ellipsise ($self->{ellipsise});
1596 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1386 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1598
1387 new_from_layout CFClient::Texture $self->{layout} 1599 new_from_layout CFClient::Texture $self->{layout}
1388 }; 1600 };
1389 1601
1390 glEnable GL_BLEND; 1602 unless (exists $self->{ox}) {
1391 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1603 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1604 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1605 : ($self->{w} - $tex->{w}) * 0.5);
1606
1607 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1608 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1609 : ($self->{h} - $tex->{h}) * 0.5);
1610 };
1611
1392 glEnable GL_TEXTURE_2D; 1612 glEnable GL_TEXTURE_2D;
1393 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1394 1614
1615 if ($tex->{format} == GL_ALPHA) {
1395 glColor @{$self->{fg}}; 1616 glColor @{$self->{fg}};
1396
1397 $self->{ox} = int (
1398 $self->{align} < 0 ? $self->{padding}
1399 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1400 : ($self->{w} - $tex->{w}) * 0.5
1401 );
1402
1403 $self->{oy} = int (
1404 $self->{valign} < 0 ? $self->{padding}
1405 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1406 : ($self->{h} - $tex->{h}) * 0.5
1407 );
1408
1409 $tex->draw_quad ($self->{ox}, $self->{oy}); 1617 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1618 } else {
1619 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1620 }
1410 1621
1411 glDisable GL_TEXTURE_2D; 1622 glDisable GL_TEXTURE_2D;
1412 glDisable GL_BLEND;
1413} 1623}
1414 1624
1415############################################################################# 1625#############################################################################
1416 1626
1417package CFClient::UI::EntryBase; 1627package CFClient::UI::EntryBase;
… …
1430 active_fg => [0, 0, 0], 1640 active_fg => [0, 0, 0],
1431 can_hover => 1, 1641 can_hover => 1,
1432 can_focus => 1, 1642 can_focus => 1,
1433 valign => 0, 1643 valign => 0,
1434 can_events => 1, 1644 can_events => 1,
1645 #text => ...
1435 @_ 1646 @_
1436 ) 1647 )
1437} 1648}
1438 1649
1439sub _set_text { 1650sub _set_text {
… …
1449 $self->{text} = $text; 1660 $self->{text} = $text;
1450 1661
1451 $text =~ s/./*/g if $self->{hidden}; 1662 $text =~ s/./*/g if $self->{hidden};
1452 $self->{layout}->set_text ("$text "); 1663 $self->{layout}->set_text ("$text ");
1453 1664
1454 $self->emit (changed => $self->{text}); 1665 $self->_emit (changed => $self->{text});
1666}
1667
1668sub set_text {
1669 my ($self, $text) = @_;
1670
1671 $self->{cursor} = length $text;
1672 $self->_set_text ($text);
1673
1674 $self->realloc;
1455} 1675}
1456 1676
1457sub get_text { 1677sub get_text {
1458 $_[0]{text} 1678 $_[0]{text}
1459} 1679}
… …
1462 my ($self) = @_; 1682 my ($self) = @_;
1463 1683
1464 my ($w, $h) = $self->SUPER::size_request; 1684 my ($w, $h) = $self->SUPER::size_request;
1465 1685
1466 ($w + 1, $h) # add 1 for cursor 1686 ($w + 1, $h) # add 1 for cursor
1467}
1468
1469sub size_allocate {
1470 my ($self, $w, $h) = @_;
1471
1472 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1473}
1474
1475sub set_text {
1476 my ($self, $text) = @_;
1477
1478 $self->{cursor} = length $text;
1479 $self->_set_text ($text);
1480 $self->update;
1481} 1687}
1482 1688
1483sub key_down { 1689sub key_down {
1484 my ($self, $ev) = @_; 1690 my ($self, $ev) = @_;
1485 1691
… …
1487 my $sym = $ev->{sym}; 1693 my $sym = $ev->{sym};
1488 my $uni = $ev->{unicode}; 1694 my $uni = $ev->{unicode};
1489 1695
1490 my $text = $self->get_text; 1696 my $text = $self->get_text;
1491 1697
1492 if ($sym == 8) { 1698 if ($uni == 8) {
1493 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1699 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1494 } elsif ($sym == 127) { 1700 } elsif ($uni == 127) {
1495 substr $text, $self->{cursor}, 1, ""; 1701 substr $text, $self->{cursor}, 1, "";
1496 } elsif ($sym == CFClient::SDLK_LEFT) { 1702 } elsif ($sym == CFClient::SDLK_LEFT) {
1497 --$self->{cursor} if $self->{cursor}; 1703 --$self->{cursor} if $self->{cursor};
1498 } elsif ($sym == CFClient::SDLK_RIGHT) { 1704 } elsif ($sym == CFClient::SDLK_RIGHT) {
1499 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1705 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1500 } elsif ($sym == CFClient::SDLK_HOME) { 1706 } elsif ($sym == CFClient::SDLK_HOME) {
1501 $self->{cursor} = 0; 1707 $self->{cursor} = 0;
1502 } elsif ($sym == CFClient::SDLK_END) { 1708 } elsif ($sym == CFClient::SDLK_END) {
1503 $self->{cursor} = length $text; 1709 $self->{cursor} = length $text;
1504 } elsif ($sym == 27) { 1710 } elsif ($uni == 27) {
1505 $self->emit ('escape'); 1711 $self->_emit ('escape');
1506 } elsif ($uni) { 1712 } elsif ($uni) {
1507 substr $text, $self->{cursor}++, 0, chr $uni; 1713 substr $text, $self->{cursor}++, 0, chr $uni;
1508 } 1714 }
1509 1715
1510 $self->_set_text ($text); 1716 $self->_set_text ($text);
1511 $self->update; 1717
1718 $self->realloc;
1512} 1719}
1513 1720
1514sub focus_in { 1721sub focus_in {
1515 my ($self) = @_; 1722 my ($self) = @_;
1516 1723
… …
1596 if ($sym == 13) { 1803 if ($sym == 13) {
1597 unshift @{$self->{history}}, 1804 unshift @{$self->{history}},
1598 my $txt = $self->get_text; 1805 my $txt = $self->get_text;
1599 $self->{history_pointer} = -1; 1806 $self->{history_pointer} = -1;
1600 $self->{history_saveback} = ''; 1807 $self->{history_saveback} = '';
1601 $self->emit (activate => $txt); 1808 $self->_emit (activate => $txt);
1602 $self->update; 1809 $self->update;
1603 1810
1604 } elsif ($sym == CFClient::SDLK_UP) { 1811 } elsif ($sym == CFClient::SDLK_UP) {
1605 if ($self->{history_pointer} < 0) { 1812 if ($self->{history_pointer} < 0) {
1606 $self->{history_saveback} = $self->get_text; 1813 $self->{history_saveback} = $self->get_text;
… …
1643 1850
1644sub new { 1851sub new {
1645 my $class = shift; 1852 my $class = shift;
1646 1853
1647 $class->SUPER::new ( 1854 $class->SUPER::new (
1648 padding => 4, 1855 padding_x => 4,
1856 padding_y => 4,
1649 fg => [1, 1, 1], 1857 fg => [1, 1, 1],
1650 bg => [1, 1, 1, 0.2],
1651 active_fg => [0, 0, 1], 1858 active_fg => [0, 0, 1],
1652 can_hover => 1, 1859 can_hover => 1,
1653 align => 0, 1860 align => 0,
1654 valign => 0, 1861 valign => 0,
1655 can_events => 1, 1862 can_events => 1,
1656 @_ 1863 @_
1657 ) 1864 )
1658} 1865}
1659 1866
1867sub activate { }
1868
1660sub button_up { 1869sub button_up {
1661 my ($self, $ev, $x, $y) = @_; 1870 my ($self, $ev, $x, $y) = @_;
1662 1871
1872 $self->emit ("activate")
1663 if ($x >= 0 && $x < $self->{w} 1873 if $x >= 0 && $x < $self->{w}
1664 && $y >= 0 && $y < $self->{h}) { 1874 && $y >= 0 && $y < $self->{h};
1665 $self->emit ("activate");
1666 }
1667} 1875}
1668 1876
1669sub _draw { 1877sub _draw {
1670 my ($self) = @_; 1878 my ($self) = @_;
1671 1879
… …
1673 1881
1674 if ($GRAB == $self) { 1882 if ($GRAB == $self) {
1675 $self->{fg} = $self->{active_fg}; 1883 $self->{fg} = $self->{active_fg};
1676 } 1884 }
1677 1885
1678 glEnable GL_BLEND;
1679 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1680 glEnable GL_TEXTURE_2D; 1886 glEnable GL_TEXTURE_2D;
1681 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1682 glColor 0, 0, 0, 1; 1888 glColor 0, 0, 0, 1;
1683 1889
1684 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1890 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1685 1891
1686 glDisable GL_TEXTURE_2D; 1892 glDisable GL_TEXTURE_2D;
1687 glDisable GL_BLEND;
1688 1893
1689 $self->SUPER::_draw; 1894 $self->SUPER::_draw;
1690} 1895}
1691 1896
1692############################################################################# 1897#############################################################################
… …
1703 1908
1704sub new { 1909sub new {
1705 my $class = shift; 1910 my $class = shift;
1706 1911
1707 $class->SUPER::new ( 1912 $class->SUPER::new (
1708 padding => 2, 1913 padding_x => 2,
1914 padding_y => 2,
1709 fg => [1, 1, 1], 1915 fg => [1, 1, 1],
1710 active_fg => [1, 1, 0], 1916 active_fg => [1, 1, 0],
1917 bg => [0, 0, 0, 0.2],
1918 active_bg => [1, 1, 1, 0.5],
1711 state => 0, 1919 state => 0,
1712 can_hover => 1, 1920 can_hover => 1,
1713 @_ 1921 @_
1714 ) 1922 )
1715} 1923}
1716 1924
1717sub size_request { 1925sub size_request {
1718 my ($self) = @_; 1926 my ($self) = @_;
1719 1927
1720 ($self->{padding} * 2 + 6) x 2 1928 (6) x 2
1721} 1929}
1722 1930
1723sub button_down { 1931sub button_down {
1724 my ($self, $ev, $x, $y) = @_; 1932 my ($self, $ev, $x, $y) = @_;
1725 1933
1726 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1727 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1728 $self->{state} = !$self->{state}; 1936 $self->{state} = !$self->{state};
1729 $self->emit (changed => $self->{state}); 1937 $self->_emit (changed => $self->{state});
1730 } 1938 }
1731} 1939}
1732 1940
1733sub _draw { 1941sub _draw {
1734 my ($self) = @_; 1942 my ($self) = @_;
1735 1943
1736 $self->SUPER::_draw; 1944 $self->SUPER::_draw;
1737 1945
1738 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1946 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1739 1947
1740 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1948 my ($w, $h) = @$self{qw(w h)};
1949
1950 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1741 1951
1742 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1952 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1743 1953
1744 glEnable GL_BLEND; 1954 my $tex = $self->{state} ? $tex[1] : $tex[0];
1955
1745 glEnable GL_TEXTURE_2D; 1956 glEnable GL_TEXTURE_2D;
1746 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1747
1748 my $tex = $self->{state} ? $tex[1] : $tex[0];
1749
1750 $tex->draw_quad (0, 0, $s, $s); 1957 $tex->draw_quad_alpha (0, 0, $s, $s);
1751
1752 glDisable GL_TEXTURE_2D; 1958 glDisable GL_TEXTURE_2D;
1753 glDisable GL_BLEND;
1754} 1959}
1755 1960
1756############################################################################# 1961#############################################################################
1757 1962
1758package CFClient::UI::Image; 1963package CFClient::UI::Image;
… …
1801 glTranslate 0, -$self->{w}, 0; 2006 glTranslate 0, -$self->{w}, 0;
1802 2007
1803 ($w, $h) = ($h, $w); 2008 ($w, $h) = ($h, $w);
1804 } 2009 }
1805 2010
1806 glEnable GL_BLEND;
1807 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1808 glEnable GL_TEXTURE_2D; 2011 glEnable GL_TEXTURE_2D;
1809 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1810 2013
1811 $tex->draw_quad (0, 0, $w, $h); 2014 $tex->draw_quad_alpha (0, 0, $w, $h);
1812 2015
1813 glDisable GL_BLEND;
1814 glDisable GL_TEXTURE_2D; 2016 glDisable GL_TEXTURE_2D;
1815} 2017}
1816 2018
1817############################################################################# 2019#############################################################################
1818 2020
… …
2007 qw(s1_slider.png s1_slider_bg.png); 2209 qw(s1_slider.png s1_slider_bg.png);
2008 2210
2009sub new { 2211sub new {
2010 my $class = shift; 2212 my $class = shift;
2011 2213
2012 # range [value, low, high, page] 2214 # range [value, low, high, page, unit]
2013 2215
2014 # TODO: 0-width page 2216 # TODO: 0-width page
2015 # TODO: req_w/h are wrong with vertical 2217 # TODO: req_w/h are wrong with vertical
2016 # TODO: calculations are off 2218 # TODO: calculations are off
2017 my $self = $class->SUPER::new ( 2219 my $self = $class->SUPER::new (
2018 fg => [1, 1, 1], 2220 fg => [1, 1, 1],
2019 active_fg => [0, 0, 0], 2221 active_fg => [0, 0, 0],
2222 bg => [0, 0, 0, 0.2],
2223 active_bg => [1, 1, 1, 0.5],
2020 range => [0, 0, 100, 10], 2224 range => [0, 0, 100, 10, 0],
2021 req_w => $::WIDTH / 80, 2225 min_w => $::WIDTH / 80,
2022 req_h => $::WIDTH / 80, 2226 min_h => $::WIDTH / 80,
2023 vertical => 0, 2227 vertical => 0,
2024 can_hover => 1, 2228 can_hover => 1,
2025 inner_pad => 5, 2229 inner_pad => 0.02,
2026 @_ 2230 @_
2027 ); 2231 );
2028 2232
2233 $self->set_value ($self->{range}[0]);
2234 $self->update;
2235
2029 $self 2236 $self
2030} 2237}
2031 2238
2239sub changed { }
2240
2241sub set_range {
2242 my ($self, $range) = @_;
2243
2244 ($range, $self->{range}) = ($self->{range}, $range);
2245
2246 $self->update
2247 if "@$range" ne "@{$self->{range}}";
2248}
2249
2250sub set_value {
2251 my ($self, $value) = @_;
2252
2253 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2254
2255 $hi = $lo + 1 if $hi <= $lo;
2256
2257 $page = $hi - $lo if $page > $hi - $lo;
2258
2259 $value = $lo if $value < $lo;
2260 $value = $hi - $page if $value > $hi - $page;
2261
2262 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2263 if $unit;
2264
2265 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2266
2267 if ($value != $old_value) {
2268 $self->_emit (changed => $value);
2269 $self->update;
2270 }
2271}
2272
2032sub size_request { 2273sub size_request {
2033 my ($self) = @_; 2274 my ($self) = @_;
2034 2275
2035 my $w = $self->{req_w}; 2276 ($self->{req_w}, $self->{req_h})
2036 my $h = $self->{req_h};
2037
2038 $self->{vertical} ? ($h, $w) : ($w, $h)
2039} 2277}
2040 2278
2041sub button_down { 2279sub button_down {
2042 my ($self, $ev, $x, $y) = @_; 2280 my ($self, $ev, $x, $y) = @_;
2043 2281
2044 $self->SUPER::button_down ($ev, $x, $y); 2282 $self->SUPER::button_down ($ev, $x, $y);
2283
2284 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285
2045 $self->mouse_motion ($ev, $x, $y); 2286 $self->mouse_motion ($ev, $x, $y);
2046} 2287}
2047 2288
2048sub mouse_motion { 2289sub mouse_motion {
2049 my ($self, $ev, $x, $y) = @_; 2290 my ($self, $ev, $x, $y) = @_;
2050 2291
2051 if ($GRAB == $self) { 2292 if ($GRAB == $self) {
2293 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2294
2295 my (undef, $lo, $hi, $page) = @{$self->{range}};
2296
2297 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298
2299 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2300 }
2301}
2302
2303sub update {
2304 my ($self) = @_;
2305
2306 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2307 $self->set_value ($self->{range}[0]);
2308
2052 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2309 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100;
2053 2311
2054 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2312 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2055 2313
2056 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2314 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2057 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2315 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2058 2316
2059 $x -= $inner_pad_px; # substract the padding 2317 $value = ($value - $lo) / $range;
2060 $x = $x * ($hi - $lo) / $inner_w + $lo; 2318 $value = $value * $self->{scale} + $self->{offset};
2061 $x = $lo if $x < $lo;
2062 $x = $hi - $page if $x > $hi - $page;
2063 $self->{range}[0] = $x;
2064 2319
2065 $self->emit (changed => $x); 2320 $self->{knob_x} = $value - $knob_w * 0.5;
2066 $self->update; 2321 $self->{knob_w} = $knob_w;
2067 } 2322 });
2068}
2069 2323
2070# the inner_* stuff is for generating a padding for the slider handle, 2324 $self->SUPER::update;
2071# so that the handle doesn't leave the texture. This calculation isn't 100%
2072# correct propably, but it does the job for now
2073sub _calc_inner_pad_px {
2074 my ($self, $w) = @_;
2075 ($w / 100) * $self->{inner_pad} # % to pixels
2076} 2325}
2077 2326
2078sub _draw { 2327sub _draw {
2079 my ($self) = @_; 2328 my ($self) = @_;
2080 2329
2081 $self->SUPER::_draw (); 2330 $self->SUPER::_draw ();
2082 2331
2083 my ($w, $h) = @$self{qw(w h)}; 2332 glScale $self->{w}, $self->{h};
2084 2333
2085 if ($self->{vertical}) { 2334 if ($self->{vertical}) {
2086 # draw a vertical slider like a rotated horizontal slider 2335 # draw a vertical slider like a rotated horizontal slider
2087 2336
2337 glTranslate 1, 0, 0;
2088 glRotate 90, 0, 0, 1; 2338 glRotate 90, 0, 0, 1;
2089 glTranslate 0, -$self->{w}, 0;
2090
2091 ($w, $h) = ($h, $w);
2092 } 2339 }
2093 2340
2094 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2341 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2095 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2342 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2096 2343
2097 my ($value, $lo, $hi, $page) = @{$self->{range}};
2098
2099 $hi = $value + 1 if $lo == $hi;
2100
2101 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2102 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2103
2104 $page = int $page * $inner_w / ($hi - $lo);
2105 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2106
2107 $w -= $page;
2108 $page &= ~1;
2109 glTranslate $page * 0.5, 0, 0;
2110 $page ||= 2;
2111
2112 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2113 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2114
2115 glEnable GL_BLEND;
2116 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2117 glEnable GL_TEXTURE_2D; 2344 glEnable GL_TEXTURE_2D;
2118 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2345 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2119 2346
2120 # draw background 2347 # draw background
2121 $tex[1]->draw_quad (0, 0, $w, $h); 2348 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2122 2349
2123 # draw handle 2350 # draw handle
2124 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2351 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2125 2352
2126 glDisable GL_BLEND;
2127 glDisable GL_TEXTURE_2D; 2353 glDisable GL_TEXTURE_2D;
2128} 2354}
2355
2356#############################################################################
2357
2358package CFClient::UI::ValSlider;
2359
2360our @ISA = CFClient::UI::HBox::;
2361
2362sub new {
2363 my ($class, %arg) = @_;
2364
2365 my $range = delete $arg{range};
2366
2367 my $self = $class->SUPER::new (
2368 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2369 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2370 to_value => sub { shift },
2371 from_value => sub { shift },
2372 %arg,
2373 );
2374
2375 $self->{slider}->connect (changed => sub {
2376 my ($self, $value) = @_;
2377 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2378 $self->{parent}->emit (changed => $value);
2379 });
2380
2381# $self->{entry}->connect (changed => sub {
2382# my ($self, $value) = @_;
2383# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2384# $self->{parent}->emit (changed => $value);
2385# });
2386
2387 $self->add ($self->{slider}, $self->{entry});
2388
2389 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2390
2391 $self
2392}
2393
2394sub set_range { shift->{slider}->set_range (@_) }
2395sub set_value { shift->{slider}->set_value (@_) }
2129 2396
2130############################################################################# 2397#############################################################################
2131 2398
2132package CFClient::UI::TextView; 2399package CFClient::UI::TextView;
2133 2400
… …
2142 fontsize => 1, 2409 fontsize => 1,
2143 can_events => 0, 2410 can_events => 0,
2144 #font => default_font 2411 #font => default_font
2145 @_, 2412 @_,
2146 2413
2147 layout => (new CFClient::Layout), 2414 layout => (new CFClient::Layout 1),
2148 par => [], 2415 par => [],
2149 height => 0, 2416 height => 0,
2150 children => [ 2417 children => [
2151 (new CFClient::UI::Empty expand => 1), 2418 (new CFClient::UI::Empty expand => 1),
2152 (new CFClient::UI::Slider vertical => 1), 2419 (new CFClient::UI::Slider vertical => 1),
… …
2163 2430
2164 $self->{fontsize} = $fontsize; 2431 $self->{fontsize} = $fontsize;
2165 $self->reflow; 2432 $self->reflow;
2166} 2433}
2167 2434
2168sub text_height {
2169 my ($self, $text) = @_;
2170
2171 my $layout = $self->{layout};
2172
2173 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2174 $layout->set_width ($self->{children}[0]{w});
2175 $layout->set_text ($text);
2176
2177 ($layout->size)[1]
2178}
2179
2180sub reflow {
2181 my ($self) = @_;
2182
2183 $self->{need_reflow}++;
2184 $self->update;
2185}
2186
2187sub size_allocate { 2435sub size_allocate {
2188 my ($self, $w, $h) = @_; 2436 my ($self, $w, $h) = @_;
2189 2437
2190 $self->SUPER::size_allocate ($w, $h); 2438 $self->SUPER::size_allocate ($w, $h);
2191 2439
… …
2194 $self->{layout}->set_width ($self->{children}[0]{w}); 2442 $self->{layout}->set_width ($self->{children}[0]{w});
2195 2443
2196 $self->reflow; 2444 $self->reflow;
2197} 2445}
2198 2446
2447sub text_size {
2448 my ($self, $text, $indent) = @_;
2449
2450 my $layout = $self->{layout};
2451
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453 $layout->set_width ($self->{children}[0]{w} - $indent);
2454 $layout->set_markup ($text);
2455
2456 $layout->size
2457}
2458
2459sub reflow {
2460 my ($self) = @_;
2461
2462 $self->{need_reflow}++;
2463 $self->update;
2464}
2465
2466sub set_offset {
2467 my ($self, $offset) = @_;
2468
2469 # todo: base offset on lines or so, not on pixels
2470 $self->{children}[1]->set_value ($offset);
2471}
2472
2473sub clear {
2474 my ($self) = @_;
2475
2476 $self->{par} = [];
2477 $self->{height} = 0;
2478 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2479}
2480
2199sub add_paragraph { 2481sub add_paragraph {
2200 my ($self, $color, $text) = @_; 2482 my ($self, $color, $text, $indent) = @_;
2201 2483
2202 #TODO: intelligently "reformat" paragraph 2484 for my $line (split /\n/, $text) {
2203 2485 my ($w, $h) = $self->text_size ($line);
2204 my $height = $self->text_height ($text);
2205
2206 $self->{height} += $height; 2486 $self->{height} += $h;
2487 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2488 }
2207 2489
2208 push @{$self->{par}}, [$height, $color, $text];
2209
2210 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2490 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2211 $self->{children}[1]->update;
2212} 2491}
2213 2492
2214sub update { 2493sub update {
2215 my ($self) = @_; 2494 my ($self) = @_;
2216 2495
… …
2218 2497
2219 return unless $self->{h} > 0; 2498 return unless $self->{h} > 0;
2220 2499
2221 delete $self->{texture}; 2500 delete $self->{texture};
2222 2501
2223 $ROOT->on_refresh ($self, sub { 2502 $ROOT->on_post_alloc ($self, sub {
2503 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504
2224 if (delete $self->{need_reflow}) { 2505 if (delete $self->{need_reflow}) {
2225 my $height = 0; 2506 my $height = 0;
2226 2507
2227 $height += $_->[0] = $self->text_height ($_->[2]) 2508 my $layout = $self->{layout};
2509
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511
2228 for @{$self->{par}}; 2512 for (@{$self->{par}}) {
2513 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2514 $layout->set_width ($W - $_->[3]);
2515 $layout->set_markup ($_->[4]);
2516 my ($w, $h) = $layout->size;
2517 $_->[0] = $w + $_->[3];
2518 $_->[1] = $h;
2519 }
2520
2521 $height += $_->[1];
2522 }
2229 2523
2230 $self->{height} = $height; 2524 $self->{height} = $height;
2231 2525
2232 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2526 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2233 2527
2234 delete $self->{texture}; 2528 delete $self->{texture};
2235 } 2529 }
2236 2530
2237 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2531 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2238 glClearColor 0, 0, 0, 0; 2532 glClearColor 0.5, 0.5, 0.5, 0;
2239 glClear GL_COLOR_BUFFER_BIT; 2533 glClear GL_COLOR_BUFFER_BIT;
2240 2534
2535 my $top = int $self->{children}[1]{range}[0];
2536
2537 my $y0 = $top;
2538 my $y1 = $top + $H;
2539
2540 my $y = 0;
2541
2542 my $layout = $self->{layout};
2543
2544 $layout->set_font ($self->{font}) if $self->{font};
2545
2241 glEnable GL_BLEND; 2546 glEnable GL_BLEND;
2547 #TODO# not correct in windows where rgba is forced off
2242 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2548 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2243 glEnable GL_TEXTURE_2D;
2244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2245
2246 my $top = int $self->{children}[1]{range}[0];
2247
2248 my $y0 = $top;
2249 my $y1 = $top + $self->{h};
2250
2251 my $y = 0;
2252
2253 my $layout = $self->{layout};
2254
2255 $layout->set_font ($self->{font}) if $self->{font};
2256 2549
2257 for my $par (@{$self->{par}}) { 2550 for my $par (@{$self->{par}}) {
2258 my $h = $par->[0]; 2551 my $h = $par->[1];
2259 2552
2260 if ($y0 < $y + $h && $y < $y1) { 2553 if ($y0 < $y + $h && $y < $y1) {
2554 $layout->set_foreground (@{ $par->[2] });
2555 $layout->set_width ($W - $par->[3]);
2261 $layout->set_text ($par->[2]); 2556 $layout->set_markup ($par->[4]);
2262 2557
2263 glColor @{ $par->[1] }; 2558 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264 my ($W, $H) = $layout->size; 2559
2265 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2560 glRasterPos $par->[3], $y - $y0;
2561 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2266 } 2562 }
2267 2563
2268 $y += $h; 2564 $y += $h;
2269 } 2565 }
2270 2566
2271 glDisable GL_TEXTURE_2D;
2272 glDisable GL_BLEND; 2567 glDisable GL_BLEND;
2273 }; 2568 };
2274 }); 2569 });
2275} 2570}
2276 2571
2277sub _draw { 2572sub _draw {
2278 my ($self) = @_; 2573 my ($self) = @_;
2279 2574
2280 glEnable GL_BLEND;
2281 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2282 glEnable GL_TEXTURE_2D; 2575 glEnable GL_TEXTURE_2D;
2283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2576 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2284 glColor 1, 1, 1, 1; 2577 glColor 1, 1, 1, 1;
2285 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2578 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2286 glDisable GL_TEXTURE_2D; 2579 glDisable GL_TEXTURE_2D;
2287 glDisable GL_BLEND;
2288 2580
2289 $self->{children}[1]->draw; 2581 $self->{children}[1]->draw;
2290 2582
2291} 2583}
2292 2584
… …
2340 2632
2341sub new { 2633sub new {
2342 my $class = shift; 2634 my $class = shift;
2343 2635
2344 my $self = $class->SUPER::new ( 2636 my $self = $class->SUPER::new (
2345 state => 0, 2637 state => 0,
2346 connect_activate => \&toggle_flopper, 2638 on_activate => \&toggle_flopper,
2347 @_ 2639 @_
2348 ); 2640 );
2349 2641
2350 if ($self->{state}) {
2351 $self->{state} = 0;
2352 $self->toggle_flopper;
2353 }
2354
2355 $self 2642 $self
2356} 2643}
2357 2644
2358sub toggle_flopper { 2645sub toggle_flopper {
2359 my ($self) = @_; 2646 my ($self) = @_;
2360 2647
2361 # TODO: use animation 2648 $self->{other}->toggle_visibility;
2362 if ($self->{state} = !$self->{state}) {
2363 $CFClient::UI::ROOT->add ($self->{other});
2364 $self->{other}->move ($self->coord2global (0, $self->{h}));
2365 $self->emit ("open");
2366 } else {
2367 $CFClient::UI::ROOT->remove ($self->{other});
2368 $self->emit ("close");
2369 }
2370
2371 $self->emit (changed => $self->{state});
2372} 2649}
2373 2650
2374############################################################################# 2651#############################################################################
2375 2652
2376package CFClient::UI::Tooltip; 2653package CFClient::UI::Tooltip;
… …
2386 @_, 2663 @_,
2387 can_events => 0, 2664 can_events => 0,
2388 ) 2665 )
2389} 2666}
2390 2667
2391sub set_markup { 2668sub set_tooltip_from {
2392 my ($self, $text) = @_; 2669 my ($self, $widget) = @_;
2393 2670
2394 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2671 my $tooltip = $widget->{tooltip};
2395 $self->{label}->set_markup ($text); 2672
2396 $self->add ($self->{label}); 2673 if ($ENV{CFPLUS_DEBUG} & 2) {
2674 $tooltip .= "\n\n" . (ref $widget) . "\n"
2675 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676 . "req $widget->{req_w} $widget->{req_h}\n"
2677 . "visible $widget->{visible}";
2678 }
2679
2680 $self->add (new CFClient::UI::Label
2681 markup => $tooltip,
2682 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2683 fontsize => 0.8,
2684 fg => [0, 0, 0, 1],
2685 ellipsise => 0,
2686 font => ($widget->{tooltip_font} || $::FONT_PROP),
2687 );
2397} 2688}
2398 2689
2399sub size_request { 2690sub size_request {
2400 my ($self) = @_; 2691 my ($self) = @_;
2401
2402 $self->child->set_max_size ($::WIDTH * 0.3);
2403 2692
2404 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2693 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2405 2694
2406 ($w + 4, $h + 4) 2695 ($w + 4, $h + 4)
2407} 2696}
… …
2410 my ($self, $w, $h) = @_; 2699 my ($self, $w, $h) = @_;
2411 2700
2412 $self->SUPER::size_allocate ($w - 4, $h - 4); 2701 $self->SUPER::size_allocate ($w - 4, $h - 4);
2413} 2702}
2414 2703
2704sub visibility_change {
2705 my ($self, $visible) = @_;
2706
2707 return unless $visible;
2708
2709 $self->{root}->on_post_alloc ("move_$self" => sub {
2710 my $widget = $self->{owner}
2711 or return;
2712
2713 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714
2715 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716 if $x + $self->{w} > $::WIDTH;
2717
2718 $self->move_abs ($x, $y);
2719 });
2720}
2721
2415sub _draw { 2722sub _draw {
2416 my ($self) = @_; 2723 my ($self) = @_;
2417 2724
2418 glPushMatrix;
2419 glTranslate 0.375, 0.375; 2725 glTranslate 0.375, 0.375;
2420 2726
2421 my ($w, $h) = @$self{qw(w h)}; 2727 my ($w, $h) = @$self{qw(w h)};
2422 2728
2423 glColor 1, 0.8, 0.4; 2729 glColor 1, 0.8, 0.4;
… …
2434 glVertex 0 , $h; 2740 glVertex 0 , $h;
2435 glVertex $w, $h; 2741 glVertex $w, $h;
2436 glVertex $w, 0; 2742 glVertex $w, 0;
2437 glEnd; 2743 glEnd;
2438 2744
2439 glPopMatrix; 2745 glTranslate 2 - 0.375, 2 - 0.375;
2440 2746
2441 glTranslate 2, 2;
2442 $self->SUPER::_draw; 2747 $self->SUPER::_draw;
2443} 2748}
2444 2749
2445############################################################################# 2750#############################################################################
2446 2751
… …
2451use CFClient::OpenGL; 2756use CFClient::OpenGL;
2452 2757
2453sub new { 2758sub new {
2454 my $class = shift; 2759 my $class = shift;
2455 2760
2456 $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2457 aspect => 1, 2762 aspect => 1,
2763 can_events => 0,
2458 @_, 2764 @_,
2459 ) 2765 );
2766
2767 if ($self->{anim} && $self->{animspeed}) {
2768 Scalar::Util::weaken (my $widget = $self);
2769
2770 $self->{timer} = Event->timer (
2771 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2772 hard => 1,
2773 interval => $self->{animspeed},
2774 cb => sub {
2775 ++$widget->{frame};
2776 $widget->update;
2777 },
2778 );
2779 }
2780
2781 $self
2460} 2782}
2461 2783
2462sub size_request { 2784sub size_request {
2463 (32, 8) 2785 (32, 8)
2464} 2786}
2465 2787
2788sub update {
2789 my ($self) = @_;
2790
2791 return unless $self->{visible};
2792
2793 $self->SUPER::update;
2794}
2795
2466sub _draw { 2796sub _draw {
2467 my ($self) = @_; 2797 my ($self) = @_;
2468 2798
2799 return unless $::CONN;
2800
2801 my $face;
2802
2803 if ($self->{frame}) {
2804 my $anim = $::CONN->{anim}[$self->{anim}];
2805
2806 $face = $anim->[ $self->{frame} % @$anim ]
2807 if $anim && @$anim;
2808 }
2809
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2810 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2470 2811
2471 # TODO animation
2472 if ($tex) { 2812 if ($tex) {
2473 glEnable GL_BLEND;
2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475 glEnable GL_TEXTURE_2D; 2813 glEnable GL_TEXTURE_2D;
2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477 glColor 1, 1, 1, 1; 2815 glColor 1, 1, 1, 1;
2478 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2816 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479 glDisable GL_TEXTURE_2D; 2817 glDisable GL_TEXTURE_2D;
2480 glDisable GL_BLEND;
2481 } 2818 }
2819}
2820
2821sub DESTROY {
2822 my ($self) = @_;
2823
2824 $self->{timer}->cancel
2825 if $self->{timer};
2826
2827 $self->SUPER::DESTROY;
2482} 2828}
2483 2829
2484############################################################################# 2830#############################################################################
2485 2831
2486package CFClient::UI::Menu; 2832package CFClient::UI::Menu;
… …
2521 2867
2522# popup given the event (must be a mouse button down event currently) 2868# popup given the event (must be a mouse button down event currently)
2523sub popup { 2869sub popup {
2524 my ($self, $ev) = @_; 2870 my ($self, $ev) = @_;
2525 2871
2526 $self->emit ("popdown"); 2872 $self->_emit ("popdown");
2527 2873
2528 # maybe save $GRAB? must be careful about events... 2874 # maybe save $GRAB? must be careful about events...
2529 $GRAB = $self; 2875 $GRAB = $self;
2530 $self->{button} = $ev->{button}; 2876 $self->{button} = $ev->{button};
2531 2877
2532 $self->show; 2878 $self->show;
2533 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2879 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2534} 2880}
2535 2881
2536sub mouse_motion { 2882sub mouse_motion {
2537 my ($self, $ev, $x, $y) = @_; 2883 my ($self, $ev, $x, $y) = @_;
2538 2884
… …
2546 2892
2547 if ($ev->{button} == $self->{button}) { 2893 if ($ev->{button} == $self->{button}) {
2548 undef $GRAB; 2894 undef $GRAB;
2549 $self->hide; 2895 $self->hide;
2550 2896
2551 $self->emit ("popdown"); 2897 $self->_emit ("popdown");
2552 $self->{hover}[1]->() if $self->{hover}; 2898 $self->{hover}[1]->() if $self->{hover};
2553 } 2899 }
2554} 2900}
2555 2901
2556############################################################################# 2902#############################################################################
2557 2903
2904package CFClient::UI::Statusbox;
2905
2906our @ISA = CFClient::UI::VBox::;
2907
2908sub new {
2909 my $class = shift;
2910
2911 $class->SUPER::new (
2912 fontsize => 0.8,
2913 @_,
2914 )
2915}
2916
2917sub reorder {
2918 my ($self) = @_;
2919 my $NOW = time;
2920
2921 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 }
2924
2925 my @widgets;
2926
2927 my @items = sort {
2928 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} };
2931
2932 my $count = 10 + 1;
2933 for my $item (@items) {
2934 last unless --$count;
2935
2936 push @widgets, $item->{label} ||= do {
2937 # TODO: doesn't handle markup well (read as: at all)
2938 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text};
2941
2942 for ($short) {
2943 s/^\s+//;
2944 s/\s+/ /g;
2945 }
2946
2947 new CFClient::UI::Label
2948 markup => $short,
2949 tooltip => $item->{tooltip},
2950 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg},
2955 can_events => 1,
2956 can_hover => 1
2957 };
2958 }
2959
2960 $self->clear;
2961 $self->SUPER::add (reverse @widgets);
2962}
2963
2964sub add {
2965 my ($self, $text, %arg) = @_;
2966
2967 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//;
2969
2970 return unless $text;
2971
2972 my $timeout = time + ((delete $arg{timeout}) || 60);
2973
2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2975
2976 if (my $item = $self->{item}{$group}) {
2977 if ($item->{text} eq $text) {
2978 $item->{count}++;
2979 } else {
2980 $item->{count} = 1;
2981 $item->{text} = $item->{tooltip} = $text;
2982 }
2983 $item->{id} = ++$self->{id};
2984 $item->{timeout} = $timeout;
2985 delete $item->{label};
2986 } else {
2987 $self->{item}{$group} = {
2988 id => ++$self->{id},
2989 text => $text,
2990 timeout => $timeout,
2991 tooltip => $text,
2992 fg => [0.8, 0.8, 0.8, 0.8],
2993 pri => 0,
2994 count => 1,
2995 %arg,
2996 };
2997 }
2998
2999 $self->reorder;
3000}
3001
3002sub reconfigure {
3003 my ($self) = @_;
3004
3005 delete $_->{label}
3006 for values %{ $self->{item} || {} };
3007
3008 $self->reorder;
3009 $self->SUPER::reconfigure;
3010}
3011
3012#############################################################################
3013
3014package CFClient::UI::Inventory;
3015
3016our @ISA = CFClient::UI::ScrolledWindow::;
3017
3018sub new {
3019 my $class = shift;
3020
3021 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3023 @_,
3024 );
3025
3026 $self
3027}
3028
3029sub set_items {
3030 my ($self, $items) = @_;
3031
3032 $self->{scrolled}->clear;
3033 return unless $items;
3034
3035 my @items = sort {
3036 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name})
3038 } @$items;
3039
3040 $self->{real_items} = \@items;
3041
3042 my $row = 0;
3043 for my $item (@items) {
3044 CFClient::Item::update_widgets $item;
3045
3046 $self->{scrolled}->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3049
3050 $row++;
3051 }
3052}
3053
3054#############################################################################
3055
3056package CFClient::UI::BindEditor;
3057
3058our @ISA = CFClient::UI::FancyFrame::;
3059
3060sub new {
3061 my $class = shift;
3062
3063 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3064
3065 $self->add (my $vb = new CFClient::UI::VBox);
3066
3067
3068 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3069 text => "start recording",
3070 tooltip => "Start/Stops recording of actions."
3071 ."All subsequent actions after the recording started will be captured."
3072 ."The actions are displayed after the record was stopped."
3073 ."To bind the action you have to click on the 'Bind' button",
3074 on_activate => sub {
3075 unless ($self->{recording}) {
3076 $self->start;
3077 } else {
3078 $self->stop;
3079 }
3080 });
3081
3082 $vb->add (new CFClient::UI::Label text => "Actions:");
3083 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3084
3085 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3086 $vb->add (my $hb = new CFClient::UI::HBox);
3087 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3088 $hb->add (new CFClient::UI::Button
3089 text => "bind",
3090 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3091 on_activate => sub {
3092 $self->ask_for_bind;
3093 });
3094
3095 $vb->add (my $hb = new CFClient::UI::HBox);
3096 $hb->add (new CFClient::UI::Button
3097 text => "ok",
3098 expand => 1,
3099 tooltip => "This closes the binding editor and saves the binding",
3100 on_activate => sub {
3101 $self->hide;
3102 $self->commit;
3103 });
3104
3105 $hb->add (new CFClient::UI::Button
3106 text => "cancel",
3107 expand => 1,
3108 tooltip => "This closes the binding editor without saving",
3109 on_activate => sub {
3110 $self->hide;
3111 $self->{binding_cancel}->()
3112 if $self->{binding_cancel};
3113 });
3114
3115 $self->update_binding_widgets;
3116
3117 $self
3118}
3119
3120sub commit {
3121 my ($self) = @_;
3122 my ($mod, $sym, $cmds) = $self->get_binding;
3123 if ($sym != 0 && @$cmds > 0) {
3124 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3125 ."'. Don't forget 'Save Config'!");
3126 $self->{binding_change}->($mod, $sym, $cmds)
3127 if $self->{binding_change};
3128 } else {
3129 $::STATUSBOX->add ("No action bound, no key or action specified!");
3130 $self->{binding_cancel}->()
3131 if $self->{binding_cancel};
3132 }
3133}
3134
3135sub start {
3136 my ($self) = @_;
3137
3138 $self->{rec_btn}->set_text ("stop recording");
3139 $self->{recording} = 1;
3140 $self->clear_command_list;
3141 $::CONN->start_record if $::CONN;
3142}
3143
3144sub stop {
3145 my ($self) = @_;
3146
3147 $self->{rec_btn}->set_text ("start recording");
3148 $self->{recording} = 0;
3149
3150 my $rec;
3151 $rec = $::CONN->stop_record if $::CONN;
3152 return unless ref $rec eq 'ARRAY';
3153 $self->set_command_list ($rec);
3154}
3155
3156# if $commit is true, the binding will be set after the user entered a key combo
3157sub ask_for_bind {
3158 my ($self, $commit) = @_;
3159
3160 CFClient::Binder::open_binding_dialog (sub {
3161 my ($mod, $sym) = @_;
3162 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3163 $self->update_binding_widgets;
3164 $self->commit if $commit;
3165 });
3166}
3167
3168# $mod and $sym are the modifiers and key symbol
3169# $cmds is a array ref of strings (the commands)
3170# $cb is the callback that is executed on OK
3171# $ccb is the callback that is executed on CANCEL and
3172# when the binding was unsuccessful on OK
3173sub set_binding {
3174 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3175
3176 $self->clear_command_list;
3177 $self->{recording} = 0;
3178 $self->{rec_btn}->set_text ("start recording");
3179
3180 $self->{binding} = [$mod, $sym];
3181 $self->{commands} = $cmds;
3182
3183 $self->{binding_change} = $cb;
3184 $self->{binding_cancel} = $ccb;
3185
3186 $self->update_binding_widgets;
3187}
3188
3189# this is a shortcut method that asks for a binding
3190# and then just binds it.
3191sub do_quick_binding {
3192 my ($self, $cmds) = @_;
3193 $self->set_binding (undef, undef, $cmds, sub {
3194 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3195 });
3196 $self->ask_for_bind (1);
3197}
3198
3199sub update_binding_widgets {
3200 my ($self) = @_;
3201 my ($mod, $sym, $cmds) = $self->get_binding;
3202 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3203 $self->set_command_list ($cmds);
3204}
3205
3206sub get_binding {
3207 my ($self) = @_;
3208 return (
3209 $self->{binding}->[0],
3210 $self->{binding}->[1],
3211 [ grep { defined $_ } @{$self->{commands}} ]
3212 );
3213}
3214
3215sub clear_command_list {
3216 my ($self) = @_;
3217 $self->{cmdbox}->clear ();
3218}
3219
3220sub set_command_list {
3221 my ($self, $cmds) = @_;
3222
3223 $self->{cmdbox}->clear ();
3224 $self->{commands} = $cmds;
3225
3226 my $idx = 0;
3227
3228 for (@$cmds) {
3229 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3230
3231 my $i = $idx;
3232 $hb->add (new CFClient::UI::Label text => $_);
3233 $hb->add (new CFClient::UI::Button
3234 text => "delete",
3235 tooltip => "Deletes the action from the record",
3236 on_activate => sub {
3237 $self->{cmdbox}->remove ($hb);
3238 $cmds->[$i] = undef;
3239 });
3240
3241
3242 $idx++
3243 }
3244}
3245
3246#############################################################################
3247
3248package CFClient::UI::SpellList;
3249
3250our @ISA = CFClient::UI::FancyFrame::;
3251
3252sub new {
3253 my $class = shift;
3254
3255 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3256
3257 $self->add (new CFClient::UI::ScrolledWindow
3258 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3259
3260 $self;
3261}
3262
3263# XXX: Do sorting? Argl...
3264sub add_spell {
3265 my ($self, $spell) = @_;
3266 $self->{spells}->{$spell->{name}} = $spell;
3267
3268 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3269 face => $spell->{face},
3270 can_hover => 1,
3271 can_events => 1,
3272 tooltip => $spell->{message});
3273
3274 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3275 text => $spell->{name},
3276 can_hover => 1,
3277 can_events => 1,
3278 tooltip => $spell->{message},
3279 expand => 1);
3280
3281 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3282 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3283 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3284 expand => 1);
3285
3286 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3287 text => "bind to key",
3288 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3289}
3290
3291sub rebuild_spell_list {
3292 my ($self) = @_;
3293 $self->{tbl_idx} = 0;
3294 $self->add_spell ($_) for values %{$self->{spells}};
3295}
3296
3297sub remove_spell {
3298 my ($self, $spell) = @_;
3299 delete $self->{spells}->{$spell->{name}};
3300 $self->rebuild_spell_list;
3301}
3302
3303#############################################################################
3304
2558package CFClient::UI::Root; 3305package CFClient::UI::Root;
2559 3306
2560our @ISA = CFClient::UI::Container::; 3307our @ISA = CFClient::UI::Container::;
2561 3308
2562use CFClient::OpenGL; 3309use CFClient::OpenGL;
2563 3310
2564sub check_size { 3311sub new {
2565 my ($self) = @_; 3312 my $class = shift;
2566 3313
2567 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3314 my $self = $class->SUPER::new (
3315 visible => 1,
3316 @_,
3317 );
3318
3319 Scalar::Util::weaken ($self->{root} = $self);
3320
3321 $self
2568} 3322}
2569 3323
2570sub size_request { 3324sub size_request {
2571 ($::WIDTH, $::HEIGHT) 3325 my ($self) = @_;
2572}
2573 3326
2574sub configure { 3327 ($self->{w}, $self->{h})
3328}
3329
3330sub _to_pixel {
3331 my ($coord, $size, $max) = @_;
3332
3333 $coord =
3334 $coord eq "center" ? ($max - $size) * 0.5
3335 : $coord eq "max" ? $max
3336 : $coord;
3337
3338 $coord = 0 if $coord < 0;
3339 $coord = $max - $size if $coord > $max - $size;
3340
3341 int $coord + 0.5
3342}
3343
3344sub size_allocate {
2575 my ($self, $x, $y, $w, $h) = @_; 3345 my ($self, $w, $h) = @_;
2576 3346
2577 $self->SUPER::configure ($x, $y, $w, $h);
2578
2579 for my $child (@{$self->{children}}) { 3347 for my $child ($self->children) {
2580 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3348 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2581 3349
2582 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3350 $X = $child->{force_x} if exists $child->{force_x};
2583 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3351 $Y = $child->{force_y} if exists $child->{force_y};
3352
3353 $X = _to_pixel $X, $W, $self->{w};
3354 $Y = _to_pixel $Y, $H, $self->{h};
3355
2584 $child->configure ($X, $Y, $W,$H); 3356 $child->configure ($X, $Y, $W, $H);
2585 } 3357 }
2586} 3358}
2587 3359
2588sub _topleft { 3360sub coord2local {
2589 my ($self, $x, $y) = @_; 3361 my ($self, $x, $y) = @_;
2590 3362
2591 ($x, $y) 3363 ($x, $y)
2592} 3364}
2593 3365
3366sub coord2global {
3367 my ($self, $x, $y) = @_;
3368
3369 ($x, $y)
3370}
3371
2594sub update { 3372sub update {
2595 my ($self) = @_; 3373 my ($self) = @_;
2596 3374
2597 $self->check_size; 3375 $::WANT_REFRESH++;
2598 ::refresh ();
2599} 3376}
2600 3377
2601sub add { 3378sub add {
2602 my ($self, $child) = @_; 3379 my ($self, @children) = @_;
2603 3380
2604 # integerize window positions 3381 $_->{is_toplevel} = 1
2605 $child->{x} = int $child->{x}; 3382 for @children;
2606 $child->{y} = int $child->{y};
2607 3383
2608 $self->SUPER::add ($child); 3384 $self->SUPER::add (@children);
3385}
3386
3387sub remove {
3388 my ($self, @children) = @_;
3389
3390 $self->SUPER::remove (@children);
3391
3392 delete $self->{is_toplevel}
3393 for @children;
3394
3395 while (@children) {
3396 my $w = pop @children;
3397 push @children, $w->children;
3398 $w->set_invisible;
3399 }
2609} 3400}
2610 3401
2611sub on_refresh { 3402sub on_refresh {
2612 my ($self, $id, $cb) = @_; 3403 my ($self, $id, $cb) = @_;
2613 3404
2614 $self->{refresh_hook}{$id} = $cb; 3405 $self->{refresh_hook}{$id} = $cb;
2615} 3406}
2616 3407
3408sub on_post_alloc {
3409 my ($self, $id, $cb) = @_;
3410
3411 $self->{post_alloc_hook}{$id} = $cb;
3412}
3413
2617sub draw { 3414sub draw {
2618 my ($self) = @_; 3415 my ($self) = @_;
2619 3416
2620 while (my $rcb = delete $self->{refresh_hook}) { 3417 while ($self->{refresh_hook}) {
2621 $_->() for values %$rcb; 3418 $_->()
3419 for values %{delete $self->{refresh_hook}};
2622 } 3420 }
3421
3422 if ($self->{realloc}) {
3423 my %queue;
3424 my @queue;
3425 my $widget;
3426
3427 outer:
3428 while () {
3429 if (my $realloc = delete $self->{realloc}) {
3430 for $widget (values %$realloc) {
3431 $widget->{visible} or next; # do not resize invisible widgets
3432
3433 $queue{$widget+0}++ and next; # duplicates are common
3434
3435 push @{ $queue[$widget->{visible}] }, $widget;
3436 }
3437 }
3438
3439 while () {
3440 @queue or last outer;
3441
3442 $widget = pop @{ $queue[-1] || [] }
3443 and last;
3444
3445 pop @queue;
3446 }
3447
3448 delete $queue{$widget+0};
3449
3450 my ($w, $h) = $widget->size_request;
3451
3452 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3453 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3454
3455 $w = $widget->{force_w} if exists $widget->{force_w};
3456 $h = $widget->{force_h} if exists $widget->{force_h};
3457
3458 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3459 || delete $widget->{force_realloc}) {
3460 $widget->{req_w} = $w;
3461 $widget->{req_h} = $h;
3462
3463 $self->{size_alloc}{$widget+0} = $widget;
3464
3465 if (my $parent = $widget->{parent}) {
3466 $self->{realloc}{$parent+0} = $parent
3467 unless $queue{$parent+0};
3468
3469 $parent->{force_size_alloc} = 1;
3470 $self->{size_alloc}{$parent+0} = $parent;
3471 }
3472 }
3473
3474 delete $self->{realloc}{$widget+0};
3475 }
3476 }
3477
3478 while (my $size_alloc = delete $self->{size_alloc}) {
3479 my @queue = sort { $b->{visible} <=> $a->{visible} }
3480 values %$size_alloc;
3481
3482 while () {
3483 my $widget = pop @queue || last;
3484
3485 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3486
3487 $w = 0 if $w < 0;
3488 $h = 0 if $h < 0;
3489
3490 $w = int $w + 0.5;
3491 $h = int $h + 0.5;
3492
3493 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3494 $widget->{old_w} = $widget->{w};
3495 $widget->{old_h} = $widget->{h};
3496
3497 $widget->{w} = $w;
3498 $widget->{h} = $h;
3499
3500 $widget->emit (size_allocate => $w, $h);
3501 }
3502 }
3503 }
3504
3505 while ($self->{post_alloc_hook}) {
3506 $_->()
3507 for values %{delete $self->{post_alloc_hook}};
3508 }
3509
2623 3510
2624 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3511 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2625 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3512 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2626 glClear GL_COLOR_BUFFER_BIT; 3513 glClear GL_COLOR_BUFFER_BIT;
2627 3514
2628 glMatrixMode GL_PROJECTION; 3515 glMatrixMode GL_PROJECTION;
2629 glLoadIdentity; 3516 glLoadIdentity;
2630 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3517 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2631 glMatrixMode GL_MODELVIEW; 3518 glMatrixMode GL_MODELVIEW;
2632 glLoadIdentity; 3519 glLoadIdentity;
2633 3520
3521 {
3522 package CFClient::UI::Base;
3523
3524 ($draw_x, $draw_y, $draw_w, $draw_h) =
3525 (0, 0, $self->{w}, $self->{h});
3526 }
3527
2634 $self->_draw; 3528 $self->_draw;
2635} 3529}
2636 3530
2637############################################################################# 3531#############################################################################
2638 3532
2639package CFClient::UI::InventoryItem;
2640
2641our @ISA = CFClient::UI::HBox::;
2642
2643sub new {
2644 my $class = shift;
2645
2646 my %args = @_;
2647
2648 my $item = $args{item};
2649
2650 my $desc = $item->{nrof} < 2
2651 ? $item->{name}
2652 : "$item->{nrof} $item->{name_pl}";
2653
2654
2655 my $self = $class->SUPER::new (
2656 can_hover => 1,
2657 can_events => 1,
2658 tooltip => (CFClient::UI::Label->escape ($desc)
2659 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2660 connect_button_down => sub {
2661 my ($self, $ev, $x, $y) = @_;
2662
2663 # todo: maybe put examine on 1? but should just be a tooltip :(
2664 if ($ev->{button} == 1) {
2665 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2666 } elsif ($ev->{button} == 2) {
2667 $::CONN->send ("apply $item->{tag}");
2668 } elsif ($ev->{button} == 3) {
2669 CFClient::UI::Menu->new (
2670 items => [
2671 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2672 [
2673 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2674 sub { $::CONN->send ("lock $item->{tag}") },
2675 ],
2676 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2677 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2678 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2679 ],
2680 )->popup ($ev);
2681 }
2682
2683 1
2684 },
2685 %args
2686 );
2687 $self->add(new CFClient::UI::Face
2688 can_events => 0,
2689 face => $item->{face},
2690 anim => $item->{anim},
2691 animspeed => $item->{animspeed});
2692 $self->add(new CFClient::UI::Label
2693 can_events => 0,
2694 text => $desc);
2695
2696 $self
2697}
2698
2699#############################################################################
2700
2701package CFClient::UI::Inventory;
2702
2703our @ISA = CFClient::UI::ScrolledWindow::;
2704
2705sub new {
2706 my $class = shift;
2707
2708 my $self = $class->SUPER::new (
2709 scrolled => (new CFClient::UI::VBox),
2710 @_,
2711 );
2712
2713 $self
2714}
2715
2716sub set_items {
2717 my ($self, $items) = @_;
2718
2719 $self->{scrolled}->clear;
2720 return unless $items;
2721
2722 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2723
2724 $self->{real_items} = \@items;
2725
2726 for my $item (@items) {
2727 my $desc = $item->{nrof} < 2
2728 ? $item->{name}
2729 : "$item->{nrof} $item->{name_pl}";
2730
2731 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2732 }
2733
2734# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2735}
2736
2737sub size_request {
2738 my ($self) = @_;
2739 ($self->{req_w}, $self->{req_h});
2740}
2741
2742#############################################################################
2743
2744package CFClient::UI; 3533package CFClient::UI;
2745 3534
2746$ROOT = new CFClient::UI::Root; 3535$ROOT = new CFClient::UI::Root;
2747$TOOLTIP = new CFClient::UI::Tooltip; 3536$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2748 3537
27491 35381
2750 3539

Diff Legend

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