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

Diff Legend

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