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.456 by root, Fri Dec 28 11:44:02 2007 UTC

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

Diff Legend

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