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

Diff Legend

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