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

Diff Legend

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