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

Diff Legend

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