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.60 by root, Tue Apr 11 13:14:36 2006 UTC vs.
Revision 1.100 by elmex, Fri Apr 14 11:32:22 2006 UTC

1package CFClient::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6 6use List::Util ();
7use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9 7
10use CFClient; 8use CFClient;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
… …
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49 47
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51 49
52 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab; 52 $grab->update if $grab;
55 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
70 } 68 }
71 69
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73} 71}
74 72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
78
79use SDL::OpenGL;
80
75sub new { 81sub new {
76 my $class = shift; 82 my $class = shift;
77 83
78 bless { @_ }, $class 84 my $self = bless {
85 x => 0,
86 y => 0,
87 z => 0,
88 w => -1,
89 h => -1,
90 @_
91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
79} 100}
80 101
81sub move { 102sub move {
82 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
83 $self->{x} = $x; 104 $self->{x} = $x;
… …
92sub size_request { 113sub size_request {
93 require Carp; 114 require Carp;
94 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
95} 116}
96 117
97sub size_allocate { 118sub _size_allocate {
98 my ($self, $w, $h) = @_; 119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = $x;
122 $self->{y} = $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
99 125
100 $self->{w} = $w; 126 $self->{w} = $w;
101 $self->{h} = $h; 127 $self->{h} = $h;
102}
103 128
129 1
130}
131
132sub size_allocate {
133 my ($self, $x, $y, $w, $h) = @_;
134
135 $self->_size_allocate ($x, $y, $w, $h);
136}
137
104# translate global koordinates to local coordinate system 138# translate global coordinates to local coordinate system
105sub translate { 139sub translate {
106 my ($self, $x, $y) = @_; 140 my ($self, $x, $y) = @_;
107 141
108 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
109} 143}
110 144
111sub focus_in { 145sub focus_in {
112 my ($self) = @_; 146 my ($self) = @_;
147
148 return if $FOCUS == $self;
149 return unless $self->{can_focus};
113 150
114 my $focus = $FOCUS; $FOCUS = $self; 151 my $focus = $FOCUS; $FOCUS = $self;
115 $focus->update if $focus; 152 $focus->update if $focus;
116 $FOCUS->update; 153 $FOCUS->update;
117} 154}
… …
125 $focus->update if $focus; #? 162 $focus->update if $focus; #?
126} 163}
127 164
128sub mouse_motion { } 165sub mouse_motion { }
129sub button_up { } 166sub button_up { }
130sub button_down { }
131sub key_down { } 167sub key_down { }
132sub key_up { } 168sub key_up { }
169
170sub button_down {
171 my ($self, $ev, $x, $y) = @_;
172
173 $self->focus_in;
174}
133 175
134sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 176sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
135sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 177sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
136sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 178sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
137sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 179sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
138sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 180sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
139 181
140sub draw { 182sub draw {
141 my ($self) = @_; 183 my ($self) = @_;
142 184
185 return unless $self->{h} && $self->{w};
186
143 glPushMatrix; 187 glPushMatrix;
144 glTranslate $self->{x}, $self->{y}, 0; 188 glTranslate $self->{x}, $self->{y}, 0;
145 $self->_draw; 189 $self->_draw;
146 if ($self == $HOVER) { 190 glPopMatrix;
147 glColor 1, 1, 1, 0.4; 191
192 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)};
194
195 glColor 0, 0, 1, 0.2;
148 glEnable GL_BLEND; 196 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
149 glBegin GL_QUADS; 198 glBegin GL_QUADS;
150 glVertex 0 , 0; 199 glVertex $x , $y;
151 glVertex $self->{w}, 0; 200 glVertex $x + $self->{w}, $y;
152 glVertex $self->{w}, $self->{h}; 201 glVertex $x + $self->{w}, $y + $self->{h};
153 glVertex 0 , $self->{h}; 202 glVertex $x , $y + $self->{h};
154 glEnd; 203 glEnd;
155 glDisable GL_BLEND; 204 glDisable GL_BLEND;
156 } 205 }
157 glPopMatrix;
158} 206}
159 207
160sub _draw { 208sub _draw {
161 my ($self) = @_; 209 my ($self) = @_;
162 210
163 warn "no draw defined for $self\n"; 211 warn "no draw defined for $self\n";
164}
165
166sub bbox {
167 my ($self) = @_;
168 my ($w, $h) = $self->size_request;
169 (
170 $self->{x},
171 $self->{y},
172 $self->{x} = $w,
173 $self->{y} = $h
174 )
175} 212}
176 213
177sub find_widget { 214sub find_widget {
178 my ($self, $x, $y) = @_; 215 my ($self, $x, $y) = @_;
179 216
… …
182 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 219 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
183 220
184 () 221 ()
185} 222}
186 223
187sub del_parent { $_[0]->{parent} = undef }
188
189sub set_parent { 224sub set_parent {
190 my ($self, $par) = @_; 225 my ($self, $par) = @_;
191 226
192 $self->{parent} = $par; 227 $self->{parent} = $par;
193 Scalar::Util::weaken $self->{parent}; 228 Scalar::Util::weaken $self->{parent};
… …
202 237
203 $self->{parent}->update 238 $self->{parent}->update
204 if $self->{parent}; 239 if $self->{parent};
205} 240}
206 241
242sub connect {
243 my ($self, $signal, $cb) = @_;
244
245 push @{ $self->{cb}{$signal} }, $cb;
246}
247
248sub emit {
249 my ($self, $signal, @args) = @_;
250
251 $_->($self, @args)
252 for @{$self->{cb}{$signal} || []};
253}
254
207sub DESTROY { 255sub DESTROY {
208 my ($self) = @_; 256 my ($self) = @_;
209 257
210 #$self->deactivate; 258 #$self->deactivate;
211} 259}
212 260
213############################################################################# 261#############################################################################
214 262
215package CFClient::Widget::Container; 263package CFClient::UI::DrawBG;
216 264
217our @ISA = CFClient::Widget::; 265our @ISA = CFClient::UI::Base::;
266
267use strict;
268use SDL::OpenGL;
218 269
219sub new { 270sub new {
271 my $class = shift;
272
273 # range [value, low, high, page]
274
275 $class->SUPER::new (
276 bg => [0, 0, 0, 0.2],
277 active_bg => [1, 1, 1, 0.5],
278 @_
279 )
280}
281
282sub _draw {
283 my ($self) = @_;
284
285 my ($w, $h) = @$self{qw(w h)};
286
287 glEnable GL_BLEND;
288 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
289 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
290
291 glBegin GL_QUADS;
292 glVertex 0 , 0;
293 glVertex 0 , $h;
294 glVertex $w, $h;
295 glVertex $w, 0;
296 glEnd;
297
298 glDisable GL_BLEND;
299}
300
301#############################################################################
302
303package CFClient::UI::Empty;
304
305our @ISA = CFClient::UI::Base::;
306
307sub size_request {
308 (0, 0)
309}
310
311sub draw { }
312
313#############################################################################
314
315package CFClient::UI::Container;
316
317our @ISA = CFClient::UI::Base::;
318
319sub new {
220 my ($class, @widgets) = @_; 320 my ($class, %arg) = @_;
221 321
322 my $children = delete $arg{children} || [];
323
222 my $self = $class->SUPER::new (children => []); 324 my $self = $class->SUPER::new (children => [], %arg);
223 $self->add ($_) for @widgets; 325 $self->add ($_) for @$children;
224 326
225 $self 327 $self
226} 328}
227 329
228sub add { 330sub add {
229 my ($self, $chld, $expand) = @_; 331 my ($self, $chld) = @_;
230 332
231 $chld->{expand} = $expand;
232 $chld->set_parent ($self); 333 $chld->set_parent ($self);
233 334
234 @{$self->{children}} = 335 $self->{children} = [
235 sort { $a->{z} <=> $b->{z} } 336 sort { $a->{z} <=> $b->{z} }
236 @{$self->{children}}, $chld; 337 @{$self->{children}}, $chld
338 ];
237 339
238 $self->size_allocate ($self->{w}, $self->{h}) 340 $self->{w} = $self->{h} = -1;
239 if $self->{w}; #TODO: check for "realised state" 341 $self->update;
240} 342}
241 343
242sub remove { 344sub remove {
243 my ($self, $widget) = @_; 345 my ($self, $widget) = @_;
244 346
245 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
246 348
247 $self->size_allocate ($self->{w}, $self->{h}); 349 $self->size_allocate (0, 0, $self->{w}, $self->{h});
248} 350}
249 351
250sub find_widget { 352sub find_widget {
251 my ($self, $x, $y) = @_; 353 my ($self, $x, $y) = @_;
252 354
… …
269 $_->draw for @{$self->{children}}; 371 $_->draw for @{$self->{children}};
270} 372}
271 373
272############################################################################# 374#############################################################################
273 375
274package CFClient::Widget::Bin; 376package CFClient::UI::Bin;
275 377
276our @ISA = CFClient::Widget::Container::; 378our @ISA = CFClient::UI::Container::;
379
380sub new {
381 my ($class, %arg) = @_;
382
383 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
384
385 $class->SUPER::new (children => [$child], %arg)
386}
387
388sub add {
389 my ($self, $widget) = @_;
390
391 $self->{children} = [];
392
393 $self->SUPER::add ($widget);
394}
395
396sub remove {
397 my ($self, $widget) = @_;
398
399 $self->SUPER::remove ($widget);
400
401 $self->{children} = [new CFClient::UI::Empty]
402 unless @{$self->{children}};
403}
277 404
278sub child { $_[0]->{children}[0] } 405sub child { $_[0]->{children}[0] }
279 406
280sub size_request { 407sub size_request {
281 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 408 $_[0]{children}[0]->size_request
282} 409}
283 410
284sub size_allocate { 411sub size_allocate {
285 my ($self, $w, $h) = @_; 412 my ($self, $x, $y, $w, $h) = @_;
286 413
287 $self->SUPER::size_allocate ($w, $h); 414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
288 $self->{children}[0]->size_allocate ($w, $h) 416 $self->{children}[0]->size_allocate (0, 0, $w, $h);
289 if $self->{children}[0]
290} 417}
291 418
292############################################################################# 419#############################################################################
293 420
294package CFClient::Widget::Window; 421package CFClient::UI::Window;
295 422
296our @ISA = CFClient::Widget::Bin::; 423our @ISA = CFClient::UI::Bin::;
297 424
298use SDL::OpenGL; 425use SDL::OpenGL;
299 426
300sub new { 427sub new {
301 my ($class, $x, $y, $z, $w, $h) = @_; 428 my ($class, %arg) = @_;
302 429
303 my $self = $class->SUPER::new; 430 my $self = $class->SUPER::new (%arg);
304
305 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
306} 431}
307 432
308sub update { 433sub update {
309 my ($self) = @_; 434 my ($self) = @_;
310 435
436 # we want to do this delayed...
311 $self->render_chld; 437 $self->render_chld;
312 $self->SUPER::update; 438 $self->SUPER::update;
313} 439}
314 440
315sub render_chld { 441sub render_chld {
… …
320 $self->{w}, $self->{h}, sub { $self->child->draw } 446 $self->{w}, $self->{h}, sub { $self->child->draw }
321 ); 447 );
322} 448}
323 449
324sub size_allocate { 450sub size_allocate {
325 my ($self, $w, $h) = @_; 451 my ($self, $x, $y, $w, $h) = @_;
326 452
327 $self->{w} = $w; 453 $self->_size_allocate ($x, $y, $w, $h) or return;
328 $self->{h} = $h;
329 454
330 $self->child->size_allocate ($w, $h); 455 $self->child->size_allocate (0, 0, $w, $h);
331 456
332 $self->render_chld; 457 $self->render_chld;
333} 458}
334 459
335sub _draw { 460sub _draw {
… …
339 464
340 my $tex = $self->{texture} 465 my $tex = $self->{texture}
341 or return; 466 or return;
342 467
343 glEnable GL_BLEND; 468 glEnable GL_BLEND;
469 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
344 glEnable GL_TEXTURE_2D; 470 glEnable GL_TEXTURE_2D;
345 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
346 472
347 $tex->draw_quad (0, 0, $w, $h); 473 $tex->draw_quad (0, 0, $w, $h);
348 474
… …
350 glDisable GL_TEXTURE_2D; 476 glDisable GL_TEXTURE_2D;
351} 477}
352 478
353############################################################################# 479#############################################################################
354 480
355package CFClient::Widget::Frame; 481package CFClient::UI::Frame;
356 482
357our @ISA = CFClient::Widget::Bin::; 483our @ISA = CFClient::UI::Bin::;
358 484
359use SDL::OpenGL; 485use SDL::OpenGL;
360 486
361sub size_request { 487sub size_request {
362 my ($self) = @_; 488 my ($self) = @_;
… …
367 493
368 map { $_ + 4 } $chld->size_request; 494 map { $_ + 4 } $chld->size_request;
369} 495}
370 496
371sub size_allocate { 497sub size_allocate {
372 my ($self, $w, $h) = @_; 498 my ($self, $x, $y, $w, $h) = @_;
373 499
374 $self->{w} = $w; 500 $self->_size_allocate ($x, $y, $w, $h) or return;
375 $self->{h} = $h;
376 501
377 $self->child->size_allocate ($w - 4, $h - 4); 502 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
378 $self->child->move (2, 2);
379} 503}
380 504
381sub _draw { 505sub _draw {
382 my ($self) = @_; 506 my ($self) = @_;
383 507
… …
396 $chld->draw; 520 $chld->draw;
397} 521}
398 522
399############################################################################# 523#############################################################################
400 524
401package CFClient::Widget::FancyFrame; 525package CFClient::UI::FancyFrame;
402 526
403our @ISA = CFClient::Widget::Bin::; 527our @ISA = CFClient::UI::Bin::;
404 528
405use SDL::OpenGL; 529use SDL::OpenGL;
406 530
407my @tex = 531my @tex =
408 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
409 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 533 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
410 534
535sub new {
536 my $class = shift;
537
538 # TODO: user_x, user_y, overwrite moveto?
539
540 $class->SUPER::new (
541 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8,
544 @_
545 )
546}
547
411sub size_request { 548sub size_request {
412 my ($self) = @_; 549 my ($self) = @_;
413 550
551 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
552
414 my ($w, $h) = $self->SUPER::size_request; 553 my ($w, $h) = $self->SUPER::size_request;
415 554
416 $h += $tex[1]->{height}; 555 (
417 $h += $tex[4]->{height}; 556 $w + $self->{border} * 2,
418 $w += $tex[2]->{width}; 557 $h + $self->{border} * 2,
419 $w += $tex[3]->{width}; 558 )
420
421 ($w, $h)
422} 559}
423 560
424sub size_allocate { 561sub size_allocate {
425 my ($self, $w, $h) = @_; 562 my ($self, $x, $y, $w, $h) = @_;
426 563
427 $self->SUPER::size_allocate ($w, $h); 564 $self->_size_allocate ($x, $y, $w, $h) or return;
428 565
429 $h -= $tex[1]->{height}; 566 $h -= List::Util::max 0, $self->{border} * 2;
430 $h -= $tex[4]->{height}; 567 $w -= List::Util::max 0, $self->{border} * 2;
431 $w -= $tex[2]->{width};
432 $w -= $tex[3]->{width};
433 568
434 $h = $h < 0 ? 0 : $h; 569 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
435 $w = $w < 0 ? 0 : $w; 570}
436 571
437 $self->child->size_allocate ($w, $h); 572sub button_down {
438 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 573 my ($self, $ev, $x, $y) = @_;
574
575 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
576 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
577
578 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
579 my ($bw, $bh) = ($self->{w}, $self->{h});
580
581 $self->{motion} = sub {
582 my ($ev, $x, $y) = @_;
583
584 ($x, $y) = ($ev->motion_x, $ev->motion_y);
585
586 $self->{user_w} = $bw + $x - $ox;
587 $self->{user_h} = $bh + $y - $oy;
588 $self->update;
589 };
590
591 } elsif ($x >= 0 && $x < $self->{w}
592 && $y >= 0 && $y < $self->{border}) {
593
594 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
595 my ($bx, $by) = ($self->{x}, $self->{y});
596
597 $self->{motion} = sub {
598 my ($ev, $x, $y) = @_;
599
600 ($x, $y) = ($ev->motion_x, $ev->motion_y);
601
602 $self->move ($bx + $x - $ox, $by + $y - $oy);
603 $self->update;
604 };
605 }
606}
607
608sub button_up {
609 my ($self, $ev, $x, $y) = @_;
610
611 delete $self->{motion};
612}
613
614sub mouse_motion {
615 my ($self, $ev, $x, $y) = @_;
616
617 $self->{motion}->($ev, $x, $y) if $self->{motion};
439} 618}
440 619
441sub _draw { 620sub _draw {
442 my ($self) = @_; 621 my ($self) = @_;
443 622
444 my ($w, $h) = ($self->{w}, $self->{h}); 623 my ($w, $h ) = ($self->{w}, $self->{h});
445 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 624 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
446 625
447 glEnable GL_BLEND; 626 glEnable GL_BLEND;
627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
448 glEnable GL_TEXTURE_2D; 628 glEnable GL_TEXTURE_2D;
449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
451 630
452 my $top = $tex[1]; 631 glColor @{ $self->{border_bg} };
453 $top->draw_quad (0, 0, $w, $top->{height}); 632 $tex[1]->draw_quad (0, 0, $w, $self->{border});
454 633 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
455 my $left = $tex[3]; 634 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
456 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 635 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
457
458 my $right = $tex[2];
459 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
460
461 my $bottom = $tex[4];
462 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
463 636
464 my $bg = $tex[0]; 637 my $bg = $tex[0];
465 glBindTexture GL_TEXTURE_2D, $bg->{name};
466 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
467 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
469 638
639 # TODO: repeat texture not scale
470 my $rep_x = $cw / $bg->{width}; 640 my $rep_x = $cw / $bg->{w};
471 my $rep_y = $ch / $bg->{height}; 641 my $rep_y = $ch / $bg->{h};
472 642
643 glColor @{ $self->{bg} };
644
645 $bg->{s} = $rep_x;
646 $bg->{t} = $rep_y;
647 $bg->{wrap_mode} = 1;
473 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 648 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
474 649
650 glDisable GL_TEXTURE_2D;
475 glDisable GL_BLEND; 651 glDisable GL_BLEND;
476 glDisable GL_TEXTURE_2D;
477 652
478 $self->child->draw; 653 $self->child->draw;
479
480} 654}
481 655
482############################################################################# 656#############################################################################
483 657
484package CFClient::Widget::Table; 658package CFClient::UI::Table;
485 659
486our @ISA = CFClient::Widget::Bin::; 660our @ISA = CFClient::UI::Base::;
661
662use List::Util qw(max sum);
487 663
488use SDL::OpenGL; 664use SDL::OpenGL;
665
666sub new {
667 my $class = shift;
668
669 $class->SUPER::new (
670 col_expand => [],
671 @_
672 )
673}
489 674
490sub add { 675sub add {
491 my ($self, $x, $y, $chld) = @_; 676 my ($self, $x, $y, $chld) = @_;
492 my $old_chld = $self->{children}[$y][$x];
493 677
494 $self->{children}[$y][$x] = $chld; 678 $self->{children}[$y][$x] = $chld;
495 $chld->set_parent ($self); 679 $chld->set_parent ($self);
680
681 $self->{w} = $self->{h} = -1;
496 $self->update; 682 $self->update;
497} 683}
498 684
499sub max_row_height { 685sub get_wh {
500 my ($self, $row) = @_; 686 my ($self) = @_;
501 687
502 my $hs = 0; 688 my (@w, @h);
503 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 689
690 for my $y (0 .. $#{$self->{children}}) {
504 my $c = $self->{children}->[$row]->[$xi]; 691 my $row = $self->{children}[$y]
505 if ($c) { 692 or next;
693
694 for my $x (0 .. $#$row) {
695 my $widget = $row->[$x]
696 or next;
506 my ($w, $h) = $c->size_request; 697 my ($w, $h) = $widget->size_request;
507 if ($hs < $h) { $hs = $h } 698
699 $w[$x] = max $w[$x], $w;
700 $h[$y] = max $h[$y], $h;
508 } 701 }
509 } 702 }
510 return $hs;
511}
512 703
513sub max_col_width { 704 (\@w, \@h)
705}
706
707sub size_request {
514 my ($self, $col) = @_; 708 my ($self) = @_;
515 709
710 my ($ws, $hs) = $self->get_wh;
711
712 (
713 (sum @$ws),
714 (sum @$hs),
715 )
716}
717
718sub size_allocate {
719 my ($self, $x, $y, $w, $h) = @_;
720
721 $self->_size_allocate ($x, $y, $w, $h) or return;
722
723 my ($ws, $hs) = $self->get_wh;
724
725 my $req_w = sum @$ws;
726 my $req_h = sum @$hs;
727
728 # TODO: nicer code && do row_expand
729 my @col_expand = @{$self->{col_expand}};
730 @col_expand = (1) x @$ws unless @col_expand;
731 my $col_expand = (sum @col_expand) || 1;
732
733 # linearly scale sizes
734 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
735 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
736
737 my $y;
738
739 for my $r (0 .. $#{$self->{children}}) {
740 my $row = $self->{children}[$r]
741 or next;
742
516 my $ws = 0; 743 my $x = 0;
517 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 744 my $row_h = $hs->[$r];
518 my $c = ($self->{children}->[$yi] || [])->[$col]; 745
519 if ($c) { 746 for my $c (0 .. $#$row) {
520 my ($w, $h) = $c->size_request; 747 my $col_w = $ws->[$c];
521 if ($ws < $w) { $ws = $w } 748
749 if (my $widget = $row->[$c]) {
750 $widget->size_allocate ($x, $y, $col_w, $row_h);
751 }
752
753 $x += $col_w;
522 } 754 }
755
756 $y += $row_h;
523 } 757 }
524 return $ws; 758
525} 759}
760
761sub find_widget {
762 my ($self, $x, $y) = @_;
763
764 $x -= $self->{x};
765 $y -= $self->{y};
766
767 my $res;
768
769 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
770 $res = $_->find_widget ($x, $y)
771 and return $res;
772 }
773
774 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
775}
776
777sub _draw {
778 my ($self) = @_;
779
780 for (grep $_, @{$self->{children}}) {
781 $_->draw for grep $_, @$_;
782 }
783}
784
785#############################################################################
786
787package CFClient::UI::HBox;
788
789# TODO: wrap into common Box base class
790
791our @ISA = CFClient::UI::Container::;
526 792
527sub size_request { 793sub size_request {
528 my ($self) = @_; 794 my ($self) = @_;
529 795
796 my @alloc = map [$_->size_request], @{$self->{children}};
797
798 (
799 (List::Util::sum map $_->[0], @alloc),
800 (List::Util::max map $_->[1], @alloc),
801 )
802}
803
804sub size_allocate {
805 my ($self, $x, $y, $w, $h) = @_;
806
807 $self->_size_allocate ($x, $y, $w, $h);
808
530 my ($hs, $ws) = (0, 0); 809 ($h, $w) = ($w, $h);
531 810
532 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 811 my $children = $self->{children};
533 $hs += $self->max_row_height ($yi);
534 }
535 812
536 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 813 my @h = map +($_->size_request)[0], @$children;
537 my $wm = 0; 814
538 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 815 my $req_h = List::Util::sum @h;
539 $wm += $self->max_col_width ($xi) 816
817 if ($req_h > $h) {
818 # ah well, not enough space
819 $_ *= $h / $req_h for @h;
820 } else {
821 my $exp = List::Util::sum map $_->{expand}, @$children;
822 $exp ||= 1;
823
824 for (0 .. $#$children) {
825 my $child = $children->[$_];
826
827 my $alloc_h = $h[$_];
828 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
829 $h[$_] = $alloc_h;
540 } 830 }
541 if ($ws < $wm) { $ws = $wm }
542 } 831 }
543
544 return ($ws, $hs);
545}
546
547sub _draw {
548 my ($self) = @_;
549 832
550 my $y = 0; 833 my $y = 0;
551 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 834 for (0 .. $#$children) {
835 my $child = $children->[$_];
552 my $x = 0; 836 my $h = $h[$_];
837 $child->size_allocate ($y, 0, $h, $w);
553 838
554 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 839 $y += $h;
555
556 my $c = $self->{children}->[$yi]->[$xi];
557 if ($c) {
558 $c->move ($x, $y, 0); #TODO: Move to size_request
559 $c->draw if $c;
560 }
561
562 $x += $self->max_col_width ($xi);
563 }
564
565 $y += $self->max_row_height ($yi);
566 } 840 }
567} 841}
568 842
569############################################################################# 843#############################################################################
570 844
571package CFClient::Widget::VBox; 845package CFClient::UI::VBox;
572 846
847# TODO: wrap into common Box base class
848
573our @ISA = CFClient::Widget::Container::; 849our @ISA = CFClient::UI::Container::;
574
575use SDL::OpenGL;
576 850
577sub size_request { 851sub size_request {
578 my ($self) = @_; 852 my ($self) = @_;
579 853
580 my @alloc = map [$_->size_request], @{$self->{children}}; 854 my @alloc = map [$_->size_request], @{$self->{children}};
… …
584 (List::Util::sum map $_->[1], @alloc), 858 (List::Util::sum map $_->[1], @alloc),
585 ) 859 )
586} 860}
587 861
588sub size_allocate { 862sub size_allocate {
589 my ($self, $w, $h) = @_; 863 my ($self, $x, $y, $w, $h) = @_;
590 864
591 $self->w ($w); 865 $self->_size_allocate ($x, $y, $w, $h);
592 $self->h ($h);
593 866
594 my $exp; 867 my $children = $self->{children};
595 my @oth; 868
596 # find expand widget 869 my @h = map +($_->size_request)[1], @$children;
597 for (@{$self->{children}}) { 870
598 if ($_->{expand}) { 871 my $req_h = List::Util::sum @h;
872
873 if ($req_h > $h) {
874 # ah well, not enough space
875 $_ *= $h / $req_h for @h;
876 } else {
877 my $exp = List::Util::sum map $_->{expand}, @$children;
599 $exp = $_; 878 $exp ||= 1;
600 last; 879
880 for (0 .. $#$children) {
881 my $child = $children->[$_];
882
883 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
601 } 884 }
602 push @oth, $_;
603 }
604
605 my ($ow, $oh);
606
607 # get sizes of other widgets
608 for (@oth) {
609 my ($w, $h) = $_->size_request;
610 $oh += $h;
611 if ($ow < $w) { $ow = $w }
612 } 885 }
613 886
614 my $y = 0; 887 my $y = 0;
615 for (@{$self->{children}}) { 888 for (0 .. $#$children) {
616 $_->move (0, $y); 889 my $child = $children->[$_];
617 890 my $h = $h[$_];
618 if ($_ == $exp) {
619 $_->size_allocate ($w, $h - $oh);
620 $y += $h - $oh;
621 } else {
622 my ($cw, $h) = $_->size_request;
623 $_->size_allocate ($w, $h); 891 $child->size_allocate (0, $y, $w, $h);
892
624 $y += $h; 893 $y += $h;
625 }
626 } 894 }
627} 895}
628 896
629############################################################################# 897#############################################################################
630 898
631package CFClient::Widget::Label; 899package CFClient::UI::Label;
632 900
633our @ISA = CFClient::Widget::; 901our @ISA = CFClient::UI::Base::;
634 902
635use SDL::OpenGL; 903use SDL::OpenGL;
636 904
637sub new { 905sub new {
638 my ($class, $x, $y, $z, $height, $text) = @_; 906 my ($class, %arg) = @_;
639 907
640 $height ||= $::FONTSIZE;
641
642 # TODO: color, and make height, xyz etc. optional
643 my $self = $class->SUPER::new ( 908 my $self = $class->SUPER::new (
644 x => $x, 909 fg => [1, 1, 1],
645 y => $y, 910 height => $::FONTSIZE,
646 z => $z, 911 text => "",
647 height => $height, 912 align => -1,
913 padding => 2,
648 layout => new CFClient::Layout, 914 layout => new CFClient::Layout,
915 %arg
649 ); 916 );
650 917
651 $self->set_text ($text); 918 $self->set_text ($self->{text});
652 919
653 $self 920 $self
921}
922
923sub escape_text {
924 local $_ = $_[1];
925
926 s/&/&amp;/g;
927 s/>/&gt;/g;
928 s/</&lt;/g;
929
930 $_[1]
654} 931}
655 932
656sub set_text { 933sub set_text {
657 my ($self, $text) = @_; 934 my ($self, $text) = @_;
658 935
659 $self->{text} = $text; 936 $self->{text} = $text;
660 $self->{layout}->set_markup ($text); 937 $self->{layout}->set_markup ($text);
661 938
662 delete $self->{texture}; 939 delete $self->{texture};
940# $self->{w} = $self->{h} = -1;
941 $self->update;
663} 942}
664 943
665sub get_text { 944sub get_text {
666 my ($self, $text) = @_; 945 my ($self, $text) = @_;
667 946
… …
670 949
671sub size_request { 950sub size_request {
672 my ($self) = @_; 951 my ($self) = @_;
673 952
674 $self->{layout}->set_width; 953 $self->{layout}->set_width;
954 $self->{layout}->set_height ($self->{height});
675 $self->{layout}->size 955 my ($w, $h) = $self->{layout}->size;
676# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 956
677# ( 957 (
678# $self->{texture}{width}, 958 $w + $self->{padding} * 2,
679# $self->{texture}{height}, 959 $h + $self->{padding} * 2,
680# ) 960 )
681# } else {
682# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
683#
684# ($w, $h)
685# }
686} 961}
687 962
688sub size_allocate { 963sub size_allocate {
689 my ($self, $w, $h) = @_; 964 my ($self, $x, $y, $w, $h) = @_;
690 965
691 $self->SUPER::size_allocate ($w, $h); 966 $self->_size_allocate ($x, $y, $w, $h) or return;
967
692 delete $self->{texture}; 968 delete $self->{texture};
969}
970
971sub update {
972 my ($self) = @_;
973
974 delete $self->{texture};
975 $self->SUPER::update;
693} 976}
694 977
695sub _draw { 978sub _draw {
696 my ($self) = @_; 979 my ($self) = @_;
697 980
698 my $tex = $self->{texture} ||= do { 981 my $tex = $self->{texture} ||= do {
699 $self->{layout}->set_width ($self->{w}); 982 $self->{layout}->set_width ($self->{w});
983 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
700 new_from_layout CFClient::Texture $self->{layout}; 984 new_from_layout CFClient::Texture $self->{layout}
701 }; 985 };
986
987 glEnable GL_BLEND;
988 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
989 glEnable GL_TEXTURE_2D;
990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
991
992 glColor @{$self->{fg}};
993
994 my $x =
995 $self->{align} < 0 ? $self->{padding}
996 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
997 : ($self->{w} - $tex->{w}) * 0.5;
998
999 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
1000 $tex->draw_quad (0, 0);
1001
1002 glDisable GL_TEXTURE_2D;
1003 glDisable GL_BLEND;
1004}
1005
1006#############################################################################
1007
1008package CFClient::UI::Entry;
1009
1010our @ISA = CFClient::UI::Label::;
1011
1012use SDL;
1013use SDL::OpenGL;
1014
1015sub new {
1016 my $class = shift;
1017
1018 $class->SUPER::new (
1019 fg => [1, 1, 1],
1020 bg => [0, 0, 0, 0.2],
1021 active_bg => [1, 1, 1, 0.5],
1022 active_fg => [0, 0, 0],
1023 can_hover => 1,
1024 can_focus => 1,
1025 @_
1026 )
1027}
1028
1029sub _set_text {
1030 my ($self, $text) = @_;
1031
1032 my $old_text = $self->{text};
1033
1034 $self->{last_activity} = $::NOW;
1035
1036 $self->{text} = $text;
1037 $self->{layout}->set_width ($self->{w});
1038 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1039
1040 $text =~ s/./*/g if $self->{hidden};
1041
1042 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1043
1044 $text = substr $text, 0, $self->{cursor};
1045 utf8::encode $text;
1046
1047 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1048
1049 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1050 if $old_text ne $self->{text};
1051}
1052
1053sub size_request {
1054 my ($self) = @_;
1055
1056 my ($w, $h) = $self->SUPER::size_request;
1057
1058 ($w + 1, $h) # add 1 for cursor
1059}
1060
1061sub size_allocate {
1062 my ($self, $x, $y, $w, $h) = @_;
1063
1064 $self->SUPER::size_allocate ($x, $y, $w, $h);
1065
1066 $self->_set_text ($self->{text});
1067}
1068
1069sub set_text {
1070 my ($self, $text) = @_;
1071
1072 $self->{cursor} = length $text;
1073 $self->_set_text ($text);
1074 $self->update;
1075}
1076
1077sub key_down {
1078 my ($self, $ev) = @_;
1079
1080 my $mod = $ev->key_mod;
1081 my $sym = $ev->key_sym;
1082
1083 my $uni = $ev->key_unicode;
1084
1085 my $text = $self->get_text;
1086
1087 if ($sym == SDLK_BACKSPACE) {
1088 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1089 } elsif ($sym == SDLK_DELETE) {
1090 substr $text, $self->{cursor}, 1, "";
1091 } elsif ($sym == SDLK_LEFT) {
1092 --$self->{cursor} if $self->{cursor};
1093 } elsif ($sym == SDLK_RIGHT) {
1094 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1095 } elsif ($sym == SDLK_HOME) {
1096 $self->{cursor} = 0;
1097 } elsif ($sym == SDLK_END) {
1098 $self->{cursor} = length $text;
1099 } elsif ($uni) {
1100 substr $text, $self->{cursor}++, 0, chr $uni;
1101 }
1102
1103 $self->_set_text ($text);
1104 $self->update;
1105}
1106
1107sub focus_in {
1108 my ($self) = @_;
1109
1110 $self->{last_activity} = $::NOW;
1111
1112 $self->SUPER::focus_in;
1113}
1114
1115sub button_down {
1116 my ($self, $ev, $x, $y) = @_;
1117
1118 $self->SUPER::button_down ($ev, $x, $y);
1119
1120 my $idx = $self->{layout}->xy_to_index ($x, $y);
1121
1122 # byte-index to char-index
1123 my $text = $self->{text};
1124 utf8::encode $text;
1125 $self->{cursor} = length substr $text, 0, $idx;
1126
1127 $self->_set_text ($self->{text});
1128 $self->update;
1129}
1130
1131sub mouse_motion {
1132 my ($self, $ev, $x, $y) = @_;
1133# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1134}
1135
1136sub _draw {
1137 my ($self) = @_;
1138
1139 local $self->{fg} = $self->{fg};
1140
1141 if ($FOCUS == $self) {
1142 glColor @{$self->{active_bg}};
1143 $self->{fg} = $self->{active_fg};
1144 } else {
1145 glColor @{$self->{bg}};
1146 }
1147
1148 glEnable GL_BLEND;
1149 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1150 glBegin GL_QUADS;
1151 glVertex 0 , 0;
1152 glVertex 0 , $self->{h};
1153 glVertex $self->{w}, $self->{h};
1154 glVertex $self->{w}, 0;
1155 glEnd;
1156 glDisable GL_BLEND;
1157
1158 $self->SUPER::_draw;
1159
1160 #TODO: force update every cursor change :(
1161 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1162 glColor @{$self->{fg}};
1163 glBegin GL_LINES;
1164 glVertex $self->{cur_x}, $self->{cur_y};
1165 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1166 glEnd;
1167 }
1168}
1169
1170package CFClient::UI::LineEntry;
1171
1172our @ISA = CFClient::UI::Entry::;
1173
1174use SDL;
1175use SDL::OpenGL;
1176
1177sub key_down {
1178 my ($self, $ev) = @_;
1179
1180 my $sym = $ev->key_sym;
1181
1182 if ($sym == SDLK_RETURN) {
1183 $self->emit (activate => $self->get_text);
1184 $self->update;
1185
1186 } else {
1187 $self->SUPER::key_down ($ev);
1188 }
1189
1190}
1191
1192#############################################################################
1193
1194package CFClient::UI::Button;
1195
1196our @ISA = CFClient::UI::Label::;
1197
1198use SDL;
1199use SDL::OpenGL;
1200
1201my @tex =
1202 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1203 qw(b1_button_active.png);
1204
1205sub new {
1206 my $class = shift;
1207
1208 $class->SUPER::new (
1209 padding => 4,
1210 fg => [1, 1, 1],
1211 bg => [1, 1, 1, 0.2],
1212 active_fg => [1, 1, 0],
1213 can_hover => 1,
1214 @_
1215 )
1216}
1217
1218sub button_up {
1219 my ($self, $ev, $x, $y) = @_;
1220
1221 if ($x >= 0 && $x < $self->{w}
1222 && $y >= 0 && $y < $self->{h}) {
1223 $self->emit ("activate");
1224 }
1225}
1226
1227sub _draw {
1228 my ($self) = @_;
1229
1230 local $self->{fg} = $self->{fg};
1231 my $tex = $tex[0];
702 1232
703 glEnable GL_BLEND; 1233 glEnable GL_BLEND;
704 glEnable GL_TEXTURE_2D; 1234 glEnable GL_TEXTURE_2D;
705 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1235 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1236
1237 if ($GRAB == $self) {
1238 $self->{fg} = $self->{active_fg};
1239 }
1240
1241 glBindTexture GL_TEXTURE_2D, $tex->{name};
706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1242 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
707 1243
708 glColor 1, 0, 0, 1; # TODO color 1244 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
709 1245
1246 glDisable GL_TEXTURE_2D;
1247 glDisable GL_BLEND;
1248
1249 $self->SUPER::_draw;
1250}
1251
1252#############################################################################
1253
1254package CFClient::UI::CheckBox;
1255
1256our @ISA = CFClient::UI::DrawBG::;
1257
1258use SDL;
1259use SDL::OpenGL;
1260
1261sub new {
1262 my $class = shift;
1263
1264 $class->SUPER::new (
1265 padding => 2,
1266 fg => [1, 1, 1],
1267 active_fg => [1, 1, 0],
1268 state => 0,
1269 can_hover => 1,
1270 @_
1271 )
1272}
1273
1274sub size_request {
1275 my ($self) = @_;
1276
1277 ($self->{padding} * 2 + 6) x 2
1278}
1279
1280sub size_allocate {
1281 my ($self, $x, $y, $w, $h) = @_;
1282
1283 $self->_size_allocate ($x, $y, $w, $h);
1284}
1285
1286sub button_down {
1287 my ($self, $ev, $x, $y) = @_;
1288
1289 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1290 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1291 $self->{state} = !$self->{state};
1292 $self->emit (changed => $self->{state});
1293 }
1294}
1295
1296sub _draw {
1297 my ($self) = @_;
1298
1299 $self->SUPER::_draw;
1300
1301 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1302
1303 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1304
1305 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1306
1307 glBegin GL_LINE_LOOP;
1308 glVertex 0 , 0;
1309 glVertex 0 , $s;
1310 glVertex $s, $s;
1311 glVertex $s, 0;
1312 glEnd;
1313
1314 if ($self->{state}) {
1315 glBegin GL_LINES;
1316 glVertex 0 , 0;
1317 glVertex $s, $s;
1318 glVertex $s, 0;
1319 glVertex 0 , $s;
1320 glEnd;
1321 }
1322}
1323
1324#############################################################################
1325
1326package CFClient::UI::Slider;
1327
1328use strict;
1329
1330use SDL::OpenGL;
1331
1332our @ISA = CFClient::UI::DrawBG::;
1333
1334my @tex =
1335 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1336 qw(s1_slider.png s1_slider_bg.png);
1337
1338sub new {
1339 my $class = shift;
1340
1341 # range [value, low, high, page]
1342
1343 # TODO: 0-width page
1344 # TODO: req_w/h are wrong with vertical
1345 # TODO: calculations are off
1346 my $self = $class->SUPER::new (
1347 fg => [1, 1, 1],
1348 active_fg => [0, 0, 0],
1349 range => [0, 0, 100, 10],
1350 req_w => 40,
1351 req_h => 13,
1352 vertical => 0,
1353 can_hover => 1,
1354 @_
1355 );
1356
1357 $self
1358}
1359
1360sub size_request {
1361 my ($self) = @_;
1362
1363 my $w = $self->{req_w};
1364 my $h = $self->{req_h};
1365
1366 $self->{vertical} ? ($h, $w) : ($w, $h)
1367}
1368
1369sub button_down {
1370 my ($self, $ev, $x, $y) = @_;
1371
1372 $self->SUPER::button_down ($ev, $x, $y);
1373 $self->mouse_motion ($ev, $x, $y);
1374}
1375
1376sub mouse_motion {
1377 my ($self, $ev, $x, $y) = @_;
1378
1379 if ($GRAB == $self) {
1380 my ($value, $lo, $hi, $page) = @{$self->{range}};
1381
1382 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1383
1384 $x = $x * ($hi - $lo) / $w + $lo;
1385 $x = $lo if $x < $lo;
1386 $x = $hi - $page if $x > $hi - $page;
1387 $self->{range}[0] = $x;
1388
1389 $self->emit (changed => $x);
1390 $self->update;
1391 }
1392}
1393
1394sub _draw {
1395 my ($self) = @_;
1396
1397 $self->SUPER::_draw ();
1398
1399 my ($w, $h) = @$self{qw(w h)};
1400
1401 if ($self->{vertical}) {
1402 # draw a vertical slider like a rotated horizontal slider
1403
1404 glRotate 90, 0, 0, 1;
1405 glTranslate 0, -$self->{w}, 0;
1406
1407 ($w, $h) = ($h, $w);
1408 }
1409
1410 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1411 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1412
1413 my ($value, $lo, $hi, $page) = @{$self->{range}};
1414
1415 # the inner_* stuff is for generating a padding for the slider handle,
1416 # so that the handle doesn't leave the texture. This calculation isn't 100%
1417 # correct propably, but it does the job for now
1418 my $inner_pad = 5; # 5% of width for slider bg texture border
1419 my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
1420 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1421
1422 $page = int $page * $inner_w / ($hi - $lo);
1423 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1424
1425 $w -= $page;
1426 $page &= ~1;
1427 glTranslate $page * 0.5, 0, 0;
1428 $page ||= 2;
1429
1430 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1431 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1432
1433 glEnable GL_BLEND;
1434 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1435 glEnable GL_TEXTURE_2D;
1436 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1437
1438 # draw background
710 $tex->draw_quad (0, 0); 1439 $tex[1]->draw_quad (0, 0, $w, $h);
1440
1441 # draw handle
1442 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
711 1443
712 glDisable GL_BLEND; 1444 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 1445 glDisable GL_TEXTURE_2D;
714} 1446}
715 1447
716############################################################################# 1448#############################################################################
717 1449
1450package CFClient::UI::TextView;
1451
1452our @ISA = CFClient::UI::HBox::;
1453
1454use SDL::OpenGL;
1455
1456sub new {
1457 my $class = shift;
1458
1459 my $self = $class->SUPER::new (
1460 par => [],
1461 @_,
1462 children => [
1463 (new CFClient::UI::Empty expand => 1),
1464 (new CFClient::UI::Slider vertical => 1),
1465 ],
1466 );
1467
1468 $self
1469}
1470
1471sub add_paragraph {
1472 my ($self, $color, $text) = @_;
1473
1474 push @{$self->{par}}, [$color, $text];
1475 my $count = scalar @{$self->{par}};
1476 $self->{children}[1]{range} = [$count - 1, 0, $count, 1];
1477 $self->{children}[1]->update;
1478}
1479
1480sub _draw {
1481 my ($self) = @_;
1482
1483 my $par = $self->{par};
1484
1485 my $bottom = (scalar @$par) - 1;
1486
1487 my $w = $self->{children}[0]{w};
1488 my $y = $self->{h};
1489
1490 glEnable GL_BLEND;
1491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1492 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1494
1495 # TODO: everything!
1496 while ($y > 0 && $bottom >= 0) {
1497 my $par = $par->[$bottom--];
1498
1499 my $layout = new CFClient::Layout;
1500
1501 $layout->set_height ($::FONTSIZE);
1502 $layout->set_width ($w);
1503 $layout->set_text ($par->[1]);
1504 my $tex = new_from_layout CFClient::Texture $layout;
1505 $y -= $tex->{h};
1506
1507 glColor @{ $par->[0] };
1508 $tex->draw_quad (0, $y);
1509 }
1510
1511 glDisable GL_TEXTURE_2D;
1512 glDisable GL_BLEND;
1513}
1514
1515#############################################################################
1516
718package CFClient::Widget::Entry; 1517package CFClient::UI::MapWidget;
719 1518
720our @ISA = CFClient::Widget::Label::; 1519use strict;
1520
1521use List::Util qw(min max);
721 1522
722use SDL; 1523use SDL;
723use SDL::OpenGL; 1524use SDL::OpenGL;
724 1525
725sub key_down {
726 my ($self, $ev) = @_;
727
728 my $mod = $ev->key_mod;
729 my $sym = $ev->key_sym;
730
731 my $uni = $ev->key_unicode;
732
733 my $text = $self->get_text;
734
735 if ($sym == SDLK_BACKSPACE) {
736 substr $text, -1, 1, '';
737 } elsif ($uni) {
738 $text .= chr $uni;
739 }
740
741 $self->set_text ($text);
742}
743
744sub button_down {
745 my ($self, $ev) = @_;
746
747 $self->focus_in;
748}
749
750sub mouse_motion {
751 my ($self, $ev, $x, $y) = @_;
752 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
753}
754
755sub _draw {
756 my ($self) = @_;
757
758 if ($FOCUS == $self) {
759 glColor 1, 1, 1;
760 } else {
761 glColor 0.7, 0.7, 0.7;
762 }
763
764 glBegin GL_QUADS;
765 glVertex 0 , 0;
766 glVertex 0 , $self->{h} - 1;
767 glVertex $self->{w} - 1, $self->{h} - 1;
768 glVertex $self->{w} - 1, 0;
769 glEnd;
770
771 $self->SUPER::_draw;
772}
773
774#############################################################################
775
776package CFClient::Widget::MapWidget;
777
778use strict;
779
780use List::Util qw(min max);
781
782use SDL;
783use SDL::OpenGL;
784use SDL::OpenGL::Constants;
785
786our @ISA = CFClient::Widget::; 1526our @ISA = CFClient::UI::Base::;
1527
1528sub new {
1529 my $class = shift;
1530
1531 $class->SUPER::new (
1532 z => -1,
1533 can_focus => 1,
1534 list => (glGenLists 1),
1535 @_
1536 )
1537}
787 1538
788sub key_down { 1539sub key_down {
789 print "MAPKEYDOWN\n"; 1540 print "MAPKEYDOWN\n";
790} 1541}
791 1542
792sub key_up { 1543sub key_up {
793} 1544}
794 1545
795sub size_request { 1546sub size_request {
796 ( 1547 (
797 1 + int $::WIDTH / 32, 1548 1 + 32 * int $::WIDTH / 32,
798 1 + int $::HEIGHT / 32, 1549 1 + 32 * int $::HEIGHT / 32,
799 ) 1550 )
800} 1551}
801 1552
1553sub update {
1554 my ($self) = @_;
1555
1556 $self->{need_update} = 1;
1557 $self->SUPER::update;
1558}
1559
802sub _draw { 1560sub draw {
803 my ($self) = @_; 1561 my ($self) = @_;
804 1562
805 my $mx = $::CONN->{mapx}; 1563 $self->{need_update}++;#d#
806 my $my = $::CONN->{mapy}; 1564 if (delete $self->{need_update}) {
1565 glNewList $self->{list}, GL_COMPILE;
807 1566
808 my $map = $::CONN->{map};
809
810 my ($xofs, $yofs);
811
812 my $sw = 1 + int $::WIDTH / 32; 1567 my $sw = int $::WIDTH / 32;
813 my $sh = 1 + int $::HEIGHT / 32; 1568 my $sh = int $::HEIGHT / 32;
814 1569
815 if ($::CONN->{mapw} > $sw) { 1570 if ($::MAP) {
816 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1571 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
817 } else {
818 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
819 }
820 1572
821 if ($::CONN->{maph} > $sh) { 1573 if ($::CFG->{fow_enable}) {
822 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1574 if ($::CFG->{fow_smooth}) { # smooth fog of war
823 } else { 1575 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
824 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1576 glConvolutionFilter2D
825 } 1577 GL_CONVOLUTION_2D,
826 1578 GL_ALPHA,
827 glEnable GL_TEXTURE_2D; 1579 3, 3,
828 glEnable GL_BLEND; 1580 GL_ALPHA, GL_FLOAT,
829 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1581 pack "f*",
830 1582 0.1, 0.1, 0.1,
831 my $sw4 = ($sw + 3) & ~3; 1583 0.1, 0.2, 0.1,
832 my $darkness = "\x00" x ($sw4 * $sh); 1584 0.1, 0.1, 0.1,
833 1585 ;
834 for my $x (0 .. $sw - 1) { 1586 glEnable GL_CONVOLUTION_2D;
835 my $row = $map->[$x + $xofs];
836 for my $y (0 .. $sh - 1) {
837
838 my $cell = $row->[$y + $yofs]
839 or next;
840
841 my $dark = $cell->[0];
842 if ($dark < 0) {
843 substr $darkness, $y * $sw4 + $x, 1, chr 224;
844 } else {
845 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
846 }
847
848 for my $num (grep $_, @$cell[1,2,3]) {
849 my $tex = $::CONN->{face}[$num]{texture} || next;
850 1587 }
851 my $w = $tex->{width};
852 my $h = $tex->{height};
853 1588
854 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1589 my $tex = new CFClient::Texture
1590 w => $w,
1591 h => $h,
1592 data => $data,
1593 internalformat => GL_ALPHA,
1594 format => GL_ALPHA;
1595
1596 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1597
1598 glEnable GL_BLEND;
1599 glEnable GL_TEXTURE_2D;
1600 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1601
1602 glColor +($::CFG->{fow_intensity}) x 3, 1;
1603 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1604
1605 glDisable GL_TEXTURE_2D;
1606 glDisable GL_BLEND;
855 } 1607 }
856 } 1608 }
857 }
858 1609
859# if (1) { # higher quality darkness 1610 glEndList;
860# $lighting =~ s/(.)/$1$1$1/gs;
861# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
862#
863# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
864#
865# $lighting = $pb->get_pixels;
866# $lighting =~ s/(.)../$1/gs;
867# } 1611 }
868 1612
869 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1613 glCallList $self->{list};
870 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
871 1614
872 $darkness = new CFClient::Texture 1615 if ($FOCUS != $self) {
873 width => $sw4, 1616 glColor 64/255, 64/255, 64/255;
874 height => $sh, 1617 glLogicOp GL_AND;
875 data => $darkness, 1618 glEnable GL_COLOR_LOGIC_OP;
876 internalformat => GL_ALPHA, 1619 glBegin GL_QUADS;
877 format => GL_ALPHA; 1620 glVertex 0, 0;
878 1621 glVertex 0, $::HEIGHT;
879 glColor 0.45, 0.45, 0.45, 1; 1622 glVertex $::WIDTH, $::HEIGHT;
880 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32); 1623 glVertex $::WIDTH, 0;
881 1624 glEnd;
882 glDisable GL_TEXTURE_2D; 1625 glDisable GL_COLOR_LOGIC_OP;
883 glDisable GL_BLEND; 1626 }
884} 1627}
885 1628
886my %DIR = ( 1629my %DIR = (
887 SDLK_KP8, [1, "north"], 1630 SDLK_KP8, [1, "north"],
888 SDLK_KP9, [2, "northeast"], 1631 SDLK_KP9, [2, "northeast"],
… …
904 1647
905 my $mod = $ev->key_mod; 1648 my $mod = $ev->key_mod;
906 my $sym = $ev->key_sym; 1649 my $sym = $ev->key_sym;
907 1650
908 if ($sym == SDLK_KP5) { 1651 if ($sym == SDLK_KP5) {
909 $::CONN->send ("command stay fire"); 1652 $::CONN->user_send ("command stay fire");
1653 } elsif ($sym == SDLK_a) {
1654 $::CONN->user_send ("command apply");
910 } elsif (exists $DIR{$sym}) { 1655 } elsif (exists $DIR{$sym}) {
911 if ($mod & KMOD_SHIFT) { 1656 if ($mod & KMOD_SHIFT) {
912 $self->{shft}++; 1657 $self->{shft}++;
913 $::CONN->send ("command fire $DIR{$sym}[0]"); 1658 $::CONN->user_send ("command fire $DIR{$sym}[0]");
914 } elsif ($mod & KMOD_CTRL) { 1659 } elsif ($mod & KMOD_CTRL) {
915 $self->{ctrl}++; 1660 $self->{ctrl}++;
916 $::CONN->send ("command run $DIR{$sym}[0]"); 1661 $::CONN->user_send ("command run $DIR{$sym}[0]");
917 } else { 1662 } else {
918 $::CONN->send ("command $DIR{$sym}[1]"); 1663 $::CONN->user_send ("command $DIR{$sym}[1]");
919 } 1664 }
920 } 1665 }
921} 1666}
922 1667
923sub key_up { 1668sub key_up {
… …
925 1670
926 my $mod = $ev->key_mod; 1671 my $mod = $ev->key_mod;
927 my $sym = $ev->key_sym; 1672 my $sym = $ev->key_sym;
928 1673
929 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1674 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
930 $::CONN->send ("command fire_stop"); 1675 $::CONN->user_send ("command fire_stop");
931 } 1676 }
932 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1677 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
933 $::CONN->send ("command run_stop"); 1678 $::CONN->user_send ("command run_stop");
934 } 1679 }
935} 1680}
936 1681
937############################################################################# 1682#############################################################################
938 1683
939package CFClient::Widget::Animator; 1684package CFClient::UI::Animator;
940 1685
941use SDL::OpenGL; 1686use SDL::OpenGL;
942 1687
943our @ISA = CFClient::Widget::Bin::; 1688our @ISA = CFClient::UI::Bin::;
944 1689
945sub moveto { 1690sub moveto {
946 my ($self, $x, $y) = @_; 1691 my ($self, $x, $y) = @_;
947 1692
948 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1693 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
976 glPopMatrix; 1721 glPopMatrix;
977} 1722}
978 1723
979############################################################################# 1724#############################################################################
980 1725
1726package CFClient::UI::Flopper;
1727
1728our @ISA = CFClient::UI::Button::;
1729
1730sub new {
1731 my $class = shift;
1732
1733 my $self = $class->SUPER::new (
1734 state => 0,
1735 connect_activate => \&toggle_flopper,
1736 @_
1737 );
1738
1739 if ($self->{state}) {
1740 $self->{state} = 0;
1741 $self->toggle_flopper;
1742 }
1743
1744 $self
1745}
1746
1747sub toggle_flopper {
1748 my ($self) = @_;
1749
1750 # TODO: use animation
1751 if ($self->{state} = !$self->{state}) {
1752 $CFClient::UI::TOPLEVEL->add ($self->{other});
1753 $self->{other}->move (
1754 ($::WIDTH - $self->{other}{w}) * 0.5,
1755 ($::HEIGHT - $self->{other}{h}) * 0.5,
1756 );
1757 } else {
1758 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1759 }
1760}
1761
1762#############################################################################
1763
981package CFClient::Widget::Toplevel; 1764package CFClient::UI::Toplevel;
982 1765
983our @ISA = CFClient::Widget::Container::; 1766our @ISA = CFClient::UI::Container::;
984 1767
985sub size_request { 1768sub size_request {
986 ($::WIDTH, $::HEIGHT) 1769 ($::WIDTH, $::HEIGHT)
987} 1770}
988 1771
989sub size_allocate { 1772sub size_allocate {
990 my ($self, $w, $h) = @_; 1773 my ($self, $x, $y, $w, $h) = @_;
991 1774
992 $self->SUPER::size_allocate ($w, $h); 1775 $self->_size_allocate ($x, $y, $w, $h);
993 1776
994 $_->size_allocate ($_->size_request) 1777 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
995 for @{$self->{children}}; 1778 for @{$self->{children}};
996} 1779}
997 1780
998sub translate { 1781sub translate {
999 my ($self, $x, $y) = @_; 1782 my ($self, $x, $y) = @_;
… …
1002} 1785}
1003 1786
1004sub update { 1787sub update {
1005 my ($self) = @_; 1788 my ($self) = @_;
1006 1789
1007 $self->size_allocate ($self->size_request); 1790 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1008 ::refresh (); 1791 ::refresh ();
1009} 1792}
1010 1793
1011sub add { 1794sub add {
1012 my ($self, $widget) = @_; 1795 my ($self, $widget) = @_;
1013 1796
1014 $self->SUPER::add ($widget); 1797 $self->SUPER::add ($widget);
1015 1798
1016 $widget->size_allocate ($widget->size_request); 1799 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1017} 1800}
1018 1801
1019sub draw { 1802sub draw {
1020 my ($self) = @_; 1803 my ($self) = @_;
1021 1804
1022 $self->_draw; 1805 $self->_draw;
1023} 1806}
1024 1807
1025############################################################################# 1808#############################################################################
1026 1809
1027package CFClient::Widget; 1810package CFClient::UI;
1028 1811
1029$TOPLEVEL = new CFClient::Widget::Toplevel; 1812$TOPLEVEL = new CFClient::UI::Toplevel;
1030 1813
10311 18141
1032 1815

Diff Legend

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