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.302 by root, Mon Jun 12 13:26:14 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $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 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
102 118
103 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
104 } 120 }
105} 121}
106 122
107sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
108 my ($ev) = @_; 124 my ($ev) = @_;
… …
114 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
115 131
116 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 $TOOLTIP_WATCHER->start;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
136 $rem += $_ - $i; 150 $rem += $_ - $i;
137 $_ = $i; 151 $_ = $i;
138 } 152 }
139} 153}
140 154
155sub full_refresh {
156 # make a copy, otherwise for complains about freed values.
157 my @widgets = values %WIDGET;
158
159 $_->update
160 for @widgets;
161}
162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
141# call when resolution changes etc. 171# call when resolution changes etc.
142sub rescale_widgets { 172sub rescale_widgets {
143 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
144 174
145 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $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}; 181 $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}; 182 $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}; 183 $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}; 184 $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}; 185 $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}; 186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
155 } 190 }
156
157 $widget->reconfigure;
158 } 191 }
192
193 reconfigure_widgets;
159} 194}
160 195
161############################################################################# 196#############################################################################
162 197
163package CFClient::UI::Base; 198package CFClient::UI::Base;
… …
168 203
169sub new { 204sub new {
170 my $class = shift; 205 my $class = shift;
171 206
172 my $self = bless { 207 my $self = bless {
173 x => 0, 208 x => "center",
174 y => 0, 209 y => "center",
175 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
176 can_events => 1, 213 can_events => 1,
177 @_ 214 @_
178 }, $class; 215 }, $class;
179 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
180 for (keys %$self) { 219 for (keys %$self) {
181 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
182 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
183 } 222 }
184 } 223 }
185 224
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
187 236
188 $self 237 $self
189} 238}
190 239
191sub destroy { 240sub destroy {
… …
201 return if $self->{parent}; 250 return if $self->{parent};
202 251
203 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
204} 253}
205 254
206sub hide { 255sub set_visible {
207 my ($self) = @_; 256 my ($self) = @_;
257
258 return if $self->{visible};
259
260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
262
263 $self->emit (visibility_change => 1);
264
265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
271 my ($self) = @_;
272
273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
276
277 delete $self->{visible};
278 delete $self->{root};
208 279
209 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
211 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
286 $self->focus_out;
287
288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
306}
307
308sub hide {
309 my ($self) = @_;
310
311 $self->set_invisible;
312
212 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
213 if $self->{parent}; 314 if $self->{parent};
214} 315}
215 316
216sub move { 317sub move_abs {
217 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
218 319
219 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
220 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
221 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
222 323
223 $self->update; 324 $self->update;
224} 325}
225 326
226sub set_size { 327sub set_size {
227 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
228 329
229 $self->{user_w} = $w; 330 $self->{force_w} = $w;
230 $self->{user_h} = $h; 331 $self->{force_h} = $h;
231 332
232 $self->check_size; 333 $self->realloc;
233} 334}
234 335
235sub size_request { 336sub size_request {
236 require Carp; 337 require Carp;
237 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
239 340
240sub configure { 341sub configure {
241 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
242 343
243 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
244 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
245 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
246 349
247 # use alignment to adjust x, y 350 # use alignment to adjust x, y
248 351
249 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
250 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
251
252 ($w, $h) = ($w2, $h2);
253 } 354 }
254 355
255 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
256 $self->{x} = $x; 357 $self->{x} = $x;
257 $self->{y} = $y; 358 $self->{y} = $y;
258 $self->update; 359 $self->update;
259 } 360 }
260 361
261 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 return unless $self->{visible};
364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
368 $self->{root}{size_alloc}{$self+0} = $self;
263 } 369 }
264} 370}
265 371
266sub size_allocate { 372sub size_allocate {
267 # nothing to be done 373 # nothing to be done
268} 374}
269 375
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
277sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
278} 382}
279 383
280sub set_max_size { 384sub set_max_size {
281 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
282 386
283 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
285} 391}
286 392
287sub set_tooltip { 393sub set_tooltip {
288 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
289 395
396 $tooltip =~ s/^\s+//;
397 $tooltip =~ s/\s+$//;
398
399 return if $self->{tooltip} eq $tooltip;
400
290 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
291 402
292 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
294 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
295 } 406 }
296} 407}
297 408
298# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
299sub coord2local { 410sub coord2local {
… …
315 return if $FOCUS == $self; 426 return if $FOCUS == $self;
316 return unless $self->{can_focus}; 427 return unless $self->{can_focus};
317 428
318 my $focus = $FOCUS; $FOCUS = $self; 429 my $focus = $FOCUS; $FOCUS = $self;
319 430
320 $self->emit (focus_in => $focus); 431 $self->_emit (focus_in => $focus);
321 432
322 $focus->update if $focus; 433 $focus->update if $focus;
323 $FOCUS->update; 434 $FOCUS->update;
324} 435}
325 436
… …
328 439
329 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
330 441
331 my $focus = $FOCUS; undef $FOCUS; 442 my $focus = $FOCUS; undef $FOCUS;
332 443
333 $self->emit (focus_out => $focus); 444 $self->_emit (focus_out => $focus);
334 445
335 $focus->update if $focus; #? 446 $focus->update if $focus; #?
336}
337 447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
449 unless $FOCUS;
450}
451
338sub mouse_motion { } 452sub mouse_motion { 0 }
339sub button_up { } 453sub button_up { 0 }
340sub key_down { } 454sub key_down { 0 }
341sub key_up { } 455sub key_up { 0 }
342 456
343sub button_down { 457sub button_down {
344 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
345 459
346 $self->focus_in; 460 $self->focus_in;
347}
348 461
349sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
350sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
351sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
352sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
353sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
354 538
355sub draw { 539sub draw {
356 my ($self) = @_; 540 my ($self) = @_;
357 541
358 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
359 553
360 glPushMatrix; 554 glPushMatrix;
361 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
362 $self->_draw;
363 glPopMatrix;
364 556
365 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
366 my ($x, $y) = @$self{qw(x y)};
367
368 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
369 glEnable GL_BLEND; 559 glEnable GL_BLEND;
370 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
371 glBegin GL_QUADS; 561 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; 562 glVertex 0 , 0;
386 glVertex $self->{w}, 0; 563 glVertex $self->{w}, 0;
387 glVertex $self->{w}, $self->{h}; 564 glVertex $self->{w}, $self->{h};
388 glVertex 0 , $self->{h}; 565 glVertex 0 , $self->{h};
389 glEnd; 566 glEnd;
567 glDisable GL_BLEND;
568 }
569
570 if ($ENV{CFPLUS_DEBUG} & 1) {
571 glPushMatrix;
572 glColor 1, 1, 0, 1;
573 glTranslate 0.375, 0.375;
574 glBegin GL_LINE_LOOP;
575 glVertex 0 , 0;
576 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1;
579 glEnd;
390 glPopMatrix; 580 glPopMatrix;
391 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
392 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
393} 586}
394 587
395sub _draw { 588sub _draw {
396 my ($self) = @_; 589 my ($self) = @_;
397 590
398 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
399} 592}
400 593
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}
448
449sub DESTROY { 594sub DESTROY {
450 my ($self) = @_; 595 my ($self) = @_;
451 596
452 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
453 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
454} 601}
455 602
456############################################################################# 603#############################################################################
457 604
458package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
483 630
484 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
485 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
486 633
487 glEnable GL_BLEND; 634 glEnable GL_BLEND;
488 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
489 glColor @$color; 636 glColor_premultiply @$color;
490 637
491 glBegin GL_QUADS; 638 glBegin GL_QUADS;
492 glVertex 0 , 0; 639 glVertex 0 , 0;
493 glVertex 0 , $h; 640 glVertex 0 , $h;
494 glVertex $w, $h; 641 glVertex $w, $h;
… …
509 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
510 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
511} 658}
512 659
513sub size_request { 660sub size_request {
514 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
515} 664}
516 665
517sub draw { } 666sub draw { }
518 667
519############################################################################# 668#############################################################################
… …
523our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
524 673
525sub new { 674sub new {
526 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
527 676
528 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
529 678
530 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
531 children => [], 680 children => [],
532 can_events => 0, 681 can_events => 0,
533 %arg, 682 %arg,
534 ); 683 );
684
535 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
536 687
537 $self 688 $self
538} 689}
539 690
540sub add { 691sub add {
… …
548 $self->{children} = [ 699 $self->{children} = [
549 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
550 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
551 ]; 702 ];
552 703
553 $self->check_size (1); 704 $self->realloc;
554 $self->update;
555} 705}
556 706
557sub children { 707sub children {
558 @{ $_[0]{children} } 708 @{ $_[0]{children} }
559} 709}
… …
564 delete $child->{parent}; 714 delete $child->{parent};
565 $child->hide; 715 $child->hide;
566 716
567 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
568 718
569 $self->check_size; 719 $self->realloc;
570 $self->update;
571} 720}
572 721
573sub clear { 722sub clear {
574 my ($self) = @_; 723 my ($self) = @_;
575 724
… …
579 for (@$children) { 728 for (@$children) {
580 delete $_->{parent}; 729 delete $_->{parent};
581 $_->hide; 730 $_->hide;
582 } 731 }
583 732
584 $self->check_size; 733 $self->realloc;
585 $self->update;
586} 734}
587 735
588sub find_widget { 736sub find_widget {
589 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
590 738
591 $x -= $self->{x}; 739 $x -= $self->{x};
592 $y -= $self->{y}; 740 $y -= $self->{y};
593 741
594 my $res; 742 my $res;
595 743
596 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
597 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
598 and return $res; 746 and return $res;
599 } 747 }
600 748
601 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
622} 770}
623 771
624sub add { 772sub add {
625 my ($self, $child) = @_; 773 my ($self, $child) = @_;
626 774
627 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
628
629 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
630} 777}
631 778
632sub remove { 779sub remove {
633 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
650 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
651} 798}
652 799
653############################################################################# 800#############################################################################
654 801
802# back-buffered drawing area
803
655package CFClient::UI::Window; 804package CFClient::UI::Window;
656 805
657our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
658 807
659use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
677 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
678 $self->update; 827 $self->update;
679} 828}
680 829
681sub _render { 830sub _render {
831 my ($self) = @_;
832
682 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
683} 834}
684 835
685sub render_child { 836sub render_child {
686 my ($self) = @_; 837 my ($self) = @_;
687 838
688 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
689 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
690 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
691 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
692 $self->_render; 850 $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 }; 851 };
701} 852}
702 853
703sub _draw { 854sub _draw {
704 my ($self) = @_; 855 my ($self) = @_;
705 856
706 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
707 858
708 my $tex = $self->{texture} 859 my $tex = $self->{texture}
709 or return; 860 or return;
710 861
711 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
… …
721 872
722package CFClient::UI::ViewPort; 873package CFClient::UI::ViewPort;
723 874
724our @ISA = CFClient::UI::Window::; 875our @ISA = CFClient::UI::Window::;
725 876
877sub new {
878 my $class = shift;
879
880 $class->SUPER::new (
881 scroll_x => 0,
882 scroll_y => 1,
883 @_,
884 )
885}
886
726sub size_request { 887sub size_request {
727 my ($self) = @_; 888 my ($self) = @_;
728 889
729 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
730 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
731 891
732 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y};
894
895 ($w, $h)
733} 896}
734 897
735sub size_allocate { 898sub size_allocate {
736 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
737 900
901 my $child = $self->child;
902
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905
906 $self->child->configure (0, 0, $w, $h);
738 $self->update; 907 $self->update;
739} 908}
740 909
741sub set_offset { 910sub set_offset {
742 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
… …
776} 945}
777 946
778sub _render { 947sub _render {
779 my ($self) = @_; 948 my ($self) = @_;
780 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
781 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
782 954
783 $self->SUPER::_render; 955 $self->SUPER::_render;
784} 956}
785 957
… …
788package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
789 961
790our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
791 963
792sub new { 964sub new {
793 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
794 968
795 my $self; 969 my $self;
796 970
797 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
798 vertical => 1, 972 vertical => 1,
799 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
800 connect_changed => sub { 974 on_changed => sub {
801 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 975 $self->{vp}->set_offset (0, $_[1]);
802 }, 976 },
803 ; 977 ;
804 978
805 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
806 vp => (new CFClient::UI::ViewPort), 980 vp => (new CFClient::UI::ViewPort expand => 1),
807 slider => $slider, 981 slider => $slider,
808 @_, 982 %arg,
809 ); 983 );
810 984
811 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp});
813 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
814 987
815 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
995}
996
997sub update {
998 my ($self) = @_;
999
1000 $self->SUPER::update;
1001
1002 # todo: overwrite size_allocate of child
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005}
1006
1007sub size_allocate {
1008 my ($self, $w, $h) = @_;
1009
1010 $self->SUPER::size_allocate ($w, $h);
1011
1012 my $child = $self->{vp}->child;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
816} 1014}
817 1015
818#TODO# update range on size_allocate depending on child 1016#TODO# update range on size_allocate depending on child
819# update viewport offset on scroll 1017# update viewport offset on scroll
820 1018
… …
840 1038
841 if ($self->{bg}) { 1039 if ($self->{bg}) {
842 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
843 1041
844 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
845 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
846 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
847 1045
848 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
849 glVertex 0 , 0; 1047 glVertex 0 , 0;
850 glVertex 0 , $h; 1048 glVertex 0 , $h;
851 glVertex $w, $h; 1049 glVertex $w, $h;
… …
864 1062
865our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
866 1064
867use CFClient::OpenGL; 1065use CFClient::OpenGL;
868 1066
869my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
870 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 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); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
872 1074
873sub new { 1075sub new {
874 my $class = shift; 1076 my ($class, %arg) = @_;
875
876 # TODO: user_x, user_y, overwrite moveto?
877 1077
878 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
879 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
880 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
881 border => 0.6, 1081 border => 0.6,
882 toplevel => 1,
883 can_events => 1, 1082 can_events => 1,
884 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
885 ); 1086 );
886 1087
887 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
888 align => 0, 1089 align => 0,
889 valign => 1, 1090 valign => 1,
890 text => $self->{title}, 1091 text => $self->{title},
891 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
892 1094
893 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
894} 1103}
895 1104
896sub border { 1105sub border {
897 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
898} 1107}
899 1108
900sub size_request { 1109sub size_request {
901 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title_widget}->size_request
1113 if $self->{title_widget};
902 1114
903 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
904 1116
905 ( 1117 (
906 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
909} 1121}
910 1122
911sub size_allocate { 1123sub size_allocate {
912 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
913 1125
1126 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h);
1130 }
1131
1132 my $border = $self->border;
1133
914 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
915 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
916 1136
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); 1137 $self->child->configure ($border, $border, $w, $h);
921} 1138}
922 1139
923sub button_down { 1140sub button_down {
924 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
925 1142
… …
941 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
942 1159
943 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
944 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
945 1162
946 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
947 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
948 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
949 $self->check_size; 1167 $self->realloc;
950 }; 1168 };
951 1169
952 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
953 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
954 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
956 $self->{motion} = sub { 1174 $self->{motion} = sub {
957 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
958 1176
959 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
960 1178
961 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
962 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
963 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
964 } 1187 1
965} 1188}
966 1189
967sub button_up { 1190sub button_up {
968 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
969 1192
970 delete $self->{motion}; 1193 !!delete $self->{motion}
971} 1194}
972 1195
973sub mouse_motion { 1196sub mouse_motion {
974 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
975 1198
976 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
977} 1202}
978 1203
979sub _draw { 1204sub _draw {
980 my ($self) = @_; 1205 my ($self) = @_;
981 1206
1207 my $child = $self->{children}[0];
1208
982 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
983 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
984 1211
985 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
987 1214
988 my $border = $self->border; 1215 my $border = $self->border;
989 1216
990 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
991 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
995 1222
996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
997 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
998 1225
999 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1000 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1001 my $rep_y = $ch / $bg->{h}; 1229 $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); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 } 1231 }
1010 1232
1011 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1012 1234
1013 $self->{title}->draw if $self->{title};
1014
1015 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw;
1240 }
1016} 1241}
1017 1242
1018############################################################################# 1243#############################################################################
1019 1244
1020package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1028sub new { 1253sub new {
1029 my $class = shift; 1254 my $class = shift;
1030 1255
1031 $class->SUPER::new ( 1256 $class->SUPER::new (
1032 col_expand => [], 1257 col_expand => [],
1033 @_ 1258 @_,
1034 ) 1259 )
1260}
1261
1262sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035} 1264}
1036 1265
1037sub add { 1266sub add {
1038 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1039 1268
1040 $child->set_parent ($self); 1269 $child->set_parent ($self);
1041 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1042 1271
1043 $child->check_size; 1272 $self->realloc;
1044} 1273}
1045 1274
1046sub children { 1275sub remove {
1047 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1276 my ($self, $child) = @_;
1048}
1049 1277
1278 # TODO: not yet implemented
1279}
1280
1050# TODO: move to container class maybe? send childs a signal on removal? 1281# TODO: move to container class maybe? send children a signal on removal?
1051sub clear { 1282sub clear {
1052 my ($self) = @_; 1283 my ($self) = @_;
1053 1284
1054 my @children = $self->children; 1285 my @children = $self->children;
1055 delete $self->{children}; 1286 delete $self->{children};
… …
1057 for (@children) { 1288 for (@children) {
1058 delete $_->{parent}; 1289 delete $_->{parent};
1059 $_->hide; 1290 $_->hide;
1060 } 1291 }
1061 1292
1062 $self->update; 1293 $self->realloc;
1063} 1294}
1064 1295
1065sub get_wh { 1296sub get_wh {
1066 my ($self) = @_; 1297 my ($self) = @_;
1067 1298
… …
1098sub size_allocate { 1329sub size_allocate {
1099 my ($self, $w, $h) = @_; 1330 my ($self, $w, $h) = @_;
1100 1331
1101 my ($ws, $hs) = $self->get_wh; 1332 my ($ws, $hs) = $self->get_wh;
1102 1333
1103 my $req_w = sum @$ws; 1334 my $req_w = (sum @$ws) || 1;
1104 my $req_h = sum @$hs; 1335 my $req_h = (sum @$hs) || 1;
1105 1336
1106 # TODO: nicer code && do row_expand 1337 # TODO: nicer code && do row_expand
1107 my @col_expand = @{$self->{col_expand}}; 1338 my @col_expand = @{$self->{col_expand}};
1108 @col_expand = (1) x @$ws unless @col_expand; 1339 @col_expand = (1) x @$ws unless @col_expand;
1109 my $col_expand = (sum @col_expand) || 1; 1340 my $col_expand = (sum @col_expand) || 1;
… …
1163 } 1394 }
1164} 1395}
1165 1396
1166############################################################################# 1397#############################################################################
1167 1398
1168package CFClient::UI::HBox; 1399package CFClient::UI::Box;
1169
1170# TODO: wrap into common Box base class
1171 1400
1172our @ISA = CFClient::UI::Container::; 1401our @ISA = CFClient::UI::Container::;
1173 1402
1174sub size_request { 1403sub size_request {
1175 my ($self) = @_; 1404 my ($self) = @_;
1176 1405
1177 my @alloc = map [$_->size_request], @{$self->{children}}; 1406 $self->{vertical}
1178 1407 ? (
1179 ( 1408 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1180 (List::Util::sum map $_->[0], @alloc), 1409 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1181 (List::Util::max map $_->[1], @alloc), 1410 )
1182 ) 1411 : (
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 )
1183} 1415}
1184 1416
1185sub size_allocate { 1417sub size_allocate {
1186 my ($self, $w, $h) = @_; 1418 my ($self, $w, $h) = @_;
1187 1419
1188 ($h, $w) = ($w, $h); 1420 my $space = $self->{vertical} ? $h : $w;
1189
1190 my $children = $self->{children}; 1421 my $children = $self->{children};
1191 1422
1192 my @h = map $_->{req_w}, @$children; 1423 my @req;
1193 1424
1194 my $req_h = List::Util::sum @h; 1425 if ($self->{homogeneous}) {
1195 1426 @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 { 1427 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1429 my $req = List::Util::sum @req;
1430
1431 if ($req > $space) {
1432 # ah well, not enough space
1433 $_ *= $space / $req for @req;
1434 } else {
1200 my $exp = List::Util::sum map $_->{expand}, @$children; 1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1201 $exp ||= 1;
1202 1436
1437 $space = ($space - $req) / $expand; # remaining space to give away
1438
1439 $req[$_] += $space * $children->[$_]{expand}
1203 for (0 .. $#$children) { 1440 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 } 1441 }
1210 } 1442 }
1211 1443
1212 CFClient::UI::harmonize \@h; 1444 CFClient::UI::harmonize \@req;
1213 1445
1214 my $y = 0; 1446 my $pos = 0;
1215 for (0 .. $#$children) { 1447 for (0 .. $#$children) {
1216 my $child = $children->[$_];
1217 my $h = $h[$_]; 1448 my $alloc = $req[$_];
1218 $child->configure ($y, 0, $h, $w); 1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1219 1450
1220 $y += $h; 1451 $pos += $alloc;
1221 } 1452 }
1222 1453
1223 1 1454 1
1224} 1455}
1225 1456
1226############################################################################# 1457#############################################################################
1227 1458
1459package CFClient::UI::HBox;
1460
1461our @ISA = CFClient::UI::Box::;
1462
1463sub new {
1464 my $class = shift;
1465
1466 $class->SUPER::new (
1467 vertical => 0,
1468 @_,
1469 )
1470}
1471
1472#############################################################################
1473
1228package CFClient::UI::VBox; 1474package CFClient::UI::VBox;
1229 1475
1230# TODO: wrap into common Box base class
1231
1232our @ISA = CFClient::UI::Container::; 1476our @ISA = CFClient::UI::Box::;
1233 1477
1234sub size_request { 1478sub new {
1235 my ($self) = @_; 1479 my $class = shift;
1236 1480
1237 my @alloc = map [$_->size_request], @{$self->{children}}; 1481 $class->SUPER::new (
1238 1482 vertical => 1,
1239 ( 1483 @_,
1240 (List::Util::max map $_->[0], @alloc),
1241 (List::Util::sum map $_->[1], @alloc),
1242 ) 1484 )
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} 1485}
1283 1486
1284############################################################################# 1487#############################################################################
1285 1488
1286package CFClient::UI::Label; 1489package CFClient::UI::Label;
… …
1297 #bg => none 1500 #bg => none
1298 #active_bg => none 1501 #active_bg => none
1299 #font => default_font 1502 #font => default_font
1300 #text => initial text 1503 #text => initial text
1301 #markup => initial narkup 1504 #markup => initial narkup
1505 #max_w => maximum pixel width
1506 ellipsise => 3, # end
1302 layout => (new CFClient::Layout), 1507 layout => (new CFClient::Layout),
1303 fontsize => 1, 1508 fontsize => 1,
1304 align => -1, 1509 align => -1,
1305 valign => -1, 1510 valign => -1,
1306 padding => 2, 1511 padding_x => 2,
1512 padding_y => 2,
1307 can_events => 0, 1513 can_events => 0,
1308 %arg 1514 %arg
1309 ); 1515 );
1310 1516
1311 if (exists $self->{template}) { 1517 if (exists $self->{template}) {
… …
1338 1544
1339 delete $self->{texture}; 1545 delete $self->{texture};
1340 $self->SUPER::update; 1546 $self->SUPER::update;
1341} 1547}
1342 1548
1549sub realloc {
1550 my ($self) = @_;
1551
1552 delete $self->{ox};
1553 $self->SUPER::realloc;
1554}
1555
1343sub set_text { 1556sub set_text {
1344 my ($self, $text) = @_; 1557 my ($self, $text) = @_;
1345 1558
1346 return if $self->{text} eq "T$text"; 1559 return if $self->{text} eq "T$text";
1347 $self->{text} = "T$text"; 1560 $self->{text} = "T$text";
1348 1561
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1350 $self->{layout}->set_text ($text); 1563 $self->{layout}->set_text ($text);
1351 1564
1565 delete $self->{size_req};
1566 $self->realloc;
1352 $self->update; 1567 $self->update;
1353 $self->check_size;
1354} 1568}
1355 1569
1356sub set_markup { 1570sub set_markup {
1357 my ($self, $markup) = @_; 1571 my ($self, $markup) = @_;
1358 1572
… …
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1576 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363 1577
1364 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1365 $self->{layout}->set_markup ($markup); 1579 $self->{layout}->set_markup ($markup);
1366 1580
1581 delete $self->{size_req};
1582 $self->realloc;
1367 $self->update; 1583 $self->update;
1368 $self->check_size;
1369} 1584}
1370 1585
1371sub size_request { 1586sub size_request {
1372 my ($self) = @_; 1587 my ($self) = @_;
1373 1588
1589 $self->{size_req} ||= do {
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1590 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{max_w} || -1); 1591 $self->{layout}->set_width ($self->{max_w} || -1);
1592 $self->{layout}->set_ellipsise ($self->{ellipsise});
1593 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1595
1378 my ($w, $h) = $self->{layout}->size; 1596 my ($w, $h) = $self->{layout}->size;
1379 1597
1380 if (exists $self->{template}) { 1598 if (exists $self->{template}) {
1381 $self->{template}->set_font ($self->{font}) if $self->{font}; 1599 $self->{template}->set_font ($self->{font}) if $self->{font};
1382 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1383 1601
1384 my ($w2, $h2) = $self->{template}->size; 1602 my ($w2, $h2) = $self->{template}->size;
1385 1603
1386 $w = List::Util::max $w, $w2; 1604 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1605 $h = List::Util::max $h, $h2;
1606 }
1607
1608 [$w, $h]
1388 } 1609 };
1389 1610
1390 ( 1611 @{ $self->{size_req} }
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1612}
1395 1613
1396sub size_allocate { 1614sub size_allocate {
1397 my ($self, $w, $h) = @_; 1615 my ($self, $w, $h) = @_;
1398 1616
1617 delete $self->{ox};
1618
1399 delete $self->{texture}; 1619 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1400} 1621}
1401 1622
1402sub set_fontsize { 1623sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1624 my ($self, $fontsize) = @_;
1404 1625
1405 $self->{fontsize} = $fontsize; 1626 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1627 delete $self->{texture};
1407 1628
1408 $self->update; 1629 $self->realloc;
1409 $self->check_size; 1630}
1631
1632sub reconfigure {
1633 my ($self) = @_;
1634
1635 delete $self->{size_req};
1636
1637 $self->SUPER::reconfigure;
1410} 1638}
1411 1639
1412sub _draw { 1640sub _draw {
1413 my ($self) = @_; 1641 my ($self) = @_;
1414 1642
… …
1416 1644
1417 my $tex = $self->{texture} ||= do { 1645 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1646 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1647 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 1648 $self->{layout}->set_width ($self->{w});
1649 $self->{layout}->set_ellipsise ($self->{ellipsise});
1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422 1652
1423 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1653 new_from_layout CFClient::Texture $self->{layout}
1654 };
1424 1655
1656 unless (exists $self->{ox}) {
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1427 : ($self->{w} - $tex->{w}) * 0.5); 1659 : ($self->{w} - $tex->{w}) * 0.5);
1428 1660
1429 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1430 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1431 : ($self->{h} - $tex->{h}) * 0.5); 1663 : ($self->{h} - $tex->{h}) * 0.5);
1432
1433 $tex
1434 }; 1664 };
1435 1665
1436 glEnable GL_TEXTURE_2D; 1666 glEnable GL_TEXTURE_2D;
1437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1438 1670
1439 if ($tex->{format} == GL_ALPHA) { 1671 if ($tex->{format} == GL_ALPHA) {
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1440 glColor @{$self->{fg}}; 1673 glColor @{$self->{fg}};
1441 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1442 } else { 1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1443 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1444 } 1678 }
1445 1679
1446 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1447} 1681}
1448 1682
… …
1464 active_fg => [0, 0, 0], 1698 active_fg => [0, 0, 0],
1465 can_hover => 1, 1699 can_hover => 1,
1466 can_focus => 1, 1700 can_focus => 1,
1467 valign => 0, 1701 valign => 0,
1468 can_events => 1, 1702 can_events => 1,
1703 #text => ...
1704 #hidden => "*",
1469 @_ 1705 @_
1470 ) 1706 )
1471} 1707}
1472 1708
1473sub _set_text { 1709sub _set_text {
… …
1475 1711
1476 delete $self->{cur_h}; 1712 delete $self->{cur_h};
1477 1713
1478 return if $self->{text} eq $text; 1714 return if $self->{text} eq $text;
1479 1715
1480 delete $self->{texture};
1481
1482 $self->{last_activity} = $::NOW; 1716 $self->{last_activity} = $::NOW;
1483 $self->{text} = $text; 1717 $self->{text} = $text;
1484 1718
1485 $text =~ s/./*/g if $self->{hidden}; 1719 $text =~ s/./*/g if $self->{hidden};
1486 $self->{layout}->set_text ("$text "); 1720 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req};
1487 1722
1488 $self->emit (changed => $self->{text}); 1723 $self->_emit (changed => $self->{text});
1724
1725 $self->realloc;
1726 $self->update;
1489} 1727}
1490 1728
1491sub set_text { 1729sub set_text {
1492 my ($self, $text) = @_; 1730 my ($self, $text) = @_;
1493 1731
1494 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1733 $self->_set_text ($text);
1496 $self->update;
1497 $self->check_size;
1498} 1734}
1499 1735
1500sub get_text { 1736sub get_text {
1501 $_[0]{text} 1737 $_[0]{text}
1502} 1738}
… …
1505 my ($self) = @_; 1741 my ($self) = @_;
1506 1742
1507 my ($w, $h) = $self->SUPER::size_request; 1743 my ($w, $h) = $self->SUPER::size_request;
1508 1744
1509 ($w + 1, $h) # add 1 for cursor 1745 ($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} 1746}
1517 1747
1518sub key_down { 1748sub key_down {
1519 my ($self, $ev) = @_; 1749 my ($self, $ev) = @_;
1520 1750
… …
1535 } elsif ($sym == CFClient::SDLK_HOME) { 1765 } elsif ($sym == CFClient::SDLK_HOME) {
1536 $self->{cursor} = 0; 1766 $self->{cursor} = 0;
1537 } elsif ($sym == CFClient::SDLK_END) { 1767 } elsif ($sym == CFClient::SDLK_END) {
1538 $self->{cursor} = length $text; 1768 $self->{cursor} = length $text;
1539 } elsif ($uni == 27) { 1769 } elsif ($uni == 27) {
1540 $self->emit ('escape'); 1770 $self->_emit ('escape');
1541 } elsif ($uni) { 1771 } elsif ($uni) {
1542 substr $text, $self->{cursor}++, 0, chr $uni; 1772 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else {
1774 return 0;
1543 } 1775 }
1544 1776
1545 $self->_set_text ($text); 1777 $self->_set_text ($text);
1546 $self->update; 1778
1547 $self->check_size; 1779 $self->realloc;
1780
1781 1
1548} 1782}
1549 1783
1550sub focus_in { 1784sub focus_in {
1551 my ($self) = @_; 1785 my ($self) = @_;
1552 1786
… …
1567 utf8::encode $text; 1801 utf8::encode $text;
1568 $self->{cursor} = length substr $text, 0, $idx; 1802 $self->{cursor} = length substr $text, 0, $idx;
1569 1803
1570 $self->_set_text ($self->{text}); 1804 $self->_set_text ($self->{text});
1571 $self->update; 1805 $self->update;
1806
1807 1
1572} 1808}
1573 1809
1574sub mouse_motion { 1810sub mouse_motion {
1575 my ($self, $ev, $x, $y) = @_; 1811 my ($self, $ev, $x, $y) = @_;
1576# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813
1814 0
1577} 1815}
1578 1816
1579sub _draw { 1817sub _draw {
1580 my ($self) = @_; 1818 my ($self) = @_;
1581 1819
1582 local $self->{fg} = $self->{fg}; 1820 local $self->{fg} = $self->{fg};
1583 1821
1584 if ($FOCUS == $self) { 1822 if ($FOCUS == $self) {
1585 glColor @{$self->{active_bg}}; 1823 glColor_premultiply @{$self->{active_bg}};
1586 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1587 } else { 1825 } else {
1588 glColor @{$self->{bg}}; 1826 glColor_premultiply @{$self->{bg}};
1589 } 1827 }
1590 1828
1591 glEnable GL_BLEND; 1829 glEnable GL_BLEND;
1592 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1830 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1593 glBegin GL_QUADS; 1831 glBegin GL_QUADS;
1594 glVertex 0 , 0; 1832 glVertex 0 , 0;
1595 glVertex 0 , $self->{h}; 1833 glVertex 0 , $self->{h};
1596 glVertex $self->{w}, $self->{h}; 1834 glVertex $self->{w}, $self->{h};
1597 glVertex $self->{w}, 0; 1835 glVertex $self->{w}, 0;
… …
1632 if ($sym == 13) { 1870 if ($sym == 13) {
1633 unshift @{$self->{history}}, 1871 unshift @{$self->{history}},
1634 my $txt = $self->get_text; 1872 my $txt = $self->get_text;
1635 $self->{history_pointer} = -1; 1873 $self->{history_pointer} = -1;
1636 $self->{history_saveback} = ''; 1874 $self->{history_saveback} = '';
1637 $self->emit (activate => $txt); 1875 $self->_emit (activate => $txt);
1638 $self->update; 1876 $self->update;
1639 1877
1640 } elsif ($sym == CFClient::SDLK_UP) { 1878 } elsif ($sym == CFClient::SDLK_UP) {
1641 if ($self->{history_pointer} < 0) { 1879 if ($self->{history_pointer} < 0) {
1642 $self->{history_saveback} = $self->get_text; 1880 $self->{history_saveback} = $self->get_text;
… …
1658 } else { 1896 } else {
1659 $self->set_text ($self->{history_saveback}); 1897 $self->set_text ($self->{history_saveback});
1660 } 1898 }
1661 1899
1662 } else { 1900 } else {
1663 $self->SUPER::key_down ($ev); 1901 return $self->SUPER::key_down ($ev)
1902 }
1903
1664 } 1904 1
1665
1666} 1905}
1667 1906
1668############################################################################# 1907#############################################################################
1669 1908
1670package CFClient::UI::Button; 1909package CFClient::UI::Button;
… …
1679 1918
1680sub new { 1919sub new {
1681 my $class = shift; 1920 my $class = shift;
1682 1921
1683 $class->SUPER::new ( 1922 $class->SUPER::new (
1684 padding => 4, 1923 padding_x => 4,
1924 padding_y => 4,
1685 fg => [1, 1, 1], 1925 fg => [1, 1, 1],
1686 active_fg => [0, 0, 1], 1926 active_fg => [0, 0, 1],
1687 can_hover => 1, 1927 can_hover => 1,
1688 align => 0, 1928 align => 0,
1689 valign => 0, 1929 valign => 0,
1690 can_events => 1, 1930 can_events => 1,
1691 @_ 1931 @_
1692 ) 1932 )
1693} 1933}
1694 1934
1935sub activate { }
1936
1695sub button_up { 1937sub button_up {
1696 my ($self, $ev, $x, $y) = @_; 1938 my ($self, $ev, $x, $y) = @_;
1697 1939
1940 $self->emit ("activate")
1698 if ($x >= 0 && $x < $self->{w} 1941 if $x >= 0 && $x < $self->{w}
1699 && $y >= 0 && $y < $self->{h}) { 1942 && $y >= 0 && $y < $self->{h};
1700 $self->emit ("activate"); 1943
1701 } 1944 1
1702} 1945}
1703 1946
1704sub _draw { 1947sub _draw {
1705 my ($self) = @_; 1948 my ($self) = @_;
1706 1949
1707 local $self->{fg} = $self->{fg}; 1950 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1708
1709 if ($GRAB == $self) {
1710 $self->{fg} = $self->{active_fg};
1711 }
1712 1951
1713 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1715 glColor 0, 0, 0, 1; 1954 glColor 0, 0, 0, 1;
1716 1955
… …
1735 1974
1736sub new { 1975sub new {
1737 my $class = shift; 1976 my $class = shift;
1738 1977
1739 $class->SUPER::new ( 1978 $class->SUPER::new (
1740 padding => 2, 1979 padding_x => 2,
1980 padding_y => 2,
1741 fg => [1, 1, 1], 1981 fg => [1, 1, 1],
1742 active_fg => [1, 1, 0], 1982 active_fg => [1, 1, 0],
1743 bg => [0, 0, 0, 0.2], 1983 bg => [0, 0, 0, 0.2],
1744 active_bg => [1, 1, 1, 0.5], 1984 active_bg => [1, 1, 1, 0.5],
1745 state => 0, 1985 state => 0,
… …
1749} 1989}
1750 1990
1751sub size_request { 1991sub size_request {
1752 my ($self) = @_; 1992 my ($self) = @_;
1753 1993
1754 ($self->{padding} * 2 + 6) x 2 1994 (6) x 2
1755} 1995}
1756 1996
1757sub button_down { 1997sub button_down {
1758 my ($self, $ev, $x, $y) = @_; 1998 my ($self, $ev, $x, $y) = @_;
1759 1999
1760 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1761 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1762 $self->{state} = !$self->{state}; 2002 $self->{state} = !$self->{state};
1763 $self->emit (changed => $self->{state}); 2003 $self->_emit (changed => $self->{state});
2004 } else {
2005 return 0
2006 }
2007
1764 } 2008 1
1765} 2009}
1766 2010
1767sub _draw { 2011sub _draw {
1768 my ($self) = @_; 2012 my ($self) = @_;
1769 2013
1770 $self->SUPER::_draw; 2014 $self->SUPER::_draw;
1771 2015
1772 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2016 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1773 2017
1774 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2018 my ($w, $h) = @$self{qw(w h)};
2019
2020 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1775 2021
1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2022 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1777 2023
1778 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2024 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779 2025
… …
1934 2180
1935 my $h1 = $self->{h} * (1 - $ycut1); 2181 my $h1 = $self->{h} * (1 - $ycut1);
1936 my $h2 = $self->{h} * (1 - $ycut2); 2182 my $h2 = $self->{h} * (1 - $ycut2);
1937 2183
1938 glEnable GL_BLEND; 2184 glEnable GL_BLEND;
1939 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1940 glEnable GL_TEXTURE_2D; 2187 glEnable GL_TEXTURE_2D;
1941 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2188 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1942 2189
1943 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2190 glBindTexture GL_TEXTURE_2D, $t1->{name};
1944 glBegin GL_QUADS; 2191 glBegin GL_QUADS;
… …
2043 my $self = $class->SUPER::new ( 2290 my $self = $class->SUPER::new (
2044 fg => [1, 1, 1], 2291 fg => [1, 1, 1],
2045 active_fg => [0, 0, 0], 2292 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2], 2293 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5], 2294 active_bg => [1, 1, 1, 0.5],
2048 range => [0, 0, 100, 10], 2295 range => [0, 0, 100, 10, 0],
2049 req_w => $::WIDTH / 80, 2296 min_w => $::WIDTH / 80,
2050 req_h => $::WIDTH / 80, 2297 min_h => $::WIDTH / 80,
2051 vertical => 0, 2298 vertical => 0,
2052 can_hover => 1, 2299 can_hover => 1,
2053 inner_pad => .05, 2300 inner_pad => 0.02,
2054 @_ 2301 @_
2055 ); 2302 );
2056 2303
2057 $self->set_value ($self->{range}[0]); 2304 $self->set_value ($self->{range}[0]);
2058 $self->update; 2305 $self->update;
2059 2306
2060 $self 2307 $self
2061} 2308}
2062 2309
2310sub changed { }
2311
2312sub set_range {
2313 my ($self, $range) = @_;
2314
2315 ($range, $self->{range}) = ($self->{range}, $range);
2316
2317 if ("@$range" ne "@{$self->{range}}") {
2318 $self->update;
2319 $self->set_value ($self->{range}[0]);
2320 }
2321}
2322
2063sub set_value { 2323sub set_value {
2064 my ($self, $value) = @_; 2324 my ($self, $value) = @_;
2065 2325
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2326 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067 2327
2068 $hi = $lo + 1 if $hi <= $lo; 2328 $hi = $lo + 1 if $hi <= $lo;
2069 2329
2330 $page = $hi - $lo if $page > $hi - $lo;
2331
2070 $value = $lo if $value < $lo; 2332 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi; 2333 $value = $hi - $page if $value > $hi - $page;
2072 2334
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2335 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit; 2336 if $unit;
2075 2337
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079 2339
2080 if ($value != $old_value) { 2340 if ($value != $old_value) {
2081 $self->emit (changed => $value); 2341 $self->_emit (changed => $value);
2082 $self->update; 2342 $self->update;
2083 } 2343 }
2084} 2344}
2085 2345
2086sub size_request { 2346sub size_request {
2087 my ($self) = @_; 2347 my ($self) = @_;
2088 2348
2089 my $w = $self->{req_w}; 2349 ($self->{req_w}, $self->{req_h})
2090 my $h = $self->{req_h};
2091
2092 $self->{vertical} ? ($h, $w) : ($w, $h)
2093} 2350}
2094 2351
2095sub button_down { 2352sub button_down {
2096 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
2097 2354
2098 $self->SUPER::button_down ($ev, $x, $y); 2355 $self->SUPER::button_down ($ev, $x, $y);
2356
2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358
2099 $self->mouse_motion ($ev, $x, $y); 2359 $self->mouse_motion ($ev, $x, $y)
2100} 2360}
2101 2361
2102sub mouse_motion { 2362sub mouse_motion {
2103 my ($self, $ev, $x, $y) = @_; 2363 my ($self, $ev, $x, $y) = @_;
2104 2364
2105 if ($GRAB == $self) { 2365 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2366 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107 2367
2108 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2368 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109 2369
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2370 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111 2371
2112 $self->set_value ($x * ($hi - $lo) + $lo); 2372 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2373 } else {
2374 return 0;
2375 }
2376
2113 } 2377 1
2114} 2378}
2115 2379
2116sub update { 2380sub update {
2117 my ($self) = @_; 2381 my ($self) = @_;
2118 2382
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2383 delete $self->{knob_w};
2384 $self->SUPER::update;
2385}
2386
2387sub _draw {
2388 my ($self) = @_;
2389
2390 unless ($self->{knob_w}) {
2120 $self->set_value ($self->{range}[0]); 2391 $self->set_value ($self->{range}[0]);
2121 2392
2122 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2393 my ($value, $lo, $hi, $page) = @{$self->{range}};
2394 my $range = ($hi - $page - $lo) || 1e-100;
2123 2395
2124 my $inner_w = 1 - 2 * $self->{inner_pad}; 2396 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125 2397
2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2398 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2399 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127 2400
2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2401 $value = ($value - $lo) / $range;
2129 $value = $self->{scale} * ($value - $lo); 2402 $value = $value * $self->{scale} + $self->{offset};
2130 2403
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; 2404 $self->{knob_x} = $value - $knob_w * 0.5;
2137 $self->{knob_w} = $page; 2405 $self->{knob_w} = $knob_w;
2138 }); 2406 }
2139
2140 $self->SUPER::update;
2141}
2142
2143sub _draw {
2144 my ($self) = @_;
2145 2407
2146 $self->SUPER::_draw (); 2408 $self->SUPER::_draw ();
2147 2409
2148 glScale $self->{w}, $self->{h}; 2410 glScale $self->{w}, $self->{h};
2149 2411
2150 if ($self->{vertical}) { 2412 if ($self->{vertical}) {
2151 # draw a vertical slider like a rotated horizontal slider 2413 # draw a vertical slider like a rotated horizontal slider
2152 2414
2415 glTranslate 1, 0, 0;
2153 glRotate 90, 0, 0, 1; 2416 glRotate 90, 0, 0, 1;
2154 glTranslate 0, 1, 0;
2155 } 2417 }
2156 2418
2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2419 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2420 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159 2421
… …
2169 glDisable GL_TEXTURE_2D; 2431 glDisable GL_TEXTURE_2D;
2170} 2432}
2171 2433
2172############################################################################# 2434#############################################################################
2173 2435
2436package CFClient::UI::ValSlider;
2437
2438our @ISA = CFClient::UI::HBox::;
2439
2440sub new {
2441 my ($class, %arg) = @_;
2442
2443 my $range = delete $arg{range};
2444
2445 my $self = $class->SUPER::new (
2446 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2447 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2448 to_value => sub { shift },
2449 from_value => sub { shift },
2450 %arg,
2451 );
2452
2453 $self->{slider}->connect (changed => sub {
2454 my ($self, $value) = @_;
2455 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2456 $self->{parent}->emit (changed => $value);
2457 });
2458
2459# $self->{entry}->connect (changed => sub {
2460# my ($self, $value) = @_;
2461# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2462# $self->{parent}->emit (changed => $value);
2463# });
2464
2465 $self->add ($self->{slider}, $self->{entry});
2466
2467 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2468
2469 $self
2470}
2471
2472sub set_range { shift->{slider}->set_range (@_) }
2473sub set_value { shift->{slider}->set_value (@_) }
2474
2475#############################################################################
2476
2174package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2175 2478
2176our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2177 2480
2178use CFClient::OpenGL; 2481use CFClient::OpenGL;
2179 2482
… …
2181 my $class = shift; 2484 my $class = shift;
2182 2485
2183 my $self = $class->SUPER::new ( 2486 my $self = $class->SUPER::new (
2184 fontsize => 1, 2487 fontsize => 1,
2185 can_events => 0, 2488 can_events => 0,
2489 indent => 0,
2186 #font => default_font 2490 #font => default_font
2187 @_, 2491 @_,
2188 2492
2189 layout => (new CFClient::Layout 1), 2493 layout => (new CFClient::Layout 1),
2190 par => [], 2494 par => [],
… …
2205 2509
2206 $self->{fontsize} = $fontsize; 2510 $self->{fontsize} = $fontsize;
2207 $self->reflow; 2511 $self->reflow;
2208} 2512}
2209 2513
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 { 2514sub size_allocate {
2230 my ($self, $w, $h) = @_; 2515 my ($self, $w, $h) = @_;
2231 2516
2232 $self->SUPER::size_allocate ($w, $h); 2517 $self->SUPER::size_allocate ($w, $h);
2233 2518
2234 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2519 $self->{layout}->set_font ($self->{font}) if $self->{font};
2235 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2236 $self->{layout}->set_width ($self->{children}[0]{w}); 2521 $self->{layout}->set_width ($self->{children}[0]{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2237 2523
2238 $self->reflow; 2524 $self->reflow;
2239} 2525}
2240 2526
2527sub text_size {
2528 my ($self, $text, $indent) = @_;
2529
2530 my $layout = $self->{layout};
2531
2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533 $layout->set_width ($self->{children}[0]{w} - $indent);
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535 $layout->set_markup ($text);
2536
2537 $layout->size
2538}
2539
2540sub reflow {
2541 my ($self) = @_;
2542
2543 $self->{need_reflow}++;
2544 $self->update;
2545}
2546
2547sub set_offset {
2548 my ($self, $offset) = @_;
2549
2550 # todo: base offset on lines or so, not on pixels
2551 $self->{children}[1]->set_value ($offset);
2552}
2553
2554sub clear {
2555 my ($self) = @_;
2556
2557 $self->{par} = [];
2558 $self->{height} = 0;
2559 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560}
2561
2241sub add_paragraph { 2562sub add_paragraph {
2242 my ($self, $color, $text) = @_; 2563 my ($self, $color, $text, $indent) = @_;
2243 2564
2244 #TODO: intelligently "reformat" paragraph 2565 for my $line (split /\n/, $text) {
2245 2566 my ($w, $h) = $self->text_size ($line);
2246 my $height = $self->text_height ($text);
2247
2248 $self->{height} += $height; 2567 $self->{height} += $h;
2568 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2569 }
2249 2570
2250 push @{$self->{par}}, [$height, $color, $text];
2251
2252 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2571 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2253 $self->{children}[1]->update;
2254} 2572}
2255 2573
2256sub update { 2574sub update {
2257 my ($self) = @_; 2575 my ($self) = @_;
2258 2576
… …
2260 2578
2261 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2262 2580
2263 delete $self->{texture}; 2581 delete $self->{texture};
2264 2582
2265 $ROOT->on_post_alloc ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585
2266 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2267 my $height = 0; 2587 my $height = 0;
2268 2588
2269 $height += $_->[0] = $self->text_height ($_->[2]) 2589 my $layout = $self->{layout};
2590
2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2270 for @{$self->{par}}; 2593 for (@{$self->{par}}) {
2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($_->[4]);
2598 my ($w, $h) = $layout->size;
2599 $_->[0] = $w + $_->[3];
2600 $_->[1] = $h;
2601 }
2602
2603 $height += $_->[1];
2604 }
2271 2605
2272 $self->{height} = $height; 2606 $self->{height} = $height;
2273 2607
2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275 2609
2276 delete $self->{texture}; 2610 delete $self->{texture};
2277 } 2611 }
2278 2612
2279 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2280 glClearColor 0, 0, 0, 0; 2614 glClearColor 0, 0, 0, 0;
2281 glClear GL_COLOR_BUFFER_BIT; 2615 glClear GL_COLOR_BUFFER_BIT;
2282 2616
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]; 2617 my $top = int $self->{children}[1]{range}[0];
2287 2618
2288 my $y0 = $top; 2619 my $y0 = $top;
2289 my $y1 = $top + $self->{h}; 2620 my $y1 = $top + $H;
2290 2621
2291 my $y = 0; 2622 my $y = 0;
2292 2623
2293 my $layout = $self->{layout}; 2624 my $layout = $self->{layout};
2294 2625
2295 $layout->set_font ($self->{font}) if $self->{font}; 2626 $layout->set_font ($self->{font}) if $self->{font};
2296 2627
2628 glEnable GL_BLEND;
2629 #TODO# not correct in windows where rgba is forced off
2630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631
2297 for my $par (@{$self->{par}}) { 2632 for my $par (@{$self->{par}}) {
2298 my $h = $par->[0]; 2633 my $h = $par->[1];
2299 2634
2300 if ($y0 < $y + $h && $y < $y1) { 2635 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] }); 2636 $layout->set_foreground (@{ $par->[2] });
2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2302 $layout->set_markup ($par->[2]); 2639 $layout->set_markup ($par->[4]);
2303 2640
2304 my ($W, $H) = $layout->size; 2641 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2642
2643 glRasterPos $par->[3], $y - $y0;
2644 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2306 } 2645 }
2307 2646
2308 $y += $h; 2647 $y += $h;
2309 } 2648 }
2310 2649
2311 glDisable GL_TEXTURE_2D; 2650 glDisable GL_BLEND;
2312 }; 2651 };
2313 }); 2652 });
2314} 2653}
2315 2654
2316sub _draw { 2655sub _draw {
2317 my ($self) = @_; 2656 my ($self) = @_;
2318 2657
2319 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2659 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321 glColor 1, 1, 1, 1; 2660 glColor 0, 0, 0, 1;
2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323 glDisable GL_TEXTURE_2D; 2662 glDisable GL_TEXTURE_2D;
2324 2663
2325 $self->{children}[1]->draw; 2664 $self->{children}[1]->draw;
2326 2665
… …
2376 2715
2377sub new { 2716sub new {
2378 my $class = shift; 2717 my $class = shift;
2379 2718
2380 my $self = $class->SUPER::new ( 2719 my $self = $class->SUPER::new (
2381 state => 0, 2720 state => 0,
2382 connect_activate => \&toggle_flopper, 2721 on_activate => \&toggle_flopper,
2383 @_ 2722 @_
2384 ); 2723 );
2385 2724
2386 if ($self->{state}) {
2387 $self->{state} = 0;
2388 $self->toggle_flopper;
2389 }
2390
2391 $self 2725 $self
2392} 2726}
2393 2727
2394sub toggle_flopper { 2728sub toggle_flopper {
2395 my ($self) = @_; 2729 my ($self) = @_;
2396 2730
2397 # TODO: use animation 2731 $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} 2732}
2409 2733
2410############################################################################# 2734#############################################################################
2411 2735
2412package CFClient::UI::Tooltip; 2736package CFClient::UI::Tooltip;
… …
2425} 2749}
2426 2750
2427sub set_tooltip_from { 2751sub set_tooltip_from {
2428 my ($self, $widget) = @_; 2752 my ($self, $widget) = @_;
2429 2753
2754 my $tooltip = $widget->{tooltip};
2755
2756 if ($ENV{CFPLUS_DEBUG} & 2) {
2757 $tooltip .= "\n\n" . (ref $widget) . "\n"
2758 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2759 . "req $widget->{req_w} $widget->{req_h}\n"
2760 . "visible $widget->{visible}";
2761 }
2762
2763 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//;
2765
2430 $self->add (new CFClient::UI::Label 2766 $self->add (new CFClient::UI::Label
2431 markup => $widget->{tooltip}, 2767 markup => $tooltip,
2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8, 2769 fontsize => 0.8,
2434 fg => [0, 0, 0, 1], 2770 fg => [0, 0, 0, 1],
2771 ellipsise => 0,
2435 font => ($widget->{tooltip_font} || $::FONT_PROP), 2772 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 ); 2773 );
2437} 2774}
2438 2775
2439sub size_request { 2776sub size_request {
2440 my ($self) = @_; 2777 my ($self) = @_;
… …
2446 2783
2447sub size_allocate { 2784sub size_allocate {
2448 my ($self, $w, $h) = @_; 2785 my ($self, $w, $h) = @_;
2449 2786
2450 $self->SUPER::size_allocate ($w - 4, $h - 4); 2787 $self->SUPER::size_allocate ($w - 4, $h - 4);
2788}
2789
2790sub visibility_change {
2791 my ($self, $visible) = @_;
2792
2793 return unless $visible;
2794
2795 $self->{root}->on_post_alloc ("move_$self" => sub {
2796 my $widget = $self->{owner}
2797 or return;
2798
2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800
2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802 if $x + $self->{w} > $self->{root}{w};
2803
2804 $self->move_abs ($x, $y);
2805 });
2451} 2806}
2452 2807
2453sub _draw { 2808sub _draw {
2454 my ($self) = @_; 2809 my ($self) = @_;
2455 2810
… …
2472 glVertex $w, $h; 2827 glVertex $w, $h;
2473 glVertex $w, 0; 2828 glVertex $w, 0;
2474 glEnd; 2829 glEnd;
2475 2830
2476 glTranslate 2 - 0.375, 2 - 0.375; 2831 glTranslate 2 - 0.375, 2 - 0.375;
2832
2477 $self->SUPER::_draw; 2833 $self->SUPER::_draw;
2478} 2834}
2479 2835
2480############################################################################# 2836#############################################################################
2481 2837
… …
2486use CFClient::OpenGL; 2842use CFClient::OpenGL;
2487 2843
2488sub new { 2844sub new {
2489 my $class = shift; 2845 my $class = shift;
2490 2846
2491 $class->SUPER::new ( 2847 my $self = $class->SUPER::new (
2492 aspect => 1, 2848 aspect => 1,
2849 can_events => 0,
2493 @_, 2850 @_,
2494 ) 2851 );
2852
2853 if ($self->{anim} && $self->{animspeed}) {
2854 Scalar::Util::weaken (my $widget = $self);
2855
2856 $self->{timer} = Event->timer (
2857 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2858 hard => 1,
2859 interval => $self->{animspeed},
2860 cb => sub {
2861 ++$widget->{frame};
2862 $widget->update;
2863 },
2864 );
2865 }
2866
2867 $self
2495} 2868}
2496 2869
2497sub size_request { 2870sub size_request {
2498 (32, 8) 2871 (32, 8)
2499} 2872}
2500 2873
2874sub update {
2875 my ($self) = @_;
2876
2877 return unless $self->{visible};
2878
2879 $self->SUPER::update;
2880}
2881
2501sub _draw { 2882sub _draw {
2502 my ($self) = @_; 2883 my ($self) = @_;
2503 2884
2504 return unless $::CONN;#d# manage and cache textures differently 2885 return unless $::CONN;
2886
2887 my $face;
2888
2889 if ($self->{frame}) {
2890 my $anim = $::CONN->{anim}[$self->{anim}];
2891
2892 $face = $anim->[ $self->{frame} % @$anim ]
2893 if $anim && @$anim;
2894 }
2895
2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506 2897
2507 # TODO animation
2508 if ($tex) { 2898 if ($tex) {
2509 glEnable GL_TEXTURE_2D; 2899 glEnable GL_TEXTURE_2D;
2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511 glColor 1, 1, 1, 1; 2901 glColor 0, 0, 0, 1;
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2514 } 2904 }
2515} 2905}
2516 2906
2907sub destroy {
2908 my ($self) = @_;
2909
2910 $self->{timer}->cancel
2911 if $self->{timer};
2912
2913 $self->SUPER::destroy;
2914}
2915
2517############################################################################# 2916#############################################################################
2518 2917
2519package CFClient::UI::InventoryItem; 2918package CFClient::UI::Buttonbar;
2520 2919
2521our @ISA = CFClient::UI::HBox::; 2920our @ISA = CFClient::UI::HBox::;
2522 2921
2523sub _item_to_desc { 2922# 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 2923
2667############################################################################# 2924#############################################################################
2668 2925
2669package CFClient::UI::Menu; 2926package CFClient::UI::Menu;
2670 2927
… …
2682 ); 2939 );
2683 2940
2684 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2941 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2685 2942
2686 for my $item (@{ $self->{items} }) { 2943 for my $item (@{ $self->{items} }) {
2687 my ($widget, $cb) = @$item; 2944 my ($widget, $cb, $tooltip) = @$item;
2688 2945
2689 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2690 if (!ref $widget) { 2947 if (!ref $widget) {
2691 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2692 can_hover => 1, 2949 can_hover => 1,
2693 can_events => 1, 2950 can_events => 1,
2694 text => $widget; 2951 markup => $widget,
2952 tooltip => $tooltip
2695 } 2953 }
2696 2954
2697 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2698 2956
2699 $self->{vbox}->add ($widget); 2957 $self->{vbox}->add ($widget);
… …
2704 2962
2705# popup given the event (must be a mouse button down event currently) 2963# popup given the event (must be a mouse button down event currently)
2706sub popup { 2964sub popup {
2707 my ($self, $ev) = @_; 2965 my ($self, $ev) = @_;
2708 2966
2709 $self->emit ("popdown"); 2967 $self->_emit ("popdown");
2710 2968
2711 # maybe save $GRAB? must be careful about events... 2969 # maybe save $GRAB? must be careful about events...
2712 $GRAB = $self; 2970 $GRAB = $self;
2713 $self->{button} = $ev->{button}; 2971 $self->{button} = $ev->{button};
2714 2972
2715 $self->show; 2973 $self->show;
2716 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2717} 2975}
2718 2976
2719sub mouse_motion { 2977sub mouse_motion {
2720 my ($self, $ev, $x, $y) = @_; 2978 my ($self, $ev, $x, $y) = @_;
2721 2979
2722 # TODO: should use vbox->find_widget or so 2980 # TODO: should use vbox->find_widget or so
2723 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2724 $self->{hover} = $self->{item}{$HOVER}; 2982 $self->{hover} = $self->{item}{$HOVER};
2983
2984 0
2725} 2985}
2726 2986
2727sub button_up { 2987sub button_up {
2728 my ($self, $ev, $x, $y) = @_; 2988 my ($self, $ev, $x, $y) = @_;
2729 2989
2730 if ($ev->{button} == $self->{button}) { 2990 if ($ev->{button} == $self->{button}) {
2731 undef $GRAB; 2991 undef $GRAB;
2732 $self->hide; 2992 $self->hide;
2733 2993
2734 $self->emit ("popdown"); 2994 $self->_emit ("popdown");
2735 $self->{hover}[1]->() if $self->{hover}; 2995 $self->{hover}[1]->() if $self->{hover};
2996 } else {
2997 return 0
2998 }
2999
2736 } 3000 1
2737} 3001}
2738 3002
2739############################################################################# 3003#############################################################################
2740 3004
2741package CFClient::UI::Statusbox; 3005package CFClient::UI::Multiplexer;
2742 3006
2743our @ISA = CFClient::UI::VBox::; 3007our @ISA = CFClient::UI::Container::;
2744 3008
2745sub new { 3009sub new {
2746 my $class = shift; 3010 my $class = shift;
2747 3011
2748 $class->SUPER::new ( 3012 my $self = $class->SUPER::new (
3013 @_,
3014 );
3015
3016 $self->{current} = $self->{children}[0]
3017 if @{ $self->{children} };
3018
3019 $self
3020}
3021
3022sub add {
3023 my ($self, @widgets) = @_;
3024
3025 $self->SUPER::add (@widgets);
3026
3027 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} };
3029}
3030
3031sub set_current_page {
3032 my ($self, $page_or_widget) = @_;
3033
3034 my $widget = ref $page_or_widget
3035 ? $page_or_widget
3036 : $self->{children}[$page_or_widget];
3037
3038 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040
3041 $self->_emit (page_changed => $self->{current});
3042
3043 $self->realloc;
3044}
3045
3046sub visible_children {
3047 $_[0]{current}
3048}
3049
3050sub size_request {
3051 my ($self) = @_;
3052
3053 $self->{current}->size_request
3054}
3055
3056sub size_allocate {
3057 my ($self, $w, $h) = @_;
3058
3059 $self->{current}->configure (0, 0, $w, $h);
3060}
3061
3062sub _draw {
3063 my ($self) = @_;
3064
3065 $self->{current}->draw;
3066}
3067
3068#############################################################################
3069
3070package CFClient::UI::Notebook;
3071
3072our @ISA = CFClient::UI::VBox::;
3073
3074sub new {
3075 my $class = shift;
3076
3077 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self
3081 @_,
3082 );
3083
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3085 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3086
3087 $self
3088}
3089
3090sub add {
3091 my ($self, $title, $widget, $tooltip) = @_;
3092
3093 Scalar::Util::weaken $self;
3094
3095 $self->{buttonbar}->add (new CFClient::UI::Button
3096 markup => $title,
3097 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) },
3099 );
3100
3101 $self->{multiplexer}->add ($widget);
3102}
3103
3104sub set_current_page {
3105 my ($self, $page) = @_;
3106
3107 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current});
3109}
3110
3111#############################################################################
3112
3113package CFClient::UI::Combobox;
3114
3115use utf8;
3116
3117our @ISA = CFClient::UI::Button::;
3118
3119sub new {
3120 my $class = shift;
3121
3122 my $self = $class->SUPER::new (
3123 options => [], # [value, title, longdesc], ...
3124 value => undef,
3125 @_,
3126 );
3127
3128 $self->_set_value ($self->{value});
3129
3130 $self
3131}
3132
3133sub button_down {
3134 my ($self, $ev) = @_;
3135
3136 my @menu_items;
3137
3138 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_;
3140
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 }
3143
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145}
3146
3147sub _set_value {
3148 my ($self, $value) = @_;
3149
3150 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3151 or return;
3152
3153 $self->{value} = $item->[0];
3154 $self->set_markup ("$item->[1] ⇓");
3155 $self->set_tooltip ($item->[2]);
3156}
3157
3158sub set_value {
3159 my ($self, $value) = @_;
3160
3161 return unless $self->{value} ne $value;
3162
3163 $self->_set_value ($value);
3164 $self->_emit (changed => $value);
3165}
3166
3167#############################################################################
3168
3169package CFClient::UI::Statusbox;
3170
3171our @ISA = CFClient::UI::VBox::;
3172
3173sub new {
3174 my $class = shift;
3175
3176 my $self = $class->SUPER::new (
2749 fontsize => 0.8, 3177 fontsize => 0.8,
2750 @_, 3178 @_,
2751 ) 3179 );
3180
3181 Scalar::Util::weaken (my $this = $self);
3182
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184
3185 $self
2752} 3186}
2753 3187
2754sub reorder { 3188sub reorder {
2755 my ($self) = @_; 3189 my ($self) = @_;
2756 my $NOW = time; 3190 my $NOW = Time::HiRes::time;
3191
3192 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} };
2757 3196
2758 while (my ($k, $v) = each %{ $self->{item} }) { 3197 while (my ($k, $v) = each %{ $self->{item} }) {
2759 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3198 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2760 } 3199 }
2761 3200
… …
2764 my @items = sort { 3203 my @items = sort {
2765 $a->{pri} <=> $b->{pri} 3204 $a->{pri} <=> $b->{pri}
2766 or $b->{id} <=> $a->{id} 3205 or $b->{id} <=> $a->{id}
2767 } values %{ $self->{item} }; 3206 } values %{ $self->{item} };
2768 3207
3208 $self->{timer}->interval (1);
3209
2769 my $count = 10 + 1; 3210 my $count = 10 + 1;
2770 for my $item (@items) { 3211 for my $item (@items) {
2771 last unless --$count; 3212 last unless --$count;
2772 3213
2773 push @widgets, $item->{label} ||= do { 3214 my $label = $item->{label} ||= do {
2774 # TODO: doesn't handle markup well (read as: at all) 3215 # TODO: doesn't handle markup well (read as: at all)
2775 my $short = $item->{count} > 1 3216 my $short = $item->{count} > 1
2776 ? "<b>$item->{count} ×</b> $item->{text}" 3217 ? "<b>$item->{count} ×</b> $item->{text}"
2777 : $item->{text}; 3218 : $item->{text};
2778 3219
2779 my $fontsize = $item->{fontsize} || $self->{fontsize};
2780
2781 for ($short) { 3220 for ($short) {
2782 s/^\s+//; 3221 s/^\s+//;
2783 s/\s+/ /g; 3222 s/\s+/ /g;
2784 my $len = int 40 / $fontsize;
2785 substr $_, $len, length, "…" if $len < length;
2786 } 3223 }
2787 3224
2788 new CFClient::UI::Label 3225 new CFClient::UI::Label
2789 markup => $short, 3226 markup => $short,
2790 tooltip => $item->{tooltip}, 3227 tooltip => $item->{tooltip},
2791 tooltip_font => $::FONT_PROP, 3228 tooltip_font => $::FONT_PROP,
2792 tooltip_width => 0.67, 3229 tooltip_width => 0.67,
2793 fontsize => $fontsize, 3230 fontsize => $item->{fontsize} || $self->{fontsize},
3231 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg}, 3232 fg => [@{ $item->{fg} }],
2795 can_events => 1, 3233 can_events => 1,
2796 can_hover => 1 3234 can_hover => 1
2797 }; 3235 };
3236
3237 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3238 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3239 $label->update;
3240 $label->set_max_size (undef, $label->{req_h} * $diff)
3241 if $diff < 1;
3242 $self->{timer}->interval (1/30);
3243 } else {
3244 $label->{fg}[3] = $item->{fg}[3] || 1;
3245 }
3246
3247 push @widgets, $label;
2798 } 3248 }
2799 3249
2800 $self->clear; 3250 $self->clear;
2801 $self->SUPER::add (reverse @widgets); 3251 $self->SUPER::add (reverse @widgets);
2802} 3252}
… …
2805 my ($self, $text, %arg) = @_; 3255 my ($self, $text, %arg) = @_;
2806 3256
2807 $text =~ s/^\s+//; 3257 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 3258 $text =~ s/\s+$//;
2809 3259
3260 return unless $text;
3261
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 3262 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2811 3263
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3264 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 3265
2814 if (my $item = $self->{item}{$group}) { 3266 if (my $item = $self->{item}{$group}) {
2815 if ($item->{text} eq $text) { 3267 if ($item->{text} eq $text) {
2816 $item->{count}++; 3268 $item->{count}++;
2817 } else { 3269 } else {
2818 $item->{count} = 1; 3270 $item->{count} = 1;
2819 $item->{text} = $item->{tooltip} = $text; 3271 $item->{text} = $item->{tooltip} = $text;
2820 } 3272 }
2821 $item->{id} = ++$self->{id}; 3273 $item->{id} += 0.2;#d#
2822 $item->{timeout} = $timeout; 3274 $item->{timeout} = $timeout;
2823 delete $item->{label}; 3275 delete $item->{label};
2824 } else { 3276 } else {
2825 $self->{item}{$group} = { 3277 $self->{item}{$group} = {
2826 id => ++$self->{id}, 3278 id => ++$self->{id},
… …
2835 } 3287 }
2836 3288
2837 $self->reorder; 3289 $self->reorder;
2838} 3290}
2839 3291
3292sub reconfigure {
3293 my ($self) = @_;
3294
3295 delete $_->{label}
3296 for values %{ $self->{item} || {} };
3297
3298 $self->reorder;
3299 $self->SUPER::reconfigure;
3300}
3301
3302sub destroy {
3303 my ($self) = @_;
3304
3305 $self->{timer}->cancel;
3306
3307 $self->SUPER::destroy;
3308}
3309
2840############################################################################# 3310#############################################################################
2841 3311
2842package CFClient::UI::Root; 3312package CFClient::UI::Inventory;
2843 3313
2844our @ISA = CFClient::UI::Container::; 3314our @ISA = CFClient::UI::ScrolledWindow::;
2845
2846use CFClient::OpenGL;
2847 3315
2848sub new { 3316sub new {
2849 my $class = shift; 3317 my $class = shift;
2850 3318
2851 $class->SUPER::new ( 3319 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321 @_,
3322 );
3323
3324 $self
3325}
3326
3327sub set_items {
3328 my ($self, $items) = @_;
3329
3330 $self->{child}->clear;
3331 return unless $items;
3332
3333 my @items = sort {
3334 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name})
3336 } @$items;
3337
3338 $self->{real_items} = \@items;
3339
3340 my $row = 0;
3341 for my $item (@items) {
3342 CFClient::Item::update_widgets $item;
3343
3344 $self->{child}->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget});
3347
3348 $row++;
3349 }
3350}
3351
3352#############################################################################
3353
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 }
3547}
3548
3549#############################################################################
3550
3551package CFClient::UI::SpellList;
3552
3553our @ISA = CFClient::UI::Table::;
3554
3555sub new {
3556 my $class = shift;
3557
3558 my $self = $class->SUPER::new (
3559 binding => [],
3560 commands => [],
2852 @_, 3561 @_,
2853 ) 3562 )
2854} 3563}
2855 3564
2856sub configure { 3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2857 my ($self, $x, $y, $w, $h) = @_;
2858 3566
2859 $self->{w} = $w; 3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2860 $self->{h} = $h; 3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2861} 3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
2862 3577
2863sub check_size { 3578sub rebuild_spell_list {
3579 my ($self) = @_;
3580
3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear;
3583
3584 return unless $::CONN;
3585
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592 my $row = 0;
3593
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_};
3596
3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625 $self->add (0, $row, new CFClient::UI::Face
3626 face => $spell->{face},
3627 can_hover => 1,
3628 can_events => 1,
3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3631 );
3632
3633 $self->add (1, $row, new CFClient::UI::Label
3634 expand => 1,
3635 text => $spell->{name},
3636 can_hover => 1,
3637 can_events => 1,
3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3640 );
3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 }
3647 });
3648}
3649
3650sub add_spell {
2864 my ($self) = @_; 3651 my ($self, $spell) = @_;
2865 3652
2866 $self->size_allocate ($self->{w}, $self->{h}) 3653 $self->{spell}->{$spell->{name}} = $spell;
2867 if $self->{w}; 3654 $self->rebuild_spell_list;
3655}
3656
3657sub remove_spell {
3658 my ($self, $spell) = @_;
3659
3660 delete $self->{spell}->{$spell->{name}};
3661 $self->rebuild_spell_list;
3662}
3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3668 $self->rebuild_spell_list;
3669}
3670
3671#############################################################################
3672
3673package CFClient::UI::Root;
3674
3675our @ISA = CFClient::UI::Container::;
3676
3677use List::Util qw(min max);
3678
3679use CFClient::OpenGL;
3680
3681sub new {
3682 my $class = shift;
3683
3684 my $self = $class->SUPER::new (
3685 visible => 1,
3686 @_,
3687 );
3688
3689 Scalar::Util::weaken ($self->{root} = $self);
3690
3691 $self
2868} 3692}
2869 3693
2870sub size_request { 3694sub size_request {
2871 my ($self) = @_; 3695 my ($self) = @_;
2872 3696
2873 ($self->{w}, $self->{h}) 3697 ($self->{w}, $self->{h})
3698}
3699
3700sub _to_pixel {
3701 my ($coord, $size, $max) = @_;
3702
3703 $coord =
3704 $coord eq "center" ? ($max - $size) * 0.5
3705 : $coord eq "max" ? $max
3706 : $coord;
3707
3708 $coord = 0 if $coord < 0;
3709 $coord = $max - $size if $coord > $max - $size;
3710
3711 int $coord + 0.5
2874} 3712}
2875 3713
2876sub size_allocate { 3714sub size_allocate {
2877 my ($self, $w, $h) = @_; 3715 my ($self, $w, $h) = @_;
2878 3716
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) { 3717 for my $child ($self->children) {
2886 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2887 3719
2888 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3720 $X = $child->{force_x} if exists $child->{force_x};
2889 if exists $child->{req_x}; 3721 $Y = $child->{force_y} if exists $child->{force_y};
2890 3722
2891 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3723 $X = _to_pixel $X, $W, $self->{w};
2892 if exists $child->{req_y}; 3724 $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 3725
2897 $child->configure ($X, $Y, $W, $H); 3726 $child->configure ($X, $Y, $W, $H);
2898 } 3727 }
2899} 3728}
2900 3729
… …
2911} 3740}
2912 3741
2913sub update { 3742sub update {
2914 my ($self) = @_; 3743 my ($self) = @_;
2915 3744
2916 $self->check_size;
2917 $::WANT_REFRESH++; 3745 $::WANT_REFRESH++;
2918} 3746}
2919 3747
2920sub add { 3748sub add {
2921 my ($self, @children) = @_; 3749 my ($self, @children) = @_;
2922 3750
2923 for my $child (@children) {
2924 $child->{toplevel} = 1; 3751 $_->{is_toplevel} = 1
2925 3752 for @children;
2926 # integerise window positions
2927 $child->{x} = int $child->{x};
2928 $child->{y} = int $child->{y};
2929 }
2930 3753
2931 $self->SUPER::add (@children); 3754 $self->SUPER::add (@children);
3755}
3756
3757sub remove {
3758 my ($self, @children) = @_;
3759
3760 $self->SUPER::remove (@children);
3761
3762 delete $self->{is_toplevel}
3763 for @children;
3764
3765 while (@children) {
3766 my $w = pop @children;
3767 push @children, $w->children;
3768 $w->set_invisible;
3769 }
2932} 3770}
2933 3771
2934sub on_refresh { 3772sub on_refresh {
2935 my ($self, $id, $cb) = @_; 3773 my ($self, $id, $cb) = @_;
2936 3774
… …
2949 while ($self->{refresh_hook}) { 3787 while ($self->{refresh_hook}) {
2950 $_->() 3788 $_->()
2951 for values %{delete $self->{refresh_hook}}; 3789 for values %{delete $self->{refresh_hook}};
2952 } 3790 }
2953 3791
2954 if ($self->{check_size}) { 3792 if ($self->{realloc}) {
2955 my @queue = ([], []); 3793 my %queue;
3794 my @queue;
3795 my $widget;
2956 3796
2957 for (;;) { 3797 outer:
2958 if ($self->{check_size}) { 3798 while () {
2959 # heuristic: check containers last 3799 if (my $realloc = delete $self->{realloc}) {
2960 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3800 for $widget (values %$realloc) {
2961 for values %{delete $self->{check_size}} 3801 $widget->{visible} or next; # do not resize invisible widgets
3802
3803 $queue{$widget+0}++ and next; # duplicates are common
3804
3805 push @{ $queue[$widget->{visible}] }, $widget;
3806 }
2962 } 3807 }
2963 3808
2964 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3809 while () {
3810 @queue or last outer;
2965 3811
2966 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3812 $widget = pop @{ $queue[-1] || [] }
2967 ? @$widget{qw(user_w user_h)} 3813 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 3814
3815 pop @queue;
3816 }
3817
3818 delete $queue{$widget+0};
3819
3820 my ($w, $h) = $widget->size_request;
3821
3822 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3823 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3824
3825 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3826 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3827
3828 $w = $widget->{force_w} if exists $widget->{force_w};
3829 $h = $widget->{force_h} if exists $widget->{force_h};
3830
3831 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3832 || delete $widget->{force_realloc}) {
2974 $widget->{req_w} = $w; 3833 $widget->{req_w} = $w;
2975 $widget->{req_h} = $h; 3834 $widget->{req_h} = $h;
2976 3835
2977 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3836 $self->{size_alloc}{$widget+0} = $widget;
2978 3837
2979 $widget->{parent}->check_size
2980 if $widget->{parent}; 3838 if (my $parent = $widget->{parent}) {
3839 $self->{realloc}{$parent+0} = $parent
3840 unless $queue{$parent+0};
3841
3842 $parent->{force_size_alloc} = 1;
3843 $self->{size_alloc}{$parent+0} = $parent;
3844 }
2981 } 3845 }
3846
3847 delete $self->{realloc}{$widget+0};
2982 } 3848 }
2983 } 3849 }
2984 3850
2985 while ($self->{size_alloc}) { 3851 while (my $size_alloc = delete $self->{size_alloc}) {
2986 for (values %{delete $self->{size_alloc}}) { 3852 my @queue = sort { $b->{visible} <=> $a->{visible} }
2987 my ($widget, $w, $h) = @$_; 3853 values %$size_alloc;
3854
3855 while () {
3856 my $widget = pop @queue || last;
3857
3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2988 3859
2989 $w = 0 if $w < 0; 3860 $w = 0 if $w < 0;
2990 $h = 0 if $h < 0; 3861 $h = 0 if $h < 0;
2991 3862
3863 $w = int $w + 0.5;
3864 $h = int $h + 0.5;
3865
3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w};
3868 $widget->{old_h} = $widget->{h};
3869
2992 $widget->{w} = $w; 3870 $widget->{w} = $w;
2993 $widget->{h} = $h; 3871 $widget->{h} = $h;
2994 $widget->size_allocate ($w, $h); 3872
2995 $widget->emit (size_allocate => $w, $h); 3873 $widget->emit (size_allocate => $w, $h);
3874 }
2996 } 3875 }
2997 } 3876 }
2998 3877
2999 while ($self->{post_alloc_hook}) { 3878 while ($self->{post_alloc_hook}) {
3000 $_->() 3879 $_->()
3001 for values %{delete $self->{post_alloc_hook}}; 3880 for values %{delete $self->{post_alloc_hook}};
3002 } 3881 }
3003 3882
3883
3004 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3005 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3006 glClear GL_COLOR_BUFFER_BIT; 3886 glClear GL_COLOR_BUFFER_BIT;
3007 3887
3008 glMatrixMode GL_PROJECTION; 3888 glMatrixMode GL_PROJECTION;
3009 glLoadIdentity; 3889 glLoadIdentity;
3010 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3011 glMatrixMode GL_MODELVIEW; 3891 glMatrixMode GL_MODELVIEW;
3012 glLoadIdentity; 3892 glLoadIdentity;
3013 3893
3894 {
3895 package CFClient::UI::Base;
3896
3897 ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h});
3899 }
3900
3014 $self->_draw; 3901 $self->_draw;
3015} 3902}
3016 3903
3017############################################################################# 3904#############################################################################
3018 3905
3019package CFClient::UI; 3906package CFClient::UI;
3020 3907
3021$ROOT = new CFClient::UI::Root; 3908$ROOT = new CFClient::UI::Root;
3022$TOOLTIP = new CFClient::UI::Tooltip; 3909$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3023 3910
30241 39111
3025 3912

Diff Legend

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