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

Diff Legend

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