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

Diff Legend

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