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

Diff Legend

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