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.237 by root, Thu May 25 21:36:45 2006 UTC vs.
Revision 1.340 by root, Sun Jul 30 13:16:44 2006 UTC

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

Diff Legend

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