ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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