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.31 by elmex, Sun Apr 9 00:43:11 2006 UTC vs.
Revision 1.39 by root, Sun Apr 9 21:39:08 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines