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.212 by elmex, Wed May 17 14:55:14 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 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
50 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
51} 70}
52 71
53# class methods for events 72# class methods for events
54sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 75 if $FOCUS;
57} 76}
58 77
59sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 80 if $FOCUS;
62} 81}
63 82
64sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
65 my ($ev) = @_; 84 my ($ev) = @_;
… …
74 check_tooltip; 93 check_tooltip;
75 } 94 }
76 95
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 97
79 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 100}
84 101
85sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
86 my ($ev) = @_; 103 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
88 105
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 107
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 109
93 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 112
98 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 115 $grab->update if $grab;
101 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 133
119 check_tooltip; 134 check_tooltip;
120 } 135 }
121 136
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 138 if $HOVER;
126} 139}
127 140
128# convert position array to integers 141# convert position array to integers
129sub harmonize { 142sub harmonize {
130 my ($vals) = @_; 143 my ($vals) = @_;
… …
136 $rem += $_ - $i; 149 $rem += $_ - $i;
137 $_ = $i; 150 $_ = $i;
138 } 151 }
139} 152}
140 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
141# call when resolution changes etc. 170# call when resolution changes etc.
142sub rescale_widgets { 171sub rescale_widgets {
143 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
144 173
145 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
146 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
147 $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.]+$/;
148 $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};
149 $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};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $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.]+$/;
152 $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};
153 $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};
154 $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
155 } 189 }
156
157 $widget->reconfigure;
158 } 190 }
191
192 reconfigure_widgets;
159} 193}
160 194
161############################################################################# 195#############################################################################
162 196
163package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
168 202
169sub new { 203sub new {
170 my $class = shift; 204 my $class = shift;
171 205
172 my $self = bless { 206 my $self = bless {
173 x => 0, 207 x => "center",
174 y => 0, 208 y => "center",
175 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
176 can_events => 1, 212 can_events => 1,
177 @_ 213 @_
178 }, $class; 214 }, $class;
179 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
180 for (keys %$self) { 218 for (keys %$self) {
181 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
182 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
183 } 221 }
184 } 222 }
185 223
186 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 }
187 235
188 $self 236 $self
189} 237}
190 238
191sub destroy { 239sub destroy {
… …
201 return if $self->{parent}; 249 return if $self->{parent};
202 250
203 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
204} 252}
205 253
206sub hide { 254sub set_visible {
207 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};
208 278
209 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
211 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
212 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
213 if $self->{parent}; 313 if $self->{parent};
214} 314}
215 315
216sub move { 316sub move_abs {
217 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
218 318
219 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
220 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
221 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
222 322
223 $self->update; 323 $self->update;
224} 324}
225 325
226sub set_size { 326sub set_size {
227 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
228 328
229 $self->{user_w} = $w; 329 $self->{force_w} = $w;
230 $self->{user_h} = $h; 330 $self->{force_h} = $h;
231 331
232 $self->check_size; 332 $self->realloc;
233} 333}
234 334
235sub size_request { 335sub size_request {
236 require Carp; 336 require Carp;
237 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
239 339
240sub configure { 340sub configure {
241 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
242 342
243 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
244 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
245 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
246 348
247 # use alignment to adjust x, y 349 # use alignment to adjust x, y
248 350
249 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
250 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
251
252 ($w, $h) = ($w2, $h2);
253 } 353 }
254 354
255 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
256 $self->{x} = $x; 356 $self->{x} = $x;
257 $self->{y} = $y; 357 $self->{y} = $y;
258 $self->update; 358 $self->update;
259 } 359 }
260 360
261 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
262 $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;
263 } 368 }
264} 369}
265 370
266sub size_allocate { 371sub size_allocate {
267 # nothing to be done 372 # nothing to be done
268} 373}
269 374
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
277sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
278} 381}
279 382
280sub set_max_size { 383sub set_max_size {
281 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
282 385
… …
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
285} 388}
286 389
287sub set_tooltip { 390sub set_tooltip {
288 my ($self, $tooltip) = @_; 391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
289 397
290 $self->{tooltip} = $tooltip; 398 $self->{tooltip} = $tooltip;
291 399
292 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293 delete $CFClient::UI::TOOLTIP->{owner}; 401 delete $CFClient::UI::TOOLTIP->{owner};
… …
315 return if $FOCUS == $self; 423 return if $FOCUS == $self;
316 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
317 425
318 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
319 427
320 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
321 429
322 $focus->update if $focus; 430 $focus->update if $focus;
323 $FOCUS->update; 431 $FOCUS->update;
324} 432}
325 433
… …
328 436
329 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
330 438
331 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
332 440
333 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
334 442
335 $focus->update if $focus; #? 443 $focus->update if $focus; #?
336}
337 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
338sub mouse_motion { } 449sub mouse_motion { 0 }
339sub button_up { } 450sub button_up { 0 }
340sub key_down { } 451sub key_down { 0 }
341sub key_up { } 452sub key_up { 0 }
342 453
343sub button_down { 454sub button_down {
344 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
345 456
346 $self->focus_in; 457 $self->focus_in;
347}
348 458
349sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
350sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
351sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
352sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
353sub 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
354 535
355sub draw { 536sub draw {
356 my ($self) = @_; 537 my ($self) = @_;
357 538
358 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);
359 550
360 glPushMatrix; 551 glPushMatrix;
361 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
362 $self->_draw;
363 glPopMatrix;
364 553
365 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
366 my ($x, $y) = @$self{qw(x y)};
367
368 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
369 glEnable GL_BLEND; 556 glEnable GL_BLEND;
370 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
371 glBegin GL_QUADS; 558 glBegin GL_QUADS;
372 glVertex $x , $y;
373 glVertex $x + $self->{w}, $y;
374 glVertex $x + $self->{w}, $y + $self->{h};
375 glVertex $x , $y + $self->{h};
376 glEnd;
377 glDisable GL_BLEND;
378 }
379
380 if ($ENV{PCLIENT_DEBUG}) {
381 glPushMatrix;
382 glColor 1, 1, 0, 1;
383 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
384 glBegin GL_LINE_LOOP;
385 glVertex 0 , 0; 559 glVertex 0 , 0;
386 glVertex $self->{w}, 0; 560 glVertex $self->{w}, 0;
387 glVertex $self->{w}, $self->{h}; 561 glVertex $self->{w}, $self->{h};
388 glVertex 0 , $self->{h}; 562 glVertex 0 , $self->{h};
389 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;
390 glPopMatrix; 577 glPopMatrix;
391 #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;
392 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
393} 583}
394 584
395sub _draw { 585sub _draw {
396 my ($self) = @_; 586 my ($self) = @_;
397 587
398 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
399}
400
401sub find_widget {
402 my ($self, $x, $y) = @_;
403
404 return () unless $self->{can_events};
405
406 return $self
407 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
408 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
409
410 ()
411}
412
413sub set_parent {
414 my ($self, $parent) = @_;
415
416 Scalar::Util::weaken ($self->{parent} = $parent);
417
418 # TODO: req_w _does_change after ->reconfigure
419 $self->check_size
420 unless exists $self->{req_w};
421}
422
423sub check_size {
424 my ($self, $forced) = @_;
425
426 $self->{force_alloc} = 1 if $forced;
427 $CFClient::UI::ROOT->{check_size}{$self} = $self;
428}
429
430sub update {
431 my ($self) = @_;
432
433 $self->{parent}->update
434 if $self->{parent};
435}
436
437sub connect {
438 my ($self, $signal, $cb) = @_;
439
440 push @{ $self->{signal_cb}{$signal} }, $cb;
441}
442
443sub emit {
444 my ($self, $signal, @args) = @_;
445
446 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
447} 589}
448 590
449sub DESTROY { 591sub DESTROY {
450 my ($self) = @_; 592 my ($self) = @_;
451 593
… …
483 625
484 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
485 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
486 628
487 glEnable GL_BLEND; 629 glEnable GL_BLEND;
488 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
489 glColor @$color; 631 glColor_premultiply @$color;
490 632
491 glBegin GL_QUADS; 633 glBegin GL_QUADS;
492 glVertex 0 , 0; 634 glVertex 0 , 0;
493 glVertex 0 , $h; 635 glVertex 0 , $h;
494 glVertex $w, $h; 636 glVertex $w, $h;
… …
509 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
510 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
511} 653}
512 654
513sub size_request { 655sub size_request {
514 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
515} 659}
516 660
517sub draw { } 661sub draw { }
518 662
519############################################################################# 663#############################################################################
… …
523our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
524 668
525sub new { 669sub new {
526 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
527 671
528 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
529 673
530 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
531 children => [], 675 children => [],
532 can_events => 0, 676 can_events => 0,
533 %arg, 677 %arg,
534 ); 678 );
679
535 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
536 682
537 $self 683 $self
538} 684}
539 685
540sub add { 686sub add {
… …
548 $self->{children} = [ 694 $self->{children} = [
549 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
550 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
551 ]; 697 ];
552 698
553 $self->check_size (1); 699 $self->realloc;
554 $self->update;
555} 700}
556 701
557sub children { 702sub children {
558 @{ $_[0]{children} } 703 @{ $_[0]{children} }
559} 704}
… …
564 delete $child->{parent}; 709 delete $child->{parent};
565 $child->hide; 710 $child->hide;
566 711
567 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
568 713
569 $self->check_size; 714 $self->realloc;
570 $self->update;
571} 715}
572 716
573sub clear { 717sub clear {
574 my ($self) = @_; 718 my ($self) = @_;
575 719
… …
579 for (@$children) { 723 for (@$children) {
580 delete $_->{parent}; 724 delete $_->{parent};
581 $_->hide; 725 $_->hide;
582 } 726 }
583 727
584 $self->check_size; 728 $self->realloc;
585 $self->update;
586} 729}
587 730
588sub find_widget { 731sub find_widget {
589 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
590 733
591 $x -= $self->{x}; 734 $x -= $self->{x};
592 $y -= $self->{y}; 735 $y -= $self->{y};
593 736
594 my $res; 737 my $res;
595 738
596 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
597 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
598 and return $res; 741 and return $res;
599 } 742 }
600 743
601 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
650 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
651} 794}
652 795
653############################################################################# 796#############################################################################
654 797
798# back-buffered drawing area
799
655package CFClient::UI::Window; 800package CFClient::UI::Window;
656 801
657our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
658 803
659use CFClient::OpenGL; 804use CFClient::OpenGL;
… …
677 $self->SUPER::size_allocate ($w, $h); 822 $self->SUPER::size_allocate ($w, $h);
678 $self->update; 823 $self->update;
679} 824}
680 825
681sub _render { 826sub _render {
827 my ($self) = @_;
828
682 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
683} 830}
684 831
685sub render_child { 832sub render_child {
686 my ($self) = @_; 833 my ($self) = @_;
687 834
688 $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 {
689 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
690 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
691 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
692 $self->_render; 846 $self->_render;
693# glColorMask 1, 1, 1, 0;
694# glEnable GL_BLEND;
695# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
696# glRasterPos 0, 0;
697# glCopyPixels 0, 0, $self->{w}, $self->{h};
698# glDisable GL_BLEND;
699# glColorMask 1, 1, 1, 1;
700 }; 847 };
701} 848}
702 849
703sub _draw { 850sub _draw {
704 my ($self) = @_; 851 my ($self) = @_;
705 852
706 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
707 854
708 my $tex = $self->{texture} 855 my $tex = $self->{texture}
709 or return; 856 or return;
710 857
711 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
… …
721 868
722package CFClient::UI::ViewPort; 869package CFClient::UI::ViewPort;
723 870
724our @ISA = CFClient::UI::Window::; 871our @ISA = CFClient::UI::Window::;
725 872
873sub new {
874 my $class = shift;
875
876 $class->SUPER::new (
877 scroll_x => 0,
878 scroll_y => 1,
879 @_,
880 )
881}
882
726sub size_request { 883sub size_request {
727 my ($self) = @_; 884 my ($self) = @_;
728 885
729 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
730 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
731 887
732 @$self{qw(child_w child_h)} 888 $w = 10 if $self->{scroll_x};
889 $h = 10 if $self->{scroll_y};
890
891 ($w, $h)
733} 892}
734 893
735sub size_allocate { 894sub size_allocate {
736 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
737 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);
738 $self->update; 903 $self->update;
739} 904}
740 905
741sub set_offset { 906sub set_offset {
742 my ($self, $x, $y) = @_; 907 my ($self, $x, $y) = @_;
… …
776} 941}
777 942
778sub _render { 943sub _render {
779 my ($self) = @_; 944 my ($self) = @_;
780 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
781 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 949 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
782 950
783 $self->SUPER::_render; 951 $self->SUPER::_render;
784} 952}
785 953
… …
788package CFClient::UI::ScrolledWindow; 956package CFClient::UI::ScrolledWindow;
789 957
790our @ISA = CFClient::UI::HBox::; 958our @ISA = CFClient::UI::HBox::;
791 959
792sub new { 960sub new {
793 my $class = shift; 961 my ($class, %arg) = @_;
962
963 my $child = delete $arg{child};
794 964
795 my $self; 965 my $self;
796 966
797 my $slider = new CFClient::UI::Slider 967 my $slider = new CFClient::UI::Slider
798 vertical => 1, 968 vertical => 1,
799 range => [0, 0, 1, 0.01], # HACK fix 969 range => [0, 0, 1, 0.01], # HACK fix
800 connect_changed => sub { 970 on_changed => sub {
801 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 971 $self->{vp}->set_offset (0, $_[1]);
802 }, 972 },
803 ; 973 ;
804 974
805 $self = $class->SUPER::new ( 975 $self = $class->SUPER::new (
806 vp => (new CFClient::UI::ViewPort), 976 vp => (new CFClient::UI::ViewPort expand => 1),
807 slider => $slider, 977 slider => $slider,
808 @_, 978 %arg,
809 ); 979 );
810 980
811 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp});
813 $self->add ($self->{slider}); 981 $self->SUPER::add ($self->{vp}, $self->{slider});
982 $self->add ($child) if $child;
814 983
815 $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]);
816} 1010}
817 1011
818#TODO# update range on size_allocate depending on child 1012#TODO# update range on size_allocate depending on child
819# update viewport offset on scroll 1013# update viewport offset on scroll
820 1014
… …
840 1034
841 if ($self->{bg}) { 1035 if ($self->{bg}) {
842 my ($w, $h) = @$self{qw(w h)}; 1036 my ($w, $h) = @$self{qw(w h)};
843 1037
844 glEnable GL_BLEND; 1038 glEnable GL_BLEND;
845 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1039 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
846 glColor @{ $self->{bg} }; 1040 glColor_premultiply @{ $self->{bg} };
847 1041
848 glBegin GL_QUADS; 1042 glBegin GL_QUADS;
849 glVertex 0 , 0; 1043 glVertex 0 , 0;
850 glVertex 0 , $h; 1044 glVertex 0 , $h;
851 glVertex $w, $h; 1045 glVertex $w, $h;
… …
864 1058
865our @ISA = CFClient::UI::Bin::; 1059our @ISA = CFClient::UI::Bin::;
866 1060
867use CFClient::OpenGL; 1061use CFClient::OpenGL;
868 1062
869my @tex = 1063my $bg =
1064 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1065 mipmap => 1, wrap => 1;
1066
1067my @border =
870 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
871 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);
872 1070
873sub new { 1071sub new {
874 my $class = shift; 1072 my ($class, %arg) = @_;
875 1073
876 # TODO: user_x, user_y, overwrite moveto? 1074 my $title = delete $arg{title};
877 1075
878 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
879 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
880 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
881 border => 0.6, 1079 border => 0.6,
882 toplevel => 1,
883 can_events => 1, 1080 can_events => 1,
884 @_ 1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
885 ); 1084 );
886 1085
887 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title} = new CFClient::UI::Label
888 align => 0, 1087 align => 0,
889 valign => 1, 1088 valign => 1,
890 text => $self->{title}, 1089 text => $title,
891 fontsize => $self->{border}; 1090 fontsize => $self->{border}
1091 if defined $title;
892 1092
893 $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};
894} 1101}
895 1102
896sub border { 1103sub border {
897 int $_[0]{border} * $::FONTSIZE 1104 int $_[0]{border} * $::FONTSIZE
898} 1105}
899 1106
900sub size_request { 1107sub size_request {
901 my ($self) = @_; 1108 my ($self) = @_;
1109
1110 $self->{title}->size_request
1111 if $self->{title};
902 1112
903 my ($w, $h) = $self->SUPER::size_request; 1113 my ($w, $h) = $self->SUPER::size_request;
904 1114
905 ( 1115 (
906 $w + $self->border * 2, 1116 $w + $self->border * 2,
… …
909} 1119}
910 1120
911sub size_allocate { 1121sub size_allocate {
912 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
913 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
914 $h -= List::Util::max 0, $self->border * 2; 1132 $h -= List::Util::max 0, $border * 2;
915 $w -= List::Util::max 0, $self->border * 2; 1133 $w -= List::Util::max 0, $border * 2;
916 1134
917 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
918 if $self->{title};
919
920 $self->child->configure ($self->border, $self->border, $w, $h); 1135 $self->child->configure ($border, $border, $w, $h);
921} 1136}
922 1137
923sub button_down { 1138sub button_down {
924 my ($self, $ev, $x, $y) = @_; 1139 my ($self, $ev, $x, $y) = @_;
925 1140
… …
941 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
942 1157
943 my $dx = $ev->{x} - $ox; 1158 my $dx = $ev->{x} - $ox;
944 my $dy = $ev->{y} - $oy; 1159 my $dy = $ev->{y} - $oy;
945 1160
946 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1161 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
947 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1162 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1163
948 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
949 $self->check_size; 1165 $self->realloc;
950 }; 1166 };
951 1167
952 } elsif ($lr ^ $td) { 1168 } elsif ($lr ^ $td) {
953 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1169 my ($ox, $oy) = ($ev->{x}, $ev->{y});
954 my ($bx, $by) = ($self->{x}, $self->{y}); 1170 my ($bx, $by) = ($self->{x}, $self->{y});
… …
956 $self->{motion} = sub { 1172 $self->{motion} = sub {
957 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
958 1174
959 ($x, $y) = ($ev->{x}, $ev->{y}); 1175 ($x, $y) = ($ev->{x}, $ev->{y});
960 1176
961 $self->move ($bx + $x - $ox, $by + $y - $oy); 1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
962 $self->update; 1178 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
963 }; 1180 };
1181 } else {
1182 return 0;
1183 }
1184
964 } 1185 1
965} 1186}
966 1187
967sub button_up { 1188sub button_up {
968 my ($self, $ev, $x, $y) = @_; 1189 my ($self, $ev, $x, $y) = @_;
969 1190
970 delete $self->{motion}; 1191 !!delete $self->{motion}
971} 1192}
972 1193
973sub mouse_motion { 1194sub mouse_motion {
974 my ($self, $ev, $x, $y) = @_; 1195 my ($self, $ev, $x, $y) = @_;
975 1196
976 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1197 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198
1199 !!$self->{motion}
977} 1200}
978 1201
979sub _draw { 1202sub _draw {
980 my ($self) = @_; 1203 my ($self) = @_;
981 1204
1205 my $child = $self->{children}[0];
1206
982 my ($w, $h ) = ($self->{w}, $self->{h}); 1207 my ($w, $h ) = ($self->{w}, $self->{h});
983 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1208 my ($cw, $ch) = ($child->{w}, $child->{h});
984 1209
985 glEnable GL_TEXTURE_2D; 1210 glEnable GL_TEXTURE_2D;
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
987 1212
988 my $border = $self->border; 1213 my $border = $self->border;
989 1214
990 glColor @{ $self->{border_bg} }; 1215 glColor @{ $self->{border_bg} };
991 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1216 $border[0]->draw_quad_alpha (0, 0, $w, $border);
992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1217 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1218 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1219 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
995 1220
996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1221 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
997 my $bg = $tex[0]; 1222 glColor @{ $self->{bg} };
998 1223
999 # TODO: repeat texture not scale 1224 # TODO: repeat texture not scale
1225 # solve this better(?)
1000 my $rep_x = $cw / $bg->{w}; 1226 $bg->{s} = $cw / $bg->{w};
1001 my $rep_y = $ch / $bg->{h}; 1227 $bg->{t} = $ch / $bg->{h};
1002
1003 glColor @{ $self->{bg} };
1004
1005 $bg->{s} = $rep_x;
1006 $bg->{t} = $rep_y;
1007 $bg->{wrap_mode} = 1;
1008 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1228 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 } 1229 }
1010 1230
1011 glDisable GL_TEXTURE_2D; 1231 glDisable GL_TEXTURE_2D;
1012 1232
1013 $self->{title}->draw if $self->{title};
1014
1015 $self->child->draw; 1233 $child->draw;
1234
1235 if ($self->{title}) {
1236 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw;
1238 }
1016} 1239}
1017 1240
1018############################################################################# 1241#############################################################################
1019 1242
1020package CFClient::UI::Table; 1243package CFClient::UI::Table;
… …
1028sub new { 1251sub new {
1029 my $class = shift; 1252 my $class = shift;
1030 1253
1031 $class->SUPER::new ( 1254 $class->SUPER::new (
1032 col_expand => [], 1255 col_expand => [],
1033 @_ 1256 @_,
1034 ) 1257 )
1258}
1259
1260sub children {
1261 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035} 1262}
1036 1263
1037sub add { 1264sub add {
1038 my ($self, $x, $y, $child) = @_; 1265 my ($self, $x, $y, $child) = @_;
1039 1266
1040 $child->set_parent ($self); 1267 $child->set_parent ($self);
1041 $self->{children}[$y][$x] = $child; 1268 $self->{children}[$y][$x] = $child;
1042 1269
1043 $child->check_size; 1270 $self->realloc;
1044} 1271}
1045 1272
1046sub children {
1047 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048}
1049
1050# 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?
1051sub clear { 1274sub clear {
1052 my ($self) = @_; 1275 my ($self) = @_;
1053 1276
1054 my @children = $self->children; 1277 my @children = $self->children;
1055 delete $self->{children}; 1278 delete $self->{children};
… …
1057 for (@children) { 1280 for (@children) {
1058 delete $_->{parent}; 1281 delete $_->{parent};
1059 $_->hide; 1282 $_->hide;
1060 } 1283 }
1061 1284
1062 $self->update; 1285 $self->realloc;
1063} 1286}
1064 1287
1065sub get_wh { 1288sub get_wh {
1066 my ($self) = @_; 1289 my ($self) = @_;
1067 1290
… …
1098sub size_allocate { 1321sub size_allocate {
1099 my ($self, $w, $h) = @_; 1322 my ($self, $w, $h) = @_;
1100 1323
1101 my ($ws, $hs) = $self->get_wh; 1324 my ($ws, $hs) = $self->get_wh;
1102 1325
1103 my $req_w = sum @$ws; 1326 my $req_w = (sum @$ws) || 1;
1104 my $req_h = sum @$hs; 1327 my $req_h = (sum @$hs) || 1;
1105 1328
1106 # TODO: nicer code && do row_expand 1329 # TODO: nicer code && do row_expand
1107 my @col_expand = @{$self->{col_expand}}; 1330 my @col_expand = @{$self->{col_expand}};
1108 @col_expand = (1) x @$ws unless @col_expand; 1331 @col_expand = (1) x @$ws unless @col_expand;
1109 my $col_expand = (sum @col_expand) || 1; 1332 my $col_expand = (sum @col_expand) || 1;
… …
1163 } 1386 }
1164} 1387}
1165 1388
1166############################################################################# 1389#############################################################################
1167 1390
1168package CFClient::UI::HBox; 1391package CFClient::UI::Box;
1169
1170# TODO: wrap into common Box base class
1171 1392
1172our @ISA = CFClient::UI::Container::; 1393our @ISA = CFClient::UI::Container::;
1173 1394
1174sub size_request { 1395sub size_request {
1175 my ($self) = @_; 1396 my ($self) = @_;
1176 1397
1177 my @alloc = map [$_->size_request], @{$self->{children}}; 1398 $self->{vertical}
1178 1399 ? (
1179 ( 1400 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1180 (List::Util::sum map $_->[0], @alloc), 1401 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1181 (List::Util::max map $_->[1], @alloc), 1402 )
1182 ) 1403 : (
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 )
1183} 1407}
1184 1408
1185sub size_allocate { 1409sub size_allocate {
1186 my ($self, $w, $h) = @_; 1410 my ($self, $w, $h) = @_;
1187 1411
1188 ($h, $w) = ($w, $h); 1412 my $space = $self->{vertical} ? $h : $w;
1189
1190 my $children = $self->{children}; 1413 my $children = $self->{children};
1191 1414
1192 my @h = map $_->{req_w}, @$children; 1415 my @req;
1193 1416
1194 my $req_h = List::Util::sum @h; 1417 if ($self->{homogeneous}) {
1195 1418 @req = ($space / (@$children || 1)) x @$children;
1196 if ($req_h > $h) {
1197 # ah well, not enough space
1198 $_ *= $h / $req_h for @h;
1199 } 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 {
1200 my $exp = List::Util::sum map $_->{expand}, @$children; 1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1201 $exp ||= 1;
1202 1428
1429 $space = ($space - $req) / $expand; # remaining space to give away
1430
1431 $req[$_] += $space * $children->[$_]{expand}
1203 for (0 .. $#$children) { 1432 for 0 .. $#$children;
1204 my $child = $children->[$_];
1205
1206 my $alloc_h = $h[$_];
1207 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1208 $h[$_] = $alloc_h;
1209 } 1433 }
1210 } 1434 }
1211 1435
1212 CFClient::UI::harmonize \@h; 1436 CFClient::UI::harmonize \@req;
1213 1437
1214 my $y = 0; 1438 my $pos = 0;
1215 for (0 .. $#$children) { 1439 for (0 .. $#$children) {
1216 my $child = $children->[$_];
1217 my $h = $h[$_]; 1440 my $alloc = $req[$_];
1218 $child->configure ($y, 0, $h, $w); 1441 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1219 1442
1220 $y += $h; 1443 $pos += $alloc;
1221 } 1444 }
1222 1445
1223 1 1446 1
1224} 1447}
1225 1448
1226############################################################################# 1449#############################################################################
1227 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
1228package CFClient::UI::VBox; 1466package CFClient::UI::VBox;
1229 1467
1230# TODO: wrap into common Box base class
1231
1232our @ISA = CFClient::UI::Container::; 1468our @ISA = CFClient::UI::Box::;
1233 1469
1234sub size_request { 1470sub new {
1235 my ($self) = @_; 1471 my $class = shift;
1236 1472
1237 my @alloc = map [$_->size_request], @{$self->{children}}; 1473 $class->SUPER::new (
1238 1474 vertical => 1,
1239 ( 1475 @_,
1240 (List::Util::max map $_->[0], @alloc),
1241 (List::Util::sum map $_->[1], @alloc),
1242 ) 1476 )
1243}
1244
1245sub size_allocate {
1246 my ($self, $w, $h) = @_;
1247
1248 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1250 my $children = $self->{children};
1251
1252 my @h = map $_->{req_h}, @$children;
1253
1254 my $req_h = List::Util::sum @h;
1255
1256 if ($req_h > $h) {
1257 # ah well, not enough space
1258 $_ *= $h / $req_h for @h;
1259 } else {
1260 my $exp = List::Util::sum map $_->{expand}, @$children;
1261 $exp ||= 1;
1262
1263 for (0 .. $#$children) {
1264 my $child = $children->[$_];
1265
1266 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1267 }
1268 }
1269
1270 CFClient::UI::harmonize \@h;
1271
1272 my $y = 0;
1273 for (0 .. $#$children) {
1274 my $child = $children->[$_];
1275 my $h = $h[$_];
1276 $child->configure (0, $y, $w, $h);
1277
1278 $y += $h;
1279 }
1280
1281 1
1282} 1477}
1283 1478
1284############################################################################# 1479#############################################################################
1285 1480
1286package CFClient::UI::Label; 1481package CFClient::UI::Label;
… …
1297 #bg => none 1492 #bg => none
1298 #active_bg => none 1493 #active_bg => none
1299 #font => default_font 1494 #font => default_font
1300 #text => initial text 1495 #text => initial text
1301 #markup => initial narkup 1496 #markup => initial narkup
1497 #max_w => maximum pixel width
1498 ellipsise => 3, # end
1302 layout => (new CFClient::Layout), 1499 layout => (new CFClient::Layout),
1303 fontsize => 1, 1500 fontsize => 1,
1304 align => -1, 1501 align => -1,
1305 valign => -1, 1502 valign => -1,
1306 padding => 2, 1503 padding_x => 2,
1504 padding_y => 2,
1307 can_events => 0, 1505 can_events => 0,
1308 %arg 1506 %arg
1309 ); 1507 );
1310 1508
1311 if (exists $self->{template}) { 1509 if (exists $self->{template}) {
… …
1347 $self->{text} = "T$text"; 1545 $self->{text} = "T$text";
1348 1546
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1350 $self->{layout}->set_text ($text); 1548 $self->{layout}->set_text ($text);
1351 1549
1550 $self->realloc;
1352 $self->update; 1551 $self->update;
1353 $self->check_size;
1354} 1552}
1355 1553
1356sub set_markup { 1554sub set_markup {
1357 my ($self, $markup) = @_; 1555 my ($self, $markup) = @_;
1358 1556
… …
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1560 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363 1561
1364 $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;
1365 $self->{layout}->set_markup ($markup); 1563 $self->{layout}->set_markup ($markup);
1366 1564
1565 $self->realloc;
1367 $self->update; 1566 $self->update;
1368 $self->check_size;
1369} 1567}
1370 1568
1371sub size_request { 1569sub size_request {
1372 my ($self) = @_; 1570 my ($self) = @_;
1373 1571
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1572 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $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});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1576 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1577
1378 my ($w, $h) = $self->{layout}->size; 1578 my ($w, $h) = $self->{layout}->size;
1379 1579
1380 if (exists $self->{template}) { 1580 if (exists $self->{template}) {
… …
1385 1585
1386 $w = List::Util::max $w, $w2; 1586 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1587 $h = List::Util::max $h, $h2;
1388 } 1588 }
1389 1589
1390 ( 1590 ($w, $h)
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1591}
1395 1592
1396sub size_allocate { 1593sub size_allocate {
1397 my ($self, $w, $h) = @_; 1594 my ($self, $w, $h) = @_;
1398 1595
1596 delete $self->{ox};
1597
1399 delete $self->{texture}; 1598 delete $self->{texture}
1599 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1400} 1600}
1401 1601
1402sub set_fontsize { 1602sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1603 my ($self, $fontsize) = @_;
1404 1604
1405 $self->{fontsize} = $fontsize; 1605 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1606 delete $self->{texture};
1407 1607
1408 $self->update; 1608 $self->realloc;
1409 $self->check_size;
1410} 1609}
1411 1610
1412sub _draw { 1611sub _draw {
1413 my ($self) = @_; 1612 my ($self) = @_;
1414 1613
… …
1416 1615
1417 my $tex = $self->{texture} ||= do { 1616 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1617 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1618 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $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});
1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422 1623
1423 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1624 new_from_layout CFClient::Texture $self->{layout}
1625 };
1424 1626
1627 unless (exists $self->{ox}) {
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1427 : ($self->{w} - $tex->{w}) * 0.5); 1630 : ($self->{w} - $tex->{w}) * 0.5);
1428 1631
1429 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1430 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1431 : ($self->{h} - $tex->{h}) * 0.5); 1634 : ($self->{h} - $tex->{h}) * 0.5);
1432
1433 $tex
1434 }; 1635 };
1435 1636
1436 glEnable GL_TEXTURE_2D; 1637 glEnable GL_TEXTURE_2D;
1437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1438 1639
1640 glColor_premultiply @{$self->{fg}}
1439 if ($tex->{format} == GL_ALPHA) { 1641 if $tex->{format} == GL_ALPHA;
1440 glColor @{$self->{fg}}; 1642
1441 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1442 } else {
1443 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1444 }
1445 1644
1446 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1447} 1646}
1448 1647
1449############################################################################# 1648#############################################################################
… …
1464 active_fg => [0, 0, 0], 1663 active_fg => [0, 0, 0],
1465 can_hover => 1, 1664 can_hover => 1,
1466 can_focus => 1, 1665 can_focus => 1,
1467 valign => 0, 1666 valign => 0,
1468 can_events => 1, 1667 can_events => 1,
1668 #text => ...
1469 @_ 1669 @_
1470 ) 1670 )
1471} 1671}
1472 1672
1473sub _set_text { 1673sub _set_text {
… …
1475 1675
1476 delete $self->{cur_h}; 1676 delete $self->{cur_h};
1477 1677
1478 return if $self->{text} eq $text; 1678 return if $self->{text} eq $text;
1479 1679
1480 delete $self->{texture};
1481
1482 $self->{last_activity} = $::NOW; 1680 $self->{last_activity} = $::NOW;
1483 $self->{text} = $text; 1681 $self->{text} = $text;
1484 1682
1485 $text =~ s/./*/g if $self->{hidden}; 1683 $text =~ s/./*/g if $self->{hidden};
1486 $self->{layout}->set_text ("$text "); 1684 $self->{layout}->set_text ("$text ");
1487 1685
1488 $self->emit (changed => $self->{text}); 1686 $self->_emit (changed => $self->{text});
1687 $self->update;
1489} 1688}
1490 1689
1491sub set_text { 1690sub set_text {
1492 my ($self, $text) = @_; 1691 my ($self, $text) = @_;
1493 1692
1494 $self->{cursor} = length $text; 1693 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1694 $self->_set_text ($text);
1496 $self->update; 1695
1497 $self->check_size; 1696 $self->realloc;
1498} 1697}
1499 1698
1500sub get_text { 1699sub get_text {
1501 $_[0]{text} 1700 $_[0]{text}
1502} 1701}
… …
1505 my ($self) = @_; 1704 my ($self) = @_;
1506 1705
1507 my ($w, $h) = $self->SUPER::size_request; 1706 my ($w, $h) = $self->SUPER::size_request;
1508 1707
1509 ($w + 1, $h) # add 1 for cursor 1708 ($w + 1, $h) # add 1 for cursor
1510}
1511
1512sub size_allocate {
1513 my ($self, $w, $h) = @_;
1514
1515 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1516} 1709}
1517 1710
1518sub key_down { 1711sub key_down {
1519 my ($self, $ev) = @_; 1712 my ($self, $ev) = @_;
1520 1713
… …
1535 } elsif ($sym == CFClient::SDLK_HOME) { 1728 } elsif ($sym == CFClient::SDLK_HOME) {
1536 $self->{cursor} = 0; 1729 $self->{cursor} = 0;
1537 } elsif ($sym == CFClient::SDLK_END) { 1730 } elsif ($sym == CFClient::SDLK_END) {
1538 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1539 } elsif ($uni == 27) { 1732 } elsif ($uni == 27) {
1540 $self->emit ('escape'); 1733 $self->_emit ('escape');
1541 } elsif ($uni) { 1734 } elsif ($uni) {
1542 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1543 } 1738 }
1544 1739
1545 $self->_set_text ($text); 1740 $self->_set_text ($text);
1546 $self->update; 1741
1547 $self->check_size; 1742 $self->realloc;
1743
1744 1
1548} 1745}
1549 1746
1550sub focus_in { 1747sub focus_in {
1551 my ($self) = @_; 1748 my ($self) = @_;
1552 1749
… …
1567 utf8::encode $text; 1764 utf8::encode $text;
1568 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1569 1766
1570 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1571 $self->update; 1768 $self->update;
1769
1770 1
1572} 1771}
1573 1772
1574sub mouse_motion { 1773sub mouse_motion {
1575 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1576# 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
1577} 1778}
1578 1779
1579sub _draw { 1780sub _draw {
1580 my ($self) = @_; 1781 my ($self) = @_;
1581 1782
1582 local $self->{fg} = $self->{fg}; 1783 local $self->{fg} = $self->{fg};
1583 1784
1584 if ($FOCUS == $self) { 1785 if ($FOCUS == $self) {
1585 glColor @{$self->{active_bg}}; 1786 glColor_premultiply @{$self->{active_bg}};
1586 $self->{fg} = $self->{active_fg}; 1787 $self->{fg} = $self->{active_fg};
1587 } else { 1788 } else {
1588 glColor @{$self->{bg}}; 1789 glColor_premultiply @{$self->{bg}};
1589 } 1790 }
1590 1791
1591 glEnable GL_BLEND; 1792 glEnable GL_BLEND;
1592 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1793 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1593 glBegin GL_QUADS; 1794 glBegin GL_QUADS;
1594 glVertex 0 , 0; 1795 glVertex 0 , 0;
1595 glVertex 0 , $self->{h}; 1796 glVertex 0 , $self->{h};
1596 glVertex $self->{w}, $self->{h}; 1797 glVertex $self->{w}, $self->{h};
1597 glVertex $self->{w}, 0; 1798 glVertex $self->{w}, 0;
… …
1632 if ($sym == 13) { 1833 if ($sym == 13) {
1633 unshift @{$self->{history}}, 1834 unshift @{$self->{history}},
1634 my $txt = $self->get_text; 1835 my $txt = $self->get_text;
1635 $self->{history_pointer} = -1; 1836 $self->{history_pointer} = -1;
1636 $self->{history_saveback} = ''; 1837 $self->{history_saveback} = '';
1637 $self->emit (activate => $txt); 1838 $self->_emit (activate => $txt);
1638 $self->update; 1839 $self->update;
1639 1840
1640 } elsif ($sym == CFClient::SDLK_UP) { 1841 } elsif ($sym == CFClient::SDLK_UP) {
1641 if ($self->{history_pointer} < 0) { 1842 if ($self->{history_pointer} < 0) {
1642 $self->{history_saveback} = $self->get_text; 1843 $self->{history_saveback} = $self->get_text;
… …
1658 } else { 1859 } else {
1659 $self->set_text ($self->{history_saveback}); 1860 $self->set_text ($self->{history_saveback});
1660 } 1861 }
1661 1862
1662 } else { 1863 } else {
1663 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1664 } 1867 1
1665
1666} 1868}
1667 1869
1668############################################################################# 1870#############################################################################
1669 1871
1670package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1679 1881
1680sub new { 1882sub new {
1681 my $class = shift; 1883 my $class = shift;
1682 1884
1683 $class->SUPER::new ( 1885 $class->SUPER::new (
1684 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1685 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1686 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1687 can_hover => 1, 1890 can_hover => 1,
1688 align => 0, 1891 align => 0,
1689 valign => 0, 1892 valign => 0,
1690 can_events => 1, 1893 can_events => 1,
1691 @_ 1894 @_
1692 ) 1895 )
1693} 1896}
1694 1897
1898sub activate { }
1899
1695sub button_up { 1900sub button_up {
1696 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1697 1902
1903 $self->emit ("activate")
1698 if ($x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1699 && $y >= 0 && $y < $self->{h}) { 1905 && $y >= 0 && $y < $self->{h};
1700 $self->emit ("activate"); 1906
1701 } 1907 1
1702} 1908}
1703 1909
1704sub _draw { 1910sub _draw {
1705 my ($self) = @_; 1911 my ($self) = @_;
1706 1912
1707 local $self->{fg} = $self->{fg}; 1913 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1708
1709 if ($GRAB == $self) {
1710 $self->{fg} = $self->{active_fg};
1711 }
1712 1914
1713 glEnable GL_TEXTURE_2D; 1915 glEnable GL_TEXTURE_2D;
1714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1715 glColor 0, 0, 0, 1; 1917 glColor 0, 0, 0, 1;
1716 1918
… …
1735 1937
1736sub new { 1938sub new {
1737 my $class = shift; 1939 my $class = shift;
1738 1940
1739 $class->SUPER::new ( 1941 $class->SUPER::new (
1740 padding => 2, 1942 padding_x => 2,
1943 padding_y => 2,
1741 fg => [1, 1, 1], 1944 fg => [1, 1, 1],
1742 active_fg => [1, 1, 0], 1945 active_fg => [1, 1, 0],
1743 bg => [0, 0, 0, 0.2], 1946 bg => [0, 0, 0, 0.2],
1744 active_bg => [1, 1, 1, 0.5], 1947 active_bg => [1, 1, 1, 0.5],
1745 state => 0, 1948 state => 0,
… …
1749} 1952}
1750 1953
1751sub size_request { 1954sub size_request {
1752 my ($self) = @_; 1955 my ($self) = @_;
1753 1956
1754 ($self->{padding} * 2 + 6) x 2 1957 (6) x 2
1755} 1958}
1756 1959
1757sub button_down { 1960sub button_down {
1758 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1759 1962
1760 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1761 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1762 $self->{state} = !$self->{state}; 1965 $self->{state} = !$self->{state};
1763 $self->emit (changed => $self->{state}); 1966 $self->_emit (changed => $self->{state});
1967 } else {
1968 return 0
1969 }
1970
1764 } 1971 1
1765} 1972}
1766 1973
1767sub _draw { 1974sub _draw {
1768 my ($self) = @_; 1975 my ($self) = @_;
1769 1976
1770 $self->SUPER::_draw; 1977 $self->SUPER::_draw;
1771 1978
1772 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1979 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1773 1980
1774 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;
1775 1984
1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1985 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1777 1986
1778 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1987 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779 1988
… …
1934 2143
1935 my $h1 = $self->{h} * (1 - $ycut1); 2144 my $h1 = $self->{h} * (1 - $ycut1);
1936 my $h2 = $self->{h} * (1 - $ycut2); 2145 my $h2 = $self->{h} * (1 - $ycut2);
1937 2146
1938 glEnable GL_BLEND; 2147 glEnable GL_BLEND;
1939 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;
1940 glEnable GL_TEXTURE_2D; 2150 glEnable GL_TEXTURE_2D;
1941 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1942 2152
1943 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2153 glBindTexture GL_TEXTURE_2D, $t1->{name};
1944 glBegin GL_QUADS; 2154 glBegin GL_QUADS;
… …
2043 my $self = $class->SUPER::new ( 2253 my $self = $class->SUPER::new (
2044 fg => [1, 1, 1], 2254 fg => [1, 1, 1],
2045 active_fg => [0, 0, 0], 2255 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2], 2256 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5], 2257 active_bg => [1, 1, 1, 0.5],
2048 range => [0, 0, 100, 10], 2258 range => [0, 0, 100, 10, 0],
2049 req_w => $::WIDTH / 80, 2259 min_w => $::WIDTH / 80,
2050 req_h => $::WIDTH / 80, 2260 min_h => $::WIDTH / 80,
2051 vertical => 0, 2261 vertical => 0,
2052 can_hover => 1, 2262 can_hover => 1,
2053 inner_pad => .05, 2263 inner_pad => 0.02,
2054 @_ 2264 @_
2055 ); 2265 );
2056 2266
2057 $self->set_value ($self->{range}[0]); 2267 $self->set_value ($self->{range}[0]);
2058 $self->update; 2268 $self->update;
2059 2269
2060 $self 2270 $self
2061} 2271}
2062 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
2063sub set_value { 2284sub set_value {
2064 my ($self, $value) = @_; 2285 my ($self, $value) = @_;
2065 2286
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2287 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067 2288
2068 $hi = $lo + 1 if $hi <= $lo; 2289 $hi = $lo + 1 if $hi <= $lo;
2069 2290
2291 $page = $hi - $lo if $page > $hi - $lo;
2292
2070 $value = $lo if $value < $lo; 2293 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi; 2294 $value = $hi - $page if $value > $hi - $page;
2072 2295
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2296 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit; 2297 if $unit;
2075 2298
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2299 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079 2300
2080 if ($value != $old_value) { 2301 if ($value != $old_value) {
2081 $self->emit (changed => $value); 2302 $self->_emit (changed => $value);
2082 $self->update; 2303 $self->update;
2083 } 2304 }
2084} 2305}
2085 2306
2086sub size_request { 2307sub size_request {
2087 my ($self) = @_; 2308 my ($self) = @_;
2088 2309
2089 my $w = $self->{req_w}; 2310 ($self->{req_w}, $self->{req_h})
2090 my $h = $self->{req_h};
2091
2092 $self->{vertical} ? ($h, $w) : ($w, $h)
2093} 2311}
2094 2312
2095sub button_down { 2313sub button_down {
2096 my ($self, $ev, $x, $y) = @_; 2314 my ($self, $ev, $x, $y) = @_;
2097 2315
2098 $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
2099 $self->mouse_motion ($ev, $x, $y); 2320 $self->mouse_motion ($ev, $x, $y)
2100} 2321}
2101 2322
2102sub mouse_motion { 2323sub mouse_motion {
2103 my ($self, $ev, $x, $y) = @_; 2324 my ($self, $ev, $x, $y) = @_;
2104 2325
2105 if ($GRAB == $self) { 2326 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2327 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107 2328
2108 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2329 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109 2330
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2331 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111 2332
2112 $self->set_value ($x * ($hi - $lo) + $lo); 2333 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2334 } else {
2335 return 0;
2336 }
2337
2113 } 2338 1
2114} 2339}
2115 2340
2116sub update { 2341sub update {
2117 my ($self) = @_; 2342 my ($self) = @_;
2118 2343
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2344 delete $self->{knob_w};
2345 $self->SUPER::update;
2346}
2347
2348sub _draw {
2349 my ($self) = @_;
2350
2351 unless ($self->{knob_w}) {
2120 $self->set_value ($self->{range}[0]); 2352 $self->set_value ($self->{range}[0]);
2121 2353
2122 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2354 my ($value, $lo, $hi, $page) = @{$self->{range}};
2355 my $range = ($hi - $page - $lo) || 1e-100;
2123 2356
2124 my $inner_w = 1 - 2 * $self->{inner_pad}; 2357 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125 2358
2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2359 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2360 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127 2361
2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2362 $value = ($value - $lo) / $range;
2129 $value = $self->{scale} * ($value - $lo); 2363 $value = $value * $self->{scale} + $self->{offset};
2130 2364
2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
2132
2133 $value = 0 if $value < 0;
2134 $page = 1 - $value if $value + $page > 1;
2135
2136 $self->{knob_x} = $value; 2365 $self->{knob_x} = $value - $knob_w * 0.5;
2137 $self->{knob_w} = $page; 2366 $self->{knob_w} = $knob_w;
2138 }); 2367 }
2139
2140 $self->SUPER::update;
2141}
2142
2143sub _draw {
2144 my ($self) = @_;
2145 2368
2146 $self->SUPER::_draw (); 2369 $self->SUPER::_draw ();
2147 2370
2148 glScale $self->{w}, $self->{h}; 2371 glScale $self->{w}, $self->{h};
2149 2372
2150 if ($self->{vertical}) { 2373 if ($self->{vertical}) {
2151 # draw a vertical slider like a rotated horizontal slider 2374 # draw a vertical slider like a rotated horizontal slider
2152 2375
2376 glTranslate 1, 0, 0;
2153 glRotate 90, 0, 0, 1; 2377 glRotate 90, 0, 0, 1;
2154 glTranslate 0, 1, 0;
2155 } 2378 }
2156 2379
2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2380 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2381 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159 2382
… …
2166 # draw handle 2389 # draw handle
2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2390 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168 2391
2169 glDisable GL_TEXTURE_2D; 2392 glDisable GL_TEXTURE_2D;
2170} 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 (@_) }
2171 2435
2172############################################################################# 2436#############################################################################
2173 2437
2174package CFClient::UI::TextView; 2438package CFClient::UI::TextView;
2175 2439
… …
2205 2469
2206 $self->{fontsize} = $fontsize; 2470 $self->{fontsize} = $fontsize;
2207 $self->reflow; 2471 $self->reflow;
2208} 2472}
2209 2473
2210sub text_height {
2211 my ($self, $text) = @_;
2212
2213 my $layout = $self->{layout};
2214
2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2216 $layout->set_width ($self->{children}[0]{w});
2217 $layout->set_markup ($text);
2218
2219 ($layout->size)[1]
2220}
2221
2222sub reflow {
2223 my ($self) = @_;
2224
2225 $self->{need_reflow}++;
2226 $self->update;
2227}
2228
2229sub size_allocate { 2474sub size_allocate {
2230 my ($self, $w, $h) = @_; 2475 my ($self, $w, $h) = @_;
2231 2476
2232 $self->SUPER::size_allocate ($w, $h); 2477 $self->SUPER::size_allocate ($w, $h);
2233 2478
… …
2236 $self->{layout}->set_width ($self->{children}[0]{w}); 2481 $self->{layout}->set_width ($self->{children}[0]{w});
2237 2482
2238 $self->reflow; 2483 $self->reflow;
2239} 2484}
2240 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
2241sub add_paragraph { 2520sub add_paragraph {
2242 my ($self, $color, $text) = @_; 2521 my ($self, $color, $text, $indent) = @_;
2243 2522
2244 #TODO: intelligently "reformat" paragraph 2523 for my $line (split /\n/, $text) {
2245 2524 my ($w, $h) = $self->text_size ($line);
2246 my $height = $self->text_height ($text);
2247
2248 $self->{height} += $height; 2525 $self->{height} += $h;
2526 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2527 }
2249 2528
2250 push @{$self->{par}}, [$height, $color, $text];
2251
2252 $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]);
2253 $self->{children}[1]->update;
2254} 2530}
2255 2531
2256sub update { 2532sub update {
2257 my ($self) = @_; 2533 my ($self) = @_;
2258 2534
… …
2261 return unless $self->{h} > 0; 2537 return unless $self->{h} > 0;
2262 2538
2263 delete $self->{texture}; 2539 delete $self->{texture};
2264 2540
2265 $ROOT->on_post_alloc ($self, sub { 2541 $ROOT->on_post_alloc ($self, sub {
2542 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543
2266 if (delete $self->{need_reflow}) { 2544 if (delete $self->{need_reflow}) {
2267 my $height = 0; 2545 my $height = 0;
2268 2546
2269 $height += $_->[0] = $self->text_height ($_->[2]) 2547 my $layout = $self->{layout};
2548
2549 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550
2270 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 }
2271 2562
2272 $self->{height} = $height; 2563 $self->{height} = $height;
2273 2564
2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2565 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275 2566
2276 delete $self->{texture}; 2567 delete $self->{texture};
2277 } 2568 }
2278 2569
2279 $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 {
2280 glClearColor 0, 0, 0, 0; 2571 glClearColor 0, 0, 0, 0;
2281 glClear GL_COLOR_BUFFER_BIT; 2572 glClear GL_COLOR_BUFFER_BIT;
2282 2573
2283 glEnable GL_TEXTURE_2D;
2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2285
2286 my $top = int $self->{children}[1]{range}[0]; 2574 my $top = int $self->{children}[1]{range}[0];
2287 2575
2288 my $y0 = $top; 2576 my $y0 = $top;
2289 my $y1 = $top + $self->{h}; 2577 my $y1 = $top + $H;
2290 2578
2291 my $y = 0; 2579 my $y = 0;
2292 2580
2293 my $layout = $self->{layout}; 2581 my $layout = $self->{layout};
2294 2582
2295 $layout->set_font ($self->{font}) if $self->{font}; 2583 $layout->set_font ($self->{font}) if $self->{font};
2296 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
2297 for my $par (@{$self->{par}}) { 2589 for my $par (@{$self->{par}}) {
2298 my $h = $par->[0]; 2590 my $h = $par->[1];
2299 2591
2300 if ($y0 < $y + $h && $y < $y1) { 2592 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] }); 2593 $layout->set_foreground (@{ $par->[2] });
2594 $layout->set_width ($W - $par->[3]);
2302 $layout->set_markup ($par->[2]); 2595 $layout->set_markup ($par->[4]);
2303 2596
2304 my ($W, $H) = $layout->size; 2597 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305 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;
2306 } 2601 }
2307 2602
2308 $y += $h; 2603 $y += $h;
2309 } 2604 }
2310 2605
2311 glDisable GL_TEXTURE_2D; 2606 glDisable GL_BLEND;
2312 }; 2607 };
2313 }); 2608 });
2314} 2609}
2315 2610
2316sub _draw { 2611sub _draw {
2317 my ($self) = @_; 2612 my ($self) = @_;
2318 2613
2319 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321 glColor 1, 1, 1, 1; 2616 glColor 0, 0, 0, 1;
2322 $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});
2323 glDisable GL_TEXTURE_2D; 2618 glDisable GL_TEXTURE_2D;
2324 2619
2325 $self->{children}[1]->draw; 2620 $self->{children}[1]->draw;
2326 2621
… …
2376 2671
2377sub new { 2672sub new {
2378 my $class = shift; 2673 my $class = shift;
2379 2674
2380 my $self = $class->SUPER::new ( 2675 my $self = $class->SUPER::new (
2381 state => 0, 2676 state => 0,
2382 connect_activate => \&toggle_flopper, 2677 on_activate => \&toggle_flopper,
2383 @_ 2678 @_
2384 ); 2679 );
2385 2680
2386 if ($self->{state}) {
2387 $self->{state} = 0;
2388 $self->toggle_flopper;
2389 }
2390
2391 $self 2681 $self
2392} 2682}
2393 2683
2394sub toggle_flopper { 2684sub toggle_flopper {
2395 my ($self) = @_; 2685 my ($self) = @_;
2396 2686
2397 # TODO: use animation 2687 $self->{other}->toggle_visibility;
2398 if ($self->{state} = !$self->{state}) {
2399 $CFClient::UI::ROOT->add ($self->{other});
2400 $self->{other}->move ($self->coord2global (0, $self->{h}));
2401 $self->emit ("open");
2402 } else {
2403 $CFClient::UI::ROOT->remove ($self->{other});
2404 $self->emit ("close");
2405 }
2406
2407 $self->emit (changed => $self->{state});
2408} 2688}
2409 2689
2410############################################################################# 2690#############################################################################
2411 2691
2412package CFClient::UI::Tooltip; 2692package CFClient::UI::Tooltip;
… …
2425} 2705}
2426 2706
2427sub set_tooltip_from { 2707sub set_tooltip_from {
2428 my ($self, $widget) = @_; 2708 my ($self, $widget) = @_;
2429 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
2430 $self->add (new CFClient::UI::Label 2719 $self->add (new CFClient::UI::Label
2431 markup => $widget->{tooltip}, 2720 markup => $tooltip,
2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8, 2722 fontsize => 0.8,
2434 fg => [0, 0, 0, 1], 2723 fg => [0, 0, 0, 1],
2724 ellipsise => 0,
2435 font => ($widget->{tooltip_font} || $::FONT_PROP), 2725 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 ); 2726 );
2437} 2727}
2438 2728
2439sub size_request { 2729sub size_request {
2440 my ($self) = @_; 2730 my ($self) = @_;
… …
2446 2736
2447sub size_allocate { 2737sub size_allocate {
2448 my ($self, $w, $h) = @_; 2738 my ($self, $w, $h) = @_;
2449 2739
2450 $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 });
2451} 2759}
2452 2760
2453sub _draw { 2761sub _draw {
2454 my ($self) = @_; 2762 my ($self) = @_;
2455 2763
… …
2472 glVertex $w, $h; 2780 glVertex $w, $h;
2473 glVertex $w, 0; 2781 glVertex $w, 0;
2474 glEnd; 2782 glEnd;
2475 2783
2476 glTranslate 2 - 0.375, 2 - 0.375; 2784 glTranslate 2 - 0.375, 2 - 0.375;
2785
2477 $self->SUPER::_draw; 2786 $self->SUPER::_draw;
2478} 2787}
2479 2788
2480############################################################################# 2789#############################################################################
2481 2790
… …
2486use CFClient::OpenGL; 2795use CFClient::OpenGL;
2487 2796
2488sub new { 2797sub new {
2489 my $class = shift; 2798 my $class = shift;
2490 2799
2491 $class->SUPER::new ( 2800 my $self = $class->SUPER::new (
2492 aspect => 1, 2801 aspect => 1,
2802 can_events => 0,
2493 @_, 2803 @_,
2494 ) 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
2495} 2821}
2496 2822
2497sub size_request { 2823sub size_request {
2498 (32, 8) 2824 (32, 8)
2499} 2825}
2500 2826
2827sub update {
2828 my ($self) = @_;
2829
2830 return unless $self->{visible};
2831
2832 $self->SUPER::update;
2833}
2834
2501sub _draw { 2835sub _draw {
2502 my ($self) = @_; 2836 my ($self) = @_;
2503 2837
2504 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
2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2849 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506 2850
2507 # TODO animation
2508 if ($tex) { 2851 if ($tex) {
2509 glEnable GL_TEXTURE_2D; 2852 glEnable GL_TEXTURE_2D;
2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511 glColor 1, 1, 1, 1; 2854 glColor 0, 0, 0, 1;
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513 glDisable GL_TEXTURE_2D; 2856 glDisable GL_TEXTURE_2D;
2514 } 2857 }
2515} 2858}
2516 2859
2860sub DESTROY {
2861 my ($self) = @_;
2862
2863 $self->{timer}->cancel
2864 if $self->{timer};
2865
2866 $self->SUPER::DESTROY;
2867}
2868
2517############################################################################# 2869#############################################################################
2518 2870
2519package CFClient::UI::InventoryItem; 2871package CFClient::UI::Buttonbar;
2520 2872
2521our @ISA = CFClient::UI::HBox::; 2873our @ISA = CFClient::UI::HBox::;
2522 2874
2523sub _item_to_desc { 2875# TODO: should actualyl wrap buttons and other goodies.
2524 my ($item) = @_;
2525
2526 my $desc =
2527 $item->{nrof} < 2
2528 ? $item->{name}
2529 : "$item->{nrof} $item->{name_pl}";
2530
2531 $item->{flags} & Crossfire::Protocol::F_OPEN
2532 and $desc .= " (open)";
2533 $item->{flags} & Crossfire::Protocol::F_APPLIED
2534 and $desc .= " (applied)";
2535 $item->{flags} & Crossfire::Protocol::F_UNPAID
2536 and $desc .= " (unpaid)";
2537 $item->{flags} & Crossfire::Protocol::F_MAGIC
2538 and $desc .= " (magic)";
2539 $item->{flags} & Crossfire::Protocol::F_CURSED
2540 and $desc .= " (cursed)";
2541 $item->{flags} & Crossfire::Protocol::F_DAMNED
2542 and $desc .= " (damned)";
2543 $item->{flags} & Crossfire::Protocol::F_LOCKED
2544 and $desc .= " *";
2545
2546 $desc
2547}
2548
2549sub new {
2550 my $class = shift;
2551
2552 my %args = @_;
2553
2554 my $item = delete $args{item};
2555
2556 my $desc = _item_to_desc ($item);
2557
2558 my $self = $class->SUPER::new (
2559 can_hover => 1,
2560 can_events => 1,
2561 tooltip => ((CFClient::UI::Label::escape $desc)
2562 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2563 connect_button_down => sub {
2564 my ($self, $ev, $x, $y) = @_;
2565
2566 # todo: maybe put examine on 1? but should just be a tooltip :(
2567 if ($ev->{button} == 1) {
2568 my $targ = $::CONN->{player}{tag};
2569
2570 if ($item->{container} == $::CONN->{player}{tag}) {
2571 $targ = $main::OPENCONT;
2572 }
2573
2574 $::CONN->send ("move $targ $item->{tag} 0");
2575 } elsif ($ev->{button} == 2) {
2576 $::CONN->send ("apply $item->{tag}");
2577 } elsif ($ev->{button} == 3) {
2578 my @menu_items = (
2579 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2580 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2581 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2582 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2583 [
2584 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2585 sub { $::CONN->send ("lock $item->{tag}") },
2586 ],
2587 );
2588
2589 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2590 }
2591
2592 1
2593 },
2594 %args
2595 );
2596
2597
2598 $self->add (new CFClient::UI::Face
2599 can_events => 0,
2600 face => $item->{face},
2601 anim => $item->{anim},
2602 animspeed => $item->{animspeed},
2603 );
2604
2605 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2606
2607 $self->{item} = $item;
2608
2609 $self->update_item;
2610
2611 $self
2612}
2613
2614sub update_item {
2615 my ($self) = @_;
2616
2617 my $desc = _item_to_desc ($self->{item});
2618
2619 $self->{name_lbl}->set_text ($desc);
2620}
2621
2622#############################################################################
2623
2624package CFClient::UI::Inventory;
2625
2626our @ISA = CFClient::UI::ScrolledWindow::;
2627
2628sub new {
2629 my $class = shift;
2630
2631 my $self = $class->SUPER::new (
2632 scrolled => (new CFClient::UI::VBox),
2633 @_,
2634 );
2635
2636 $self
2637}
2638
2639sub set_items {
2640 my ($self, $items) = @_;
2641
2642 $self->{scrolled}->clear;
2643 return unless $items;
2644
2645 my @items = sort {
2646 ($a->{type} <=> $b->{type})
2647 or ($a->{name} cmp $b->{name})
2648 } @$items;
2649
2650 $self->{real_items} = \@items;
2651
2652 for my $item (@items) {
2653 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2654 $item->update_item ();
2655 }
2656
2657 $self->{scrolled}->add (@items);
2658
2659# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2660}
2661
2662sub size_request {
2663 my ($self) = @_;
2664 ($self->{req_w}, $self->{req_h});
2665}
2666 2876
2667############################################################################# 2877#############################################################################
2668 2878
2669package CFClient::UI::Menu; 2879package CFClient::UI::Menu;
2670 2880
… …
2704 2914
2705# 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)
2706sub popup { 2916sub popup {
2707 my ($self, $ev) = @_; 2917 my ($self, $ev) = @_;
2708 2918
2709 $self->emit ("popdown"); 2919 $self->_emit ("popdown");
2710 2920
2711 # maybe save $GRAB? must be careful about events... 2921 # maybe save $GRAB? must be careful about events...
2712 $GRAB = $self; 2922 $GRAB = $self;
2713 $self->{button} = $ev->{button}; 2923 $self->{button} = $ev->{button};
2714 2924
2715 $self->show; 2925 $self->show;
2716 $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);
2717} 2927}
2718 2928
2719sub mouse_motion { 2929sub mouse_motion {
2720 my ($self, $ev, $x, $y) = @_; 2930 my ($self, $ev, $x, $y) = @_;
2721 2931
2722 # TODO: should use vbox->find_widget or so 2932 # TODO: should use vbox->find_widget or so
2723 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2724 $self->{hover} = $self->{item}{$HOVER}; 2934 $self->{hover} = $self->{item}{$HOVER};
2935
2936 0
2725} 2937}
2726 2938
2727sub button_up { 2939sub button_up {
2728 my ($self, $ev, $x, $y) = @_; 2940 my ($self, $ev, $x, $y) = @_;
2729 2941
2730 if ($ev->{button} == $self->{button}) { 2942 if ($ev->{button} == $self->{button}) {
2731 undef $GRAB; 2943 undef $GRAB;
2732 $self->hide; 2944 $self->hide;
2733 2945
2734 $self->emit ("popdown"); 2946 $self->_emit ("popdown");
2735 $self->{hover}[1]->() if $self->{hover}; 2947 $self->{hover}[1]->() if $self->{hover};
2948 } else {
2949 return 0
2950 }
2951
2952 1
2953}
2954
2955#############################################################################
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 );
2736 } 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});
2737} 3061}
2738 3062
2739############################################################################# 3063#############################################################################
2740 3064
2741package CFClient::UI::Statusbox; 3065package CFClient::UI::Statusbox;
… …
2774 # TODO: doesn't handle markup well (read as: at all) 3098 # TODO: doesn't handle markup well (read as: at all)
2775 my $short = $item->{count} > 1 3099 my $short = $item->{count} > 1
2776 ? "<b>$item->{count} ×</b> $item->{text}" 3100 ? "<b>$item->{count} ×</b> $item->{text}"
2777 : $item->{text}; 3101 : $item->{text};
2778 3102
2779 my $fontsize = $item->{fontsize} || $self->{fontsize};
2780
2781 for ($short) { 3103 for ($short) {
2782 s/^\s+//; 3104 s/^\s+//;
2783 s/\s+/ /g; 3105 s/\s+/ /g;
2784 my $len = int 40 / $fontsize;
2785 substr $_, $len, length, "…" if $len < length;
2786 } 3106 }
2787 3107
2788 new CFClient::UI::Label 3108 new CFClient::UI::Label
2789 markup => $short, 3109 markup => $short,
2790 tooltip => $item->{tooltip}, 3110 tooltip => $item->{tooltip},
2791 tooltip_font => $::FONT_PROP, 3111 tooltip_font => $::FONT_PROP,
2792 tooltip_width => 0.67, 3112 tooltip_width => 0.67,
2793 fontsize => $fontsize, 3113 fontsize => $item->{fontsize} || $self->{fontsize},
3114 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg}, 3115 fg => $item->{fg},
2795 can_events => 1, 3116 can_events => 1,
2796 can_hover => 1 3117 can_hover => 1
2797 }; 3118 };
2798 } 3119 }
… …
2804sub add { 3125sub add {
2805 my ($self, $text, %arg) = @_; 3126 my ($self, $text, %arg) = @_;
2806 3127
2807 $text =~ s/^\s+//; 3128 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 3129 $text =~ s/\s+$//;
3130
3131 return unless $text;
2809 3132
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 3133 my $timeout = time + ((delete $arg{timeout}) || 60);
2811 3134
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3135 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 3136
… …
2835 } 3158 }
2836 3159
2837 $self->reorder; 3160 $self->reorder;
2838} 3161}
2839 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
2840############################################################################# 3173#############################################################################
2841 3174
2842package CFClient::UI::Root; 3175package CFClient::UI::Inventory;
2843 3176
2844our @ISA = CFClient::UI::Container::; 3177our @ISA = CFClient::UI::ScrolledWindow::;
2845
2846use CFClient::OpenGL;
2847 3178
2848sub new { 3179sub new {
2849 my $class = shift; 3180 my $class = shift;
2850 3181
2851 $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 => [],
2852 @_, 3424 @_,
2853 ) 3425 )
2854} 3426}
2855 3427
2856sub configure { 3428# XXX: Do sorting? Argl...
2857 my ($self, $x, $y, $w, $h) = @_; 3429sub add_spell {
2858
2859 $self->{w} = $w;
2860 $self->{h} = $h;
2861}
2862
2863sub check_size {
2864 my ($self) = @_; 3430 my ($self, $spell) = @_;
3431 $self->{spells}->{$spell->{name}} = $spell;
2865 3432
2866 $self->size_allocate ($self->{w}, $self->{h}) 3433 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2867 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
2868} 3487}
2869 3488
2870sub size_request { 3489sub size_request {
2871 my ($self) = @_; 3490 my ($self) = @_;
2872 3491
2873 ($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
2874} 3507}
2875 3508
2876sub size_allocate { 3509sub size_allocate {
2877 my ($self, $w, $h) = @_; 3510 my ($self, $w, $h) = @_;
2878 3511
2879 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2880 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2881
2882 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2883 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2884
2885 for my $child ($self->children) { 3512 for my $child ($self->children) {
2886 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)};
2887 3514
2888 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3515 $X = $child->{force_x} if exists $child->{force_x};
2889 if exists $child->{req_x}; 3516 $Y = $child->{force_y} if exists $child->{force_y};
2890 3517
2891 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3518 $X = _to_pixel $X, $W, $self->{w};
2892 if exists $child->{req_y}; 3519 $Y = _to_pixel $Y, $H, $self->{h};
2893
2894 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2895 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2896 3520
2897 $child->configure ($X, $Y, $W, $H); 3521 $child->configure ($X, $Y, $W, $H);
2898 } 3522 }
2899} 3523}
2900 3524
… …
2911} 3535}
2912 3536
2913sub update { 3537sub update {
2914 my ($self) = @_; 3538 my ($self) = @_;
2915 3539
2916 $self->check_size;
2917 $::WANT_REFRESH++; 3540 $::WANT_REFRESH++;
2918} 3541}
2919 3542
2920sub add { 3543sub add {
2921 my ($self, @children) = @_; 3544 my ($self, @children) = @_;
2922 3545
2923 for my $child (@children) {
2924 $child->{toplevel} = 1; 3546 $_->{is_toplevel} = 1
2925 3547 for @children;
2926 # integerise window positions
2927 $child->{x} = int $child->{x};
2928 $child->{y} = int $child->{y};
2929 }
2930 3548
2931 $self->SUPER::add (@children); 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 }
2932} 3565}
2933 3566
2934sub on_refresh { 3567sub on_refresh {
2935 my ($self, $id, $cb) = @_; 3568 my ($self, $id, $cb) = @_;
2936 3569
… …
2949 while ($self->{refresh_hook}) { 3582 while ($self->{refresh_hook}) {
2950 $_->() 3583 $_->()
2951 for values %{delete $self->{refresh_hook}}; 3584 for values %{delete $self->{refresh_hook}};
2952 } 3585 }
2953 3586
2954 if ($self->{check_size}) { 3587 if ($self->{realloc}) {
2955 my @queue = ([], []); 3588 my %queue;
3589 my @queue;
3590 my $widget;
2956 3591
2957 for (;;) { 3592 outer:
2958 if ($self->{check_size}) { 3593 while () {
2959 # heuristic: check containers last 3594 if (my $realloc = delete $self->{realloc}) {
2960 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3595 for $widget (values %$realloc) {
2961 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 }
2962 } 3602 }
2963 3603
2964 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3604 while () {
3605 @queue or last outer;
2965 3606
2966 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3607 $widget = pop @{ $queue[-1] || [] }
2967 ? @$widget{qw(user_w user_h)} 3608 and last;
2968 : $widget->size_request;
2969
2970 if (delete $widget->{force_alloc}
2971 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2972 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2973 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}) {
2974 $widget->{req_w} = $w; 3625 $widget->{req_w} = $w;
2975 $widget->{req_h} = $h; 3626 $widget->{req_h} = $h;
2976 3627
2977 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3628 $self->{size_alloc}{$widget+0} = $widget;
2978 3629
2979 $widget->{parent}->check_size
2980 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 }
2981 } 3637 }
3638
3639 delete $self->{realloc}{$widget+0};
2982 } 3640 }
2983 } 3641 }
2984 3642
2985 while ($self->{size_alloc}) { 3643 while (my $size_alloc = delete $self->{size_alloc}) {
2986 for (values %{delete $self->{size_alloc}}) { 3644 my @queue = sort { $b->{visible} <=> $a->{visible} }
2987 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)};
2988 3651
2989 $w = 0 if $w < 0; 3652 $w = 0 if $w < 0;
2990 $h = 0 if $h < 0; 3653 $h = 0 if $h < 0;
2991 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
2992 $widget->{w} = $w; 3662 $widget->{w} = $w;
2993 $widget->{h} = $h; 3663 $widget->{h} = $h;
2994 $widget->size_allocate ($w, $h); 3664
2995 $widget->emit (size_allocate => $w, $h); 3665 $widget->emit (size_allocate => $w, $h);
3666 }
2996 } 3667 }
2997 } 3668 }
2998 3669
2999 while ($self->{post_alloc_hook}) { 3670 while ($self->{post_alloc_hook}) {
3000 $_->() 3671 $_->()
3001 for values %{delete $self->{post_alloc_hook}}; 3672 for values %{delete $self->{post_alloc_hook}};
3002 } 3673 }
3003 3674
3675
3004 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3676 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3005 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3677 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3006 glClear GL_COLOR_BUFFER_BIT; 3678 glClear GL_COLOR_BUFFER_BIT;
3007 3679
3008 glMatrixMode GL_PROJECTION; 3680 glMatrixMode GL_PROJECTION;
3009 glLoadIdentity; 3681 glLoadIdentity;
3010 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3682 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3011 glMatrixMode GL_MODELVIEW; 3683 glMatrixMode GL_MODELVIEW;
3012 glLoadIdentity; 3684 glLoadIdentity;
3013 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
3014 $self->_draw; 3693 $self->_draw;
3015} 3694}
3016 3695
3017############################################################################# 3696#############################################################################
3018 3697
3019package CFClient::UI; 3698package CFClient::UI;
3020 3699
3021$ROOT = new CFClient::UI::Root; 3700$ROOT = new CFClient::UI::Root;
3022$TOOLTIP = new CFClient::UI::Tooltip; 3701$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3023 3702
30241 37031
3025 3704

Diff Legend

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