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

Diff Legend

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