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

Diff Legend

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