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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.362 by root, Sat Dec 9 21:26:46 2006 UTC

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

Diff Legend

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