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.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC

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

Diff Legend

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