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

Diff Legend

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