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.28 by root, Sun Apr 9 00:06:10 2006 UTC vs.
Revision 1.45 by root, Sun Apr 9 22:19:03 2006 UTC

5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10use Crossfire::Client;
11
10our $FOCUS; # the widget with current focus 12our $FOCUS; # the widget with current focus
11our @ACTIVE_WIDGETS;
12 13
13# class methods for events 14# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 15sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 16sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
16sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 17sub feed_sdl_button_down_event { }
17sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 18sub feed_sdl_button_up_event { }
18 19
19sub new { 20sub new {
20 my $class = shift; 21 my $class = shift;
21 22
22 bless { @_ }, $class 23 bless { @_ }, $class
23}
24
25sub activate {
26 push @ACTIVE_WIDGETS, $_[0];
27 Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28}
29
30sub deactivate {
31 @ACTIVE_WIDGETS =
32 sort { $a->{z} <=> $b->{z} }
33 grep { $_ && $_ != $_[0] }
34 @ACTIVE_WIDGETS;
35} 24}
36 25
37sub move { 26sub move {
38 my ($self, $x, $y, $z) = @_; 27 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 28 $self->{x} = $x;
44sub needs_redraw { 33sub needs_redraw {
45 0 34 0
46} 35}
47 36
48sub size_request { 37sub size_request {
38 require Carp;
49 die "size_request is abtract"; 39 Carp::confess "size_request is abtract";
40}
41
42sub size_allocate {
43 my ($self, $w, $h) = @_;
44
45 $self->{w} = $w;
46 $self->{h} = $h;
50} 47}
51 48
52sub focus_in { 49sub focus_in {
53 my ($widget) = @_; 50 my ($widget) = @_;
54 $FOCUS = $widget; 51 $FOCUS = $widget;
72 69
73sub button_up { 70sub button_up {
74 my ($widget, $sdlev) = @_; 71 my ($widget, $sdlev) = @_;
75} 72}
76 73
77sub w { $_[0]->{w} } 74sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
78sub h { $_[0]->{h} } 75sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 76sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 77sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 78sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
82 79
83sub draw { 80sub draw {
88 $self->_draw; 85 $self->_draw;
89 glPopMatrix; 86 glPopMatrix;
90} 87}
91 88
92sub _draw { 89sub _draw {
93 my ($widget) = @_; 90 my ($self) = @_;
91
92 warn "no draw defined for $self\n";
94} 93}
95 94
96sub bbox { 95sub bbox {
97 my ($widget) = @_; 96 my ($self) = @_;
97 my ($w, $h) = $self->size_request;
98 (
99 $self->{x},
100 $self->{y},
101 $self->{x} = $w,
102 $self->{y} = $h
103 )
104}
105
106sub find_widget {
107 my ($self, $x, $y) = @_;
108
109 return $self
110 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
111 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
112
113 ()
114}
115
116sub del_parent { $_[0]->{parent} = undef }
117
118sub set_parent {
119 my ($self, $par) = @_;
120
121 $self->{parent} = $par;
122 Scalar::Util::weaken $self->{parent};
123}
124
125sub get_parent {
126 $_[0]->{parent}
127}
128
129sub update {
130 my ($self) = @_;
131
132 $self->{parent}->update
133 if $self->{parent};
98} 134}
99 135
100sub DESTROY { 136sub DESTROY {
101 my ($self) = @_; 137 my ($self) = @_;
102 138
103 $self->deactivate; 139 #$self->deactivate;
104} 140}
141
142#############################################################################
105 143
106package Crossfire::Client::Widget::Container; 144package Crossfire::Client::Widget::Container;
107 145
108our @ISA = Crossfire::Client::Widget::; 146our @ISA = Crossfire::Client::Widget::;
109 147
148sub new {
149 my ($class, @widgets) = @_;
150
151 my $self = $class->SUPER::new (children => []);
152 $self->add ($_) for @widgets;
153
154 $self
155}
156
157sub add {
158 my ($self, $chld, $expand) = @_;
159
160 $chld->{expand} = $expand;
161 $chld->set_parent ($self);
162
163 @{$self->{children}} =
164 sort { $a->{z} <=> $b->{z} }
165 @{$self->{children}}, $chld;
166
167 $self->size_allocate ($self->{w}, $self->{h})
168 if $self->{w}; #TODO: check for "realised state"
169}
170
171sub remove {
172 my ($self, $widget) = @_;
173
174 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
175
176 $self->size_allocate ($self->{w}, $self->{h});
177}
178
179sub find_widget {
180 my ($self, $x, $y) = @_;
181
182 $x -= $self->{x};
183 $y -= $self->{y};
184
185 my $res;
186
187 for (@{ $self->{children} }) {
188 $res = $_->find_widget ($x, $y)
189 and return $res;
190 }
191
192 ()
193}
194
195sub _draw {
196 my ($self) = @_;
197
198 $_->draw for @{$self->{children}};
199}
200
201#############################################################################
202
203package Crossfire::Client::Widget::Bin;
204
205our @ISA = Crossfire::Client::Widget::Container::;
206
207sub child { $_[0]->{children}[0] }
208
209sub size_request {
210 $_[0]{children}[0]->size_request if $_[0]{children}[0];
211}
212
213sub size_allocate {
214 my ($self, $w, $h) = @_;
215
216 $self->SUPER::size_allocate ($w, $h);
217 $self->{children}[0]->size_allocate ($w, $h)
218 if $self->{children}[0]
219}
220
221#############################################################################
222
223package Crossfire::Client::Widget::Toplevel;
224
225our @ISA = Crossfire::Client::Widget::Container::;
226
227sub update {
228 my ($self) = @_;
229
230 ::refresh ();
231}
232
233sub add {
234 my ($self, $widget) = @_;
235
236 $self->SUPER::add ($widget);
237
238 $widget->size_allocate ($widget->size_request);
239}
240
241#############################################################################
242
243package Crossfire::Client::Widget::Window;
244
245our @ISA = Crossfire::Client::Widget::Bin::;
246
110use SDL::OpenGL; 247use SDL::OpenGL;
111 248
112sub add { $_[0]->{child} = $_[1] } 249sub new {
113sub get { $_[0]->{child} } 250 my ($class, $x, $y, $z, $w, $h) = @_;
114 251
115sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 252 my $self = $class->SUPER::new;
116 253
117sub _draw { die "Containers can't be drawn!" } 254 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
255}
118 256
119package Crossfire::Client::Widget::Window; 257sub update {
120
121our @ISA = Crossfire::Client::Widget::Container::;
122
123use SDL::OpenGL;
124
125sub add {
126 my ($self, $chld) = @_; 258 my ($self) = @_;
127 $self->SUPER::add ($chld); 259
128 $self->render_chld; #TODO: Move this to the size_request event propably? 260 $self->render_chld;
261 $self->SUPER::update;
129} 262}
130 263
131sub render_chld { 264sub render_chld {
132 my ($self) = @_; 265 my ($self) = @_;
133 my $chld = $self->get;
134 my ($w, $h) = $self->size_request;
135 266
136 $self->{texture} = 267 $self->{texture} =
137 Crossfire::Client::Texture->new_from_opengl ( 268 Crossfire::Client::Texture->new_from_opengl (
138 $w, $h, sub { $chld->draw } 269 $self->{w}, $self->{h}, sub { $self->child->draw }
139 ); 270 );
140 $self->{texture}->upload;
141} 271}
142 272
143sub size_request { 273sub size_allocate {
144 my ($self) = @_; 274 my ($self, $w, $h) = @_;
145 my $chld = $self->get 275
146 or return (0, 0); 276 $self->{w} = $w;
147 $chld->size_request 277 $self->{h} = $h;
278
279 $self->child->size_allocate ($w, $h);
280
281 $self->render_chld;
148} 282}
149 283
150sub _draw { 284sub _draw {
151 my ($self) = @_; 285 my ($self) = @_;
152 286
153 my ($w, $h) = $self->size_request;#TODO# use widht/height of texture 287 my ($w, $h) = ($self->w, $self->h);
288
154 my $tex = $self->{texture} 289 my $tex = $self->{texture}
155 or return; 290 or return;
156 291
157 glEnable GL_BLEND; 292 glEnable GL_BLEND;
158 glEnable GL_TEXTURE_2D; 293 glEnable GL_TEXTURE_2D;
159 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 294 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
160 glBindTexture GL_TEXTURE_2D, $tex->{name}; 295 glBindTexture GL_TEXTURE_2D, $tex->{name};
161
162 glColor 1, 1, 1;
163 296
164 glBegin GL_QUADS; 297 glBegin GL_QUADS;
165 glTexCoord 0, 0; glVertex 0, 0; 298 glTexCoord 0, 0; glVertex 0, 0;
166 glTexCoord 0, 1; glVertex 0, $h; 299 glTexCoord 0, 1; glVertex 0, $h;
167 glTexCoord 1, 1; glVertex $w, $h; 300 glTexCoord 1, 1; glVertex $w, $h;
170 303
171 glDisable GL_BLEND; 304 glDisable GL_BLEND;
172 glDisable GL_TEXTURE_2D; 305 glDisable GL_TEXTURE_2D;
173} 306}
174 307
308#############################################################################
309
175package Crossfire::Client::Widget::Frame; 310package Crossfire::Client::Widget::Frame;
176 311
177our @ISA = Crossfire::Client::Widget::Container::; 312our @ISA = Crossfire::Client::Widget::Bin::;
178 313
179use SDL::OpenGL; 314use SDL::OpenGL;
180 315
181sub size_request { 316sub size_request {
182 my ($self) = @_; 317 my ($self) = @_;
183 my $chld = $self->get 318 my $chld = $self->child
184 or return (0, 0); 319 or return (0, 0);
320
321 $chld->move (2, 2);
322
185 map { $_ + 4 } $chld->size_request; 323 map { $_ + 4 } $chld->size_request;
186} 324}
187 325
326sub size_allocate {
327 my ($self, $w, $h) = @_;
328
329 $self->{w} = $w;
330 $self->{h} = $h;
331
332 $self->child->size_allocate ($w - 4, $h - 4);
333 $self->child->move (2, 2);
334}
335
188sub _draw { 336sub _draw {
189 my ($self) = @_; 337 my ($self) = @_;
190 338
191 my $chld = $self->get; 339 my $chld = $self->child;
192
193 $chld->move (2, 2, 0); #TODO:move to size_request
194 340
195 my ($w, $h) = $chld->size_request; 341 my ($w, $h) = $chld->size_request;
196 342
197 glColor 1, 0, 0;
198 glBegin GL_QUADS; 343 glBegin GL_QUADS;
344 glColor 0, 0, 0;
199 glTexCoord 0, 0; glVertex 0 , 0; 345 glTexCoord 0, 0; glVertex 0 , 0;
200 glTexCoord 0, 1; glVertex 0 , $h + 4; 346 glTexCoord 0, 1; glVertex 0 , $h + 4;
201 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 347 glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
202 glTexCoord 1, 0; glVertex $w + 4 , 0; 348 glTexCoord 1, 0; glVertex $w + 4 , 0;
203 glEnd; 349 glEnd;
204 350
205 $chld->draw; 351 $chld->draw;
206} 352}
207 353
354#############################################################################
355
356package Crossfire::Client::Widget::FancyFrame;
357
358our @ISA = Crossfire::Client::Widget::Bin::;
359
360use SDL::OpenGL;
361
362my @tex =
363 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
364 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
365
366sub size_request {
367 my ($self) = @_;
368
369 my ($w, $h) = $self->SUPER::size_request;
370
371 $h += $tex[1]->{height};
372 $h += $tex[4]->{height};
373 $w += $tex[2]->{width};
374 $w += $tex[3]->{width};
375
376 ($w, $h)
377}
378
379sub size_allocate {
380 my ($self, $w, $h) = @_;
381
382 $self->SUPER::size_allocate ($w, $h);
383
384 $h -= $tex[1]->{height};
385 $h -= $tex[4]->{height};
386 $w -= $tex[2]->{width};
387 $w -= $tex[3]->{width};
388
389 $h = $h < 0 ? 0 : $h;
390 $w = $w < 0 ? 0 : $w;
391
392 $self->child->size_allocate ($w, $h);
393 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
394}
395
396sub _draw {
397 my ($self) = @_;
398
399 my ($w, $h) = ($self->{w}, $self->{h});
400 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
401
402 glEnable GL_BLEND;
403 glEnable GL_TEXTURE_2D;
404 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
405 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
406
407 my $top = $tex[1];
408 glBindTexture GL_TEXTURE_2D, $top->{name};
409
410 glBegin GL_QUADS;
411 glTexCoord 0, 0; glVertex 0 , 0;
412 glTexCoord 0, 1; glVertex 0 , $top->{height};
413 glTexCoord 1, 1; glVertex $w , $top->{height};
414 glTexCoord 1, 0; glVertex $w , 0;
415 glEnd;
416
417 my $left = $tex[3];
418 glBindTexture GL_TEXTURE_2D, $left->{name};
419
420 glBegin GL_QUADS;
421 glTexCoord 0, 0; glVertex 0 , $top->{height};
422 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
423 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
424 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
425 glEnd;
426
427 my $right = $tex[2];
428 glBindTexture GL_TEXTURE_2D, $right->{name};
429
430 glBegin GL_QUADS;
431 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
432 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
433 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
434 glTexCoord 1, 0; glVertex $w , $top->{height};
435 glEnd;
436
437 my $bottom = $tex[4];
438 glBindTexture GL_TEXTURE_2D, $bottom->{name};
439
440 glBegin GL_QUADS;
441 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
442 glTexCoord 0, 1; glVertex 0 , $h;
443 glTexCoord 1, 1; glVertex $w , $h;
444 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
445 glEnd;
446
447 my $bg = $tex[0];
448 glBindTexture GL_TEXTURE_2D, $bg->{name};
449 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
450 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
451 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
452
453 my $rep_x = $cw / $bg->{width};
454 my $rep_y = $ch / $bg->{height};
455
456 glBegin GL_QUADS;
457 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
458 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
459 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
460 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
461 glEnd;
462
463 glDisable GL_BLEND;
464 glDisable GL_TEXTURE_2D;
465
466 $self->child->draw;
467
468}
469
470#############################################################################
471
208package Crossfire::Client::Widget::Table; 472package Crossfire::Client::Widget::Table;
209 473
210our @ISA = Crossfire::Client::Widget::Container::; 474our @ISA = Crossfire::Client::Widget::Bin::;
211 475
212use SDL::OpenGL; 476use SDL::OpenGL;
213 477
214sub add { 478sub add {
215 my ($self, $x, $y, $chld) = @_; 479 my ($self, $x, $y, $chld) = @_;
480 my $old_chld = $self->{children}[$y][$x];
481
216 $self->{childs}[$y][$x] = $chld; 482 $self->{children}[$y][$x] = $chld;
483 $chld->set_parent ($self);
484 $self->update;
217} 485}
218 486
219sub max_row_height { 487sub max_row_height {
220 my ($self, $row) = @_; 488 my ($self, $row) = @_;
221 489
222 my $hs = 0; 490 my $hs = 0;
223 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 491 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
224 my $c = $self->{childs}->[$row]->[$xi]; 492 my $c = $self->{children}->[$row]->[$xi];
225 if ($c) { 493 if ($c) {
226 my ($w, $h) = $c->size_request; 494 my ($w, $h) = $c->size_request;
227 if ($hs < $h) { $hs = $h } 495 if ($hs < $h) { $hs = $h }
228 } 496 }
229 } 497 }
232 500
233sub max_col_width { 501sub max_col_width {
234 my ($self, $col) = @_; 502 my ($self, $col) = @_;
235 503
236 my $ws = 0; 504 my $ws = 0;
237 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 505 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
238 my $c = ($self->{childs}->[$yi] || [])->[$col]; 506 my $c = ($self->{children}->[$yi] || [])->[$col];
239 if ($c) { 507 if ($c) {
240 my ($w, $h) = $c->size_request; 508 my ($w, $h) = $c->size_request;
241 if ($ws < $w) { $ws = $w } 509 if ($ws < $w) { $ws = $w }
242 } 510 }
243 } 511 }
247sub size_request { 515sub size_request {
248 my ($self) = @_; 516 my ($self) = @_;
249 517
250 my ($hs, $ws) = (0, 0); 518 my ($hs, $ws) = (0, 0);
251 519
252 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 520 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
253 $hs += $self->max_row_height ($yi); 521 $hs += $self->max_row_height ($yi);
254 } 522 }
255 523
256 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 524 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
257 my $wm = 0; 525 my $wm = 0;
258 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 526 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
259 $wm += $self->max_col_width ($xi) 527 $wm += $self->max_col_width ($xi)
260 } 528 }
261 if ($ws < $wm) { $ws = $wm } 529 if ($ws < $wm) { $ws = $wm }
262 } 530 }
263 531
266 534
267sub _draw { 535sub _draw {
268 my ($self) = @_; 536 my ($self) = @_;
269 537
270 my $y = 0; 538 my $y = 0;
271 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 539 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
272 my $x = 0; 540 my $x = 0;
273 541
274 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 542 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
275 543
276 my $c = $self->{childs}->[$yi]->[$xi]; 544 my $c = $self->{children}->[$yi]->[$xi];
277 if ($c) { 545 if ($c) {
278 $c->move ($x, $y, 0); #TODO: Move to size_request 546 $c->move ($x, $y, 0); #TODO: Move to size_request
279 $c->draw if $c; 547 $c->draw if $c;
280 } 548 }
281 549
284 552
285 $y += $self->max_row_height ($yi); 553 $y += $self->max_row_height ($yi);
286 } 554 }
287} 555}
288 556
557#############################################################################
558
289package Crossfire::Client::Widget::VBox; 559package Crossfire::Client::Widget::VBox;
290 560
291our @ISA = Crossfire::Client::Widget::Container::; 561our @ISA = Crossfire::Client::Widget::Container::;
292 562
293use SDL::OpenGL; 563use SDL::OpenGL;
294 564
295sub add {
296 my ($self, $chld) = @_;
297 push @{$self->{childs}}, $chld;
298}
299
300sub size_request { 565sub size_request {
301 my ($self) = @_; 566 my ($self) = @_;
302 567
303 my ($hs, $ws) = (0, 0); 568 my @alloc = map [$_->size_request], @{$self->{children}};
569
570 (
571 (List::Util::max map $_->[0], @alloc),
572 (List::Util::sum map $_->[1], @alloc),
573 )
574}
575
576sub size_allocate {
577 my ($self, $w, $h) = @_;
578
579 $self->w ($w);
580 $self->h ($h);
581
582 my $exp;
583 my @oth;
584 # find expand widget
304 for (@{$self->{childs} || []}) { 585 for (@{$self->{children}}) {
586 if ($_->{expand}) {
587 $exp = $_;
588 last;
589 }
590 push @oth, $_;
591 }
592
593 my ($ow, $oh);
594
595 # get sizes of other widgets
596 for (@oth) {
305 my ($w, $h) = $_->size_request; 597 my ($w, $h) = $_->size_request;
306 $hs += $h; 598 $oh += $h;
307 if ($ws < $w) { $ws = $w } 599 if ($ow < $w) { $ow = $w }
308 } 600 }
309 601
310 return ($ws, $hs); 602 my $y = 0;
311}
312
313sub _draw {
314 my ($self) = @_;
315
316 my ($x, $y);
317 for (@{$self->{childs} || []}) { 603 for (@{$self->{children}}) {
318 $_->move (0, $y, 0); #TODO: move to size_request 604 $_->move (0, $y);
319 $_->draw; 605
606 if ($_ == $exp) {
607 $_->size_allocate ($w, $h - $oh);
608 $y += $h - $oh;
609 } else {
320 my ($w, $h) = $_->size_request; 610 my ($cw, $h) = $_->size_request;
611 $_->size_allocate ($w, $h);
321 $y += $h; 612 $y += $h;
613 }
322 } 614 }
323} 615}
616
617#############################################################################
324 618
325package Crossfire::Client::Widget::Label; 619package Crossfire::Client::Widget::Label;
326 620
327our @ISA = Crossfire::Client::Widget::; 621our @ISA = Crossfire::Client::Widget::;
328 622
329use SDL::OpenGL; 623use SDL::OpenGL;
330 624
331sub new { 625sub new {
332 my ($class, $x, $y, $z, $height, $text) = @_; 626 my ($class, $x, $y, $z, $height, $text) = @_;
333 627
628 # TODO: color, and make height, xyz etc. optional
334 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 629 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
335 630
336 $self->set_text ($text); 631 $self->set_text ($text);
337 632
338 $self 633 $self
340 635
341sub set_text { 636sub set_text {
342 my ($self, $text) = @_; 637 my ($self, $text) = @_;
343 638
344 $self->{text} = $text; 639 $self->{text} = $text;
345
346 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 640 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
641
642 $self->update;
347} 643}
348 644
349sub get_text { 645sub get_text {
350 my ($self, $text) = @_; 646 my ($self, $text) = @_;
351 647
366 662
367 my $tex = $self->{texture}; 663 my $tex = $self->{texture};
368 664
369 glEnable GL_BLEND; 665 glEnable GL_BLEND;
370 glEnable GL_TEXTURE_2D; 666 glEnable GL_TEXTURE_2D;
667 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
371 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
372 glBindTexture GL_TEXTURE_2D, $tex->{name}; 669 glBindTexture GL_TEXTURE_2D, $tex->{name};
373 670
374 glColor 1, 0, 1; 671 glColor 1, 0, 0, 1; # TODO color
375 672
376 glBegin GL_QUADS; 673 glBegin GL_QUADS;
377 glTexCoord 0, 0; glVertex 0 , 0; 674 glTexCoord 0, 0; glVertex 0 , 0;
378 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 675 glTexCoord 0, 1; glVertex 0 , $tex->{height};
379 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 676 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
382 679
383 glDisable GL_BLEND; 680 glDisable GL_BLEND;
384 glDisable GL_TEXTURE_2D; 681 glDisable GL_TEXTURE_2D;
385} 682}
386 683
684#############################################################################
685
387package Crossfire::Client::Widget::TextView; 686package Crossfire::Client::Widget::TextEntry;
388 687
389use strict;
390
391our @ISA = qw/Crossfire::Client::Widget/; 688our @ISA = Crossfire::Client::Widget::Label::;
392 689
690use SDL;
393use SDL::OpenGL; 691use SDL::OpenGL;
394use SDL::OpenGL::Constants;
395 692
396sub add_line { 693sub key_down {
397 my ($self, $line) = @_; 694 my ($self, $ev) = @_;
398 push @{$self->{lines}}, $line;
399}
400 695
401sub _draw { 696 my $mod = $ev->key_mod;
402 my ($self) = @_; 697 my $sym = $ev->key_sym;
403 698
699 $ev->set_unicode (1);
700 my $uni = $ev->key_unicode;
701
702 my $text = $self->get_text;
703
704 if ($sym == SDLK_BACKSPACE) {
705 substr $text, -1, 1, '';
706
707 } elsif ($uni) {
708 $text .= chr $uni;
709 }
710 $self->set_text ($text);
404} 711}
712
713#############################################################################
405 714
406package Crossfire::Client::Widget::MapWidget; 715package Crossfire::Client::Widget::MapWidget;
407 716
408use strict; 717use strict;
409 718
418sub key_down { 727sub key_down {
419 print "MAPKEYDOWN\n"; 728 print "MAPKEYDOWN\n";
420} 729}
421 730
422sub key_up { 731sub key_up {
732}
733
734sub size_request {
735
736}
737
738sub size_allocate {
423} 739}
424 740
425sub _draw { 741sub _draw {
426 my ($self) = @_; 742 my ($self) = @_;
427 743
447 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 763 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
448 } 764 }
449 765
450 glEnable GL_TEXTURE_2D; 766 glEnable GL_TEXTURE_2D;
451 glEnable GL_BLEND; 767 glEnable GL_BLEND;
452 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
769
770 my $sw4 = ($sw + 3) & ~3;
771 my $lighting = "\x00" x ($sw4 * $sh);
453 772
454 for my $x (0 .. $sw - 1) { 773 for my $x (0 .. $sw - 1) {
455 for my $y (0 .. $sh - 1) { 774 for my $y (0 .. $sh - 1) {
456 775
457 my $cell = $map->[$x + $xofs][$y + $yofs] 776 my $cell = $map->[$x + $xofs][$y + $yofs]
458 or next; 777 or next;
459 778
460 my $darkness = $cell->[0] * (1 / 255); 779 my $darkness = $cell->[0] * (1 / 255);
461 if ($darkness < 0) { 780 if ($darkness < 0) {
462 glColor 0.3, 0.3, 0.3; 781 $darkness = 0.15;
463 } else {
464 glColor $darkness, $darkness, $darkness;
465 } 782 }
783 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
466 784
467 for my $num (grep $_, @$cell[1,2,3]) { 785 for my $num (grep $_, @$cell[1,2,3]) {
468 my $tex = $::CONN->{face}[$num]{texture} || next; 786 my $tex = $::CONN->{face}[$num]{texture} || next;
469 787
470 glBindTexture GL_TEXTURE_2D, $tex->{name}; 788 glBindTexture GL_TEXTURE_2D, $tex->{name};
482 glTexCoord 1, 0; glVertex $px + $w, $py; 800 glTexCoord 1, 0; glVertex $px + $w, $py;
483 glEnd; 801 glEnd;
484 } 802 }
485 } 803 }
486 } 804 }
805
806# if (1) { # higher quality darkness
807# $lighting =~ s/(.)/$1$1$1/gs;
808# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
809#
810# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
811#
812# $lighting = $pb->get_pixels;
813# $lighting =~ s/(.)../$1/gs;
814# }
815
816 $lighting = new Crossfire::Client::Texture
817 width => $sw4,
818 height => $sh,
819 data => $lighting,
820 internalformat => GL_ALPHA4,
821 format => GL_ALPHA;
822
823 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
824 glColor 0, 0, 0, 0.75;
825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
826 glBindTexture GL_TEXTURE_2D, $lighting->{name};
827 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
828 glBegin GL_QUADS;
829 glTexCoord 0, 0; glVertex 0 , 0;
830 glTexCoord 0, 1; glVertex 0 , $sh * 32;
831 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
832 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
833 glEnd;
487 834
488 glDisable GL_TEXTURE_2D; 835 glDisable GL_TEXTURE_2D;
489 glDisable GL_BLEND; 836 glDisable GL_BLEND;
490} 837}
491 838
538 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 885 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
539 $::CONN->send ("command run_stop"); 886 $::CONN->send ("command run_stop");
540 } 887 }
541} 888}
542 889
890#############################################################################
891
892package Crossfire::Client::Widget::Animator;
893
894use SDL::OpenGL;
895
896our @ISA = Crossfire::Client::Widget::Bin::;
897
898sub moveto {
899 my ($self, $x, $y) = @_;
900
901 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
902 $self->{speed} = 0.2;
903 $self->{time} = 1;
904
905 ::animation_start $self;
906}
907
908sub animate {
909 my ($self, $interval) = @_;
910
911 $self->{time} -= $interval * $self->{speed};
912 if ($self->{time} <= 0) {
913 $self->{time} = 0;
914 ::animation_stop $self;
915 }
916
917 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
918
919 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
920 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
921}
922
923sub _draw {
924 my ($self) = @_;
925
926 glPushMatrix;
927 glRotate $self->{time} * 10000, 0, 1, 0;
928 $self->{children}[0]->draw;
929 glPopMatrix;
930}
931
5431; 9321;
544 933

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines