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

Diff Legend

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