December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] <rest-service> master : - read avaliable patches in a separate thread (in background)
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit 458b43dd8d2a3ccd182f7bf23ec9b305ff1b7ba5 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Wed Nov 11 12:56:56 2009 +0100 - read avaliable patches in a separate thread (in background) - initial commit --- .../patches/app/controllers/patches_controller.rb | 7 ++- plugins/patches/app/models/background_status.rb | 27 +++++++++++ plugins/patches/app/models/patch.rb | 46 +++++++++++++++++-- plugins/patches/app/models/resolvable.rb | 19 +++++++- 4 files changed, 90 insertions(+), 9 deletions(-) diff --git a/plugins/patches/app/controllers/patches_controller.rb b/plugins/patches/app/controllers/patches_controller.rb index a743afb..6468c0c 100644 --- a/plugins/patches/app/controllers/patches_controller.rb +++ b/plugins/patches/app/controllers/patches_controller.rb @@ -27,7 +27,7 @@ class PatchesController < ApplicationController Rails.cache.write('patches:timestamp', Time.now) return # the cache expires after 5 minutes, repository metadata - # or RPM database update invalidates the cache immeditely + # or RPM database update invalidates the cache immediately # (new patches might be applicable) elsif cache_timestamp < 5.minutes.ago || cache_timestamp < Patch.mtime logger.debug "#### Patch cache expired" @@ -42,7 +42,10 @@ class PatchesController < ApplicationController # GET /patch_updates.xml def index # note: permission check was performed in :before_filter - @patches = Patch.find(:available) +# ActionController::Base.benchmark("Patches read") do + @patches = Patch.find(:available, {:background => true}) +# end + respond_to do |format| format.xml { render :xml => @patches.to_xml( :root => "patches", :dasherize => false ) } format.json { render :json => @patches.to_json( :root => "patches", :dasherize => false ) } diff --git a/plugins/patches/app/models/background_status.rb b/plugins/patches/app/models/background_status.rb new file mode 100644 index 0000000..9ee50f0 --- /dev/null +++ b/plugins/patches/app/models/background_status.rb @@ -0,0 +1,27 @@ +# To change this template, choose Tools | Templates +# and open the template in the editor. + +class BackgroundStatus + + attr_writer :status, + :progress, + :subprogress + + def initialize(stat = 'unknown', progress = 0, subprogress = nil) + @status = stat + @progress = progress + @subprogress = subprogress + end + + def to_xml(options = {}) + xml = options[:builder] ||= Builder::XmlMarkup.new(options) + xml.instruct! unless options[:skip_instruct] + + xml.tag! :background_status do + xml.tag!(:status, @status) + xml.tag!(:progress, @progress.to_i, {:type => "integer"} ) + xml.tag!(:subprogress, @subprogress.to_i, {:type => "integer"}) + end + end + +end diff --git a/plugins/patches/app/models/patch.rb b/plugins/patches/app/models/patch.rb index f50cef0..a6deb90 100644 --- a/plugins/patches/app/models/patch.rb +++ b/plugins/patches/app/models/patch.rb @@ -3,16 +3,17 @@ require 'resolvable' # Model for patches available via package kit class Patch < Resolvable + @@running = Hash.new + @@done = Hash.new + def to_xml( options = {} ) super :patch_update, options end - # find patches - # Patch.find(:available) - # Patch.find(212) - def self.find(what) + # find patches using PackageKit + def self.do_find(what, bg_status = nil) patch_updates = Array.new - self.execute("GetUpdates", "NONE", "Package") { |line1,line2,line3| + self.execute("GetUpdates", "NONE", "Package", bg_status) { |line1,line2,line3| columns = line2.split ";" if what == :available || columns[1] == what update = Patch.new(:resolvable_id => columns[1], @@ -28,6 +29,41 @@ class Patch < Resolvable return patch_updates end + # find patches + # Patch.find(:available) + # Patch.find(212) + def self.find(what, opts = {}) + background = opts[:background] + + if background + if @@done.has_key?(what) + Rails.logger.debug "Request #{what} is done" + @@running.delete(what) + return @@done.delete(what) + end + + running = @@running[what] + if running + Rails.logger.debug "Request #{what} is already running: #{running.inspect}" + return [running] + end + + bs = BackgroundStatus.new + @@running[what] = bs + + Rails.logger.info "Starting background thread for reading patches..." + Thread.new do + res = do_find(what, bs) + Rails.logger.info "*** Patches thread: Found #{res.size} applicable patches" + @@done[what] = res + end + + return [bs] + else + return do_find(what) + end + end + # installs this def install self.class.install(id) diff --git a/plugins/patches/app/models/resolvable.rb b/plugins/patches/app/models/resolvable.rb index 7b9acc3..f4e8331 100644 --- a/plugins/patches/app/models/resolvable.rb +++ b/plugins/patches/app/models/resolvable.rb @@ -130,10 +130,11 @@ public # # method: method to execute # args: arguments to method - # signal: signal to intercept (usuallay "Package") + # signal: signal to intercept (usually "Package") + # bg_stat: BackgroundStatus object for reporting progress (optional) # block: block to run on signal # - def self.execute(method, args, signal, &block) + def self.execute(method, args, signal, bg_stat = nil, &block) begin dbusloop = DBus::Main.new transaction_iface, packagekit_iface = self.packagekit_connect @@ -159,6 +160,20 @@ public # quit, bnc#561578 transaction_iface.send(method.to_sym, *args) + if bg_stat + proxy.on_signal("StatusChanged") do |s| + Rails.logger.debug "Background process: StatusChanged: #{s}" + bg_stat.status = s + end + + proxy.on_signal("ProgressChanged") do |p1, p2, p3, p4| + Rails.logger.debug "Background process: ProgressChanged: #{p1}%" + bg_stat.progress = p1 + # 101% means no subprogress available + bg_stat.subprogress = p2 < 101 ? p2 : nil + end + end + dbusloop << DBus::SystemBus.instance dbusloop.run -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : handle PackageKit errors (bnc #559233)
by Stefan Schubert 18 Dec '09

