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

Diff Legend

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