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

Diff Legend

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