18 Dec '09

ref: refs/heads/master commit d50ad4b891552d7f205325e408fca63ad53d5a89 Author: Stefan Schubert <schubi(a)suse.de> Date: Fri Dec 18 13:10:02 2009 +0100 handle PackageKit errors (bnc #559233) --- plugins/patches/app/models/resolvable.rb | 30 +++++++++++++++++++- .../package/yast2-webservice-patches.changes | 5 +++ 2 files changed, 34 insertions(+), 1 deletions(-) diff --git a/plugins/patches/app/models/resolvable.rb b/plugins/patches/app/models/resolvable.rb index 09b1795..7b9acc3 100644 --- a/plugins/patches/app/models/resolvable.rb +++ b/plugins/patches/app/models/resolvable.rb @@ -7,6 +7,23 @@ require 'thread' require 'exceptions' +class PackageKitError < BackendException + def initialize(description) + @description = description + super("PackageKit error") + end + + def to_xml + xml = Builder::XmlMarkup.new({}) + xml.instruct! + + xml.error do + xml.type "PACKAGEKIT_ERROR" + xml.description @description + end + end +end + class Resolvable attr_accessor :resolvable_id, @@ -124,7 +141,18 @@ public proxy = transaction_iface.object proxy.on_signal(signal.to_s, &block) - proxy.on_signal("Error") {|u1,u2| dbusloop.quit } + proxy.on_signal("ErrorCode") {|u1,u2| + error_string = "#{u1}: #{u2}" + Rails.logger.error error_string + dbusloop.quit + raise PackageKitError.new(error_string) + } + proxy.on_signal("RepoSignatureRequired") {|u1,u2,u3,u4,u5,u6,u7,u8| + error_string = "Repository #{u2} needs to be signed" + Rails.logger.error error_string + dbusloop.quit + raise PackageKitError.new(error_string) + } proxy.on_signal("Finished") {|u1,u2| dbusloop.quit } # Do the call only when all signal handlers are in place, # otherwise Finished can arrive early and dbusloop will never diff --git a/plugins/patches/package/yast2-webservice-patches.changes b/plugins/patches/package/yast2-webservice-patches.changes index c85bfc4..458d60e 100644 --- a/plugins/patches/package/yast2-webservice-patches.changes +++ b/plugins/patches/package/yast2-webservice-patches.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Dec 18 13:09:28 CET 2009 - schubi(a)suse.de + +- handle PackageKit errors (bnc #559233) + +------------------------------------------------------------------- Tue Dec 8 18:24:24 CET 2009 - mvidner(a)suse.cz - Fixed a hang when PackageKit responded too fast (bnc#561578). -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60149 - /tags/stable-2_19_1/ncurses/
by mlandres＠svn.opensuse.org 18 Dec '09

18 Dec '09

Author: mlandres Date: Fri Dec 18 12:58:28 2009 New Revision: 60149 URL: http://svn.opensuse.org/viewcvs/yast?rev=60149&view=rev Log: Created tag stable-2_19_1 for ncurses Added: tags/stable-2_19_1/ncurses/ - copied from r60148, trunk/ncurses/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60148 - in /trunk/ncurses: VERSION package/yast2-ncurses.changes src/NCPad.cc src/NCPad.h src/NCTablePad.cc src/NCTablePad.h src/ncursesw.h
by mlandres＠svn.opensuse.org 18 Dec '09

18 Dec '09

Author: mlandres Date: Fri Dec 18 12:58:22 2009 New Revision: 60148 URL: http://svn.opensuse.org/viewcvs/yast?rev=60148&view=rev Log: Work around 32768 lines limit in ncurses table. (bnc #550733) Modified: trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes trunk/ncurses/src/NCPad.cc trunk/ncurses/src/NCPad.h trunk/ncurses/src/NCTablePad.cc trunk/ncurses/src/NCTablePad.h trunk/ncurses/src/ncursesw.h Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=60148&r1=601… ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Fri Dec 18 12:58:22 2009 @@ -1 +1 @@ -2.19.0 +2.19.1 Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Fri Dec 18 12:58:22 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Dec 18 12:55:49 CET 2009 - ma(a)suse.de + +- Work around 32768 lines limit in ncurses table. (bnc #550733) +- V 2.19.1 + +------------------------------------------------------------------- Tue Dec 15 20:06:59 CET 2009 - kmachalkova(a)suse.cz - Allow escaping '&' characters in string with hotkey support - Modified: trunk/ncurses/src/NCPad.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPad.cc?rev=60148&r… ============================================================================== --- trunk/ncurses/src/NCPad.cc (original) +++ trunk/ncurses/src/NCPad.cc Fri Dec 18 12:58:22 2009 @@ -20,6 +20,29 @@ #include <YUILog.h> #include "NCPad.h" +/////////////////////////////////////////////////////////////////// + +// PAD_PAGESIZE needs to be large enough to feed any destwin. We +// get in throuble here if the terminal has more than 1024 lines. +#define PAD_PAGESIZE 1024 + +// Maximum height of the NCursesPad (e.g. in case it can't hold more +// than 32768 lines). Larger pads need to page. +//#define MAX_PAD_HEIGHT 100 +#define MAX_PAD_HEIGHT NCursesWindow::maxcoord() + + +NCPad::NCPad( int lines, int cols, const NCWidget & p ) + : NCursesPad( lines > MAX_PAD_HEIGHT ? PAD_PAGESIZE : lines, cols ) + , _vheight( lines > MAX_PAD_HEIGHT ? lines : 0 ) + , parw( p ) + , destwin ( 0 ) + , maxdpos ( 0 ) + , maxspos ( 0 ) + , dclear ( false ) + , dirty ( false ) +{} + void NCPad::Destwin( NCursesWindow * dwin ) { @@ -29,9 +52,9 @@ if ( destwin ) { - wsze mysze( maxy() + 1, maxx() + 1 ); + wsze mysze( vheight(), width() ); - drect = wrect( 0, wsze( destwin->maxy() + 1, destwin->maxx() + 1 ) ); + drect = wrect( 0, wsze( destwin->height(), destwin->width() ) ); srect = wrect( 0, wsze::min( mysze, drect.Sze ) ); maxdpos = drect.Pos + srect.Sze - 1; maxspos = mysze - srect.Sze; @@ -52,7 +75,7 @@ { SetPadSize( nsze ); // might be enlarged by NCPadWidget if redirected - if ( nsze.H != height() + if ( nsze.H != vheight() || nsze.W != width() ) { NCursesWindow * odest = Destwin(); @@ -60,7 +83,19 @@ if ( odest ) Destwin( 0 ); + if ( nsze.H > MAX_PAD_HEIGHT ) + { + yuiDebug() << "TRUCNATE PAD: " << nsze.H << " > " << MAX_PAD_HEIGHT << endl; + NCursesPad::resize( PAD_PAGESIZE, nsze.W ); + _vheight = nsze.H; + } + else + { NCursesPad::resize( nsze.H, nsze.W ); + _vheight = 0; + } + + yuiDebug() << "Pageing ?: " << pageing() << endl; if ( odest ) Destwin( odest ); @@ -89,6 +124,8 @@ updateScrollHint(); + if ( ! pageing() ) + { return copywin( *destwin, srect.Pos.L, srect.Pos.C, drect.Pos.L, drect.Pos.C, @@ -96,6 +133,19 @@ false ); } + // Here: Table is pageing, so we must prepare the visible lines + // on the Pad before we're copying them to the destwin: + wsze lSze( 1, width() ); + for ( unsigned i = 0; i <= maxdpos.L; ++i ) + { + directDraw( *this, wrect( wpos( i, 0 ), lSze ), srect.Pos.L+i ); + } + return copywin( *destwin, + 0, srect.Pos.C, + drect.Pos.L, drect.Pos.C, + maxdpos.L, maxdpos.C, + false ); + } return OK; } @@ -128,7 +178,7 @@ break; case KEY_HOME: - ScrlUp( maxy() ); + ScrlUp( vheight() ); break; case KEY_DOWN: @@ -140,7 +190,7 @@ break; case KEY_END: - ScrlDown( maxy() ); + ScrlDown( vheight() ); break; case KEY_LEFT: Modified: trunk/ncurses/src/NCPad.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPad.h?rev=60148&r1… ============================================================================== --- trunk/ncurses/src/NCPad.h (original) +++ trunk/ncurses/src/NCPad.h Fri Dec 18 12:58:22 2009 @@ -86,6 +86,23 @@ class NCPad : public NCursesPad, public NCScrollHint { +private: + + /** The real height in case the NCursesPad is truncated, otherwise \c 0. + * + * \note Don't use _vheight directly, but \ref vheight. + * + * Up to ncurses5, ncurses uses \c short for window dimensions (can't hold + * more than 32768 lines). If \ref resize truncated the window, the real + * size is in \ref _vheight. Longer lists need to be paged. + * + * \todo Once all NCPad based types are able to page, \a maxPadHeight could be + * set to e.g \c 1024 to avoid bigger widgets in memory. Currently just + * \ref NCTablePad supports paging. If paging is \c ON, all content lines are + * written via \ref directDraw. Without pageing \ref DoRedraw is reponsible for this. + */ + int _vheight; + protected: const NCWidget & parw; @@ -99,6 +116,11 @@ bool dclear; bool dirty; + /** The (virtual) height of the Pad (even if truncated). */ + int vheight() const { return _vheight ? _vheight : height(); } + + /** Whether the Pad is truncated (we're pageing). */ + bool pageing() const { return _vheight; } virtual int dirtyPad() { dirty = false; return setpos( CurPos() ); } @@ -111,18 +133,20 @@ virtual void updateScrollHint(); -public: + /** Directly draw a table item at a specific location. + * + * \ref update usually copies the visible table content from the + * \ref NCursesPad to \ref destwin. In case the \ref NCursesPad + * is truncated, the visible lines are prepared immediately before + * they are written to \ref destwin + * . + * \see \ref _vheight. + */ + virtual void directDraw( NCursesWindow & w, const wrect at, unsigned lineno ) {} - NCPad( int lines, int cols, const NCWidget & p ) - : NCursesPad( lines, cols ) - , parw( p ) - , destwin( 0 ) - , maxdpos( 0 ) - , maxspos( 0 ) - , dclear( false ) - , dirty( false ) - {} +public: + NCPad( int lines, int cols, const NCWidget & p ); virtual ~NCPad() {} public: Modified: trunk/ncurses/src/NCTablePad.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTablePad.cc?rev=60… ============================================================================== --- trunk/ncurses/src/NCTablePad.cc (original) +++ trunk/ncurses/src/NCTablePad.cc Fri Dec 18 12:58:22 2009 @@ -207,11 +207,15 @@ wsze lSze( 1, width() ); + if ( ! pageing() ) + { for ( unsigned l = 0; l < Lines(); ++l ) { Items[l]->DrawAt( *this, wrect( wpos( l, 0 ), lSze ), ItemStyle, (( unsigned )citem.L == l ) ); } + } + // else: item drawing requested via directDraw if ( Headpad.width() != width() ) Headpad.resize( 1, width() ); @@ -230,6 +234,16 @@ +void NCTablePad::directDraw( NCursesWindow & w, const wrect at, unsigned lineno ) +{ + if ( lineno < Lines() ) + Items[lineno]->DrawAt( w, at, ItemStyle, ((unsigned)citem.L == lineno) ); + else + yuiWarning() << "Illegal Lineno " << lineno << " (" << Lines() << ")" << endl; +} + + + int NCTablePad::setpos( const wpos & newpos ) { if ( !Lines() ) @@ -265,6 +279,8 @@ return DoRedraw(); } + if ( ! pageing() ) + { // adjust only if ( citem.L != oitem ) { @@ -275,6 +291,8 @@ Items[citem.L]->DrawAt( *this, wrect( wpos( citem.L, 0 ), wsze( 1, width() ) ), ItemStyle, true ); + } + // else: item drawing requested via directDraw if ( srect.Pos.C != opos ) SendHead(); Modified: trunk/ncurses/src/NCTablePad.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTablePad.h?rev=601… ============================================================================== --- trunk/ncurses/src/NCTablePad.h (original) +++ trunk/ncurses/src/NCTablePad.h Fri Dec 18 12:58:22 2009 @@ -163,6 +163,8 @@ virtual int DoRedraw(); virtual void updateScrollHint(); + virtual void directDraw( NCursesWindow & w, const wrect at, unsigned lineno ); + public: NCTablePad( int lines, int cols, const NCWidget & p ); Modified: trunk/ncurses/src/ncursesw.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/ncursesw.h?rev=60148… ============================================================================== --- trunk/ncurses/src/ncursesw.h (original) +++ trunk/ncurses/src/ncursesw.h Fri Dec 18 12:58:22 2009 @@ -24,6 +24,7 @@ #include <ncursesw/etip.h> #include <cstdio> #include <cstdarg> +#include <climits> #include "position.h" #include <ncursesw/curses.h> @@ -887,6 +888,9 @@ #define bkgdset UNDEF(bkgdset) #endif +template <class _Tp> inline int ncursesMaxCoord() { return INT_MAX; } +template <> inline int ncursesMaxCoord<short>() { return SHRT_MAX; } + /** * @short C++ class for windows. */ @@ -1084,6 +1088,8 @@ */ int maxy() const { return getmaxy(w) == ERR ? ERR : getmaxy(w)-1; } + /** Ncurses up to ncurses5 internally uses \c short. */ + static int maxcoord() { return ncursesMaxCoord<NCURSES_SIZE_T>(); } wsze size() const { return wsze( height(), width() ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> backgroud_patches_bnc550934 : use constants instead of variables in tests
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit 756c532b8ae90a8db4304f18b933e4c5ad24d1b7 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Fri Dec 18 12:45:47 2009 +0100 use constants instead of variables in tests --- webservice/test/unit/background_status_test.rb | 36 +++++++++++------------ 1 files changed, 17 insertions(+), 19 deletions(-) diff --git a/webservice/test/unit/background_status_test.rb b/webservice/test/unit/background_status_test.rb index c63b93d..607f7e3 100644 --- a/webservice/test/unit/background_status_test.rb +++ b/webservice/test/unit/background_status_test.rb @@ -19,54 +19,52 @@ class ObserverTest end end +TEST_STATUS = 'testing status' +TEST_PROGRESS = 10 +TEST_SUBPROGRESS = 5 + class BackgroundStatusTest < ActiveSupport::TestCase def setup @bs = BackgroundStatus.new end def test_assignemnt - s = 'status' - p = 10 - sp = 5 - @bs.status = s - @bs.progress = p - @bs.subprogress = sp - - assert_equal s, @bs.status - assert_equal p, @bs.progress - assert_equal sp, @bs.subprogress + @bs.status = TEST_STATUS + @bs.progress = TEST_PROGRESS + @bs.subprogress = TEST_SUBPROGRESS + + assert_equal TEST_STATUS, @bs.status + assert_equal TEST_PROGRESS, @bs.progress + assert_equal TEST_SUBPROGRESS, @bs.subprogress end def test_observing ot = ObserverTest.new(@bs) - s = 'dummy status' - p = 10 - sp = 5 # test progress change ot.reset - @bs.progress = p + @bs.progress = TEST_PROGRESS assert ot.changed? ot.reset - @bs.subprogress = sp + @bs.subprogress = TEST_SUBPROGRESS assert ot.changed? ot.reset - @bs.status = s + @bs.status = TEST_STATUS assert ot.changed? # no change must not emit change event ot.reset - @bs.progress = p + @bs.progress = TEST_PROGRESS assert !ot.changed? ot.reset - @bs.subprogress = sp + @bs.subprogress = TEST_SUBPROGRESS assert !ot.changed? ot.reset - @bs.status = s + @bs.status = TEST_STATUS assert !ot.changed? end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : language: migrate to BaseModel and various fix
by Josef Reidinger 18 Dec '09

18 Dec '09

ref: refs/heads/master commit 83f51c45ac623be6971a491b3e03a9b7605e91e2 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Dec 18 11:40:39 2009 +0100 language: migrate to BaseModel and various fix migrate language to BaseModel remove onliners views check permissions before checking argument to have same behavior as others clean code temporaly remove available languages caching (need measure before dirtying code) unify naming of current language --- .../app/controllers/language_controller.rb | 16 +++-- plugins/language/app/models/language.rb | 66 +++++--------------- plugins/language/app/views/language/show.html.erb | 6 +- plugins/language/app/views/language/show.json.erb | 1 - plugins/language/app/views/language/show.xml.erb | 1 - .../test/functional/language_controller_test.rb | 53 +++++----------- plugins/language/test/test_helper.rb | 1 + plugins/language/test/unit/language_test.rb | 21 +----- 8 files changed, 47 insertions(+), 118 deletions(-) diff --git a/plugins/language/app/controllers/language_controller.rb b/plugins/language/app/controllers/language_controller.rb index cc47f32..938aca2 100644 --- a/plugins/language/app/controllers/language_controller.rb +++ b/plugins/language/app/controllers/language_controller.rb @@ -12,20 +12,16 @@ class LanguageController < ApplicationController # Actualizes language settings. Requires write permissions for language YaPI. def update + yapi_perm_check "language.write" if params.has_key?(:language) - yapi_perm_check "language.write" - @language = Language.new - @language.language = params[:language][:current] - @language.utf8 = params[:language][:utf8] - @language.rootlocale = params[:language][:rootlocale] + @language = Language.new params[:language] @language.save - else logger.warn("No argument to update") raise InvalidParameters.new :language => "Missing" end - render :show + show end # See update @@ -38,6 +34,12 @@ class LanguageController < ApplicationController yapi_perm_check "language.read" @language = Language.find + + respond_to do |format| + format.html { render :show } + format.xml { render :xml => systemtime.to_xml( :dasherize => false ) } + format.json { render :json => systemtime.to_json( :dasherize => false ) } + end end end diff --git a/plugins/language/app/models/language.rb b/plugins/language/app/models/language.rb index 5121530..08eef42 100644 --- a/plugins/language/app/models/language.rb +++ b/plugins/language/app/models/language.rb @@ -3,57 +3,49 @@ # Provides set and gets resources from YaPI language module. # Main goal is handle YaPI specific calls and data formats. Provides cleaned # and well defined data. -class Language - - # cache available languages as it is change only rarely - @@available = {} +class Language < BaseModel::Base # current language - attr_accessor :language + attr_accessor :current # utf8 settings ("true" or "false") attr_accessor :utf8 # root locale settings ("true" or "false" or "ctype") # see yast-country documentation attr_accessor :rootlocale + # available languages on target machine. + # + # It is a array of hashs. Each hash contain keys id ( of language, + # value for language variable) and name (which is localized language + # name in UTF8. + attr_reader :available private # Creates argument for dbus call which specify what data is requested. - # Available languages is cached so request it only if it is necessary. # return:: hash with requested keys def self.create_read_question #:doc: - ret = { + { "current" => "true", "utf8" => "true", - "rootlang" => "true" + "rootlang" => "true", + "languages" => "true" } - if @@available.nil? || @@available.empty? - ret["languages"]= "true" - end - return ret end public # Parses response from dbus YaPI call # response:: response from dbus def parse_response(response) #:doc: - @language = response["current"] + @current = response["current"] @utf8 = response["utf8"] @rootlocale = response["rootlang"] if response["languages"] - @@available = response["languages"] + @available = response["languages"].collect { |k,v| { :id => k, :name => v[0] } } # v array => [native UTF8, native ascii, UTF8 extension, english name] end end - # Getter for available static field - def available - @@available - end - # fills language instance with data from YaPI. - # - # +warn+: Doesn't take any parameters. - def Language.find + def Language.find(*args) ret = Language.new ret.parse_response YastService.Call("YaPI::LANGUAGE::Read",create_read_question) return ret @@ -62,37 +54,9 @@ class Language # Saves data from model to system via YaPI def save settings = {} - settings["current"] = @language if @language #set only if value is passed + settings["current"] = @current if @current #set only if value is passed settings["utf8"] = @utf8 if @utf8 #set only if value is passed settings["rootlang"] = @rootlocale if @rootlocale #set only if value is passed YastService.Call("YaPI::LANGUAGE::Write",settings) end - - def initialize - end - - def to_xml( options = {} ) - xml = options[:builder] ||= Builder::XmlMarkup.new(options) - xml.instruct! unless options[:skip_instruct] - - xml.language do - xml.tag!(:current, @language ) - xml.tag!(:utf8, @utf8) - xml.tag!(:rootlocale, @rootlocale ) - xml.available({:type => "array"}) do - @@available.each do |k,v| - xml.language do - xml.tag!(:id, k) - xml.tag!(:name, v[0]) # [native UTF8, native ascii, UTF8 extension, english name] - end - end - end - end - end - - def to_json( options = {} ) - hash = Hash.from_xml(to_xml()) - return hash.to_json - end - end diff --git a/plugins/language/app/views/language/show.html.erb b/plugins/language/app/views/language/show.html.erb index 8e37a72..6300ffb 100644 --- a/plugins/language/app/views/language/show.html.erb +++ b/plugins/language/app/views/language/show.html.erb @@ -1,10 +1,10 @@ -Locale (user): <%= @language.language -%> +Locale (user): <%= @language.current -%> Locale (root): <%= @language.rootlocale -%> UTF-8?: <%= @language.utf8 -%> Available: <ul> -<% @language.available.each do |k,v| -%> - <li><%= "#{k}: #{v.inspect}" -%></li> +<% @language.available.each do |v| -%> + <li><%= "#{v[:id]}: #{v[:name]}" -%></li> <% end -%> </ul> diff --git a/plugins/language/app/views/language/show.json.erb b/plugins/language/app/views/language/show.json.erb deleted file mode 100644 index 391a4e0..0000000 --- a/plugins/language/app/views/language/show.json.erb +++ /dev/null @@ -1 +0,0 @@ -<%= @language.to_json -%> \ No newline at end of file diff --git a/plugins/language/app/views/language/show.xml.erb b/plugins/language/app/views/language/show.xml.erb deleted file mode 100644 index 8fc40f8..0000000 --- a/plugins/language/app/views/language/show.xml.erb +++ /dev/null @@ -1 +0,0 @@ -<%= @language.to_xml -%> \ No newline at end of file diff --git a/plugins/language/test/functional/language_controller_test.rb b/plugins/language/test/functional/language_controller_test.rb index 160043d..370fc29 100644 --- a/plugins/language/test/functional/language_controller_test.rb +++ b/plugins/language/test/functional/language_controller_test.rb @@ -5,6 +5,7 @@ require File.expand_path( File.join("test","plugin_basic_tests"), RailsParent.pa class LanguageControllerTest < ActionController::TestCase fixtures :accounts + include PluginBasicTests def setup # @model_class = Language @@ -12,50 +13,26 @@ class LanguageControllerTest < ActionController::TestCase @request = ActionController::TestRequest.new # http://railsforum.com/viewtopic.php?id=1719 @request.session[:account_id] = 1 # defined in fixtures - @data = DATA - - Language.stubs(:available).returns( - { 'rootlang' => 'ctype', - 'languages' => { - 'en_US' => [ - 'English (US)', - 'English (US)', - '.UTF-8', - '', - 'English (US)' ], - 'fr_FR' => [ - 'Français', - 'Francais', - '.UTF-8', - '@euro', - 'French' ], - 'de_DE' => [ - 'Deutsch', - 'Deutsch', - '.UTF-8', - '@euro', - 'German' ] - }, - 'current' => 'en_US', - 'utf8' => 'true' - } ) - - @lang = Language.new - @lang.language = "de_DE" - @lang.rootlocale = "false" - @lang.utf8 = "false" - - Language.stubs(:find).returns(@lang) - + lang = Language.new(DATA[:language]) + lang.instance_variable_set(:'@available',AVAILABLE) #set available, but it doesn't has accessor, so it is little tricky + Language.stubs(:find).returns(lang) end - include PluginBasicTests DATA = {:language => { :current => "cs_CZ", :utf8 => "true", - :rootlocale => "false" + :rootlocale => "false", }} + AVAILABLE = [ + { :id => 'en_US', + :name => 'English (US)'}, + { :id => 'fr_FR', + :name => 'Français' }, + { :id => 'de_DE', + :name => 'Deutsch', + } + ] def test_update Language.any_instance.stubs(:save) @@ -73,7 +50,7 @@ class LanguageControllerTest < ActionController::TestCase assert_response :success lang = assigns(:language) assert lang - assert_equal lang.language, DATA[:language][:current] + assert_equal lang.current, DATA[:language][:current] assert_equal lang.utf8, DATA[:language][:utf8] assert_equal lang.rootlocale, DATA[:language][:rootlocale] end diff --git a/plugins/language/test/test_helper.rb b/plugins/language/test/test_helper.rb index 54d2979..c0b0373 100644 --- a/plugins/language/test/test_helper.rb +++ b/plugins/language/test/test_helper.rb @@ -5,6 +5,7 @@ require File.join(File.dirname(__FILE__), '..', 'config', 'rails_parent') require File.expand_path( File.join("config","environment"), RailsParent.parent ) # then enable testing, this will get the routing right require 'test_help' +require 'mocha' class ActiveSupport::TestCase # Transactional fixtures accelerate your tests by wrapping each test method diff --git a/plugins/language/test/unit/language_test.rb b/plugins/language/test/unit/language_test.rb index 22d92ae..ca23c04 100644 --- a/plugins/language/test/unit/language_test.rb +++ b/plugins/language/test/unit/language_test.rb @@ -30,23 +30,12 @@ class LanguageTest < ActiveSupport::TestCase "languages" => "true" } - ARGS_PARTIAL = { - "current"=> "true", - "utf8"=> "true", - "rootlang"=> "true" - } - RESPONSE_FULL = { "current" => "en_US", "utf8" => "true", "rootlang" => "ctype", "languages" => LANGUAGES } - RESPONSE_PARTIAL = { - "current" => "en_US", - "utf8" => "true", - "rootlang" => "ctype" } - ARGS_WRITE = { "current" => "de_DE", "utf8" => "false", @@ -54,7 +43,6 @@ class LanguageTest < ActiveSupport::TestCase def setup YastService.stubs(:Call).with("YaPI::LANGUAGE::Read",ARGS_FULL).returns(RESPONSE_FULL) - YastService.stubs(:Call).with("YaPI::LANGUAGE::Read",ARGS_PARTIAL).returns(RESPONSE_PARTIAL) YastService.stubs(:Call).with("YaPI::LANGUAGE::Write",ARGS_WRITE).returns(true) end @@ -62,15 +50,14 @@ class LanguageTest < ActiveSupport::TestCase lang = Language.find # pp Language.available - assert_equal("en_US", lang.language) + assert_equal("en_US", lang.current) assert_equal("ctype", lang.rootlocale) assert_equal("true", lang.utf8) - assert_equal(LANGUAGES,lang.available) end def test_setter lang = Language.find - lang.language = "de_DE" + lang.current = "de_DE" lang.rootlocale = "false" lang.utf8 = "false" lang.save @@ -78,7 +65,7 @@ class LanguageTest < ActiveSupport::TestCase def test_xml lang = Language.find - lang.language = "de_DE" + lang.current = "de_DE" lang.rootlocale = "false" lang.utf8 = "false" @@ -98,7 +85,7 @@ class LanguageTest < ActiveSupport::TestCase def test_json lang = Language.find - lang.language = "de_DE" + lang.current = "de_DE" lang.rootlocale = "false" lang.utf8 = "false" -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60147 - /tags/branch-Linux-11_2-2_18_11/ncurses/
by mlandres＠svn.opensuse.org 18 Dec '09

18 Dec '09

Author: mlandres Date: Fri Dec 18 11:47:42 2009 New Revision: 60147 URL: http://svn.opensuse.org/viewcvs/yast?rev=60147&view=rev Log: Created tag branch-Linux-11_2-2_18_11 for ncurses Added: tags/branch-Linux-11_2-2_18_11/ncurses/ - copied from r60146, branches/SuSE-Linux-11_2-Branch/ncurses/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60146 - /tags/branch-Linux-11_2-2_18_11/
by mlandres＠svn.opensuse.org 18 Dec '09

18 Dec '09

Author: mlandres Date: Fri Dec 18 11:47:41 2009 New Revision: 60146 URL: http://svn.opensuse.org/viewcvs/yast?rev=60146&view=rev Log: Created tag branch-Linux-11_2-2_18_11 Added: tags/branch-Linux-11_2-2_18_11/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60145 - in /branches/SuSE-Linux-11_2-Branch/ncurses: VERSION package/yast2-ncurses.changes src/NCPad.cc src/NCPad.h src/NCTablePad.cc src/NCTablePad.h src/ncursesw.h
by mlandres＠svn.opensuse.org 18 Dec '09

18 Dec '09

Author: mlandres Date: Fri Dec 18 11:47:37 2009 New Revision: 60145 URL: http://svn.opensuse.org/viewcvs/yast?rev=60145&view=rev Log: Work around 32768 lines limit in ncurses table. (bnc #550733) Modified: branches/SuSE-Linux-11_2-Branch/ncurses/VERSION branches/SuSE-Linux-11_2-Branch/ncurses/package/yast2-ncurses.changes branches/SuSE-Linux-11_2-Branch/ncurses/src/NCPad.cc branches/SuSE-Linux-11_2-Branch/ncurses/src/NCPad.h branches/SuSE-Linux-11_2-Branch/ncurses/src/NCTablePad.cc branches/SuSE-Linux-11_2-Branch/ncurses/src/NCTablePad.h branches/SuSE-Linux-11_2-Branch/ncurses/src/ncursesw.h Modified: branches/SuSE-Linux-11_2-Branch/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/ncurse… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/ncurses/VERSION (original) +++ branches/SuSE-Linux-11_2-Branch/ncurses/VERSION Fri Dec 18 11:47:37 2009 @@ -1 +1 @@ -2.18.10 +2.18.11 Modified: branches/SuSE-Linux-11_2-Branch/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/ncurse… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/ncurses/package/yast2-ncurses.changes (original) +++ branches/SuSE-Linux-11_2-Branch/ncurses/package/yast2-ncurses.changes Fri Dec 18 11:47:37 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Dec 18 11:46:34 CET 2009 - ma(a)suse.de + +- Work around 32768 lines limit in ncurses table. (bnc #550733) +- V 2.18.11 + +------------------------------------------------------------------- Thu May 28 11:28:12 CEST 2009 - gs(a)suse.de - NCTable/NCTablePad: only sort in reverse order if Ctrl 'o' Modified: branches/SuSE-Linux-11_2-Branch/ncurses/src/NCPad.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/ncurse… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/ncurses/src/NCPad.cc (original) +++ branches/SuSE-Linux-11_2-Branch/ncurses/src/NCPad.cc Fri Dec 18 11:47:37 2009 @@ -20,6 +20,29 @@ #include <YUILog.h> #include "NCPad.h" +/////////////////////////////////////////////////////////////////// + +// PAD_PAGESIZE needs to be large enough to feed any destwin. We +// get in throuble here if the terminal has more than 1024 lines. +#define PAD_PAGESIZE 1024 + +// Maximum height of the NCursesPad (e.g. in case it can't hold more +// than 32768 lines). Larger pads need to page. +//#define MAX_PAD_HEIGHT 100 +#define MAX_PAD_HEIGHT NCursesWindow::maxcoord() + + +NCPad::NCPad( int lines, int cols, const NCWidget & p ) + : NCursesPad( lines > MAX_PAD_HEIGHT ? PAD_PAGESIZE : lines, cols ) + , _vheight( lines > MAX_PAD_HEIGHT ? lines : 0 ) + , parw( p ) + , destwin ( 0 ) + , maxdpos ( 0 ) + , maxspos ( 0 ) + , dclear ( false ) + , dirty ( false ) +{} + void NCPad::Destwin( NCursesWindow * dwin ) { @@ -29,9 +52,9 @@ if ( destwin ) { - wsze mysze( maxy() + 1, maxx() + 1 ); + wsze mysze( vheight(), width() ); - drect = wrect( 0, wsze( destwin->maxy() + 1, destwin->maxx() + 1 ) ); + drect = wrect( 0, wsze( destwin->height(), destwin->width() ) ); srect = wrect( 0, wsze::min( mysze, drect.Sze ) ); maxdpos = drect.Pos + srect.Sze - 1; maxspos = mysze - srect.Sze; @@ -52,7 +75,7 @@ { SetPadSize( nsze ); // might be enlarged by NCPadWidget if redirected - if ( nsze.H != height() + if ( nsze.H != vheight() || nsze.W != width() ) { NCursesWindow * odest = Destwin(); @@ -60,7 +83,19 @@ if ( odest ) Destwin( 0 ); + if ( nsze.H > MAX_PAD_HEIGHT ) + { + yuiDebug() << "TRUCNATE PAD: " << nsze.H << " > " << MAX_PAD_HEIGHT << endl; + NCursesPad::resize( PAD_PAGESIZE, nsze.W ); + _vheight = nsze.H; + } + else + { NCursesPad::resize( nsze.H, nsze.W ); + _vheight = 0; + } + + yuiDebug() << "Pageing ?: " << pageing() << endl; if ( odest ) Destwin( odest ); @@ -89,6 +124,8 @@ updateScrollHint(); + if ( ! pageing() ) + { return copywin( *destwin, srect.Pos.L, srect.Pos.C, drect.Pos.L, drect.Pos.C, @@ -96,6 +133,19 @@ false ); } + // Here: Table is pageing, so we must prepare the visible lines + // on the Pad before we're copying them to the destwin: + wsze lSze( 1, width() ); + for ( unsigned i = 0; i <= maxdpos.L; ++i ) + { + directDraw( *this, wrect( wpos( i, 0 ), lSze ), srect.Pos.L+i ); + } + return copywin( *destwin, + 0, srect.Pos.C, + drect.Pos.L, drect.Pos.C, + maxdpos.L, maxdpos.C, + false ); + } return OK; } @@ -128,7 +178,7 @@ break; case KEY_HOME: - ScrlUp( maxy() ); + ScrlUp( vheight() ); break; case KEY_DOWN: @@ -140,7 +190,7 @@ break; case KEY_END: - ScrlDown( maxy() ); + ScrlDown( vheight() ); break; case KEY_LEFT: Modified: branches/SuSE-Linux-11_2-Branch/ncurses/src/NCPad.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/ncurse… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/ncurses/src/NCPad.h (original) +++ branches/SuSE-Linux-11_2-Branch/ncurses/src/NCPad.h Fri Dec 18 11:47:37 2009 @@ -86,6 +86,23 @@ class NCPad : public NCursesPad, public NCScrollHint { +private: + + /** The real height in case the NCursesPad is truncated, otherwise \c 0. + * + * \note Don't use _vheight directly, but \ref vheight. + * + * Up to ncurses5, ncurses uses \c short for window dimensions (can't hold + * more than 32768 lines). If \ref resize truncated the window, the real + * size is in \ref _vheight. Longer lists need to be paged. + * + * \todo Once all NCPad based types are able to page, \a maxPadHeight could be + * set to e.g \c 1024 to avoid bigger widgets in memory. Currently just + * \ref NCTablePad supports paging. If paging is \c ON, all content lines are + * written via \ref directDraw. Without pageing \ref DoRedraw is reponsible for this. + */ + int _vheight; + protected: const NCWidget & parw; @@ -99,6 +116,11 @@ bool dclear; bool dirty; + /** The (virtual) height of the Pad (even if truncated). */ + int vheight() const { return _vheight ? _vheight : height(); } + + /** Whether the Pad is truncated (we're pageing). */ + bool pageing() const { return _vheight; } virtual int dirtyPad() { dirty = false; return setpos( CurPos() ); } @@ -111,18 +133,20 @@ virtual void updateScrollHint(); -public: + /** Directly draw a table item at a specific location. + * + * \ref update usually copies the visible table content from the + * \ref NCursesPad to \ref destwin. In case the \ref NCursesPad + * is truncated, the visible lines are prepared immediately before + * they are written to \ref destwin + * . + * \see \ref _vheight. + */ + virtual void directDraw( NCursesWindow & w, const wrect at, unsigned lineno ) {} - NCPad( int lines, int cols, const NCWidget & p ) - : NCursesPad( lines, cols ) - , parw( p ) - , destwin( 0 ) - , maxdpos( 0 ) - , maxspos( 0 ) - , dclear( false ) - , dirty( false ) - {} +public: + NCPad( int lines, int cols, const NCWidget & p ); virtual ~NCPad() {} public: Modified: branches/SuSE-Linux-11_2-Branch/ncurses/src/NCTablePad.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/ncurse… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/ncurses/src/NCTablePad.cc (original) +++ branches/SuSE-Linux-11_2-Branch/ncurses/src/NCTablePad.cc Fri Dec 18 11:47:37 2009 @@ -207,11 +207,15 @@ wsze lSze( 1, width() ); + if ( ! pageing() ) + { for ( unsigned l = 0; l < Lines(); ++l ) { Items[l]->DrawAt( *this, wrect( wpos( l, 0 ), lSze ), ItemStyle, (( unsigned )citem.L == l ) ); } + } + // else: item drawing requested via directDraw if ( Headpad.width() != width() ) Headpad.resize( 1, width() ); @@ -230,6 +234,16 @@ +void NCTablePad::directDraw( NCursesWindow & w, const wrect at, unsigned lineno ) +{ + if ( lineno < Lines() ) + Items[lineno]->DrawAt( w, at, ItemStyle, ((unsigned)citem.L == lineno) ); + else + yuiWarning() << "Illegal Lineno " << lineno << " (" << Lines() << ")" << endl; +} + + + int NCTablePad::setpos( const wpos & newpos ) { if ( !Lines() ) @@ -265,6 +279,8 @@ return DoRedraw(); } + if ( ! pageing() ) + { // adjust only if ( citem.L != oitem ) { @@ -275,6 +291,8 @@ Items[citem.L]->DrawAt( *this, wrect( wpos( citem.L, 0 ), wsze( 1, width() ) ), ItemStyle, true ); + } + // else: item drawing requested via directDraw if ( srect.Pos.C != opos ) SendHead(); Modified: branches/SuSE-Linux-11_2-Branch/ncurses/src/NCTablePad.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/ncurse… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/ncurses/src/NCTablePad.h (original) +++ branches/SuSE-Linux-11_2-Branch/ncurses/src/NCTablePad.h Fri Dec 18 11:47:37 2009 @@ -163,6 +163,8 @@ virtual int DoRedraw(); virtual void updateScrollHint(); + virtual void directDraw( NCursesWindow & w, const wrect at, unsigned lineno ); + public: NCTablePad( int lines, int cols, const NCWidget & p ); Modified: branches/SuSE-Linux-11_2-Branch/ncurses/src/ncursesw.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/ncurse… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/ncurses/src/ncursesw.h (original) +++ branches/SuSE-Linux-11_2-Branch/ncurses/src/ncursesw.h Fri Dec 18 11:47:37 2009 @@ -24,6 +24,7 @@ #include <ncursesw/etip.h> #include <cstdio> #include <cstdarg> +#include <climits> #include "position.h" #include <ncursesw/curses.h> @@ -887,6 +888,9 @@ #define bkgdset UNDEF(bkgdset) #endif +template <class _Tp> inline int ncursesMaxCoord() { return INT_MAX; } +template <> inline int ncursesMaxCoord<short>() { return SHRT_MAX; } + /** * @short C++ class for windows. */ @@ -1084,6 +1088,8 @@ */ int maxy() const { return getmaxy(w) == ERR ? ERR : getmaxy(w)-1; } + /** Ncurses up to ncurses5 internally uses \c short. */ + static int maxcoord() { return ncursesMaxCoord<NCURSES_SIZE_T>(); } wsze size() const { return wsze( height(), width() ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60144 - /tags/branch-Code-11-SP1-2_17_17/ncurses/
by mlandres＠svn.opensuse.org 18 Dec '09

18 Dec '09

Author: mlandres Date: Fri Dec 18 11:31:39 2009 New Revision: 60144 URL: http://svn.opensuse.org/viewcvs/yast?rev=60144&view=rev Log: Created tag branch-Code-11-SP1-2_17_17 for ncurses Added: tags/branch-Code-11-SP1-2_17_17/ncurses/ (props changed) - copied from r60143, branches/SuSE-Code-11-SP1-Branch/ncurses/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0