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.234 by root, Thu May 25 16:24:44 2006 UTC vs.
Revision 1.483 by root, Wed Jan 4 11:23:23 2012 UTC

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

Diff Legend

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