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.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.340 by root, Sun Jul 30 13:16:44 2006 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
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 CFPlus;
10use CFClient::Texture; 11use CFPlus::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
15our $LAYOUT;
14our $ROOT; 16our $ROOT;
15our $TOOLTIP; 17our $TOOLTIP;
16our $BUTTON_STATE; 18our $BUTTON_STATE;
17 19
18our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
19 21
20sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
21 if (!$GRAB) { 23 if (!$GRAB) {
22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
24
25 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
26 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
27 32
28 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
29 34
30 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
31 36
32 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
33 $TOOLTIP->show; 38 $TOOLTIP->show;
34
35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
36
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 if $x + $TOOLTIP->{w} > $::WIDTH;
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 39 }
44 40
45 return; 41 return;
46 } 42 }
47 } 43 }
48 } 44 }
49 45
50 $TOOLTIP->hide; 46 $TOOLTIP->hide;
51 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;
52} 71}
53 72
54# class methods for events 73# class methods for events
55sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
56 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
60sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
61 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
62 if $FOCUS; 81 if $FOCUS;
63} 82}
64 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
65sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
66 my ($ev) = @_; 98 my ($ev) = @_;
67 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
68 100
69 if (!$BUTTON_STATE) { 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
70 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
71 105
72 $GRAB = $widget; 106 $GRAB = $widget;
73 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
74 108
75 check_tooltip; 109 $TOOLTIP_WATCHER->cb->();
76 } 110 }
77 111
78 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 112 if ($GRAB) {
79 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
80 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 114 # mousewheel
81 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 }
82} 122}
83 123
84sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
85 my ($ev) = @_; 125 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y});
87 126
88 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
89 128
90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91 130
92 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
93 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
94 133
95 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 136 $grab->update if $grab;
98 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
99 138
100 check_tooltip; 139 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->();
101 } 141 }
102} 142}
103 143
104sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
105 my ($ev) = @_; 145 my ($ev) = @_;
106 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
107 147
108 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
109 149
110 if ($widget != $HOVER) { 150 check_hover $widget;
111 my $hover = $HOVER; $HOVER = $widget;
112 151
113 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
114 $HOVER->update if $HOVER && $HOVER->{can_hover};
115
116 check_tooltip;
117 }
118
119 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
120 if $HOVER; 153 if $HOVER;
121} 154}
122 155
123# convert position array to integers 156# convert position array to integers
124sub harmonize { 157sub harmonize {
… …
153sub rescale_widgets { 186sub rescale_widgets {
154 my ($sx, $sy) = @_; 187 my ($sx, $sy) = @_;
155 188
156 for my $widget (values %WIDGET) { 189 for my $widget (values %WIDGET) {
157 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
158 $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.]+$/;
159 $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};
160 $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};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 197 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 198 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 199 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 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
166 } 204 }
167 } 205 }
168 206
169 reconfigure_widgets; 207 reconfigure_widgets;
170} 208}
171 209
172############################################################################# 210#############################################################################
173 211
212package CFPlus::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216}
217
218#############################################################################
219
174package CFClient::UI::Base; 220package CFPlus::UI::Base;
175 221
176use strict; 222use strict;
177 223
178use CFClient::OpenGL; 224use CFPlus::OpenGL;
179 225
180sub new { 226sub new {
181 my $class = shift; 227 my $class = shift;
182 228
183 my $self = bless { 229 my $self = bless {
184 x => 0, 230 x => "center",
185 y => 0, 231 y => "center",
186 z => 0, 232 z => 0,
233 w => undef,
234 h => undef,
187 can_events => 1, 235 can_events => 1,
188 @_ 236 @_
189 }, $class; 237 }, $class;
190 238
239 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240
191 for (keys %$self) { 241 for (keys %$self) {
192 if (/^connect_(.*)$/) { 242 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 243 $self->connect ($1 => delete $self->{$_});
194 } 244 }
195 } 245 }
196 246
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 247 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251 $self->{force_h} = $layout->{h} * $CFPlus::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 }
198 258
199 $self 259 $self
200} 260}
201 261
202sub destroy { 262sub destroy {
… …
206 %$self = (); 266 %$self = ();
207} 267}
208 268
209sub show { 269sub show {
210 my ($self) = @_; 270 my ($self) = @_;
271
211 return if $self->{parent}; 272 return if $self->{parent};
212 273
213 $CFClient::UI::ROOT->add ($self); 274 $CFPlus::UI::ROOT->add ($self);
214} 275}
215 276
216sub show_centered { 277sub set_visible {
217 my ($self) = @_; 278 my ($self) = @_;
279
218 return if $self->{parent}; 280 return if $self->{visible};
219 281
220 $self->show; 282 $self->{root} = $self->{parent}{root};
283 $self->{visible} = $self->{parent}{visible} + 1;
221 284
222 $CFClient::UI::ROOT->on_post_alloc ( 285 $self->emit (visibility_change => 1);
223 "centered $self" => sub { 286
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 287 $self->realloc if !exists $self->{req_w};
225 }, 288
226 ); 289 $_->set_visible for $self->children;
227} 290}
228 291
229sub set_invisible { 292sub set_invisible {
230 my ($self) = @_; 293 my ($self) = @_;
231 294
232 # broken show/hide model 295 return unless $self->{visible};
296
297 $_->set_invisible for $self->children;
233 298
234 delete $self->{visible}; 299 delete $self->{visible};
300 delete $self->{root};
235 301
236 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
237 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
238 304
239 CFClient::UI::check_tooltip 305 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
240 if $CFClient::UI::TOOLTIP->{owner} == $self; 306 if $TOOLTIP->{owner} == $self;
241 307
242 $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;
243} 327}
244 328
245sub hide { 329sub hide {
246 my ($self) = @_; 330 my ($self) = @_;
247 331
… …
249 333
250 $self->{parent}->remove ($self) 334 $self->{parent}->remove ($self)
251 if $self->{parent}; 335 if $self->{parent};
252} 336}
253 337
254sub move { 338sub move_abs {
255 my ($self, $x, $y, $z) = @_; 339 my ($self, $x, $y, $z) = @_;
256 340
257 $self->{x} = int $x; 341 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
258 $self->{y} = int $y; 342 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
259 $self->{z} = $z if defined $z; 343 $self->{z} = $z if defined $z;
260 344
261 $self->update; 345 $self->update;
262} 346}
263 347
264sub set_size { 348sub set_size {
265 my ($self, $w, $h) = @_; 349 my ($self, $w, $h) = @_;
266 350
267 $self->{user_w} = $w; 351 $self->{force_w} = $w;
268 $self->{user_h} = $h; 352 $self->{force_h} = $h;
269 353
270 $self->check_size; 354 $self->realloc;
271} 355}
272 356
273sub size_request { 357sub size_request {
274 require Carp; 358 require Carp;
275 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
276} 360}
277 361
362sub baseline_shift {
363 0
364}
365
278sub configure { 366sub configure {
279 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
280 368
281 if ($self->{aspect}) { 369 if ($self->{aspect}) {
370 my ($ow, $oh) = ($w, $h);
371
282 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 372 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
283 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 373 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
284 374
285 # use alignment to adjust x, y 375 # use alignment to adjust x, y
286 376
287 $x += int +($w - $w2) * 0.5; 377 $x += int 0.5 * ($ow - $w);
288 $y += int +($h - $h2) * 0.5; 378 $y += int 0.5 * ($oh - $h);
289
290 ($w, $h) = ($w2, $h2);
291 } 379 }
292 380
293 if ($self->{x} != $x || $self->{y} != $y) { 381 if ($self->{x} ne $x || $self->{y} ne $y) {
294 $self->{x} = $x; 382 $self->{x} = $x;
295 $self->{y} = $y; 383 $self->{y} = $y;
296 $self->update; 384 $self->update;
297 } 385 }
298 386
299 if ($self->{w} != $w || $self->{h} != $h) { 387 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
300 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 388 return unless $self->{visible};
301 }
302}
303 389
304sub size_allocate { 390 $self->{alloc_w} = $w;
305 # nothing to be done 391 $self->{alloc_h} = $h;
306}
307 392
308sub reconfigure { 393 $self->{root}{size_alloc}{$self+0} = $self;
309 my ($self) = @_; 394 }
310
311 $self->check_size (1);
312 $self->update;
313} 395}
314 396
315sub children { 397sub children {
398 # nop
399}
400
401sub visible_children {
402 $_[0]->children
316} 403}
317 404
318sub set_max_size { 405sub set_max_size {
319 my ($self, $w, $h) = @_; 406 my ($self, $w, $h) = @_;
320 407
321 delete $self->{max_w}; $self->{max_w} = $w if $w; 408 $self->{max_w} = int $w if defined $w;
322 delete $self->{max_h}; $self->{max_h} = $h if $h; 409 $self->{max_h} = int $h if defined $h;
410
411 $self->realloc;
323} 412}
324 413
325sub set_tooltip { 414sub set_tooltip {
326 my ($self, $tooltip) = @_; 415 my ($self, $tooltip) = @_;
327 416
… …
330 419
331 return if $self->{tooltip} eq $tooltip; 420 return if $self->{tooltip} eq $tooltip;
332 421
333 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
334 423
335 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
336 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFPlus::UI::TOOLTIP->{owner};
337 CFClient::UI::check_tooltip; 426 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
338 } 427 }
339} 428}
340 429
341# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
342sub coord2local { 431sub coord2local {
343 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
344 433
434 Carp::confess unless $self->{parent};#d#
435
345 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
346} 437}
347 438
348# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
349sub coord2global { 440sub coord2global {
350 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
351 442
443 Carp::confess unless $self->{parent};#d#
444
352 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
353} 446}
354 447
355sub focus_in { 448sub invoke_focus_in {
356 my ($self) = @_; 449 my ($self) = @_;
357 450
358 return if $FOCUS == $self; 451 return if $FOCUS == $self;
359 return unless $self->{can_focus}; 452 return unless $self->{can_focus};
360 453
361 my $focus = $FOCUS; $FOCUS = $self; 454 $FOCUS = $self;
362 455
363 $self->_emit (focus_in => $focus); 456 $self->update;
364 457
365 $focus->update if $focus; 458 0
366 $FOCUS->update;
367} 459}
368 460
369sub focus_out { 461sub invoke_focus_out {
370 my ($self) = @_; 462 my ($self) = @_;
371 463
372 return unless $FOCUS == $self; 464 return unless $FOCUS == $self;
373 465
374 my $focus = $FOCUS; undef $FOCUS; 466 undef $FOCUS;
375 467
376 $self->_emit (focus_out => $focus); 468 $self->update;
377 469
378 $focus->update if $focus; #?
379
380 $::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
381 unless $FOCUS; 471 unless $FOCUS;
382}
383 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
384sub mouse_motion { } 483sub invoke_mouse_motion { 0 }
385sub button_up { } 484sub invoke_button_up { 0 }
386sub key_down { } 485sub invoke_key_down { 0 }
387sub key_up { } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
388 488
389sub button_down { 489sub invoke_button_down {
390 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
391 491
392 $self->focus_in; 492 $self->grab_focus;
393}
394 493
395sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 494 0
396sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 495}
397sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 496
398sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 497sub connect {
399sub 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 CFPlus::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
400 583
401sub draw { 584sub draw {
402 my ($self) = @_; 585 my ($self) = @_;
403 586
404 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);
405 596
406 glPushMatrix; 597 glPushMatrix;
407 glTranslate $self->{x}, $self->{y}, 0; 598 glTranslate $self->{x}, $self->{y}, 0;
408 $self->_draw;
409 glPopMatrix;
410 599
411 if ($self == $HOVER && $self->{can_hover}) { 600 if ($self == $HOVER && $self->{can_hover}) {
412 my ($x, $y) = @$self{qw(x y)};
413
414 glColor 1, 0.8, 0.5, 0.2; 601 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
415 glEnable GL_BLEND; 602 glEnable GL_BLEND;
416 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
417 glBegin GL_QUADS; 604 glBegin GL_QUADS;
418 glVertex $x , $y; 605 glVertex 0 , 0;
419 glVertex $x + $self->{w}, $y; 606 glVertex $self->{w}, 0;
420 glVertex $x + $self->{w}, $y + $self->{h}; 607 glVertex $self->{w}, $self->{h};
421 glVertex $x , $y + $self->{h}; 608 glVertex 0 , $self->{h};
422 glEnd; 609 glEnd;
423 glDisable GL_BLEND; 610 glDisable GL_BLEND;
424 } 611 }
425 612
426 if ($ENV{PCLIENT_DEBUG}) { 613 if ($ENV{CFPLUS_DEBUG} & 1) {
427 glPushMatrix; 614 glPushMatrix;
428 glColor 1, 1, 0, 1; 615 glColor 1, 1, 0, 1;
429 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 616 glTranslate 0.375, 0.375;
430 glBegin GL_LINE_LOOP; 617 glBegin GL_LINE_LOOP;
431 glVertex 0 , 0; 618 glVertex 0 , 0;
432 glVertex $self->{w} - 1, 0; 619 glVertex $self->{w} - 1, 0;
433 glVertex $self->{w} - 1, $self->{h} - 1; 620 glVertex $self->{w} - 1, $self->{h} - 1;
434 glVertex 0 , $self->{h} - 1; 621 glVertex 0 , $self->{h} - 1;
435 glEnd; 622 glEnd;
436 glPopMatrix; 623 glPopMatrix;
437 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 624 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
438 } 625 }
626
627 $self->_draw;
628 glPopMatrix;
439} 629}
440 630
441sub _draw { 631sub _draw {
442 my ($self) = @_; 632 my ($self) = @_;
443 633
444 warn "no draw defined for $self\n"; 634 warn "no draw defined for $self\n";
445} 635}
446 636
447sub find_widget {
448 my ($self, $x, $y) = @_;
449
450 return () unless $self->{can_events};
451
452 return $self
453 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
454 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
455
456 ()
457}
458
459sub set_parent {
460 my ($self, $parent) = @_;
461
462 Scalar::Util::weaken ($self->{parent} = $parent);
463
464 $self->{root} = $parent->{root};
465 $self->{visible} = $parent->{visible};
466
467 # TODO: req_w _does_change after ->reconfigure
468 $self->check_size
469 unless exists $self->{req_w};
470
471 $self->show;
472}
473
474sub check_size {
475 my ($self, $forced) = @_;
476
477 $self->{force_alloc} = 1 if $forced;
478 $CFClient::UI::ROOT->{check_size}{$self} = $self;
479}
480
481sub update {
482 my ($self) = @_;
483
484 $self->{parent}->update
485 if $self->{parent};
486}
487
488sub connect {
489 my ($self, $signal, $cb) = @_;
490
491 push @{ $self->{signal_cb}{$signal} }, $cb;
492}
493
494sub _emit {
495 my ($self, $signal, @args) = @_;
496
497 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
498}
499
500sub emit {
501 my ($self, $signal, @args) = @_;
502
503 $self->_emit ($signal, @args)
504 || $self->$signal (@args);
505}
506
507sub DESTROY { 637sub DESTROY {
508 my ($self) = @_; 638 my ($self) = @_;
509 639
640 return if CFPlus::in_destruct;
641
510 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
511 #$self->deactivate; 643
644 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
512} 646}
513 647
514############################################################################# 648#############################################################################
515 649
516package CFClient::UI::DrawBG; 650package CFPlus::UI::DrawBG;
517 651
518our @ISA = CFClient::UI::Base::; 652our @ISA = CFPlus::UI::Base::;
519 653
520use strict; 654use strict;
521use CFClient::OpenGL; 655use CFPlus::OpenGL;
522 656
523sub new { 657sub new {
524 my $class = shift; 658 my $class = shift;
525 659
526 # range [value, low, high, page] 660 # range [value, low, high, page]
… …
541 675
542 if ($color && (@$color < 4 || $color->[3])) { 676 if ($color && (@$color < 4 || $color->[3])) {
543 my ($w, $h) = @$self{qw(w h)}; 677 my ($w, $h) = @$self{qw(w h)};
544 678
545 glEnable GL_BLEND; 679 glEnable GL_BLEND;
546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 680 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
547 glColor @$color; 681 glColor_premultiply @$color;
548 682
549 glBegin GL_QUADS; 683 glBegin GL_QUADS;
550 glVertex 0 , 0; 684 glVertex 0 , 0;
551 glVertex 0 , $h; 685 glVertex 0 , $h;
552 glVertex $w, $h; 686 glVertex $w, $h;
… …
557 } 691 }
558} 692}
559 693
560############################################################################# 694#############################################################################
561 695
562package CFClient::UI::Empty; 696package CFPlus::UI::Empty;
563 697
564our @ISA = CFClient::UI::Base::; 698our @ISA = CFPlus::UI::Base::;
565 699
566sub new { 700sub new {
567 my ($class, %arg) = @_; 701 my ($class, %arg) = @_;
568 $class->SUPER::new (can_events => 0, %arg); 702 $class->SUPER::new (can_events => 0, %arg);
569} 703}
570 704
571sub size_request { 705sub size_request {
572 (0, 0) 706 my ($self) = @_;
707
708 ($self->{w} + 0, $self->{h} + 0)
573} 709}
574 710
575sub draw { } 711sub draw { }
576 712
577############################################################################# 713#############################################################################
578 714
579package CFClient::UI::Container; 715package CFPlus::UI::Container;
580 716
581our @ISA = CFClient::UI::Base::; 717our @ISA = CFPlus::UI::Base::;
582 718
583sub new { 719sub new {
584 my ($class, %arg) = @_; 720 my ($class, %arg) = @_;
585 721
586 my $children = delete $arg{children} || []; 722 my $children = delete $arg{children};
587 723
588 my $self = $class->SUPER::new ( 724 my $self = $class->SUPER::new (
589 children => [], 725 children => [],
590 can_events => 0, 726 can_events => 0,
591 %arg, 727 %arg,
592 ); 728 );
729
593 $self->add ($_) for @$children; 730 $self->add (@$children)
731 if $children;
594 732
595 $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;
596} 742}
597 743
598sub add { 744sub add {
599 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
600 746
… …
606 $self->{children} = [ 752 $self->{children} = [
607 sort { $a->{z} <=> $b->{z} } 753 sort { $a->{z} <=> $b->{z} }
608 @{$self->{children}}, @widgets 754 @{$self->{children}}, @widgets
609 ]; 755 ];
610 756
611 $self->check_size (1); 757 $self->realloc;
612 $self->update;
613} 758}
614 759
615sub children { 760sub children {
616 @{ $_[0]{children} } 761 @{ $_[0]{children} }
617} 762}
… …
622 delete $child->{parent}; 767 delete $child->{parent};
623 $child->hide; 768 $child->hide;
624 769
625 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 770 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
626 771
627 $self->check_size (1); 772 $self->realloc;
628 $self->update;
629} 773}
630 774
631sub clear { 775sub clear {
632 my ($self) = @_; 776 my ($self) = @_;
633 777
… …
637 for (@$children) { 781 for (@$children) {
638 delete $_->{parent}; 782 delete $_->{parent};
639 $_->hide; 783 $_->hide;
640 } 784 }
641 785
642 $self->check_size; 786 $self->realloc;
643 $self->update;
644} 787}
645 788
646sub find_widget { 789sub find_widget {
647 my ($self, $x, $y) = @_; 790 my ($self, $x, $y) = @_;
648 791
649 $x -= $self->{x}; 792 $x -= $self->{x};
650 $y -= $self->{y}; 793 $y -= $self->{y};
651 794
652 my $res; 795 my $res;
653 796
654 for (reverse @{ $self->{children} }) { 797 for (reverse $self->visible_children) {
655 $res = $_->find_widget ($x, $y) 798 $res = $_->find_widget ($x, $y)
656 and return $res; 799 and return $res;
657 } 800 }
658 801
659 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 802 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
665 $_->draw for @{$self->{children}}; 808 $_->draw for @{$self->{children}};
666} 809}
667 810
668############################################################################# 811#############################################################################
669 812
670package CFClient::UI::Bin; 813package CFPlus::UI::Bin;
671 814
672our @ISA = CFClient::UI::Container::; 815our @ISA = CFPlus::UI::Container::;
673 816
674sub new { 817sub new {
675 my ($class, %arg) = @_; 818 my ($class, %arg) = @_;
676 819
677 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 820 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
678 821
679 $class->SUPER::new (children => [$child], %arg) 822 $class->SUPER::new (children => [$child], %arg)
680} 823}
681 824
682sub add { 825sub add {
683 my ($self, $child) = @_; 826 my ($self, $child) = @_;
684 827
685 $self->{children} = []; 828 $self->SUPER::remove ($_) for @{ $self->{children} };
686
687 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
688} 830}
689 831
690sub remove { 832sub remove {
691 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
692 834
693 $self->SUPER::remove ($widget); 835 $self->SUPER::remove ($widget);
694 836
695 $self->{children} = [new CFClient::UI::Empty] 837 $self->{children} = [new CFPlus::UI::Empty]
696 unless @{$self->{children}}; 838 unless @{$self->{children}};
697} 839}
698 840
699sub child { $_[0]->{children}[0] } 841sub child { $_[0]->{children}[0] }
700 842
701sub size_request { 843sub size_request {
702 $_[0]{children}[0]->size_request 844 $_[0]{children}[0]->size_request
703} 845}
704 846
705sub size_allocate { 847sub invoke_size_allocate {
706 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
707 849
708 $self->{children}[0]->configure (0, 0, $w, $h); 850 $self->{children}[0]->configure (0, 0, $w, $h);
851
852 1
709} 853}
710 854
711############################################################################# 855#############################################################################
712 856
857# back-buffered drawing area
858
713package CFClient::UI::Window; 859package CFPlus::UI::Window;
714 860
715our @ISA = CFClient::UI::Bin::; 861our @ISA = CFPlus::UI::Bin::;
716 862
717use CFClient::OpenGL; 863use CFPlus::OpenGL;
718 864
719sub new { 865sub new {
720 my ($class, %arg) = @_; 866 my ($class, %arg) = @_;
721 867
722 my $self = $class->SUPER::new (%arg); 868 my $self = $class->SUPER::new (%arg);
… …
727 873
728 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 874 $ROOT->on_post_alloc ($self => sub { $self->render_child });
729 $self->SUPER::update; 875 $self->SUPER::update;
730} 876}
731 877
732sub size_allocate { 878sub invoke_size_allocate {
733 my ($self, $w, $h) = @_; 879 my ($self, $w, $h) = @_;
734 880
735 $self->SUPER::size_allocate ($w, $h);
736 $self->update; 881 $self->update;
882
883 $self->SUPER::invoke_size_allocate ($w, $h)
737} 884}
738 885
739sub _render { 886sub _render {
887 my ($self) = @_;
888
740 $_[0]{children}[0]->draw; 889 $self->{children}[0]->draw;
741} 890}
742 891
743sub render_child { 892sub render_child {
744 my ($self) = @_; 893 my ($self) = @_;
745 894
746 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 895 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
747 glClearColor 0, 0, 0, 0; 896 glClearColor 0, 0, 0, 0;
748 glClear GL_COLOR_BUFFER_BIT; 897 glClear GL_COLOR_BUFFER_BIT;
749 898
899 {
900 package CFPlus::UI::Base;
901
902 ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h});
904 }
905
750 $self->_render; 906 $self->_render;
751 }; 907 };
752} 908}
753 909
754sub _draw { 910sub _draw {
755 my ($self) = @_; 911 my ($self) = @_;
756 912
757 my ($w, $h) = ($self->w, $self->h); 913 my ($w, $h) = @$self{qw(w h)};
758 914
759 my $tex = $self->{texture} 915 my $tex = $self->{texture}
760 or return; 916 or return;
761 917
762 glEnable GL_TEXTURE_2D; 918 glEnable GL_TEXTURE_2D;
763 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
764 glColor 1, 1, 1, 1; 920 glColor 0, 0, 0, 1;
765 921
766 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
767 923
768 glDisable GL_TEXTURE_2D; 924 glDisable GL_TEXTURE_2D;
769} 925}
770 926
771############################################################################# 927#############################################################################
772 928
773package CFClient::UI::ViewPort; 929package CFPlus::UI::ViewPort;
774 930
775our @ISA = CFClient::UI::Window::; 931our @ISA = CFPlus::UI::Window::;
776 932
777sub new { 933sub new {
778 my $class = shift; 934 my $class = shift;
779 935
780 $class->SUPER::new ( 936 $class->SUPER::new (
… …
785} 941}
786 942
787sub size_request { 943sub size_request {
788 my ($self) = @_; 944 my ($self) = @_;
789 945
790 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 946 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
791 947
792 @$self{qw(child_w child_h)} 948 $w = 10 if $self->{scroll_x};
793} 949 $h = 10 if $self->{scroll_y};
794 950
951 ($w, $h)
952}
953
795sub size_allocate { 954sub invoke_size_allocate {
796 my ($self, $w, $h) = @_; 955 my ($self, $w, $h) = @_;
797 956
957 my $child = $self->child;
958
798 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 959 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
799 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 960 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
800 961
801 $self->child->configure (0, 0, $w, $h); 962 $self->child->configure (0, 0, $w, $h);
802 $self->update; 963 $self->update;
964
965 1
803} 966}
804 967
805sub set_offset { 968sub set_offset {
806 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
807 970
… …
833 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
834 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 997 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
835 ) { 998 ) {
836 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
837 } else { 1000 } else {
838 $self->CFClient::UI::Base::find_widget ($x, $y) 1001 $self->CFPlus::UI::Base::find_widget ($x, $y)
839 } 1002 }
840} 1003}
841 1004
842sub _render { 1005sub _render {
843 my ($self) = @_; 1006 my ($self) = @_;
844 1007
1008 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1009 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010
845 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1011 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
846 1012
847 $self->SUPER::_render; 1013 $self->SUPER::_render;
848} 1014}
849 1015
850############################################################################# 1016#############################################################################
851 1017
852package CFClient::UI::ScrolledWindow; 1018package CFPlus::UI::ScrolledWindow;
853 1019
854our @ISA = CFClient::UI::HBox::; 1020our @ISA = CFPlus::UI::HBox::;
855 1021
856sub new { 1022sub new {
857 my $class = shift; 1023 my ($class, %arg) = @_;
1024
1025 my $child = delete $arg{child};
858 1026
859 my $self; 1027 my $self;
860 1028
861 my $slider = new CFClient::UI::Slider 1029 my $slider = new CFPlus::UI::Slider
862 vertical => 1, 1030 vertical => 1,
863 range => [0, 0, 1, 0.01], # HACK fix 1031 range => [0, 0, 1, 0.01], # HACK fix
864 connect_changed => sub { 1032 on_changed => sub {
865 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
866 }, 1034 },
867 ; 1035 ;
868 1036
869 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
870 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFPlus::UI::ViewPort expand => 1),
1039 can_events => 1,
871 slider => $slider, 1040 slider => $slider,
872 @_, 1041 %arg,
873 ); 1042 );
874 1043
875 $self->{vp}->add ($self->{scrolled});
876 $self->add ($self->{vp});
877 $self->add ($self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
1045 $self->add ($child) if $child;
878 1046
879 $self 1047 $self
880} 1048}
881 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
882sub update { 1074sub update {
883 my ($self) = @_; 1075 my ($self) = @_;
884 1076
885 $self->SUPER::update; 1077 $self->SUPER::update;
886 1078
887 # todo: overwrite size_allocate of child 1079 $self->update_slider;
888 my $child = $self->{vp}->child;
889 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
890} 1080}
891 1081
892sub size_allocate { 1082sub invoke_size_allocate {
893 my ($self, $w, $h) = @_; 1083 my ($self, $w, $h) = @_;
894 1084
1085 $self->update_slider;
1086
895 $self->SUPER::size_allocate ($w, $h); 1087 $self->SUPER::invoke_size_allocate ($w, $h)
896
897 my $child = $self->{vp}->child;
898 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
899} 1088}
900
901#TODO# update range on size_allocate depending on child
902# update viewport offset on scroll
903 1089
904############################################################################# 1090#############################################################################
905 1091
906package CFClient::UI::Frame; 1092package CFPlus::UI::Frame;
907 1093
908our @ISA = CFClient::UI::Bin::; 1094our @ISA = CFPlus::UI::Bin::;
909 1095
910use CFClient::OpenGL; 1096use CFPlus::OpenGL;
911 1097
912sub new { 1098sub new {
913 my $class = shift; 1099 my $class = shift;
914 1100
915 $class->SUPER::new ( 1101 $class->SUPER::new (
… …
923 1109
924 if ($self->{bg}) { 1110 if ($self->{bg}) {
925 my ($w, $h) = @$self{qw(w h)}; 1111 my ($w, $h) = @$self{qw(w h)};
926 1112
927 glEnable GL_BLEND; 1113 glEnable GL_BLEND;
928 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1114 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
929 glColor @{ $self->{bg} }; 1115 glColor_premultiply @{ $self->{bg} };
930 1116
931 glBegin GL_QUADS; 1117 glBegin GL_QUADS;
932 glVertex 0 , 0; 1118 glVertex 0 , 0;
933 glVertex 0 , $h; 1119 glVertex 0 , $h;
934 glVertex $w, $h; 1120 glVertex $w, $h;
… …
941 $self->SUPER::_draw; 1127 $self->SUPER::_draw;
942} 1128}
943 1129
944############################################################################# 1130#############################################################################
945 1131
946package CFClient::UI::FancyFrame; 1132package CFPlus::UI::FancyFrame;
947 1133
948our @ISA = CFClient::UI::Bin::; 1134our @ISA = CFPlus::UI::Bin::;
949 1135
950use CFClient::OpenGL; 1136use CFPlus::OpenGL;
951 1137
952my @tex = 1138my $bg =
1139 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1;
1141
1142my @border =
953 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1143 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
954 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);
955 1145
956sub new { 1146sub new {
957 my $class = shift; 1147 my ($class, %arg) = @_;
958
959 # TODO: user_x, user_y, overwrite moveto?
960 1148
961 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
962 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
963 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
964 border => 0.6, 1152 border => 0.6,
965 is_toplevel => 1,
966 can_events => 1, 1153 can_events => 1,
967 @_ 1154 min_w => 64,
1155 min_h => 32,
1156 %arg,
968 ); 1157 );
969 1158
970 $self->{title} &&= new CFClient::UI::Label 1159 $self->{title_widget} = new CFPlus::UI::Label
971 align => 0, 1160 align => 0,
972 valign => 1, 1161 valign => 1,
973 text => $self->{title}, 1162 text => $self->{title},
974 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 CFPlus::UI::ImageButton
1169 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") };
1171
1172 $self->CFPlus::UI::Container::add ($self->{close_button});
1173 }
975 1174
976 $self 1175 $self
1176}
1177
1178sub add {
1179 my ($self, @widgets) = @_;
1180
1181 $self->SUPER::add (@widgets);
1182 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1183 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
977} 1184}
978 1185
979sub border { 1186sub border {
980 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
981} 1188}
982 1189
983sub size_request { 1190sub size_request {
984 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};
985 1198
986 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
987 1200
988 ( 1201 (
989 $w + $self->border * 2, 1202 $w + $self->border * 2,
990 $h + $self->border * 2, 1203 $h + $self->border * 2,
991 ) 1204 )
992} 1205}
993 1206
994sub size_allocate { 1207sub invoke_size_allocate {
995 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
996 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
997 $h -= List::Util::max 0, $self->border * 2; 1218 $h -= List::Util::max 0, $border * 2;
998 $w -= List::Util::max 0, $self->border * 2; 1219 $w -= List::Util::max 0, $border * 2;
999 1220
1000 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1001 if $self->{title};
1002
1003 $self->child->configure ($self->border, $self->border, $w, $h); 1221 $self->child->configure ($border, $border, $w, $h);
1004}
1005 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
1006sub button_down { 1237sub invoke_button_down {
1007 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1008 1239
1009 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1010 my $border = $self->border; 1241 my $border = $self->border;
1011 1242
… …
1024 my ($ev, $x, $y) = @_; 1255 my ($ev, $x, $y) = @_;
1025 1256
1026 my $dx = $ev->{x} - $ox; 1257 my $dx = $ev->{x} - $ox;
1027 my $dy = $ev->{y} - $oy; 1258 my $dy = $ev->{y} - $oy;
1028 1259
1029 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1260 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1030 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1261 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1262
1031 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1263 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1032 $self->check_size; 1264 $self->realloc;
1033 }; 1265 };
1034 1266
1035 } elsif ($lr ^ $td) { 1267 } elsif ($lr ^ $td) {
1036 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1268 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1037 my ($bx, $by) = ($self->{x}, $self->{y}); 1269 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1039 $self->{motion} = sub { 1271 $self->{motion} = sub {
1040 my ($ev, $x, $y) = @_; 1272 my ($ev, $x, $y) = @_;
1041 1273
1042 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1043 1275
1044 $self->move ($bx + $x - $ox, $by + $y - $oy); 1276 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1045 $self->update; 1277 # HACK: the next line is required to enforce placement
1278 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1046 }; 1279 };
1280 } else {
1281 return 0;
1282 }
1283
1047 } 1284 1
1048} 1285}
1049 1286
1050sub button_up { 1287sub invoke_button_up {
1051 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1052 1289
1053 delete $self->{motion}; 1290 ! ! delete $self->{motion}
1054} 1291}
1055 1292
1056sub mouse_motion { 1293sub invoke_mouse_motion {
1057 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1058 1295
1059 $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
1060} 1307}
1061 1308
1062sub _draw { 1309sub _draw {
1063 my ($self) = @_; 1310 my ($self) = @_;
1064 1311
1312 my $child = $self->{children}[0];
1313
1065 my ($w, $h ) = ($self->{w}, $self->{h}); 1314 my ($w, $h ) = ($self->{w}, $self->{h});
1066 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1315 my ($cw, $ch) = ($child->{w}, $child->{h});
1067 1316
1068 glEnable GL_TEXTURE_2D; 1317 glEnable GL_TEXTURE_2D;
1069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1070 1319
1071 my $border = $self->border; 1320 my $border = $self->border;
1072 1321
1073 glColor @{ $self->{border_bg} }; 1322 glColor @{ $self->{border_bg} };
1074 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1323 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1075 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1324 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1076 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1325 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1077 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1326 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1078 1327
1079 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1328 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1080 my $bg = $tex[0]; 1329 glColor @{ $self->{bg} };
1081 1330
1082 # TODO: repeat texture not scale 1331 # TODO: repeat texture not scale
1332 # solve this better(?)
1083 my $rep_x = $cw / $bg->{w}; 1333 $bg->{s} = $cw / $bg->{w};
1084 my $rep_y = $ch / $bg->{h}; 1334 $bg->{t} = $ch / $bg->{h};
1085
1086 glColor @{ $self->{bg} };
1087
1088 $bg->{s} = $rep_x;
1089 $bg->{t} = $rep_y;
1090 $bg->{wrap_mode} = 1;
1091 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1335 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1092 } 1336 }
1093 1337
1094 glDisable GL_TEXTURE_2D; 1338 glDisable GL_TEXTURE_2D;
1095 1339
1096 $self->{title}->draw if $self->{title};
1097
1098 $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};
1099} 1351}
1100 1352
1101############################################################################# 1353#############################################################################
1102 1354
1103package CFClient::UI::Table; 1355package CFPlus::UI::Table;
1104 1356
1105our @ISA = CFClient::UI::Base::; 1357our @ISA = CFPlus::UI::Base::;
1106 1358
1107use List::Util qw(max sum); 1359use List::Util qw(max sum);
1108 1360
1109use CFClient::OpenGL; 1361use CFPlus::OpenGL;
1110 1362
1111sub new { 1363sub new {
1112 my $class = shift; 1364 my $class = shift;
1113 1365
1114 $class->SUPER::new ( 1366 $class->SUPER::new (
… …
1120sub children { 1372sub children {
1121 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1373 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1122} 1374}
1123 1375
1124sub add { 1376sub add {
1125 my ($self, $x, $y, $child) = @_; 1377 my ($self) = shift;
1126 1378
1379 while (@_) {
1380 my ($x, $y, $child) = splice @_, 0, 3, ();
1127 $child->set_parent ($self); 1381 $child->set_parent ($self);
1128 $self->{children}[$y][$x] = $child; 1382 $self->{children}[$y][$x] = $child;
1383 }
1129 1384
1130 $self->check_size (1); 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
1131} 1394}
1132 1395
1133# TODO: move to container class maybe? send children a signal on removal? 1396# TODO: move to container class maybe? send children a signal on removal?
1134sub clear { 1397sub clear {
1135 my ($self) = @_; 1398 my ($self) = @_;
… …
1140 for (@children) { 1403 for (@children) {
1141 delete $_->{parent}; 1404 delete $_->{parent};
1142 $_->hide; 1405 $_->hide;
1143 } 1406 }
1144 1407
1145 $self->check_size (1); 1408 $self->realloc;
1146 $self->update;
1147} 1409}
1148 1410
1149sub get_wh { 1411sub get_wh {
1150 my ($self) = @_; 1412 my ($self) = @_;
1151 1413
… …
1177 (sum @$ws), 1439 (sum @$ws),
1178 (sum @$hs), 1440 (sum @$hs),
1179 ) 1441 )
1180} 1442}
1181 1443
1182sub size_allocate { 1444sub invoke_size_allocate {
1183 my ($self, $w, $h) = @_; 1445 my ($self, $w, $h) = @_;
1184 1446
1185 my ($ws, $hs) = $self->get_wh; 1447 my ($ws, $hs) = $self->get_wh;
1186 1448
1187 my $req_w = (sum @$ws) || 1; 1449 my $req_w = (sum @$ws) || 1;
… …
1194 1456
1195 # linearly scale sizes 1457 # linearly scale sizes
1196 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1458 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1197 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1459 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1198 1460
1199 CFClient::UI::harmonize $ws; 1461 CFPlus::UI::harmonize $ws;
1200 CFClient::UI::harmonize $hs; 1462 CFPlus::UI::harmonize $hs;
1201 1463
1202 my $y; 1464 my $y;
1203 1465
1204 for my $r (0 .. $#{$self->{children}}) { 1466 for my $r (0 .. $#{$self->{children}}) {
1205 my $row = $self->{children}[$r] 1467 my $row = $self->{children}[$r]
… …
1219 } 1481 }
1220 1482
1221 $y += $row_h; 1483 $y += $row_h;
1222 } 1484 }
1223 1485
1486 1
1224} 1487}
1225 1488
1226sub find_widget { 1489sub find_widget {
1227 my ($self, $x, $y) = @_; 1490 my ($self, $x, $y) = @_;
1228 1491
… …
1247 } 1510 }
1248} 1511}
1249 1512
1250############################################################################# 1513#############################################################################
1251 1514
1252package CFClient::UI::HBox; 1515package CFPlus::UI::Box;
1253 1516
1254# TODO: wrap into common Box base class
1255
1256our @ISA = CFClient::UI::Container::; 1517our @ISA = CFPlus::UI::Container::;
1257 1518
1258sub size_request { 1519sub size_request {
1259 my ($self) = @_; 1520 my ($self) = @_;
1260 1521
1261 my @alloc = map [$_->size_request], @{$self->{children}}; 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}
1262 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 }
1263 ( 1558 }
1264 (List::Util::sum map $_->[0], @alloc), 1559
1265 (List::Util::max map $_->[1], @alloc), 1560 CFPlus::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
1575package CFPlus::UI::HBox;
1576
1577our @ISA = CFPlus::UI::Box::;
1578
1579sub new {
1580 my $class = shift;
1581
1582 $class->SUPER::new (
1583 vertical => 0,
1584 @_,
1266 ) 1585 )
1267} 1586}
1268 1587
1269sub size_allocate {
1270 my ($self, $w, $h) = @_;
1271
1272 ($h, $w) = ($w, $h);
1273
1274 my $children = $self->{children};
1275
1276 my @h = map $_->{req_w}, @$children;
1277
1278 my $req_h = List::Util::sum @h;
1279
1280 if ($req_h > $h) {
1281 # ah well, not enough space
1282 $_ *= $h / $req_h for @h;
1283 } else {
1284 my $exp = List::Util::sum map $_->{expand}, @$children;
1285 $exp ||= 1;
1286
1287 for (0 .. $#$children) {
1288 my $child = $children->[$_];
1289
1290 my $alloc_h = $h[$_];
1291 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1292 $h[$_] = $alloc_h;
1293 }
1294 }
1295
1296 CFClient::UI::harmonize \@h;
1297
1298 my $y = 0;
1299 for (0 .. $#$children) {
1300 my $child = $children->[$_];
1301 my $h = $h[$_];
1302 $child->configure ($y, 0, $h, $w);
1303
1304 $y += $h;
1305 }
1306
1307 1
1308}
1309
1310############################################################################# 1588#############################################################################
1311 1589
1312package CFClient::UI::VBox; 1590package CFPlus::UI::VBox;
1313 1591
1314# TODO: wrap into common Box base class 1592our @ISA = CFPlus::UI::Box::;
1315 1593
1316our @ISA = CFClient::UI::Container::; 1594sub new {
1595 my $class = shift;
1317 1596
1318sub size_request { 1597 $class->SUPER::new (
1319 my ($self) = @_; 1598 vertical => 1,
1320 1599 @_,
1321 my @alloc = map [$_->size_request], @{$self->{children}};
1322
1323 (
1324 (List::Util::max map $_->[0], @alloc),
1325 (List::Util::sum map $_->[1], @alloc),
1326 ) 1600 )
1327} 1601}
1328 1602
1329sub size_allocate {
1330 my ($self, $w, $h) = @_;
1331
1332 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1333
1334 my $children = $self->{children};
1335
1336 my @h = map $_->{req_h}, @$children;
1337
1338 my $req_h = List::Util::sum @h;
1339
1340 if ($req_h > $h) {
1341 # ah well, not enough space
1342 $_ *= $h / $req_h for @h;
1343 } else {
1344 my $exp = List::Util::sum map $_->{expand}, @$children;
1345 $exp ||= 1;
1346
1347 for (0 .. $#$children) {
1348 my $child = $children->[$_];
1349
1350 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1351 }
1352 }
1353
1354 CFClient::UI::harmonize \@h;
1355
1356 my $y = 0;
1357 for (0 .. $#$children) {
1358 my $child = $children->[$_];
1359 my $h = $h[$_];
1360 $child->configure (0, $y, $w, $h);
1361
1362 $y += $h;
1363 }
1364
1365 1
1366}
1367
1368############################################################################# 1603#############################################################################
1369 1604
1370package CFClient::UI::Label; 1605package CFPlus::UI::Label;
1371 1606
1372our @ISA = CFClient::UI::DrawBG::; 1607our @ISA = CFPlus::UI::DrawBG::;
1373 1608
1374use CFClient::OpenGL; 1609use CFPlus::OpenGL;
1375 1610
1376sub new { 1611sub new {
1377 my ($class, %arg) = @_; 1612 my ($class, %arg) = @_;
1378 1613
1379 my $self = $class->SUPER::new ( 1614 my $self = $class->SUPER::new (
… …
1383 #font => default_font 1618 #font => default_font
1384 #text => initial text 1619 #text => initial text
1385 #markup => initial narkup 1620 #markup => initial narkup
1386 #max_w => maximum pixel width 1621 #max_w => maximum pixel width
1387 ellipsise => 3, # end 1622 ellipsise => 3, # end
1388 layout => (new CFClient::Layout), 1623 layout => (new CFPlus::Layout),
1389 fontsize => 1, 1624 fontsize => 1,
1390 align => -1, 1625 align => -1,
1391 valign => -1, 1626 valign => -1,
1392 padding => 2, 1627 padding_x => 2,
1628 padding_y => 2,
1393 can_events => 0, 1629 can_events => 0,
1394 %arg 1630 %arg
1395 ); 1631 );
1396 1632
1397 if (exists $self->{template}) { 1633 if (exists $self->{template}) {
1398 my $layout = new CFClient::Layout; 1634 my $layout = new CFPlus::Layout;
1399 $layout->set_text (delete $self->{template}); 1635 $layout->set_text (delete $self->{template});
1400 $self->{template} = $layout; 1636 $self->{template} = $layout;
1401 } 1637 }
1402 1638
1403 if (exists $self->{markup}) { 1639 if (exists $self->{markup}) {
… …
1407 } 1643 }
1408 1644
1409 $self 1645 $self
1410} 1646}
1411 1647
1412sub escape($) {
1413 local $_ = $_[0];
1414
1415 s/&/&amp;/g;
1416 s/>/&gt;/g;
1417 s/</&lt;/g;
1418
1419 $_
1420}
1421
1422sub update { 1648sub update {
1423 my ($self) = @_; 1649 my ($self) = @_;
1424 1650
1425 delete $self->{texture}; 1651 delete $self->{texture};
1426 $self->SUPER::update; 1652 $self->SUPER::update;
1427} 1653}
1428 1654
1655sub realloc {
1656 my ($self) = @_;
1657
1658 delete $self->{ox};
1659 $self->SUPER::realloc;
1660}
1661
1429sub set_text { 1662sub set_text {
1430 my ($self, $text) = @_; 1663 my ($self, $text) = @_;
1431 1664
1432 return if $self->{text} eq "T$text"; 1665 return if $self->{text} eq "T$text";
1433 $self->{text} = "T$text"; 1666 $self->{text} = "T$text";
1434 1667
1435 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1436 $self->{layout}->set_text ($text); 1668 $self->{layout}->set_text ($text);
1437 1669
1670 delete $self->{size_req};
1671 $self->realloc;
1438 $self->update; 1672 $self->update;
1439 $self->check_size;
1440} 1673}
1441 1674
1442sub set_markup { 1675sub set_markup {
1443 my ($self, $markup) = @_; 1676 my ($self, $markup) = @_;
1444 1677
1445 return if $self->{text} eq "M$markup"; 1678 return if $self->{text} eq "M$markup";
1446 $self->{text} = "M$markup"; 1679 $self->{text} = "M$markup";
1447 1680
1448 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1681 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1449 1682
1450 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1451 $self->{layout}->set_markup ($markup); 1683 $self->{layout}->set_markup ($markup);
1452 1684
1685 delete $self->{size_req};
1686 $self->realloc;
1453 $self->update; 1687 $self->update;
1454 $self->check_size;
1455} 1688}
1456 1689
1457sub size_request { 1690sub size_request {
1458 my ($self) = @_; 1691 my ($self) = @_;
1459 1692
1693 $self->{size_req} ||= do {
1460 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1694 $self->{layout}->set_font ($self->{font}) if $self->{font};
1461 $self->{layout}->set_width ($self->{max_w} || -1); 1695 $self->{layout}->set_width ($self->{max_w} || -1);
1462 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1696 $self->{layout}->set_ellipsise ($self->{ellipsise});
1463 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1697 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1464 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1698 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1465 1699
1466 my ($w, $h) = $self->{layout}->size; 1700 my ($w, $h) = $self->{layout}->size;
1467 1701
1468 if (exists $self->{template}) { 1702 if (exists $self->{template}) {
1469 $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);
1470 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1705 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1471 1706
1472 my ($w2, $h2) = $self->{template}->size; 1707 my ($w2, $h2) = $self->{template}->size;
1473 1708
1474 $w = List::Util::max $w, $w2; 1709 $w = List::Util::max $w, $w2;
1475 $h = List::Util::max $h, $h2; 1710 $h = List::Util::max $h, $h2;
1711 }
1712
1713 [$w, $h]
1476 } 1714 };
1477 1715
1478 ( 1716 @{ $self->{size_req} }
1479 $w + $self->{padding} * 2,
1480 $h + $self->{padding} * 2,
1481 )
1482} 1717}
1483 1718
1719sub baseline_shift {
1720 $_[0]{layout}->descent
1721}
1722
1484sub size_allocate { 1723sub invoke_size_allocate {
1485 my ($self, $w, $h) = @_; 1724 my ($self, $w, $h) = @_;
1486 1725
1726 delete $self->{ox};
1727
1487 delete $self->{texture}; 1728 delete $self->{texture}
1729 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1730
1731 1
1488} 1732}
1489 1733
1490sub set_fontsize { 1734sub set_fontsize {
1491 my ($self, $fontsize) = @_; 1735 my ($self, $fontsize) = @_;
1492 1736
1493 $self->{fontsize} = $fontsize; 1737 $self->{fontsize} = $fontsize;
1738 delete $self->{size_req};
1494 delete $self->{texture}; 1739 delete $self->{texture};
1495 1740
1496 $self->update; 1741 $self->realloc;
1497 $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;
1498} 1751}
1499 1752
1500sub _draw { 1753sub _draw {
1501 my ($self) = @_; 1754 my ($self) = @_;
1502 1755
1503 $self->SUPER::_draw; # draw background, if applicable 1756 $self->SUPER::_draw; # draw background, if applicable
1504 1757
1505 my $tex = $self->{texture} ||= do { 1758 my $size = $self->{texture} ||= do {
1506 $self->{layout}->set_foreground (@{$self->{fg}}); 1759 $self->{layout}->set_foreground (@{$self->{fg}});
1507 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1760 $self->{layout}->set_font ($self->{font}) if $self->{font};
1508 $self->{layout}->set_width ($self->{w}); 1761 $self->{layout}->set_width ($self->{w});
1509 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1762 $self->{layout}->set_ellipsise ($self->{ellipsise});
1510 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1763 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1511 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1764 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1512 1765
1513 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1766 [$self->{layout}->size]
1514
1515 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1516 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1517 : ($self->{w} - $tex->{w}) * 0.5);
1518
1519 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1520 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1521 : ($self->{h} - $tex->{h}) * 0.5);
1522
1523 $tex
1524 }; 1767 };
1525 1768
1526 glEnable GL_TEXTURE_2D; 1769 unless (exists $self->{ox}) {
1527 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);
1528 1773
1529 if ($tex->{format} == GL_ALPHA) { 1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1530 glColor @{$self->{fg}}; 1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1531 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1776 : ($self->{h} - $size->[1]) * 0.5);
1532 } else {
1533 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1534 } 1777 };
1535 1778
1536 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});
1537} 1783}
1538 1784
1539############################################################################# 1785#############################################################################
1540 1786
1541package CFClient::UI::EntryBase; 1787package CFPlus::UI::EntryBase;
1542 1788
1543our @ISA = CFClient::UI::Label::; 1789our @ISA = CFPlus::UI::Label::;
1544 1790
1545use CFClient::OpenGL; 1791use CFPlus::OpenGL;
1546 1792
1547sub new { 1793sub new {
1548 my $class = shift; 1794 my $class = shift;
1549 1795
1550 $class->SUPER::new ( 1796 $class->SUPER::new (
… …
1555 can_hover => 1, 1801 can_hover => 1,
1556 can_focus => 1, 1802 can_focus => 1,
1557 valign => 0, 1803 valign => 0,
1558 can_events => 1, 1804 can_events => 1,
1559 #text => ... 1805 #text => ...
1806 #hidden => "*",
1560 @_ 1807 @_
1561 ) 1808 )
1562} 1809}
1563 1810
1564sub _set_text { 1811sub _set_text {
… …
1566 1813
1567 delete $self->{cur_h}; 1814 delete $self->{cur_h};
1568 1815
1569 return if $self->{text} eq $text; 1816 return if $self->{text} eq $text;
1570 1817
1571 delete $self->{texture};
1572
1573 $self->{last_activity} = $::NOW; 1818 $self->{last_activity} = $::NOW;
1574 $self->{text} = $text; 1819 $self->{text} = $text;
1575 1820
1576 $text =~ s/./*/g if $self->{hidden}; 1821 $text =~ s/./*/g if $self->{hidden};
1577 $self->{layout}->set_text ("$text "); 1822 $self->{layout}->set_text ("$text ");
1823 delete $self->{size_req};
1578 1824
1579 $self->_emit (changed => $self->{text}); 1825 $self->emit (changed => $self->{text});
1826
1827 $self->realloc;
1828 $self->update;
1580} 1829}
1581 1830
1582sub set_text { 1831sub set_text {
1583 my ($self, $text) = @_; 1832 my ($self, $text) = @_;
1584 1833
1585 $self->{cursor} = length $text; 1834 $self->{cursor} = length $text;
1586 $self->_set_text ($text); 1835 $self->_set_text ($text);
1587 $self->update;
1588 $self->check_size;
1589} 1836}
1590 1837
1591sub get_text { 1838sub get_text {
1592 $_[0]{text} 1839 $_[0]{text}
1593} 1840}
… …
1598 my ($w, $h) = $self->SUPER::size_request; 1845 my ($w, $h) = $self->SUPER::size_request;
1599 1846
1600 ($w + 1, $h) # add 1 for cursor 1847 ($w + 1, $h) # add 1 for cursor
1601} 1848}
1602 1849
1603sub key_down { 1850sub invoke_key_down {
1604 my ($self, $ev) = @_; 1851 my ($self, $ev) = @_;
1605 1852
1606 my $mod = $ev->{mod}; 1853 my $mod = $ev->{mod};
1607 my $sym = $ev->{sym}; 1854 my $sym = $ev->{sym};
1608 my $uni = $ev->{unicode}; 1855 my $uni = $ev->{unicode};
… …
1611 1858
1612 if ($uni == 8) { 1859 if ($uni == 8) {
1613 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1614 } elsif ($uni == 127) { 1861 } elsif ($uni == 127) {
1615 substr $text, $self->{cursor}, 1, ""; 1862 substr $text, $self->{cursor}, 1, "";
1616 } elsif ($sym == CFClient::SDLK_LEFT) { 1863 } elsif ($sym == CFPlus::SDLK_LEFT) {
1617 --$self->{cursor} if $self->{cursor}; 1864 --$self->{cursor} if $self->{cursor};
1618 } elsif ($sym == CFClient::SDLK_RIGHT) { 1865 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1619 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1866 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1620 } elsif ($sym == CFClient::SDLK_HOME) { 1867 } elsif ($sym == CFPlus::SDLK_HOME) {
1621 $self->{cursor} = 0; 1868 $self->{cursor} = 0;
1622 } elsif ($sym == CFClient::SDLK_END) { 1869 } elsif ($sym == CFPlus::SDLK_END) {
1623 $self->{cursor} = length $text; 1870 $self->{cursor} = length $text;
1624 } elsif ($uni == 27) { 1871 } elsif ($uni == 27) {
1625 $self->_emit ('escape'); 1872 $self->emit ('escape');
1626 } elsif ($uni) { 1873 } elsif ($uni) {
1627 substr $text, $self->{cursor}++, 0, chr $uni; 1874 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else {
1876 return 0;
1628 } 1877 }
1629 1878
1630 $self->_set_text ($text); 1879 $self->_set_text ($text);
1631 $self->update;
1632 $self->check_size;
1633}
1634 1880
1881 $self->realloc;
1882
1883 1
1884}
1885
1635sub focus_in { 1886sub invoke_focus_in {
1636 my ($self) = @_; 1887 my ($self) = @_;
1637 1888
1638 $self->{last_activity} = $::NOW; 1889 $self->{last_activity} = $::NOW;
1639 1890
1640 $self->SUPER::focus_in; 1891 $self->SUPER::invoke_focus_in
1641} 1892}
1642 1893
1643sub button_down { 1894sub invoke_button_down {
1644 my ($self, $ev, $x, $y) = @_; 1895 my ($self, $ev, $x, $y) = @_;
1645 1896
1646 $self->SUPER::button_down ($ev, $x, $y); 1897 $self->SUPER::invoke_button_down ($ev, $x, $y);
1647 1898
1648 my $idx = $self->{layout}->xy_to_index ($x, $y); 1899 my $idx = $self->{layout}->xy_to_index ($x, $y);
1649 1900
1650 # byte-index to char-index 1901 # byte-index to char-index
1651 my $text = $self->{text}; 1902 my $text = $self->{text};
1652 utf8::encode $text; 1903 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1653 $self->{cursor} = length substr $text, 0, $idx; 1904 $self->{cursor} = length $text;
1654 1905
1655 $self->_set_text ($self->{text}); 1906 $self->_set_text ($self->{text});
1656 $self->update; 1907 $self->update;
1908
1909 1
1657} 1910}
1658 1911
1659sub mouse_motion { 1912sub invoke_mouse_motion {
1660 my ($self, $ev, $x, $y) = @_; 1913 my ($self, $ev, $x, $y) = @_;
1661# 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
1662} 1917}
1663 1918
1664sub _draw { 1919sub _draw {
1665 my ($self) = @_; 1920 my ($self) = @_;
1666 1921
1667 local $self->{fg} = $self->{fg}; 1922 local $self->{fg} = $self->{fg};
1668 1923
1669 if ($FOCUS == $self) { 1924 if ($FOCUS == $self) {
1670 glColor @{$self->{active_bg}}; 1925 glColor_premultiply @{$self->{active_bg}};
1671 $self->{fg} = $self->{active_fg}; 1926 $self->{fg} = $self->{active_fg};
1672 } else { 1927 } else {
1673 glColor @{$self->{bg}}; 1928 glColor_premultiply @{$self->{bg}};
1674 } 1929 }
1675 1930
1676 glEnable GL_BLEND; 1931 glEnable GL_BLEND;
1677 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1932 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1678 glBegin GL_QUADS; 1933 glBegin GL_QUADS;
1679 glVertex 0 , 0; 1934 glVertex 0 , 0;
1680 glVertex 0 , $self->{h}; 1935 glVertex 0 , $self->{h};
1681 glVertex $self->{w}, $self->{h}; 1936 glVertex $self->{w}, $self->{h};
1682 glVertex $self->{w}, 0; 1937 glVertex $self->{w}, 0;
… …
1701 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 1956 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1702 glEnd; 1957 glEnd;
1703 } 1958 }
1704} 1959}
1705 1960
1706package CFClient::UI::Entry; 1961package CFPlus::UI::Entry;
1707 1962
1708our @ISA = CFClient::UI::EntryBase::; 1963our @ISA = CFPlus::UI::EntryBase::;
1709 1964
1710use CFClient::OpenGL; 1965use CFPlus::OpenGL;
1711 1966
1712sub key_down { 1967sub invoke_key_down {
1713 my ($self, $ev) = @_; 1968 my ($self, $ev) = @_;
1714 1969
1715 my $sym = $ev->{sym}; 1970 my $sym = $ev->{sym};
1716 1971
1717 if ($sym == 13) { 1972 if ($sym == 13) {
1718 unshift @{$self->{history}}, 1973 unshift @{$self->{history}},
1719 my $txt = $self->get_text; 1974 my $txt = $self->get_text;
1975
1720 $self->{history_pointer} = -1; 1976 $self->{history_pointer} = -1;
1721 $self->{history_saveback} = ''; 1977 $self->{history_saveback} = '';
1722 $self->_emit (activate => $txt); 1978 $self->emit (activate => $txt);
1723 $self->update; 1979 $self->update;
1724 1980
1725 } elsif ($sym == CFClient::SDLK_UP) { 1981 } elsif ($sym == CFPlus::SDLK_UP) {
1726 if ($self->{history_pointer} < 0) { 1982 if ($self->{history_pointer} < 0) {
1727 $self->{history_saveback} = $self->get_text; 1983 $self->{history_saveback} = $self->get_text;
1728 } 1984 }
1729 if (@{$self->{history} || []} > 0) { 1985 if (@{$self->{history} || []} > 0) {
1730 $self->{history_pointer}++; 1986 $self->{history_pointer}++;
… …
1732 $self->{history_pointer} = @{$self->{history} || []} - 1; 1988 $self->{history_pointer} = @{$self->{history} || []} - 1;
1733 } 1989 }
1734 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1990 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1735 } 1991 }
1736 1992
1737 } elsif ($sym == CFClient::SDLK_DOWN) { 1993 } elsif ($sym == CFPlus::SDLK_DOWN) {
1738 $self->{history_pointer}--; 1994 $self->{history_pointer}--;
1739 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1995 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1740 1996
1741 if ($self->{history_pointer} >= 0) { 1997 if ($self->{history_pointer} >= 0) {
1742 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1998 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1743 } else { 1999 } else {
1744 $self->set_text ($self->{history_saveback}); 2000 $self->set_text ($self->{history_saveback});
1745 } 2001 }
1746 2002
1747 } else { 2003 } else {
1748 $self->SUPER::key_down ($ev); 2004 return $self->SUPER::invoke_key_down ($ev)
2005 }
2006
1749 } 2007 1
1750
1751} 2008}
1752 2009
1753############################################################################# 2010#############################################################################
1754 2011
1755package CFClient::UI::Button; 2012package CFPlus::UI::Button;
1756 2013
1757our @ISA = CFClient::UI::Label::; 2014our @ISA = CFPlus::UI::Label::;
1758 2015
1759use CFClient::OpenGL; 2016use CFPlus::OpenGL;
1760 2017
1761my @tex = 2018my @tex =
1762 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2019 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1763 qw(b1_button_active.png); 2020 qw(b1_button_active.png);
1764 2021
1765sub new { 2022sub new {
1766 my $class = shift; 2023 my $class = shift;
1767 2024
1768 $class->SUPER::new ( 2025 $class->SUPER::new (
1769 padding => 4, 2026 padding_x => 4,
2027 padding_y => 4,
1770 fg => [1, 1, 1], 2028 fg => [1, 1, 1],
1771 active_fg => [0, 0, 1], 2029 active_fg => [0, 0, 1],
1772 can_hover => 1, 2030 can_hover => 1,
1773 align => 0, 2031 align => 0,
1774 valign => 0, 2032 valign => 0,
1775 can_events => 1, 2033 can_events => 1,
1776 @_ 2034 @_
1777 ) 2035 )
1778} 2036}
1779 2037
1780sub activate { }
1781
1782sub button_up { 2038sub invoke_button_up {
1783 my ($self, $ev, $x, $y) = @_; 2039 my ($self, $ev, $x, $y) = @_;
1784 2040
1785 $self->emit ("activate") 2041 $self->emit ("activate")
1786 if $x >= 0 && $x < $self->{w} 2042 if $x >= 0 && $x < $self->{w}
1787 && $y >= 0 && $y < $self->{h}; 2043 && $y >= 0 && $y < $self->{h};
2044
2045 1
1788} 2046}
1789 2047
1790sub _draw { 2048sub _draw {
1791 my ($self) = @_; 2049 my ($self) = @_;
1792 2050
1793 local $self->{fg} = $self->{fg}; 2051 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1794
1795 if ($GRAB == $self) {
1796 $self->{fg} = $self->{active_fg};
1797 }
1798 2052
1799 glEnable GL_TEXTURE_2D; 2053 glEnable GL_TEXTURE_2D;
1800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1801 glColor 0, 0, 0, 1; 2055 glColor 0, 0, 0, 1;
1802 2056
… …
1807 $self->SUPER::_draw; 2061 $self->SUPER::_draw;
1808} 2062}
1809 2063
1810############################################################################# 2064#############################################################################
1811 2065
1812package CFClient::UI::CheckBox; 2066package CFPlus::UI::CheckBox;
1813 2067
1814our @ISA = CFClient::UI::DrawBG::; 2068our @ISA = CFPlus::UI::DrawBG::;
1815 2069
1816my @tex = 2070my @tex =
1817 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2071 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1818 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2072 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1819 2073
1820use CFClient::OpenGL; 2074use CFPlus::OpenGL;
1821 2075
1822sub new { 2076sub new {
1823 my $class = shift; 2077 my $class = shift;
1824 2078
1825 $class->SUPER::new ( 2079 $class->SUPER::new (
1826 padding => 2, 2080 padding_x => 2,
2081 padding_y => 2,
1827 fg => [1, 1, 1], 2082 fg => [1, 1, 1],
1828 active_fg => [1, 1, 0], 2083 active_fg => [1, 1, 0],
1829 bg => [0, 0, 0, 0.2], 2084 bg => [0, 0, 0, 0.2],
1830 active_bg => [1, 1, 1, 0.5], 2085 active_bg => [1, 1, 1, 0.5],
1831 state => 0, 2086 state => 0,
… …
1835} 2090}
1836 2091
1837sub size_request { 2092sub size_request {
1838 my ($self) = @_; 2093 my ($self) = @_;
1839 2094
1840 ($self->{padding} * 2 + 6) x 2 2095 (6) x 2
1841} 2096}
1842 2097
2098sub toggle {
2099 my ($self) = @_;
2100
2101 $self->{state} = !$self->{state};
2102 $self->emit (changed => $self->{state});
2103 $self->update;
2104}
2105
1843sub button_down { 2106sub invoke_button_down {
1844 my ($self, $ev, $x, $y) = @_; 2107 my ($self, $ev, $x, $y) = @_;
1845 2108
1846 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2109 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1847 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2110 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1848 $self->{state} = !$self->{state}; 2111 $self->toggle;
1849 $self->_emit (changed => $self->{state}); 2112 } else {
2113 return 0
2114 }
2115
1850 } 2116 1
1851} 2117}
1852 2118
1853sub _draw { 2119sub _draw {
1854 my ($self) = @_; 2120 my ($self) = @_;
1855 2121
1856 $self->SUPER::_draw; 2122 $self->SUPER::_draw;
1857 2123
1858 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2124 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1859 2125
1860 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;
1861 2129
1862 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2130 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1863 2131
1864 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2132 my $tex = $self->{state} ? $tex[1] : $tex[0];
1865 2133
… …
1868 glDisable GL_TEXTURE_2D; 2136 glDisable GL_TEXTURE_2D;
1869} 2137}
1870 2138
1871############################################################################# 2139#############################################################################
1872 2140
1873package CFClient::UI::Image; 2141package CFPlus::UI::Image;
1874 2142
1875our @ISA = CFClient::UI::Base::; 2143our @ISA = CFPlus::UI::Base::;
1876 2144
1877use CFClient::OpenGL; 2145use CFPlus::OpenGL;
1878use Carp qw/confess/;
1879 2146
1880our %loaded_images; 2147our %texture_cache;
1881 2148
1882sub new { 2149sub new {
1883 my $class = shift; 2150 my $class = shift;
1884 2151
1885 my $self = $class->SUPER::new (can_events => 0, @_); 2152 my $self = $class->SUPER::new (
2153 can_events => 0,
2154 @_,
2155 );
1886 2156
1887 $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";
1888 2159
1889 $loaded_images{$self->{image}} ||= 2160 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1890 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2161 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1891 2162
1892 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2163 Scalar::Util::weaken $texture_cache{$self->{path}};
1893 2164
1894 Scalar::Util::weaken $loaded_images{$self->{image}}; 2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1895
1896 $self->{aspect} = $tex->{w} / $tex->{h};
1897 2166
1898 $self 2167 $self
1899} 2168}
1900 2169
2170sub STORABLE_freeze {
2171 my ($self, $cloning) = @_;
2172
2173 $self->{path}
2174 or die "cannot serialise CFPlus::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
1901sub size_request { 2185sub size_request {
1902 my ($self) = @_; 2186 my ($self) = @_;
1903 2187
1904 ($self->{tex}->{w}, $self->{tex}->{h}) 2188 ($self->{tex}{w}, $self->{tex}{h})
1905} 2189}
1906 2190
1907sub _draw { 2191sub _draw {
1908 my ($self) = @_; 2192 my ($self) = @_;
1909 2193
… …
1919 } 2203 }
1920 2204
1921 glEnable GL_TEXTURE_2D; 2205 glEnable GL_TEXTURE_2D;
1922 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1923 2207
1924 $tex->draw_quad_alpha (0, 0, $w, $h); 2208 $tex->draw_quad (0, 0, $w, $h);
1925 2209
1926 glDisable GL_TEXTURE_2D; 2210 glDisable GL_TEXTURE_2D;
1927} 2211}
1928 2212
1929############################################################################# 2213#############################################################################
1930 2214
2215package CFPlus::UI::ImageButton;
2216
2217our @ISA = CFPlus::UI::Image::;
2218
2219use CFPlus::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
2247}
2248
2249#############################################################################
2250
1931package CFClient::UI::VGauge; 2251package CFPlus::UI::VGauge;
1932 2252
1933our @ISA = CFClient::UI::Base::; 2253our @ISA = CFPlus::UI::Base::;
1934 2254
1935use List::Util qw(min max); 2255use List::Util qw(min max);
1936 2256
1937use CFClient::OpenGL; 2257use CFPlus::OpenGL;
1938 2258
1939my %tex = ( 2259my %tex = (
1940 food => [ 2260 food => [
1941 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2261 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2262 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1943 ], 2263 ],
1944 grace => [ 2264 grace => [
1945 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2265 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1946 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2266 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1947 ], 2267 ],
1948 hp => [ 2268 hp => [
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2269 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2270 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1951 ], 2271 ],
1952 mana => [ 2272 mana => [
1953 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2273 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1954 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2274 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1955 ], 2275 ],
1956); 2276);
1957 2277
1958# eg. VGauge->new (gauge => 'food'), default gauge: food 2278# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2018 my $ycut1 = max 0, min 1, $ycut; 2338 my $ycut1 = max 0, min 1, $ycut;
2019 my $ycut2 = max 0, min 1, $ycut - 1; 2339 my $ycut2 = max 0, min 1, $ycut - 1;
2020 2340
2021 my $h1 = $self->{h} * (1 - $ycut1); 2341 my $h1 = $self->{h} * (1 - $ycut1);
2022 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);
2023 2346
2024 glEnable GL_BLEND; 2347 glEnable GL_BLEND;
2025 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;
2026 glEnable GL_TEXTURE_2D; 2350 glEnable GL_TEXTURE_2D;
2027 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2351 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2028 2352
2029 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2353 glBindTexture GL_TEXTURE_2D, $t1->{name};
2030 glBegin GL_QUADS; 2354 glBegin GL_QUADS;
… …
2045 2369
2046 if ($t3) { 2370 if ($t3) {
2047 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2371 glBindTexture GL_TEXTURE_2D, $t3->{name};
2048 glBegin GL_QUADS; 2372 glBegin GL_QUADS;
2049 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2373 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2050 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2374 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2051 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2375 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2052 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2376 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2053 glEnd; 2377 glEnd;
2054 } 2378 }
2055 2379
2056 glDisable GL_BLEND; 2380 glDisable GL_BLEND;
2057 glDisable GL_TEXTURE_2D; 2381 glDisable GL_TEXTURE_2D;
2058} 2382}
2059 2383
2060############################################################################# 2384#############################################################################
2061 2385
2062package CFClient::UI::Gauge; 2386package CFPlus::UI::Gauge;
2063 2387
2064our @ISA = CFClient::UI::VBox::; 2388our @ISA = CFPlus::UI::VBox::;
2065 2389
2066sub new { 2390sub new {
2067 my ($class, %arg) = @_; 2391 my ($class, %arg) = @_;
2068 2392
2069 my $self = $class->SUPER::new ( 2393 my $self = $class->SUPER::new (
… …
2071 can_hover => 1, 2395 can_hover => 1,
2072 can_events => 1, 2396 can_events => 1,
2073 %arg, 2397 %arg,
2074 ); 2398 );
2075 2399
2076 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2400 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2077 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2401 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2078 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2402 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2079 2403
2080 $self 2404 $self
2081} 2405}
2082 2406
2083sub set_fontsize { 2407sub set_fontsize {
… …
2104 $self->{value}->set_text ($val); 2428 $self->{value}->set_text ($val);
2105} 2429}
2106 2430
2107############################################################################# 2431#############################################################################
2108 2432
2109package CFClient::UI::Slider; 2433package CFPlus::UI::Slider;
2110 2434
2111use strict; 2435use strict;
2112 2436
2113use CFClient::OpenGL; 2437use CFPlus::OpenGL;
2114 2438
2115our @ISA = CFClient::UI::DrawBG::; 2439our @ISA = CFPlus::UI::DrawBG::;
2116 2440
2117my @tex = 2441my @tex =
2118 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2442 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2119 qw(s1_slider.png s1_slider_bg.png); 2443 qw(s1_slider.png s1_slider_bg.png);
2120 2444
2121sub new { 2445sub new {
2122 my $class = shift; 2446 my $class = shift;
2123 2447
… …
2130 fg => [1, 1, 1], 2454 fg => [1, 1, 1],
2131 active_fg => [0, 0, 0], 2455 active_fg => [0, 0, 0],
2132 bg => [0, 0, 0, 0.2], 2456 bg => [0, 0, 0, 0.2],
2133 active_bg => [1, 1, 1, 0.5], 2457 active_bg => [1, 1, 1, 0.5],
2134 range => [0, 0, 100, 10, 0], 2458 range => [0, 0, 100, 10, 0],
2135 req_w => $::WIDTH / 80, 2459 min_w => $::WIDTH / 80,
2136 req_h => $::WIDTH / 80, 2460 min_h => $::WIDTH / 80,
2137 vertical => 0, 2461 vertical => 0,
2138 can_hover => 1, 2462 can_hover => 1,
2139 inner_pad => 0.02, 2463 inner_pad => 0.02,
2140 @_ 2464 @_
2141 ); 2465 );
… …
2149sub set_range { 2473sub set_range {
2150 my ($self, $range) = @_; 2474 my ($self, $range) = @_;
2151 2475
2152 ($range, $self->{range}) = ($self->{range}, $range); 2476 ($range, $self->{range}) = ($self->{range}, $range);
2153 2477
2154 $self->update
2155 if "@$range" ne "@{$self->{range}}"; 2478 if ("@$range" ne "@{$self->{range}}") {
2479 $self->update;
2480 $self->set_value ($self->{range}[0]);
2481 }
2156} 2482}
2157 2483
2158sub set_value { 2484sub set_value {
2159 my ($self, $value) = @_; 2485 my ($self, $value) = @_;
2160 2486
… …
2171 if $unit; 2497 if $unit;
2172 2498
2173 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2499 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2174 2500
2175 if ($value != $old_value) { 2501 if ($value != $old_value) {
2176 $self->_emit (changed => $value); 2502 $self->emit (changed => $value);
2177 $self->update; 2503 $self->update;
2178 } 2504 }
2179} 2505}
2180 2506
2181sub size_request { 2507sub size_request {
2182 my ($self) = @_; 2508 my ($self) = @_;
2183 2509
2184 my $w = $self->{req_w}; 2510 ($self->{req_w}, $self->{req_h})
2185 my $h = $self->{req_h};
2186
2187 $self->{vertical} ? ($h, $w) : ($w, $h)
2188} 2511}
2189 2512
2190sub button_down { 2513sub invoke_button_down {
2191 my ($self, $ev, $x, $y) = @_; 2514 my ($self, $ev, $x, $y) = @_;
2192 2515
2193 $self->SUPER::button_down ($ev, $x, $y); 2516 $self->SUPER::invoke_button_down ($ev, $x, $y);
2194 2517
2195 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2518 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2196 2519
2197 $self->mouse_motion ($ev, $x, $y); 2520 $self->invoke_mouse_motion ($ev, $x, $y)
2198} 2521}
2199 2522
2200sub mouse_motion { 2523sub invoke_mouse_motion {
2201 my ($self, $ev, $x, $y) = @_; 2524 my ($self, $ev, $x, $y) = @_;
2202 2525
2203 if ($GRAB == $self) { 2526 if ($GRAB == $self) {
2204 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2527 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2205 2528
2206 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2529 my (undef, $lo, $hi, $page) = @{$self->{range}};
2207 2530
2208 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2531 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2209 2532
2210 $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
2211 } 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
2212} 2549}
2213 2550
2214sub update { 2551sub update {
2215 my ($self) = @_; 2552 my ($self) = @_;
2216 2553
2217 $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}) {
2218 $self->set_value ($self->{range}[0]); 2562 $self->set_value ($self->{range}[0]);
2219 2563
2220 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2564 my ($value, $lo, $hi, $page) = @{$self->{range}};
2221 my $range = ($hi - $page - $lo) || 1e-100; 2565 my $range = ($hi - $page - $lo) || 1e-100;
2222 2566
… …
2228 $value = ($value - $lo) / $range; 2572 $value = ($value - $lo) / $range;
2229 $value = $value * $self->{scale} + $self->{offset}; 2573 $value = $value * $self->{scale} + $self->{offset};
2230 2574
2231 $self->{knob_x} = $value - $knob_w * 0.5; 2575 $self->{knob_x} = $value - $knob_w * 0.5;
2232 $self->{knob_w} = $knob_w; 2576 $self->{knob_w} = $knob_w;
2233 }); 2577 }
2234
2235 $self->SUPER::update;
2236}
2237
2238sub _draw {
2239 my ($self) = @_;
2240 2578
2241 $self->SUPER::_draw (); 2579 $self->SUPER::_draw ();
2242 2580
2243 glScale $self->{w}, $self->{h}; 2581 glScale $self->{w}, $self->{h};
2244 2582
… …
2264 glDisable GL_TEXTURE_2D; 2602 glDisable GL_TEXTURE_2D;
2265} 2603}
2266 2604
2267############################################################################# 2605#############################################################################
2268 2606
2269package CFClient::UI::ValSlider; 2607package CFPlus::UI::ValSlider;
2270 2608
2271our @ISA = CFClient::UI::HBox::; 2609our @ISA = CFPlus::UI::HBox::;
2272 2610
2273sub new { 2611sub new {
2274 my ($class, %arg) = @_; 2612 my ($class, %arg) = @_;
2275 2613
2276 my $range = delete $arg{range}; 2614 my $range = delete $arg{range};
2277 2615
2278 my $self = $class->SUPER::new ( 2616 my $self = $class->SUPER::new (
2279 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2617 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2280 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2618 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2281 to_value => sub { shift }, 2619 to_value => sub { shift },
2282 from_value => sub { shift }, 2620 from_value => sub { shift },
2283 %arg, 2621 %arg,
2284 ); 2622 );
2285 2623
… …
2305sub set_range { shift->{slider}->set_range (@_) } 2643sub set_range { shift->{slider}->set_range (@_) }
2306sub set_value { shift->{slider}->set_value (@_) } 2644sub set_value { shift->{slider}->set_value (@_) }
2307 2645
2308############################################################################# 2646#############################################################################
2309 2647
2310package CFClient::UI::TextView; 2648package CFPlus::UI::TextScroller;
2311 2649
2312our @ISA = CFClient::UI::HBox::; 2650our @ISA = CFPlus::UI::HBox::;
2313 2651
2314use CFClient::OpenGL; 2652use CFPlus::OpenGL;
2315 2653
2316sub new { 2654sub new {
2317 my $class = shift; 2655 my $class = shift;
2318 2656
2319 my $self = $class->SUPER::new ( 2657 my $self = $class->SUPER::new (
2320 fontsize => 1, 2658 fontsize => 1,
2321 can_events => 0, 2659 can_events => 1,
2660 indent => 0,
2322 #font => default_font 2661 #font => default_font
2323 @_, 2662 @_,
2324 2663
2325 layout => (new CFClient::Layout 1), 2664 layout => (new CFPlus::Layout),
2326 par => [], 2665 par => [],
2327 height => 0, 2666 height => 0,
2328 children => [ 2667 children => [
2329 (new CFClient::UI::Empty expand => 1), 2668 (new CFPlus::UI::Empty expand => 1),
2330 (new CFClient::UI::Slider vertical => 1), 2669 (new CFPlus::UI::Slider vertical => 1),
2331 ], 2670 ],
2332 ); 2671 );
2333 2672
2334 $self->{children}[1]->connect (changed => sub { $self->update }); 2673 $self->{children}[1]->connect (changed => sub { $self->update });
2335 2674
… …
2341 2680
2342 $self->{fontsize} = $fontsize; 2681 $self->{fontsize} = $fontsize;
2343 $self->reflow; 2682 $self->reflow;
2344} 2683}
2345 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
2346sub size_allocate { 2694sub invoke_size_allocate {
2347 my ($self, $w, $h) = @_; 2695 my ($self, $w, $h) = @_;
2348 2696
2349 $self->SUPER::size_allocate ($w, $h); 2697 my ($empty, $slider, @other) = @{ $self->{children} };
2698 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2350 2699
2351 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2700 $self->{layout}->set_font ($self->{font}) if $self->{font};
2352 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2701 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2353 $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});
2354 2704
2355 $self->reflow; 2705 $self->reflow;
2356}
2357 2706
2358sub text_size { 2707 local $self->{children} = [$empty, $slider];
2708 $self->SUPER::invoke_size_allocate ($w, $h)
2709}
2710
2711sub invoke_mouse_wheel {
2359 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) = @_;
2360 2723
2361 my $layout = $self->{layout}; 2724 my $layout = $self->{layout};
2362 2725
2726 $layout->set_font ($self->{font}) if $self->{font};
2727 $layout->set_foreground (@{$para->{fg}});
2363 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2728 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2364 $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});
2365 $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}}
2366 2737 );
2738
2367 $layout->size 2739 $layout
2368} 2740}
2369 2741
2370sub reflow { 2742sub reflow {
2371 my ($self) = @_; 2743 my ($self) = @_;
2372 2744
… …
2381 $self->{children}[1]->set_value ($offset); 2753 $self->{children}[1]->set_value ($offset);
2382} 2754}
2383 2755
2384sub clear { 2756sub clear {
2385 my ($self) = @_; 2757 my ($self) = @_;
2758
2759 my (undef, undef, @other) = @{ $self->{children} };
2760 $self->remove ($_) for @other;
2386 2761
2387 $self->{par} = []; 2762 $self->{par} = [];
2388 $self->{height} = 0; 2763 $self->{height} = 0;
2389 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2764 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2390} 2765}
2391 2766
2392sub add_paragraph { 2767sub add_paragraph {
2393 my ($self, $color, $text, $indent) = @_; 2768 my $self = shift;
2394 2769
2395 for my $line (split /\n/, $text) { 2770 for my $para (@_) {
2396 my ($w, $h) = $self->text_size ($line); 2771 $para = {
2397 $self->{height} += $h; 2772 fg => [1, 1, 1, 1],
2398 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2773 indent => 0,
2399 } 2774 markup => "",
2775 widget => [],
2776 ref $para ? %$para : (markup => $para),
2777 w => 1e10,
2778 wrapped => 1,
2779 };
2400 2780
2401 $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;
2402} 2794}
2403 2795
2404sub update { 2796sub update {
2405 my ($self) = @_; 2797 my ($self) = @_;
2406 2798
… …
2408 2800
2409 return unless $self->{h} > 0; 2801 return unless $self->{h} > 0;
2410 2802
2411 delete $self->{texture}; 2803 delete $self->{texture};
2412 2804
2413 $ROOT->on_post_alloc ($self, sub { 2805 $ROOT->on_post_alloc ($self => sub {
2414 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2806 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2415 2807
2416 if (delete $self->{need_reflow}) { 2808 if (delete $self->{need_reflow}) {
2417 my $height = 0; 2809 my $height = 0;
2418 2810
2419 my $layout = $self->{layout};
2420
2421 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2422
2423 for (@{$self->{par}}) { 2811 for my $para (@{$self->{par}}) {
2424 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2812 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2425 $layout->set_width ($W - $_->[3]); 2813 my $layout = $self->get_layout ($para);
2426 $layout->set_markup ($_->[4]);
2427 my ($w, $h) = $layout->size; 2814 my ($w, $h) = $layout->size;
2428 $_->[0] = $w + $_->[3]; 2815
2429 $_->[1] = $h; 2816 $para->{w} = $w + $para->{indent};
2817 $para->{h} = $h;
2818 $para->{wrapped} = $layout->has_wrapped;
2430 } 2819 }
2431 2820
2432 $height += $_->[1]; 2821 $height += $para->{h};
2433 } 2822 }
2434 2823
2435 $self->{height} = $height; 2824 $self->{height} = $height;
2436 2825
2437 $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]);
2438 2827
2439 delete $self->{texture}; 2828 delete $self->{texture};
2440 } 2829 }
2441 2830
2831 if (delete $self->{scroll_to_bottom}) {
2832 $self->{children}[1]->set_value (1e10);
2833 }
2834
2442 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2835 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2443 glClearColor 0.5, 0.5, 0.5, 0; 2836 glClearColor 0, 0, 0, 0;
2444 glClear GL_COLOR_BUFFER_BIT; 2837 glClear GL_COLOR_BUFFER_BIT;
2445 2838
2446 my $top = int $self->{children}[1]{range}[0]; 2839 my $top = int $self->{children}[1]{range}[0];
2447 2840
2448 my $y0 = $top; 2841 my $y0 = $top;
2449 my $y1 = $top + $H; 2842 my $y1 = $top + $H;
2450 2843
2451 my $y = 0; 2844 my $y = 0;
2452 2845
2453 my $layout = $self->{layout};
2454
2455 $layout->set_font ($self->{font}) if $self->{font};
2456
2457 glEnable GL_BLEND;
2458 #TODO# not correct in windows where rgba is forced off
2459 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2460
2461 for my $par (@{$self->{par}}) { 2846 for my $para (@{$self->{par}}) {
2462 my $h = $par->[1]; 2847 my $h = $para->{h};
2463 2848
2464 if ($y0 < $y + $h && $y < $y1) { 2849 if ($y0 < $y + $h && $y < $y1) {
2465 $layout->set_foreground (@{ $par->[2] });
2466 $layout->set_width ($W - $par->[3]);
2467 $layout->set_markup ($par->[4]);
2468 2850
2469 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2851 my $layout = $self->get_layout ($para);
2470 2852
2471 glRasterPos $par->[3], $y - $y0; 2853 $layout->render ($para->{indent}, $y - $y0);
2472 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 }
2473 } 2867 }
2474 2868
2475 $y += $h; 2869 $y += $h;
2476 } 2870 }
2477
2478 glDisable GL_BLEND;
2479 }; 2871 };
2480 }); 2872 });
2481} 2873}
2482 2874
2875sub reconfigure {
2876 my ($self) = @_;
2877
2878 $self->SUPER::reconfigure;
2879
2880 $_->{w} = 1e10 for @{ $self->{par} };
2881 $self->reflow;
2882}
2883
2483sub _draw { 2884sub _draw {
2484 my ($self) = @_; 2885 my ($self) = @_;
2485 2886
2486 glEnable GL_TEXTURE_2D; 2887 glEnable GL_TEXTURE_2D;
2487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2888 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2488 glColor 1, 1, 1, 1; 2889 glColor 0, 0, 0, 1;
2489 $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});
2490 glDisable GL_TEXTURE_2D; 2891 glDisable GL_TEXTURE_2D;
2491 2892
2492 $self->{children}[1]->draw; 2893 $self->{children}[1]->draw;
2493
2494} 2894}
2495 2895
2496############################################################################# 2896#############################################################################
2497 2897
2498package CFClient::UI::Animator; 2898package CFPlus::UI::Animator;
2499 2899
2500use CFClient::OpenGL; 2900use CFPlus::OpenGL;
2501 2901
2502our @ISA = CFClient::UI::Bin::; 2902our @ISA = CFPlus::UI::Bin::;
2503 2903
2504sub moveto { 2904sub moveto {
2505 my ($self, $x, $y) = @_; 2905 my ($self, $x, $y) = @_;
2506 2906
2507 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2907 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2535 glPopMatrix; 2935 glPopMatrix;
2536} 2936}
2537 2937
2538############################################################################# 2938#############################################################################
2539 2939
2540package CFClient::UI::Flopper; 2940package CFPlus::UI::Flopper;
2541 2941
2542our @ISA = CFClient::UI::Button::; 2942our @ISA = CFPlus::UI::Button::;
2543 2943
2544sub new { 2944sub new {
2545 my $class = shift; 2945 my $class = shift;
2546 2946
2547 my $self = $class->SUPER::new ( 2947 my $self = $class->SUPER::new (
2548 state => 0, 2948 state => 0,
2549 connect_activate => \&toggle_flopper, 2949 on_activate => \&toggle_flopper,
2550 @_ 2950 @_
2551 ); 2951 );
2552 2952
2553 if ($self->{state}) {
2554 $self->{state} = 0;
2555 $self->toggle_flopper;
2556 }
2557
2558 $self 2953 $self
2559} 2954}
2560 2955
2561sub toggle_flopper { 2956sub toggle_flopper {
2562 my ($self) = @_; 2957 my ($self) = @_;
2563 2958
2564 # TODO: use animation 2959 $self->{other}->toggle_visibility;
2565 if ($self->{state} = !$self->{state}) {
2566 $CFClient::UI::ROOT->add ($self->{other});
2567 $self->{other}->move ($self->coord2global (0, $self->{h}));
2568 $self->_emit ("open");
2569 } else {
2570 $CFClient::UI::ROOT->remove ($self->{other});
2571 $self->_emit ("close");
2572 }
2573
2574 $self->_emit (changed => $self->{state});
2575} 2960}
2576 2961
2577############################################################################# 2962#############################################################################
2578 2963
2579package CFClient::UI::Tooltip; 2964package CFPlus::UI::Tooltip;
2580 2965
2581our @ISA = CFClient::UI::Bin::; 2966our @ISA = CFPlus::UI::Bin::;
2582 2967
2583use CFClient::OpenGL; 2968use CFPlus::OpenGL;
2584 2969
2585sub new { 2970sub new {
2586 my $class = shift; 2971 my $class = shift;
2587 2972
2588 $class->SUPER::new ( 2973 $class->SUPER::new (
… …
2592} 2977}
2593 2978
2594sub set_tooltip_from { 2979sub set_tooltip_from {
2595 my ($self, $widget) = @_; 2980 my ($self, $widget) = @_;
2596 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
2597 $self->add (new CFClient::UI::Label 2994 $self->add (new CFPlus::UI::Label
2598 markup => $widget->{tooltip}, 2995 markup => $tooltip,
2599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2600 fontsize => 0.8, 2997 fontsize => 0.8,
2601 fg => [0, 0, 0, 1], 2998 fg => [0, 0, 0, 1],
2602 ellipsise => 0, 2999 ellipsise => 0,
2603 font => ($widget->{tooltip_font} || $::FONT_PROP), 3000 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2610 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3007 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2611 3008
2612 ($w + 4, $h + 4) 3009 ($w + 4, $h + 4)
2613} 3010}
2614 3011
2615sub size_allocate { 3012sub invoke_size_allocate {
2616 my ($self, $w, $h) = @_; 3013 my ($self, $w, $h) = @_;
2617 3014
2618 $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 });
2619} 3038}
2620 3039
2621sub _draw { 3040sub _draw {
2622 my ($self) = @_; 3041 my ($self) = @_;
2623 3042
… …
2640 glVertex $w, $h; 3059 glVertex $w, $h;
2641 glVertex $w, 0; 3060 glVertex $w, 0;
2642 glEnd; 3061 glEnd;
2643 3062
2644 glTranslate 2 - 0.375, 2 - 0.375; 3063 glTranslate 2 - 0.375, 2 - 0.375;
3064
2645 $self->SUPER::_draw; 3065 $self->SUPER::_draw;
2646} 3066}
2647 3067
2648############################################################################# 3068#############################################################################
2649 3069
2650package CFClient::UI::Face; 3070package CFPlus::UI::Face;
2651 3071
2652our @ISA = CFClient::UI::Base::; 3072our @ISA = CFPlus::UI::DrawBG::;
2653 3073
2654use CFClient::OpenGL; 3074use CFPlus::OpenGL;
2655 3075
2656sub new { 3076sub new {
2657 my $class = shift; 3077 my $class = shift;
2658 3078
2659 my $self = $class->SUPER::new ( 3079 my $self = $class->SUPER::new (
… …
2694sub _draw { 3114sub _draw {
2695 my ($self) = @_; 3115 my ($self) = @_;
2696 3116
2697 return unless $::CONN; 3117 return unless $::CONN;
2698 3118
3119 $self->SUPER::_draw;
3120
2699 my $face; 3121 my $face;
2700 3122
2701 if ($self->{frame}) { 3123 if ($self->{frame}) {
2702 my $anim = $::CONN->{anim}[$self->{anim}]; 3124 my $anim = $::CONN->{anim}[$self->{anim}];
2703 3125
… …
2708 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3130 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2709 3131
2710 if ($tex) { 3132 if ($tex) {
2711 glEnable GL_TEXTURE_2D; 3133 glEnable GL_TEXTURE_2D;
2712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2713 glColor 1, 1, 1, 1; 3135 glColor 0, 0, 0, 1;
2714 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3136 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2715 glDisable GL_TEXTURE_2D; 3137 glDisable GL_TEXTURE_2D;
2716 } 3138 }
2717} 3139}
2718 3140
2719sub DESTROY { 3141sub destroy {
2720 my ($self) = @_; 3142 my ($self) = @_;
2721 3143
2722 $self->{timer}->cancel 3144 $self->{timer}->cancel
2723 if $self->{timer}; 3145 if $self->{timer};
2724 3146
2725 $self->SUPER::DESTROY; 3147 $self->SUPER::destroy;
2726} 3148}
2727 3149
2728############################################################################# 3150#############################################################################
2729 3151
2730package CFClient::UI::Inventory; 3152package CFPlus::UI::Buttonbar;
2731 3153
2732our @ISA = CFClient::UI::ScrolledWindow::; 3154our @ISA = CFPlus::UI::HBox::;
2733 3155
2734sub new { 3156# TODO: should actualyl wrap buttons and other goodies.
2735 my $class = shift;
2736
2737 my $self = $class->SUPER::new (
2738 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2739 @_,
2740 );
2741
2742 $self
2743}
2744
2745sub set_items {
2746 my ($self, $items) = @_;
2747
2748 $self->{scrolled}->clear;
2749 return unless $items;
2750
2751 my @items = sort {
2752 ($a->{type} <=> $b->{type})
2753 or ($a->{name} cmp $b->{name})
2754 } @$items;
2755
2756 $self->{real_items} = \@items;
2757
2758 my $row = 0;
2759 for my $item (@items) {
2760 CFClient::Item::update_widgets $item;
2761
2762 $self->{scrolled}->add (0, $row, $item->{face_widget});
2763 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2764 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2765
2766 $row++;
2767 }
2768}
2769
2770sub size_request {
2771 my ($self) = @_;
2772 ($self->{req_w}, $self->{req_h});
2773}
2774 3157
2775############################################################################# 3158#############################################################################
2776 3159
2777package CFClient::UI::Menu; 3160package CFPlus::UI::Menu;
2778 3161
2779our @ISA = CFClient::UI::FancyFrame::; 3162our @ISA = CFPlus::UI::FancyFrame::;
2780 3163
2781use CFClient::OpenGL; 3164use CFPlus::OpenGL;
2782 3165
2783sub new { 3166sub new {
2784 my $class = shift; 3167 my $class = shift;
2785 3168
2786 my $self = $class->SUPER::new ( 3169 my $self = $class->SUPER::new (
2787 items => [], 3170 items => [],
2788 z => 100, 3171 z => 100,
2789 @_, 3172 @_,
2790 ); 3173 );
2791 3174
2792 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3175 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2793 3176
2794 for my $item (@{ $self->{items} }) { 3177 for my $item (@{ $self->{items} }) {
2795 my ($widget, $cb) = @$item; 3178 my ($widget, $cb, $tooltip) = @$item;
2796 3179
2797 # handle various types of items, only text for now 3180 # handle various types of items, only text for now
2798 if (!ref $widget) { 3181 if (!ref $widget) {
3182 if ($widget =~ /\t/) {
3183 my ($left, $right) = split /\t/, $widget, 2;
3184
2799 $widget = new CFClient::UI::Label 3185 $widget = new CFPlus::UI::HBox
2800 can_hover => 1, 3186 can_hover => 1,
2801 can_events => 1, 3187 can_events => 1,
3188 tooltip => $tooltip,
3189 children => [
3190 (new CFPlus::UI::Label markup => $left, expand => 1),
3191 (new CFPlus::UI::Label markup => $right, align => +1),
3192 ],
3193 ;
3194
3195 } else {
3196 $widget = new CFPlus::UI::Label
3197 can_hover => 1,
3198 can_events => 1,
2802 text => $widget; 3199 markup => $widget,
3200 tooltip => $tooltip;
3201 }
2803 } 3202 }
2804 3203
2805 $self->{item}{$widget} = $item; 3204 $self->{item}{$widget} = $item;
2806 3205
2807 $self->{vbox}->add ($widget); 3206 $self->{vbox}->add ($widget);
… …
2812 3211
2813# 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)
2814sub popup { 3213sub popup {
2815 my ($self, $ev) = @_; 3214 my ($self, $ev) = @_;
2816 3215
2817 $self->_emit ("popdown"); 3216 $self->emit ("popdown");
2818 3217
2819 # maybe save $GRAB? must be careful about events... 3218 # maybe save $GRAB? must be careful about events...
2820 $GRAB = $self; 3219 $GRAB = $self;
2821 $self->{button} = $ev->{button}; 3220 $self->{button} = $ev->{button};
2822 3221
2823 $self->show; 3222 $self->show;
2824 $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);
2825} 3224}
2826 3225
2827sub mouse_motion { 3226sub invoke_mouse_motion {
2828 my ($self, $ev, $x, $y) = @_; 3227 my ($self, $ev, $x, $y) = @_;
2829 3228
2830 # TODO: should use vbox->find_widget or so 3229 # TODO: should use vbox->find_widget or so
2831 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3230 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2832 $self->{hover} = $self->{item}{$HOVER}; 3231 $self->{hover} = $self->{item}{$HOVER};
2833}
2834 3232
3233 0
3234}
3235
2835sub button_up { 3236sub invoke_button_up {
2836 my ($self, $ev, $x, $y) = @_; 3237 my ($self, $ev, $x, $y) = @_;
2837 3238
2838 if ($ev->{button} == $self->{button}) { 3239 if ($ev->{button} == $self->{button}) {
2839 undef $GRAB; 3240 undef $GRAB;
2840 $self->hide; 3241 $self->hide;
2841 3242
2842 $self->_emit ("popdown"); 3243 $self->emit ("popdown");
2843 $self->{hover}[1]->() if $self->{hover}; 3244 $self->{hover}[1]->() if $self->{hover};
3245 } else {
3246 return 0
3247 }
3248
2844 } 3249 1
2845} 3250}
2846 3251
2847############################################################################# 3252#############################################################################
2848 3253
2849package CFClient::UI::Statusbox; 3254package CFPlus::UI::Multiplexer;
2850 3255
2851our @ISA = CFClient::UI::VBox::; 3256our @ISA = CFPlus::UI::Container::;
2852 3257
2853sub new { 3258sub new {
2854 my $class = shift; 3259 my $class = shift;
2855 3260
2856 $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 CFPlus::UI::Notebook;
3328
3329our @ISA = CFPlus::UI::VBox::;
3330
3331sub new {
3332 my $class = shift;
3333
3334 my $self = $class->SUPER::new (
3335 buttonbar => (new CFPlus::UI::Buttonbar),
3336 multiplexer => (new CFPlus::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 CFPlus::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 CFPlus::UI::Selector;
3377
3378use utf8;
3379
3380our @ISA = CFPlus::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 CFPlus::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 CFPlus::UI::Statusbox;
3433
3434our @ISA = CFPlus::UI::VBox::;
3435
3436sub new {
3437 my $class = shift;
3438
3439 my $self = $class->SUPER::new (
2857 fontsize => 0.8, 3440 fontsize => 0.8,
2858 @_, 3441 @_,
2859 ) 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
2860} 3449}
2861 3450
2862sub reorder { 3451sub reorder {
2863 my ($self) = @_; 3452 my ($self) = @_;
2864 my $NOW = time; 3453 my $NOW = Time::HiRes::time;
3454
3455 # freeze display when hovering over any label
3456 return if $CFPlus::UI::TOOLTIP->{owner}
3457 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3458 values %{ $self->{item} };
2865 3459
2866 while (my ($k, $v) = each %{ $self->{item} }) { 3460 while (my ($k, $v) = each %{ $self->{item} }) {
2867 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3461 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2868 } 3462 }
2869 3463
… …
2872 my @items = sort { 3466 my @items = sort {
2873 $a->{pri} <=> $b->{pri} 3467 $a->{pri} <=> $b->{pri}
2874 or $b->{id} <=> $a->{id} 3468 or $b->{id} <=> $a->{id}
2875 } values %{ $self->{item} }; 3469 } values %{ $self->{item} };
2876 3470
3471 $self->{timer}->interval (1);
3472
2877 my $count = 10 + 1; 3473 my $count = 10 + 1;
2878 for my $item (@items) { 3474 for my $item (@items) {
2879 last unless --$count; 3475 last unless --$count;
2880 3476
2881 push @widgets, $item->{label} ||= do { 3477 my $label = $item->{label} ||= do {
2882 # TODO: doesn't handle markup well (read as: at all) 3478 # TODO: doesn't handle markup well (read as: at all)
2883 my $short = $item->{count} > 1 3479 my $short = $item->{count} > 1
2884 ? "<b>$item->{count} ×</b> $item->{text}" 3480 ? "<b>$item->{count} ×</b> $item->{text}"
2885 : $item->{text}; 3481 : $item->{text};
2886 3482
2887 for ($short) { 3483 for ($short) {
2888 s/^\s+//; 3484 s/^\s+//;
2889 s/\s+/ /g; 3485 s/\s+/ /g;
2890 } 3486 }
2891 3487
2892 new CFClient::UI::Label 3488 new CFPlus::UI::Label
2893 markup => $short, 3489 markup => $short,
2894 tooltip => $item->{tooltip}, 3490 tooltip => $item->{tooltip},
2895 tooltip_font => $::FONT_PROP, 3491 tooltip_font => $::FONT_PROP,
2896 tooltip_width => 0.67, 3492 tooltip_width => 0.67,
2897 fontsize => $item->{fontsize} || $self->{fontsize}, 3493 fontsize => $item->{fontsize} || $self->{fontsize},
2898 max_w => $::WIDTH * 0.44, 3494 max_w => $::WIDTH * 0.44,
2899 fg => $item->{fg}, 3495 fg => [@{ $item->{fg} }],
2900 can_events => 1, 3496 can_events => 1,
2901 can_hover => 1 3497 can_hover => 1
2902 }; 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;
2903 } 3511 }
2904 3512
2905 $self->clear; 3513 $self->clear;
2906 $self->SUPER::add (reverse @widgets); 3514 $self->SUPER::add (reverse @widgets);
2907} 3515}
… …
2912 $text =~ s/^\s+//; 3520 $text =~ s/^\s+//;
2913 $text =~ s/\s+$//; 3521 $text =~ s/\s+$//;
2914 3522
2915 return unless $text; 3523 return unless $text;
2916 3524
2917 my $timeout = time + ((delete $arg{timeout}) || 60); 3525 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2918 3526
2919 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3527 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2920 3528
2921 if (my $item = $self->{item}{$group}) { 3529 if (my $item = $self->{item}{$group}) {
2922 if ($item->{text} eq $text) { 3530 if ($item->{text} eq $text) {
2923 $item->{count}++; 3531 $item->{count}++;
2924 } else { 3532 } else {
2925 $item->{count} = 1; 3533 $item->{count} = 1;
2926 $item->{text} = $item->{tooltip} = $text; 3534 $item->{text} = $item->{tooltip} = $text;
2927 } 3535 }
2928 $item->{id} = ++$self->{id}; 3536 $item->{id} += 0.2;#d#
2929 $item->{timeout} = $timeout; 3537 $item->{timeout} = $timeout;
2930 delete $item->{label}; 3538 delete $item->{label};
2931 } else { 3539 } else {
2932 $self->{item}{$group} = { 3540 $self->{item}{$group} = {
2933 id => ++$self->{id}, 3541 id => ++$self->{id},
… …
2939 count => 1, 3547 count => 1,
2940 %arg, 3548 %arg,
2941 }; 3549 };
2942 } 3550 }
2943 3551
3552 $ROOT->on_refresh (reorder => sub {
2944 $self->reorder; 3553 $self->reorder;
3554 });
2945} 3555}
2946 3556
2947sub reconfigure { 3557sub reconfigure {
2948 my ($self) = @_; 3558 my ($self) = @_;
2949 3559
… …
2952 3562
2953 $self->reorder; 3563 $self->reorder;
2954 $self->SUPER::reconfigure; 3564 $self->SUPER::reconfigure;
2955} 3565}
2956 3566
3567sub destroy {
3568 my ($self) = @_;
3569
3570 $self->{timer}->cancel;
3571
3572 $self->SUPER::destroy;
3573}
3574
2957############################################################################# 3575#############################################################################
2958 3576
2959package CFClient::UI::Root; 3577package CFPlus::UI::Inventory;
2960 3578
2961our @ISA = CFClient::UI::Container::; 3579our @ISA = CFPlus::UI::Table::;
2962
2963use CFClient::OpenGL;
2964 3580
2965sub new { 3581sub new {
2966 my $class = shift; 3582 my $class = shift;
2967 3583
2968 $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 CFPlus::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 CFPlus::UI::SpellList;
3640
3641our @ISA = CFPlus::UI::Table::;
3642
3643sub new {
3644 my $class = shift;
3645
3646 my $self = $class->SUPER::new (
3647 binding => [],
3648 commands => [],
2969 @_, 3649 @_,
2970 ) 3650 )
2971} 3651}
2972 3652
2973sub configure { 3653my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2974 my ($self, $x, $y, $w, $h) = @_;
2975 3654
2976 $self->{w} = $w; 3655my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2977 $self->{h} = $h; 3656 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2978} 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");
2979 3665
2980sub check_size { 3666sub rebuild_spell_list {
3667 my ($self) = @_;
3668
3669 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3670 $self->clear;
3671
3672 return unless $::CONN;
3673
3674 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3675 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3676 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3677 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3678 $self->add (5, 0, new CFPlus::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 CFPlus::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 CFPlus::UI::Label text => $spell->{path});
3712
3713 $self->add (0, $row, new CFPlus::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 CFPlus::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 CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3731 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3732 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3733 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3734 }
3735 });
3736}
3737
3738sub add_spell {
2981 my ($self) = @_; 3739 my ($self, $spell) = @_;
2982 3740
2983 $self->size_allocate ($self->{w}, $self->{h}) 3741 $self->{spell}->{$spell->{name}} = $spell;
2984 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 CFPlus::UI::Root;
3762
3763our @ISA = CFPlus::UI::Container::;
3764
3765use List::Util qw(min max);
3766
3767use CFPlus::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
2985} 3780}
2986 3781
2987sub size_request { 3782sub size_request {
2988 my ($self) = @_; 3783 my ($self) = @_;
2989 3784
2990 ($self->{w}, $self->{h}) 3785 ($self->{w}, $self->{h})
2991} 3786}
2992 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
2993sub size_allocate { 3802sub invoke_size_allocate {
2994 my ($self, $w, $h) = @_; 3803 my ($self, $w, $h) = @_;
2995 3804
2996 for my $child ($self->children) { 3805 for my $child ($self->children) {
2997 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)};
2998 3807
2999 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3808 $X = $child->{force_x} if exists $child->{force_x};
3000 if exists $child->{req_x}; 3809 $Y = $child->{force_y} if exists $child->{force_y};
3001 3810
3002 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3811 $X = _to_pixel $X, $W, $self->{w};
3003 if exists $child->{req_y}; 3812 $Y = _to_pixel $Y, $H, $self->{h};
3004
3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007 3813
3008 $child->configure ($X, $Y, $W, $H); 3814 $child->configure ($X, $Y, $W, $H);
3009 } 3815 }
3816
3817 1
3010} 3818}
3011 3819
3012sub coord2local { 3820sub coord2local {
3013 my ($self, $x, $y) = @_; 3821 my ($self, $x, $y) = @_;
3014 3822
… …
3022} 3830}
3023 3831
3024sub update { 3832sub update {
3025 my ($self) = @_; 3833 my ($self) = @_;
3026 3834
3027 $self->check_size;
3028 $::WANT_REFRESH++; 3835 $::WANT_REFRESH++;
3029} 3836}
3030 3837
3031sub add { 3838sub add {
3032 my ($self, @children) = @_; 3839 my ($self, @children) = @_;
3033 3840
3034 for (my @widgets = @children; my $w = pop @widgets; ) {
3035 push @widgets, $w->children;
3036 $w->{root} = $self;
3037 $w->{visible} = 1;
3038 }
3039
3040 for my $child (@children) {
3041 $child->{is_toplevel} = 1; 3841 $_->{is_toplevel} = 1
3042 3842 for @children;
3043 # integerise window positions
3044 $child->{x} = int $child->{x};
3045 $child->{y} = int $child->{y};
3046 }
3047 3843
3048 $self->SUPER::add (@children); 3844 $self->SUPER::add (@children);
3049} 3845}
3050 3846
3051sub remove { 3847sub remove {
3052 my ($self, @children) = @_; 3848 my ($self, @children) = @_;
3053 3849
3054 $self->SUPER::remove (@children); 3850 $self->SUPER::remove (@children);
3851
3852 delete $self->{is_toplevel}
3853 for @children;
3055 3854
3056 while (@children) { 3855 while (@children) {
3057 my $w = pop @children; 3856 my $w = pop @children;
3058 push @children, $w->children; 3857 push @children, $w->children;
3059 $w->set_invisible; 3858 $w->set_invisible;
… …
3078 while ($self->{refresh_hook}) { 3877 while ($self->{refresh_hook}) {
3079 $_->() 3878 $_->()
3080 for values %{delete $self->{refresh_hook}}; 3879 for values %{delete $self->{refresh_hook}};
3081 } 3880 }
3082 3881
3083 if ($self->{check_size}) { 3882 if ($self->{realloc}) {
3084 my @queue = ([], []); 3883 my %queue;
3884 my @queue;
3885 my $widget;
3085 3886
3086 for (;;) { 3887 outer:
3087 if ($self->{check_size}) { 3888 while () {
3088 # heuristic: check containers last 3889 if (my $realloc = delete $self->{realloc}) {
3089 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3890 for $widget (values %$realloc) {
3090 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 }
3091 } 3897 }
3092 3898
3093 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3899 while () {
3900 @queue or last outer;
3094 3901
3095 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3902 $widget = pop @{ $queue[-1] || [] }
3096 ? @$widget{qw(user_w user_h)} 3903 and last;
3097 : $widget->size_request;
3098
3099 if (delete $widget->{force_alloc}
3100 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3101 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3102 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}) {
3103 $widget->{req_w} = $w; 3923 $widget->{req_w} = $w;
3104 $widget->{req_h} = $h; 3924 $widget->{req_h} = $h;
3105 3925
3106 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3926 $self->{size_alloc}{$widget+0} = $widget;
3107 3927
3108 $widget->{parent}->check_size
3109 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 }
3110 } 3935 }
3936
3937 delete $self->{realloc}{$widget+0};
3111 } 3938 }
3112 } 3939 }
3113 3940
3114 while ($self->{size_alloc}) { 3941 while (my $size_alloc = delete $self->{size_alloc}) {
3115 for (values %{delete $self->{size_alloc}}) { 3942 my @queue = sort { $b->{visible} <=> $a->{visible} }
3116 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)};
3117 3949
3118 $w = 0 if $w < 0; 3950 $w = 0 if $w < 0;
3119 $h = 0 if $h < 0; 3951 $h = 0 if $h < 0;
3120 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
3121 $widget->{w} = $w; 3969 $widget->{w} = $w;
3122 $widget->{h} = $h; 3970 $widget->{h} = $h;
3971
3123 $widget->emit (size_allocate => $w, $h); 3972 $widget->emit (size_allocate => $w, $h);
3973 }
3124 } 3974 }
3125 } 3975 }
3126 3976
3127 while ($self->{post_alloc_hook}) { 3977 while ($self->{post_alloc_hook}) {
3128 $_->() 3978 $_->()
3129 for values %{delete $self->{post_alloc_hook}}; 3979 for values %{delete $self->{post_alloc_hook}};
3130 } 3980 }
3981
3131 3982
3132 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3983 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3133 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3984 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3134 glClear GL_COLOR_BUFFER_BIT; 3985 glClear GL_COLOR_BUFFER_BIT;
3135 3986
… …
3137 glLoadIdentity; 3988 glLoadIdentity;
3138 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3989 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3139 glMatrixMode GL_MODELVIEW; 3990 glMatrixMode GL_MODELVIEW;
3140 glLoadIdentity; 3991 glLoadIdentity;
3141 3992
3993 {
3994 package CFPlus::UI::Base;
3995
3996 ($draw_x, $draw_y, $draw_w, $draw_h) =
3997 (0, 0, $self->{w}, $self->{h});
3998 }
3999
3142 $self->_draw; 4000 $self->_draw;
3143} 4001}
3144 4002
3145############################################################################# 4003#############################################################################
3146 4004
3147package CFClient::UI; 4005package CFPlus::UI;
3148 4006
3149$ROOT = new CFClient::UI::Root; 4007$ROOT = new CFPlus::UI::Root;
3150$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4008$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3151 4009
31521 40101
3153 4011

Diff Legend

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